IP directed broadcast

[vpp.git] / src / plugins / pppoe / pppoe.c

diff --git a/src/plugins/pppoe/pppoe.c b/src/plugins/pppoe/pppoe.c
index e09ac7d..e5ab5d0 100644 (file)
--- a/src/plugins/pppoe/pppoe.c
+++ b/src/plugins/pppoe/pppoe.c
@@ -146,15 +146,23 @@ pppoe_build_rewrite (vnet_main_t * vnm,
  * @brief Fixup the adj rewrite post encap. Insert the packet's length
  */
 static void
-pppoe_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b0)
+pppoe_fixup (vlib_main_t * vm,
+            ip_adjacency_t * adj, vlib_buffer_t * b0, const void *data)
 {
+  const pppoe_session_t *t;
   pppoe_header_t *pppoe0;
 
-  pppoe0 = vlib_buffer_get_current (b0);
+  /* update the rewrite string */
+  pppoe0 = vlib_buffer_get_current (b0) + sizeof (ethernet_header_t);
 
   pppoe0->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b0)
                                         - sizeof (pppoe_header_t)
+                                        + sizeof (pppoe0->ppp_proto)
                                         - sizeof (ethernet_header_t));
+  /* Swap to the the packet's output interface to the encap (not the
+   * session) interface */
+  t = data;
+  vnet_buffer (b0)->sw_if_index[VLIB_TX] = t->encap_if_index;
 }
 
 static void
@@ -169,12 +177,15 @@ pppoe_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
   ASSERT (ADJ_INDEX_INVALID != ai);
 
   adj = adj_get (ai);
+  session_id = pem->session_index_by_sw_if_index[sw_if_index];
+  t = pool_elt_at_index (pem->sessions, session_id);
 
   switch (adj->lookup_next_index)
     {
     case IP_LOOKUP_NEXT_ARP:
     case IP_LOOKUP_NEXT_GLEAN:
-      adj_nbr_midchain_update_rewrite (ai, pppoe_fixup,
+    case IP_LOOKUP_NEXT_BCAST:
+      adj_nbr_midchain_update_rewrite (ai, pppoe_fixup, t,
                                       ADJ_FLAG_NONE,
                                       pppoe_build_rewrite (vnm,
                                                            sw_if_index,
@@ -186,7 +197,7 @@ pppoe_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
        * Construct a partial rewrite from the known ethernet mcast dest MAC
        * There's no MAC fixup, so the last 2 parameters are 0
        */
-      adj_mcast_midchain_update_rewrite (ai, pppoe_fixup,
+      adj_mcast_midchain_update_rewrite (ai, pppoe_fixup, t,
                                         ADJ_FLAG_NONE,
                                         pppoe_build_rewrite (vnm,
                                                              sw_if_index,
@@ -206,8 +217,6 @@ pppoe_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
       break;
     }
 
-  session_id = pem->session_index_by_sw_if_index[sw_if_index];
-  t = pool_elt_at_index (pem->sessions, session_id);
   interface_tx_dpo_add_or_lock (vnet_link_to_dpo_proto (adj->ia_link),
                                t->encap_if_index, &dpo);
 
@@ -280,10 +289,9 @@ int vnet_pppoe_add_del_session
       pfx.fp_proto = FIB_PROTOCOL_IP6;
     }
 
-  /* Get encap_if_index and local mac address */
-  pppoe_lookup_1 (&pem->session_table, &cached_key, &cached_result,
-                 a->client_mac, clib_host_to_net_u16 (a->session_id),
-                 &key, &bucket, &result);
+  /* Get encap_if_index and local mac address from link_table */
+  pppoe_lookup_1 (&pem->link_table, &cached_key, &cached_result,
+                 a->client_mac, 0, &key, &bucket, &result);
   a->encap_if_index = result.fields.sw_if_index;
 
   if (a->encap_if_index == ~0)
@@ -292,6 +300,14 @@ int vnet_pppoe_add_del_session
   si = vnet_get_sw_interface (vnm, a->encap_if_index);
   hi = vnet_get_hw_interface (vnm, si->hw_if_index);
 
+  /* lookup session_table */
+  pppoe_lookup_1 (&pem->session_table, &cached_key, &cached_result,
+                 a->client_mac, clib_host_to_net_u16 (a->session_id),
+                 &key, &bucket, &result);
+
+  /* learn client session */
+  pppoe_learn_process (&pem->session_table, a->encap_if_index,
+                      &key, &cached_key, &bucket, &result);
 
   if (a->is_add)
     {
@@ -709,6 +725,9 @@ pppoe_init (vlib_main_t * vm)
   pem->vlib_main = vm;
 
   /* Create the hash table  */
+  BV (clib_bihash_init) (&pem->link_table, "pppoe link table",
+                        PPPOE_NUM_BUCKETS, PPPOE_MEMORY_SIZE);
+
   BV (clib_bihash_init) (&pem->session_table, "pppoe session table",
                         PPPOE_NUM_BUCKETS, PPPOE_MEMORY_SIZE);
 
@@ -716,7 +735,7 @@ pppoe_init (vlib_main_t * vm)
                                pppoe_input_node.index);
 
   ethernet_register_input_type (vm, ETHERNET_TYPE_PPPOE_DISCOVERY,
-                               pppoe_tap_dispatch_node.index);
+                               pppoe_cp_dispatch_node.index);
 
   return 0;
 }