aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS5
-rw-r--r--src/configure.ac1
-rw-r--r--src/plugins/Makefile.am4
-rw-r--r--src/plugins/pppoe.am40
-rw-r--r--src/plugins/pppoe/pppoe.api90
-rw-r--r--src/plugins/pppoe/pppoe.c660
-rw-r--r--src/plugins/pppoe/pppoe.h295
-rw-r--r--src/plugins/pppoe/pppoe_all_api_h.h18
-rw-r--r--src/plugins/pppoe/pppoe_api.c224
-rw-r--r--src/plugins/pppoe/pppoe_decap.c422
-rw-r--r--src/plugins/pppoe/pppoe_encap.c384
-rw-r--r--src/plugins/pppoe/pppoe_error.def18
-rw-r--r--src/plugins/pppoe/pppoe_msg_enum.h31
-rw-r--r--src/plugins/pppoe/pppoe_tap.c89
-rw-r--r--src/plugins/pppoe/pppoe_tap_node.c297
-rw-r--r--src/plugins/pppoe/pppoe_test.c330
-rw-r--r--src/vpp-api/java/Makefile.am20
-rw-r--r--src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c107
-rw-r--r--src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h42
-rw-r--r--test/test_pppoe.py605
-rw-r--r--test/vpp_papi_provider.py26
-rw-r--r--test/vpp_pppoe_interface.py79
22 files changed, 3787 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 55fe00bfa92..4f2918fac4a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -132,6 +132,11 @@ M: Hongjun Ni <hongjun.ni@intel.com>
F: src/plugins/gtpu/
F: src/plugins/gtpu.am
+Plugin - PPPoE
+M: Hongjun Ni <hongjun.ni@intel.com>
+F: src/plugins/pppoe/
+F: src/plugins/pppoe.am
+
Test Infrastructure
M: Klement Sekera <ksekera@cisco.com>
F: test/
diff --git a/src/configure.ac b/src/configure.ac
index cb00d0bdb2c..7a038c2e49d 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -167,6 +167,7 @@ PLUGIN_ENABLED(ioam)
PLUGIN_ENABLED(ixge)
PLUGIN_ENABLED(lb)
PLUGIN_ENABLED(memif)
+PLUGIN_ENABLED(pppoe)
PLUGIN_ENABLED(sixrd)
PLUGIN_ENABLED(snat)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index f26d0fd27c5..8c7b3fac427 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -66,6 +66,10 @@ if ENABLE_MEMIF_PLUGIN
include memif.am
endif
+if ENABLE_PPPOE_PLUGIN
+include pppoe.am
+endif
+
if ENABLE_SIXRD_PLUGIN
include sixrd.am
endif
diff --git a/src/plugins/pppoe.am b/src/plugins/pppoe.am
new file mode 100644
index 00000000000..28bd20a0425
--- /dev/null
+++ b/src/plugins/pppoe.am
@@ -0,0 +1,40 @@
+# Copyright (c) 2017 Intel and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+vppapitestplugins_LTLIBRARIES += pppoe_test_plugin.la
+vppplugins_LTLIBRARIES += pppoe_plugin.la
+
+pppoe_plugin_la_SOURCES = \
+ pppoe/pppoe_decap.c \
+ pppoe/pppoe_encap.c \
+ pppoe/pppoe_tap.c \
+ pppoe/pppoe_tap_node.c \
+ pppoe/pppoe.c \
+ pppoe/pppoe_api.c
+
+BUILT_SOURCES += \
+ pppoe/pppoe.api.h \
+ pppoe/pppoe.api.json
+
+API_FILES += pppoe/pppoe.api
+
+nobase_apiinclude_HEADERS += \
+ pppoe/pppoe_all_api_h.h \
+ pppoe/pppoe_msg_enum.h \
+ pppoe/pppoe.api.h
+
+pppoe_test_plugin_la_SOURCES = \
+ pppoe/pppoe_test.c \
+ pppoe/pppoe_plugin.api.h
+
+# vi:syntax=automake
diff --git a/src/plugins/pppoe/pppoe.api b/src/plugins/pppoe/pppoe.api
new file mode 100644
index 00000000000..e8cd989f41b
--- /dev/null
+++ b/src/plugins/pppoe/pppoe.api
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** \brief Set or delete an PPPOE session
+ @param client_index - opaque cookie to identify the sender
+ @param context - sender context, to match reply w/ request
+ @param is_add - add address if non-zero, else delete
+ @param is_ipv6 - client_ip and dst_address is ipv6 or not
+ @param session_id - PPPoE session ID
+ @param client_ip - PPPOE session's client address.
+ @param decap_vrf_id - the vrf index for pppoe decaped packet
+ @param client_mac - the client ethernet address
+*/
+define pppoe_add_del_session
+{
+ u32 client_index;
+ u32 context;
+ u8 is_add;
+ u8 is_ipv6;
+ u16 session_id;
+ u8 client_ip[16];
+ u32 decap_vrf_id;
+ u8 client_mac[6];
+};
+
+/** \brief reply for set or delete an PPPOE session
+ @param context - sender context, to match reply w/ request
+ @param retval - return code
+ @param sw_if_index - software index of the interface
+*/
+define pppoe_add_del_session_reply
+{
+ u32 context;
+ i32 retval;
+ u32 sw_if_index;
+};
+
+/** \brief Dump PPPOE session
+ @param client_index - opaque cookie to identify the sender
+ @param context - sender context, to match reply w/ request
+ @param sw_if_index - software index of the interface
+*/
+define pppoe_session_dump
+{
+ u32 client_index;
+ u32 context;
+ u32 sw_if_index;
+};
+
+/** \brief dump details of an PPPOE session
+ @param context - sender context, to match reply w/ request
+ @param sw_if_index - software index of the interface
+ @param is_ipv6 - client_ip and dst_address is ipv6 or not
+ @param session_id - PPPoE session ID
+ @param client_ip - PPPOE session's client address.
+ @param encap_if_index - the index of tx interface for pppoe encaped packet
+ @param decap_vrf_id - the vrf index for pppoe decaped packet
+ @param local_mac - the local ethernet address
+ @param client_mac - the client ethernet address
+*/
+define pppoe_session_details
+{
+ u32 context;
+ u32 sw_if_index;
+ u8 is_ipv6;
+ u16 session_id;
+ u8 client_ip[16];
+ u32 encap_if_index;
+ u32 decap_vrf_id;
+ u8 local_mac[6];
+ u8 client_mac[6];
+};
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/pppoe/pppoe.c b/src/plugins/pppoe/pppoe.c
new file mode 100644
index 00000000000..4c63902a751
--- /dev/null
+++ b/src/plugins/pppoe/pppoe.c
@@ -0,0 +1,660 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+#include <stdint.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include <inttypes.h>
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_table.h>
+#include <vnet/dpo/dpo.h>
+#include <vnet/plugin/plugin.h>
+#include <vpp/app/version.h>
+#include <vnet/ppp/packet.h>
+#include <pppoe/pppoe.h>
+
+#include <vppinfra/hash.h>
+#include <vppinfra/bihash_template.c>
+
+pppoe_main_t pppoe_main;
+
+u8 *
+format_pppoe_session (u8 * s, va_list * args)
+{
+ pppoe_session_t *t = va_arg (*args, pppoe_session_t *);
+ pppoe_main_t *pem = &pppoe_main;
+
+ s = format (s, "[%d] sw-if-index %d client-ip %U session-id %d ",
+ t - pem->sessions, t->sw_if_index,
+ format_ip46_address, &t->client_ip, IP46_TYPE_ANY,
+ t->session_id);
+
+ s = format (s, "encap-if-index %d decap-fib-index %d\n",
+ t->encap_if_index, t->decap_fib_index);
+
+ s = format (s, " local-mac %U client-mac %U",
+ format_ethernet_address, t->local_mac,
+ format_ethernet_address, t->client_mac);
+
+ return s;
+}
+
+static u8 *
+format_pppoe_name (u8 * s, va_list * args)
+{
+ u32 dev_instance = va_arg (*args, u32);
+ return format (s, "pppoe_session%d", dev_instance);
+}
+
+static uword
+dummy_interface_tx (vlib_main_t * vm,
+ vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+ clib_warning ("you shouldn't be here, leaking buffers...");
+ return frame->n_vectors;
+}
+
+static clib_error_t *
+pppoe_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
+{
+ u32 hw_flags = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
+ VNET_HW_INTERFACE_FLAG_LINK_UP : 0;
+ vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
+
+ return /* no error */ 0;
+}
+
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (pppoe_device_class,static) = {
+ .name = "PPPPOE",
+ .format_device_name = format_pppoe_name,
+ .format_tx_trace = format_pppoe_encap_trace,
+ .tx_function = dummy_interface_tx,
+ .admin_up_down_function = pppoe_interface_admin_up_down,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_pppoe_header_with_length (u8 * s, va_list * args)
+{
+ u32 dev_instance = va_arg (*args, u32);
+ s = format (s, "unimplemented dev %u", dev_instance);
+ return s;
+}
+
+/* *INDENT-OFF* */
+VNET_HW_INTERFACE_CLASS (pppoe_hw_class) =
+{
+ .name = "PPPPOE",
+ .format_header = format_pppoe_header_with_length,
+ .build_rewrite = default_build_rewrite,
+ .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
+};
+/* *INDENT-ON* */
+
+#define foreach_copy_field \
+_(session_id) \
+_(encap_if_index) \
+_(decap_fib_index) \
+_(client_ip)
+
+static void
+eth_pppoe_rewrite (pppoe_session_t * t, bool is_ip6)
+{
+ u8 *rw = 0;
+ int len = sizeof (pppoe_header_t) + sizeof (ethernet_header_t);
+
+ vec_validate_aligned (rw, len - 1, CLIB_CACHE_LINE_BYTES);
+
+ ethernet_header_t *eth_hdr = (ethernet_header_t *) rw;
+ clib_memcpy (eth_hdr->dst_address, t->client_mac, 6);
+ clib_memcpy (eth_hdr->src_address, t->local_mac, 6);
+ eth_hdr->type = clib_host_to_net_u16 (ETHERNET_TYPE_PPPOE_SESSION);
+
+ pppoe_header_t *pppoe = (pppoe_header_t *) (eth_hdr + 1);
+ pppoe->ver_type = PPPOE_VER_TYPE;
+ pppoe->code = 0;
+ pppoe->session_id = clib_host_to_net_u16 (t->session_id);
+ pppoe->length = 0; /* To be filled in at run-time */
+
+ if (!is_ip6)
+ {
+ pppoe->ppp_proto = clib_host_to_net_u16 (PPP_PROTOCOL_ip4);
+ }
+ else
+ {
+ pppoe->ppp_proto = clib_host_to_net_u16 (PPP_PROTOCOL_ip6);
+ }
+
+ t->rewrite = rw;
+ _vec_len (t->rewrite) = len;
+
+ return;
+}
+
+static bool
+pppoe_decap_next_is_valid (pppoe_main_t * pem, u32 is_ip6,
+ u32 decap_fib_index)
+{
+ vlib_main_t *vm = pem->vlib_main;
+ u32 input_idx = (!is_ip6) ? ip4_input_node.index : ip6_input_node.index;
+ vlib_node_runtime_t *r = vlib_node_get_runtime (vm, input_idx);
+
+ return decap_fib_index < r->n_next_nodes;
+}
+
+int vnet_pppoe_add_del_session
+ (vnet_pppoe_add_del_session_args_t * a, u32 * sw_if_indexp)
+{
+ pppoe_main_t *pem = &pppoe_main;
+ pppoe_session_t *t = 0;
+ vnet_main_t *vnm = pem->vnet_main;
+ u32 hw_if_index = ~0;
+ u32 sw_if_index = ~0;
+ u32 is_ip6 = a->is_ip6;
+ pppoe_entry_key_t cached_key;
+ pppoe_entry_result_t cached_result;
+ u32 bucket;
+ pppoe_entry_key_t key;
+ pppoe_entry_result_t result;
+ vnet_hw_interface_t *hi;
+ vnet_sw_interface_t *si;
+ fib_prefix_t pfx;
+
+ cached_key.raw = ~0;
+ cached_result.raw = ~0; /* warning be gone */
+ memset (&pfx, 0, sizeof (pfx));
+
+ if (!is_ip6)
+ {
+ pfx.fp_addr.ip4.as_u32 = a->client_ip.ip4.as_u32;
+ pfx.fp_len = 32;
+ pfx.fp_proto = FIB_PROTOCOL_IP4;
+ }
+ else
+ {
+ pfx.fp_addr.ip6.as_u64[0] = a->client_ip.ip6.as_u64[0];
+ pfx.fp_addr.ip6.as_u64[1] = a->client_ip.ip6.as_u64[1];
+ pfx.fp_len = 128;
+ 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);
+ a->encap_if_index = result.fields.sw_if_index;
+
+ if (a->encap_if_index == ~0)
+ return VNET_API_ERROR_INVALID_SW_IF_INDEX;
+
+ si = vnet_get_sw_interface (vnm, a->encap_if_index);
+ hi = vnet_get_hw_interface (vnm, si->hw_if_index);
+
+
+ if (a->is_add)
+ {
+ /* adding a session: session must not already exist */
+ if (result.fields.session_index != ~0)
+ return VNET_API_ERROR_TUNNEL_EXIST;
+
+ /*if not set explicitly, default to ip4 */
+ if (!pppoe_decap_next_is_valid (pem, is_ip6, a->decap_fib_index))
+ return VNET_API_ERROR_INVALID_DECAP_NEXT;
+
+ pool_get_aligned (pem->sessions, t, CLIB_CACHE_LINE_BYTES);
+ memset (t, 0, sizeof (*t));
+
+ clib_memcpy (t->local_mac, hi->hw_address, 6);
+
+ /* copy from arg structure */
+#define _(x) t->x = a->x;
+ foreach_copy_field;
+#undef _
+
+ clib_memcpy (t->client_mac, a->client_mac, 6);
+
+ eth_pppoe_rewrite (t, is_ip6);
+
+ /* update pppoe fib with session_index */
+ result.fields.session_index = t - pem->sessions;
+ pppoe_update_1 (&pem->session_table,
+ a->client_mac, clib_host_to_net_u16 (a->session_id),
+ &key, &bucket, &result);
+
+ vnet_hw_interface_t *hi;
+ if (vec_len (pem->free_pppoe_session_hw_if_indices) > 0)
+ {
+ vnet_interface_main_t *im = &vnm->interface_main;
+ hw_if_index = pem->free_pppoe_session_hw_if_indices
+ [vec_len (pem->free_pppoe_session_hw_if_indices) - 1];
+ _vec_len (pem->free_pppoe_session_hw_if_indices) -= 1;
+
+ hi = vnet_get_hw_interface (vnm, hw_if_index);
+ hi->dev_instance = t - pem->sessions;
+ hi->hw_instance = hi->dev_instance;
+
+ /* clear old stats of freed session before reuse */
+ sw_if_index = hi->sw_if_index;
+ vnet_interface_counter_lock (im);
+ vlib_zero_combined_counter
+ (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX],
+ sw_if_index);
+ vlib_zero_combined_counter (&im->combined_sw_if_counters
+ [VNET_INTERFACE_COUNTER_RX],
+ sw_if_index);
+ vlib_zero_simple_counter (&im->sw_if_counters
+ [VNET_INTERFACE_COUNTER_DROP],
+ sw_if_index);
+ vnet_interface_counter_unlock (im);
+ }
+ else
+ {
+ hw_if_index = vnet_register_interface
+ (vnm, pppoe_device_class.index, t - pem->sessions,
+ pppoe_hw_class.index, t - pem->sessions);
+ hi = vnet_get_hw_interface (vnm, hw_if_index);
+ }
+
+ t->hw_if_index = hw_if_index;
+ t->sw_if_index = sw_if_index = hi->sw_if_index;
+
+ vec_validate_init_empty (pem->session_index_by_sw_if_index, sw_if_index,
+ ~0);
+ pem->session_index_by_sw_if_index[sw_if_index] = t - pem->sessions;
+
+ vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, sw_if_index);
+ si->flags &= ~VNET_SW_INTERFACE_FLAG_HIDDEN;
+ vnet_sw_interface_set_flags (vnm, sw_if_index,
+ VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+
+ /* Set pppoe session output node */
+ hi->output_node_index = pppoe_encap_node.index;
+
+ /* add reverse route for client ip */
+ fib_table_entry_path_add (a->decap_fib_index, &pfx,
+ FIB_SOURCE_PLUGIN_HI, FIB_ENTRY_FLAG_NONE,
+ pfx.fp_proto, &pfx.fp_addr, sw_if_index, ~0,
+ 1, NULL, FIB_ROUTE_PATH_FLAG_NONE);
+
+ }
+ else
+ {
+ /* deleting a session: session must exist */
+ if (result.fields.session_index == ~0)
+ return VNET_API_ERROR_NO_SUCH_ENTRY;
+
+ t = pool_elt_at_index (pem->sessions, result.fields.session_index);
+ sw_if_index = t->sw_if_index;
+
+ vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */ );
+ vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, t->sw_if_index);
+ si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN;
+
+ vec_add1 (pem->free_pppoe_session_hw_if_indices, t->hw_if_index);
+
+ pem->session_index_by_sw_if_index[t->sw_if_index] = ~0;
+
+ /* update pppoe fib with session_inde=~0x */
+ result.fields.session_index = ~0;
+ pppoe_update_1 (&pem->session_table,
+ a->client_mac, clib_host_to_net_u16 (a->session_id),
+ &key, &bucket, &result);
+
+
+ /* delete reverse route for client ip */
+ fib_table_entry_path_remove (a->decap_fib_index, &pfx,
+ FIB_SOURCE_PLUGIN_HI,
+ pfx.fp_proto,
+ &pfx.fp_addr,
+ sw_if_index, ~0, 1,
+ FIB_ROUTE_PATH_FLAG_NONE);
+
+ vec_free (t->rewrite);
+ pool_put (pem->sessions, t);
+ }
+
+ if (sw_if_indexp)
+ *sw_if_indexp = sw_if_index;
+
+ return 0;
+}
+
+static clib_error_t *
+pppoe_add_del_session_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
+{
+ unformat_input_t _line_input, *line_input = &_line_input;
+ u16 session_id = 0;
+ ip46_address_t client_ip;
+ u8 is_add = 1;
+ u8 client_ip_set = 0;
+ u8 ipv4_set = 0;
+ u8 ipv6_set = 0;
+ u32 encap_if_index = 0;
+ u32 decap_fib_index = 0;
+ u8 client_mac[6] = { 0 };
+ u8 client_mac_set = 0;
+ int rv;
+ u32 tmp;
+ vnet_pppoe_add_del_session_args_t _a, *a = &_a;
+ u32 session_sw_if_index;
+ clib_error_t *error = NULL;
+
+ /* Cant "universally zero init" (={0}) due to GCC bug 53119 */
+ memset (&client_ip, 0, sizeof client_ip);
+
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (line_input, "session-id %d", &session_id))
+ ;
+ else if (unformat (line_input, "client-ip %U",
+ unformat_ip4_address, &client_ip.ip4))
+ {
+ client_ip_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "client-ip %U",
+ unformat_ip6_address, &client_ip.ip6))
+ {
+ client_ip_set = 1;
+ ipv6_set = 1;
+ }
+ else if (unformat (line_input, "decap-vrf-id %d", &tmp))
+ {
+ if (ipv6_set)
+ decap_fib_index = fib_table_find (FIB_PROTOCOL_IP6, tmp);
+ else
+ decap_fib_index = fib_table_find (FIB_PROTOCOL_IP4, tmp);
+
+ if (decap_fib_index == ~0)
+ {
+ error =
+ clib_error_return (0, "nonexistent decap fib id %d", tmp);
+ goto done;
+ }
+ }
+ else
+ if (unformat
+ (line_input, "client-mac %U", unformat_ethernet_address,
+ client_mac))
+ client_mac_set = 1;
+ else
+ {
+ error = clib_error_return (0, "parse error: '%U'",
+ format_unformat_error, line_input);
+ goto done;
+ }
+ }
+
+ if (client_ip_set == 0)
+ {
+ error =
+ clib_error_return (0, "session client ip address not specified");
+ goto done;
+ }
+
+ if (ipv4_set && ipv6_set)
+ {
+ error = clib_error_return (0, "both IPv4 and IPv6 addresses specified");
+ goto done;
+ }
+
+ if (client_mac_set == 0)
+ {
+ error = clib_error_return (0, "session client mac not specified");
+ goto done;
+ }
+
+ memset (a, 0, sizeof (*a));
+
+ a->is_add = is_add;
+ a->is_ip6 = ipv6_set;
+
+#define _(x) a->x = x;
+ foreach_copy_field;
+#undef _
+
+ clib_memcpy (a->client_mac, client_mac, 6);
+
+ rv = vnet_pppoe_add_del_session (a, &session_sw_if_index);
+
+ switch (rv)
+ {
+ case 0:
+ if (is_add)
+ vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name,
+ vnet_get_main (), session_sw_if_index);
+ break;
+
+ case VNET_API_ERROR_TUNNEL_EXIST:
+ error = clib_error_return (0, "session already exists...");
+ goto done;
+
+ case VNET_API_ERROR_NO_SUCH_ENTRY:
+ error = clib_error_return (0, "session does not exist...");
+ goto done;
+
+ default:
+ error = clib_error_return
+ (0, "vnet_pppoe_add_del_session returned %d", rv);
+ goto done;
+ }
+
+done:
+ unformat_free (line_input);
+
+ return error;
+}
+
+/*?
+ * Add or delete a PPPPOE Session.
+ *
+ * @cliexpar
+ * Example of how to create a PPPPOE Session:
+ * @cliexcmd{create pppoe session client-ip 10.0.3.1 session-id 13
+ * client-mac 00:01:02:03:04:05 }
+ * Example of how to delete a PPPPOE Session:
+ * @cliexcmd{create pppoe session client-ip 10.0.3.1 session-id 13
+ * client-mac 00:01:02:03:04:05 del }
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (create_pppoe_session_command, static) = {
+ .path = "create pppoe session",
+ .short_help =
+ "create pppoe session client-ip <client-ip> session-id <nn>"
+ " client-mac <client-mac> [decap-vrf-id <nn>] [del]",
+ .function = pppoe_add_del_session_command_fn,
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+static clib_error_t *
+show_pppoe_session_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
+{
+ pppoe_main_t *pem = &pppoe_main;
+ pppoe_session_t *t;
+
+ if (pool_elts (pem->sessions) == 0)
+ vlib_cli_output (vm, "No pppoe sessions configured...");
+
+ pool_foreach (t, pem->sessions,
+ ({
+ vlib_cli_output (vm, "%U",format_pppoe_session, t);
+ }));
+
+ return 0;
+}
+/* *INDENT-ON* */
+
+/*?
+ * Display all the PPPPOE Session entries.
+ *
+ * @cliexpar
+ * Example of how to display the PPPPOE Session entries:
+ * @cliexstart{show pppoe session}
+ * [0] client-ip 10.0.3.1 session_id 13 encap-if-index 0 decap-vrf-id 13 sw_if_index 5
+ * local-mac a0:b0:c0:d0:e0:f0 client-mac 00:01:02:03:04:05
+ * @cliexend
+ ?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_pppoe_session_command, static) = {
+ .path = "show pppoe session",
+ .short_help = "show pppoe session",
+ .function = show_pppoe_session_command_fn,
+};
+/* *INDENT-ON* */
+
+/** Display the contents of the PPPoE Fib. */
+static clib_error_t *
+show_pppoe_fib_command_fn (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+ pppoe_main_t *pem = &pppoe_main;
+ BVT (clib_bihash) * h = &pem->session_table;
+ BVT (clib_bihash_bucket) * b;
+ BVT (clib_bihash_value) * v;
+ pppoe_entry_key_t key;
+ pppoe_entry_result_t result;
+ u32 first_entry = 1;
+ u64 total_entries = 0;
+ int i, j, k;
+ u8 *s = 0;
+
+ for (i = 0; i < h->nbuckets; i++)
+ {
+ b = &h->buckets[i];
+ if (b->offset == 0)
+ continue;
+ v = BV (clib_bihash_get_value) (h, b->offset);
+ for (j = 0; j < (1 << b->log2_pages); j++)
+ {
+ for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
+ {
+ if (v->kvp[k].key == ~0ULL && v->kvp[k].value == ~0ULL)
+ continue;
+
+ if (first_entry)
+ {
+ first_entry = 0;
+ vlib_cli_output (vm,
+ "%=19s%=12s%=13s%=14s",
+ "Mac-Address", "session_id", "sw_if_index",
+ "session_index");
+ }
+
+ key.raw = v->kvp[k].key;
+ result.raw = v->kvp[k].value;
+
+
+ vlib_cli_output (vm,
+ "%=19U%=12d%=13d%=14d",
+ format_ethernet_address, key.fields.mac,
+ clib_net_to_host_u16 (key.fields.session_id),
+ result.fields.sw_if_index == ~0
+ ? -1 : result.fields.sw_if_index,
+ result.fields.session_index == ~0
+ ? -1 : result.fields.session_index);
+ vec_reset_length (s);
+ total_entries++;
+ }
+ v++;
+ }
+ }
+
+ if (total_entries == 0)
+ vlib_cli_output (vm, "no pppoe fib entries");
+ else
+ vlib_cli_output (vm, "%lld pppoe fib entries", total_entries);
+
+ vec_free (s);
+ return 0;
+}
+
+/*?
+ * This command dispays the MAC Address entries of the PPPoE FIB table.
+ * Output can be filtered to just get the number of MAC Addresses or display
+ * each MAC Address.
+ *
+ * @cliexpar
+ * Example of how to display the number of MAC Address entries in the PPPoE
+ * FIB table:
+ * @cliexstart{show pppoe fib}
+ * Mac Address session_id Interface sw_if_index session_index
+ * 52:54:00:53:18:33 1 GigabitEthernet0/8/0 2 0
+ * 52:54:00:53:18:55 2 GigabitEthernet0/8/1 3 1
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_pppoe_fib_command, static) = {
+ .path = "show pppoe fib",
+ .short_help = "show pppoe fib",
+ .function = show_pppoe_fib_command_fn,
+};
+/* *INDENT-ON* */
+
+clib_error_t *
+pppoe_init (vlib_main_t * vm)
+{
+ pppoe_main_t *pem = &pppoe_main;
+
+ pem->vnet_main = vnet_get_main ();
+ pem->vlib_main = vm;
+
+ /* Create the hash table */
+ BV (clib_bihash_init) (&pem->session_table, "pppoe session table",
+ PPPOE_NUM_BUCKETS, PPPOE_MEMORY_SIZE);
+
+ ethernet_register_input_type (vm, ETHERNET_TYPE_PPPOE_SESSION,
+ pppoe_input_node.index);
+
+ ethernet_register_input_type (vm, ETHERNET_TYPE_PPPOE_DISCOVERY,
+ pppoe_tap_dispatch_node.index);
+
+ return 0;
+}
+
+VLIB_INIT_FUNCTION (pppoe_init);
+
+/* *INDENT-OFF* */
+VLIB_PLUGIN_REGISTER () = {
+ .version = VPP_BUILD_VER,
+ .description = "PPPoE",
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/pppoe/pppoe.h b/src/plugins/pppoe/pppoe.h
new file mode 100644
index 00000000000..37d628eb903
--- /dev/null
+++ b/src/plugins/pppoe/pppoe.h
@@ -0,0 +1,295 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#ifndef _PPPOE_H
+#define _PPPOE_H
+
+#include <vnet/plugin/plugin.h>
+#include <vppinfra/lock.h>
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip4_packet.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/dpo/dpo.h>
+#include <vnet/adj/adj_types.h>
+#include <vnet/fib/fib_table.h>
+#include <vlib/vlib.h>
+#include <vppinfra/bihash_8_8.h>
+
+
+typedef struct
+{
+ u8 ver_type;
+ u8 code;
+ u16 session_id;
+ u16 length;
+ u16 ppp_proto;
+} pppoe_header_t;
+
+#define PPPOE_VER_TYPE 0x11
+#define PPPOE_PADS 0x65
+
+typedef struct
+{
+ /* Rewrite string */
+ u8 *rewrite;
+
+ /* pppoe session_id in HOST byte order */
+ u16 session_id;
+
+ /* session client addresses */
+ ip46_address_t client_ip;
+
+ /* the index of tx interface for pppoe encaped packet */
+ u32 encap_if_index;
+
+ /** FIB indices - inner IP packet lookup here */
+ u32 decap_fib_index;
+
+ u8 local_mac[6];
+ u8 client_mac[6];
+
+ /* vnet intfc index */
+ u32 sw_if_index;
+ u32 hw_if_index;
+
+} pppoe_session_t;
+
+#define foreach_pppoe_input_next \
+_(DROP, "error-drop") \
+_(IP4_INPUT, "ip4-input") \
+_(IP6_INPUT, "ip6-input" ) \
+_(CP_INPUT, "pppoe-tap-dispatch" ) \
+
+typedef enum
+{
+#define _(s,n) PPPOE_INPUT_NEXT_##s,
+ foreach_pppoe_input_next
+#undef _
+ PPPOE_INPUT_N_NEXT,
+} pppoe_input_next_t;
+
+typedef enum
+{
+#define pppoe_error(n,s) PPPOE_ERROR_##n,
+#include <pppoe/pppoe_error.def>
+#undef pppoe_error
+ PPPOE_N_ERROR,
+} pppoe_input_error_t;
+
+
+#define MTU 1500
+#define MTU_BUFFERS ((MTU + VLIB_BUFFER_DATA_SIZE - 1) / VLIB_BUFFER_DATA_SIZE)
+#define NUM_BUFFERS_TO_ALLOC 32
+
+/*
+ * The size of pppoe session table
+ */
+#define PPPOE_NUM_BUCKETS (128 * 1024)
+#define PPPOE_MEMORY_SIZE (16<<20)
+
+/* *INDENT-OFF* */
+/*
+ * The PPPoE key is the mac address and session ID
+ */
+typedef struct
+{
+ union
+ {
+ struct
+ {
+ u16 session_id;
+ u8 mac[6];
+ } fields;
+ struct
+ {
+ u32 w0;
+ u32 w1;
+ } words;
+ u64 raw;
+ };
+} pppoe_entry_key_t;
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+/*
+ * The PPPoE entry results
+ */
+typedef struct
+{
+ union
+ {
+ struct
+ {
+ u32 sw_if_index;
+
+ u32 session_index;
+
+ } fields;
+ u64 raw;
+ };
+} pppoe_entry_result_t;
+/* *INDENT-ON* */
+
+typedef struct
+{
+ /* For DP: vector of encap session instances, */
+ pppoe_session_t *sessions;
+
+ /* For CP: vector of CP path */
+ BVT (clib_bihash) session_table;
+
+ /* Free vlib hw_if_indices */
+ u32 *free_pppoe_session_hw_if_indices;
+
+ /* Mapping from sw_if_index to session index */
+ u32 *session_index_by_sw_if_index;
+
+ /* used for pppoe cp path */
+ u32 tap_if_index;
+
+ /* API message ID base */
+ u16 msg_id_base;
+
+ /* convenience */
+ vlib_main_t *vlib_main;
+ vnet_main_t *vnet_main;
+
+} pppoe_main_t;
+
+extern pppoe_main_t pppoe_main;
+
+extern vlib_node_registration_t pppoe_input_node;
+extern vlib_node_registration_t pppoe_encap_node;
+extern vlib_node_registration_t pppoe_tap_dispatch_node;
+
+u8 *format_pppoe_encap_trace (u8 * s, va_list * args);
+
+typedef struct
+{
+ u8 is_add;
+ u8 is_ip6;
+ u16 session_id;
+ ip46_address_t client_ip;
+ u32 encap_if_index;
+ u32 decap_fib_index;
+ u8 local_mac[6];
+ u8 client_mac[6];
+} vnet_pppoe_add_del_session_args_t;
+
+int vnet_pppoe_add_del_session
+ (vnet_pppoe_add_del_session_args_t * a, u32 * sw_if_indexp);
+
+typedef struct
+{
+ u8 is_add;
+ u32 client_if_index;
+ u32 tap_if_index;
+} vnet_pppoe_add_del_tap_args_t;
+
+always_inline u64
+pppoe_make_key (u8 * mac_address, u16 session_id)
+{
+ u64 temp;
+
+ /*
+ * The mac address in memory is A:B:C:D:E:F
+ * The session_id in register is H:L
+ */
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+ /*
+ * Create the in-register key as F:E:D:C:B:A:H:L
+ * In memory the key is L:H:A:B:C:D:E:F
+ */
+ temp = *((u64 *) (mac_address)) << 16;
+ temp = (temp & ~0xffff) | (u64) (session_id);
+#else
+ /*
+ * Create the in-register key as H:L:A:B:C:D:E:F
+ * In memory the key is H:L:A:B:C:D:E:F
+ */
+ temp = *((u64 *) (mac_address)) >> 16;
+ temp = temp | (((u64) session_id) << 48);
+#endif
+
+ return temp;
+}
+
+static_always_inline void
+pppoe_lookup_1 (BVT (clib_bihash) * session_table,
+ pppoe_entry_key_t * cached_key,
+ pppoe_entry_result_t * cached_result,
+ u8 * mac0,
+ u16 session_id0,
+ pppoe_entry_key_t * key0,
+ u32 * bucket0, pppoe_entry_result_t * result0)
+{
+ /* set up key */
+ key0->raw = pppoe_make_key (mac0, session_id0);
+ *bucket0 = ~0;
+
+ if (key0->raw == cached_key->raw)
+ {
+ /* Hit in the one-entry cache */
+ result0->raw = cached_result->raw;
+ }
+ else
+ {
+ /* Do a regular session table lookup */
+ BVT (clib_bihash_kv) kv;
+
+ kv.key = key0->raw;
+ kv.value = ~0ULL;
+ BV (clib_bihash_search_inline) (session_table, &kv);
+ result0->raw = kv.value;
+
+ /* Update one-entry cache */
+ cached_key->raw = key0->raw;
+ cached_result->raw = result0->raw;
+ }
+}
+
+static_always_inline void
+pppoe_update_1 (BVT (clib_bihash) * session_table,
+ u8 * mac0,
+ u16 session_id0,
+ pppoe_entry_key_t * key0,
+ u32 * bucket0, pppoe_entry_result_t * result0)
+{
+ /* set up key */
+ key0->raw = pppoe_make_key (mac0, session_id0);
+ *bucket0 = ~0;
+
+ /* Update the entry */
+ BVT (clib_bihash_kv) kv;
+ kv.key = key0->raw;
+ kv.value = result0->raw;
+ BV (clib_bihash_add_del) (session_table, &kv, 1 /* is_add */ );
+
+}
+#endif /* _PPPOE_H */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/pppoe/pppoe_all_api_h.h b/src/plugins/pppoe/pppoe_all_api_h.h
new file mode 100644
index 00000000000..393c7680e79
--- /dev/null
+++ b/src/plugins/pppoe/pppoe_all_api_h.h
@@ -0,0 +1,18 @@
+/*
+ * pppoe_all_api_h.h - plug-in api #include file
+ *
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Include the generated file, see BUILT_SOURCES in Makefile.am */
+#include <pppoe/pppoe.api.h>
diff --git a/src/plugins/pppoe/pppoe_api.c b/src/plugins/pppoe/pppoe_api.c
new file mode 100644
index 00000000000..9b7584606a2
--- /dev/null
+++ b/src/plugins/pppoe/pppoe_api.c
@@ -0,0 +1,224 @@
+/*
+ *------------------------------------------------------------------
+ * pppoe_api.c - pppoe api
+ *
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vnet/interface.h>
+#include <vnet/api_errno.h>
+#include <vnet/feature/feature.h>
+#include <vnet/fib/fib_table.h>
+
+#include <vppinfra/byte_order.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+
+#include <pppoe/pppoe.h>
+
+
+#define vl_msg_id(n,h) n,
+typedef enum
+{
+#include <pppoe/pppoe.api.h>
+ /* We'll want to know how many messages IDs we need... */
+ VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+/* define message structures */
+#define vl_typedefs
+#include <pppoe/pppoe.api.h>
+#undef vl_typedefs
+
+/* define generated endian-swappers */
+#define vl_endianfun
+#include <pppoe/pppoe.api.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
+#define vl_printfun
+#include <pppoe/pppoe.api.h>
+#undef vl_printfun
+
+/* Get the API version number */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <pppoe/pppoe.api.h>
+#undef vl_api_version
+
+#define vl_msg_name_crc_list
+#include <pppoe/pppoe.api.h>
+#undef vl_msg_name_crc_list
+
+#define REPLY_MSG_ID_BASE pem->msg_id_base
+#include <vlibapi/api_helper_macros.h>
+
+static void
+setup_message_id_table (pppoe_main_t * pem, api_main_t * am)
+{
+#define _(id,n,crc) \
+ vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + pem->msg_id_base);
+ foreach_vl_msg_name_crc_pppoe;
+#undef _
+}
+
+#define foreach_pppoe_plugin_api_msg \
+_(PPPOE_ADD_DEL_SESSION, pppoe_add_del_session) \
+_(PPPOE_SESSION_DUMP, pppoe_session_dump)
+
+static void vl_api_pppoe_add_del_session_t_handler
+ (vl_api_pppoe_add_del_session_t * mp)
+{
+ vl_api_pppoe_add_del_session_reply_t *rmp;
+ int rv = 0;
+ u32 decap_fib_index;
+ ip4_main_t *im = &ip4_main;
+ pppoe_main_t *pem = &pppoe_main;
+
+ uword *p = hash_get (im->fib_index_by_table_id, ntohl (mp->decap_vrf_id));
+ if (!p)
+ {
+ rv = VNET_API_ERROR_NO_SUCH_INNER_FIB;
+ goto out;
+ }
+ decap_fib_index = p[0];
+
+ vnet_pppoe_add_del_session_args_t a = {
+ .is_add = mp->is_add,
+ .is_ip6 = mp->is_ipv6,
+ .decap_fib_index = decap_fib_index,
+ .session_id = ntohs (mp->session_id),
+ .client_ip = to_ip46 (mp->is_ipv6, mp->client_ip),
+ };
+ clib_memcpy (a.client_mac, mp->client_mac, 6);
+
+ u32 sw_if_index = ~0;
+ rv = vnet_pppoe_add_del_session (&a, &sw_if_index);
+
+out:
+ /* *INDENT-OFF* */
+ REPLY_MACRO2(VL_API_PPPOE_ADD_DEL_SESSION_REPLY,
+ ({
+ rmp->sw_if_index = ntohl (sw_if_index);
+ }));
+ /* *INDENT-ON* */
+}
+
+static void send_pppoe_session_details
+ (pppoe_session_t * t, unix_shared_memory_queue_t * q, u32 context)
+{
+ vl_api_pppoe_session_details_t *rmp;
+ ip4_main_t *im4 = &ip4_main;
+ ip6_main_t *im6 = &ip6_main;
+ u8 is_ipv6 = !ip46_address_is_ip4 (&t->client_ip);
+
+ rmp = vl_msg_api_alloc (sizeof (*rmp));
+ memset (rmp, 0, sizeof (*rmp));
+ rmp->_vl_msg_id = ntohs (VL_API_PPPOE_SESSION_DETAILS);
+ if (is_ipv6)
+ {
+ memcpy (rmp->client_ip, t->client_ip.ip6.as_u8, 16);
+ rmp->decap_vrf_id = htonl (im6->fibs[t->decap_fib_index].ft_table_id);
+ }
+ else
+ {
+ memcpy (rmp->client_ip, t->client_ip.ip4.as_u8, 4);
+ rmp->decap_vrf_id = htonl (im4->fibs[t->decap_fib_index].ft_table_id);
+ }
+ rmp->session_id = htons (t->session_id);
+ rmp->encap_if_index = htonl (t->encap_if_index);
+ clib_memcpy (rmp->local_mac, t->local_mac, 6);
+ clib_memcpy (rmp->client_mac, t->client_mac, 6);
+ rmp->sw_if_index = htonl (t->sw_if_index);
+ rmp->is_ipv6 = is_ipv6;
+ rmp->context = context;
+
+ vl_msg_api_send_shmem (q, (u8 *) & rmp);
+}
+
+static void
+vl_api_pppoe_session_dump_t_handler (vl_api_pppoe_session_dump_t * mp)
+{
+ unix_shared_memory_queue_t *q;
+ pppoe_main_t *pem = &pppoe_main;
+ pppoe_session_t *t;
+ u32 sw_if_index;
+
+ q = vl_api_client_index_to_input_queue (mp->client_index);
+ if (q == 0)
+ {
+ return;
+ }
+
+ sw_if_index = ntohl (mp->sw_if_index);
+
+ if (~0 == sw_if_index)
+ {
+ /* *INDENT-OFF* */
+ pool_foreach (t, pem->sessions,
+ ({
+ send_pppoe_session_details(t, q, mp->context);
+ }));
+ /* *INDENT-ON* */
+ }
+ else
+ {
+ if ((sw_if_index >= vec_len (pem->session_index_by_sw_if_index)) ||
+ (~0 == pem->session_index_by_sw_if_index[sw_if_index]))
+ {
+ return;
+ }
+ t = &pem->sessions[pem->session_index_by_sw_if_index[sw_if_index]];
+ send_pppoe_session_details (t, q, mp->context);
+ }
+}
+
+
+static clib_error_t *
+pppoe_api_hookup (vlib_main_t * vm)
+{
+ pppoe_main_t *pem = &pppoe_main;
+
+ u8 *name = format (0, "pppoe_%08x%c", api_version, 0);
+ pem->msg_id_base = vl_msg_api_get_msg_ids
+ ((char *) name, VL_MSG_FIRST_AVAILABLE);
+
+#define _(N,n) \
+ vl_msg_api_set_handlers((VL_API_##N + pem->msg_id_base), \
+ #n, \
+ vl_api_##n##_t_handler, \
+ vl_noop_handler, \
+ vl_api_##n##_t_endian, \
+ vl_api_##n##_t_print, \
+ sizeof(vl_api_##n##_t), 1);
+ foreach_pppoe_plugin_api_msg;
+#undef _
+
+ /* Add our API messages to the global name_crc hash table */
+ setup_message_id_table (pem, &api_main);
+
+ return 0;
+}
+
+VLIB_API_INIT_FUNCTION (pppoe_api_hookup);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/pppoe/pppoe_decap.c b/src/plugins/pppoe/pppoe_decap.c
new file mode 100644
index 00000000000..02c82711ddc
--- /dev/null
+++ b/src/plugins/pppoe/pppoe_decap.c
@@ -0,0 +1,422 @@
+/*
+ * decap.c: pppoe session decap packet processing
+ *
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/pg/pg.h>
+#include <vnet/ppp/packet.h>
+#include <pppoe/pppoe.h>
+
+typedef struct {
+ u32 next_index;
+ u32 session_index;
+ u32 session_id;
+ u32 error;
+} pppoe_rx_trace_t;
+
+static u8 * format_pppoe_rx_trace (u8 * s, va_list * args)
+{
+ CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+ CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+ pppoe_rx_trace_t * t = va_arg (*args, pppoe_rx_trace_t *);
+
+ if (t->session_index != ~0)
+ {
+ s = format (s, "PPPoE decap from pppoe_session%d session_id %d next %d error %d",
+ t->session_index, t->session_id, t->next_index, t->error);
+ }
+ else
+ {
+ s = format (s, "PPPoE decap error - session for session_id %d does not exist",
+ t->session_id);
+ }
+ return s;
+}
+
+static uword
+pppoe_input (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * from_frame)
+{
+ u32 n_left_from, next_index, * from, * to_next;
+ pppoe_main_t * pem = &pppoe_main;
+ vnet_main_t * vnm = pem->vnet_main;
+ vnet_interface_main_t * im = &vnm->interface_main;
+ u32 pkts_decapsulated = 0;
+ u32 thread_index = vlib_get_thread_index();
+ u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
+ pppoe_entry_key_t cached_key;
+ pppoe_entry_result_t cached_result;
+
+ from = vlib_frame_vector_args (from_frame);
+ n_left_from = from_frame->n_vectors;
+
+ /* Clear the one-entry cache in case session table was updated */
+ cached_key.raw = ~0;
+ cached_result.raw = ~0; /* warning be gone */
+
+ next_index = node->cached_next_index;
+ stats_sw_if_index = node->runtime_data[0];
+ stats_n_packets = stats_n_bytes = 0;
+
+ while (n_left_from > 0)
+ {
+ u32 n_left_to_next;
+
+ vlib_get_next_frame (vm, node, next_index,
+ to_next, n_left_to_next);
+ while (n_left_from >= 4 && n_left_to_next >= 2)
+ {
+ u32 bi0, bi1;
+ vlib_buffer_t * b0, * b1;
+ u32 next0, next1;
+ ethernet_header_t *h0, *h1;
+ pppoe_header_t * pppoe0, * pppoe1;
+ u16 ppp_proto0 = 0, ppp_proto1 = 0;
+ pppoe_session_t * t0, * t1;
+ u32 error0, error1;
+ u32 sw_if_index0, sw_if_index1, len0, len1;
+ pppoe_entry_key_t key0, key1;
+ pppoe_entry_result_t result0, result1;
+ u32 bucket0, bucket1;
+
+ /* Prefetch next iteration. */
+ {
+ vlib_buffer_t * p2, * p3;
+
+ p2 = vlib_get_buffer (vm, from[2]);
+ p3 = vlib_get_buffer (vm, from[3]);
+
+ vlib_prefetch_buffer_header (p2, LOAD);
+ vlib_prefetch_buffer_header (p3, LOAD);
+
+ CLIB_PREFETCH (p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+ CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+ }
+
+ bi0 = from[0];
+ bi1 = from[1];
+ to_next[0] = bi0;
+ to_next[1] = bi1;
+ from += 2;
+ to_next += 2;
+ n_left_to_next -= 2;
+ n_left_from -= 2;
+
+ b0 = vlib_get_buffer (vm, bi0);
+ b1 = vlib_get_buffer (vm, bi1);
+ error0 = 0;
+ error1 = 0;
+
+ /* leaves current_data pointing at the pppoe header */
+ pppoe0 = vlib_buffer_get_current (b0);
+ pppoe1 = vlib_buffer_get_current (b1);
+ ppp_proto0 = clib_net_to_host_u16(pppoe0->ppp_proto);
+ ppp_proto1 = clib_net_to_host_u16(pppoe1->ppp_proto);
+
+ /* Manipulate packet 0 */
+ if ((ppp_proto0 != PPP_PROTOCOL_ip4)
+ && (ppp_proto0 != PPP_PROTOCOL_ip6))
+ {
+ error0 = PPPOE_ERROR_CONTROL_PLANE;
+ next0 = PPPOE_INPUT_NEXT_CP_INPUT;
+ goto trace0;
+ }
+
+ /* get client mac */
+ vlib_buffer_reset(b0);
+ h0 = vlib_buffer_get_current (b0);
+
+ pppoe_lookup_1 (&pem->session_table, &cached_key, &cached_result,
+ h0->src_address, pppoe0->session_id,
+ &key0, &bucket0, &result0);
+ if (PREDICT_FALSE (result0.fields.session_index == ~0))
+ {
+ error0 = PPPOE_ERROR_NO_SUCH_SESSION;
+ next0 = PPPOE_INPUT_NEXT_DROP;
+ goto trace0;
+ }
+
+ t0 = pool_elt_at_index (pem->sessions,
+ result0.fields.session_index);
+
+ /* Pop Eth and PPPPoE header */
+ vlib_buffer_advance(b0, sizeof(*h0)+sizeof(*pppoe0));
+
+ next0 = (ppp_proto0==PPP_PROTOCOL_ip4)?
+ PPPOE_INPUT_NEXT_IP4_INPUT
+ : PPPOE_INPUT_NEXT_IP6_INPUT;
+
+ sw_if_index0 = t0->sw_if_index;
+ len0 = vlib_buffer_length_in_chain (vm, b0);
+
+ pkts_decapsulated ++;
+ stats_n_packets += 1;
+ stats_n_bytes += len0;
+
+ /* Batch stats increment on the same pppoe session so counter
+ is not incremented per packet */
+ if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index))
+ {
+ stats_n_packets -= 1;
+ stats_n_bytes -= len0;
+ if (stats_n_packets)
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+ thread_index, stats_sw_if_index,
+ stats_n_packets, stats_n_bytes);
+ stats_n_packets = 1;
+ stats_n_bytes = len0;
+ stats_sw_if_index = sw_if_index0;
+ }
+
+ trace0:
+ b0->error = error0 ? node->errors[error0] : 0;
+
+ if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ pppoe_rx_trace_t *tr
+ = vlib_add_trace (vm, node, b0, sizeof (*tr));
+ tr->next_index = next0;
+ tr->error = error0;
+ tr->session_index = result0.fields.session_index;
+ tr->session_id = clib_net_to_host_u32(pppoe0->session_id);
+ }
+
+
+ /* Manipulate packet 1 */
+ if ((ppp_proto1 != PPP_PROTOCOL_ip4)
+ && (ppp_proto1 != PPP_PROTOCOL_ip6))
+ {
+ error1 = PPPOE_ERROR_CONTROL_PLANE;
+ next1 = PPPOE_INPUT_NEXT_CP_INPUT;
+ goto trace1;
+ }
+
+ /* get client mac */
+ vlib_buffer_reset(b1);
+ h1 = vlib_buffer_get_current (b1);
+
+ pppoe_lookup_1 (&pem->session_table, &cached_key, &cached_result,
+ h1->src_address, pppoe1->session_id,
+ &key1, &bucket1, &result1);
+ if (PREDICT_FALSE (result1.fields.session_index == ~0))
+ {
+ error1 = PPPOE_ERROR_NO_SUCH_SESSION;
+ next1 = PPPOE_INPUT_NEXT_DROP;
+ goto trace1;
+ }
+
+ t1 = pool_elt_at_index (pem->sessions,
+ result1.fields.session_index);
+
+ /* Pop Eth and PPPPoE header */
+ vlib_buffer_advance(b1, sizeof(*h1)+sizeof(*pppoe1));
+
+ next1 = (ppp_proto1==PPP_PROTOCOL_ip4)?
+ PPPOE_INPUT_NEXT_IP4_INPUT
+ : PPPOE_INPUT_NEXT_IP6_INPUT;
+
+ sw_if_index1 = t1->sw_if_index;
+ len1 = vlib_buffer_length_in_chain (vm, b1);
+
+ pkts_decapsulated ++;
+ stats_n_packets += 1;
+ stats_n_bytes += len1;
+
+ /* Batch stats increment on the same pppoe session so counter
+ is not incremented per packet */
+ if (PREDICT_FALSE (sw_if_index1 != stats_sw_if_index))
+ {
+ stats_n_packets -= 1;
+ stats_n_bytes -= len1;
+ if (stats_n_packets)
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+ thread_index, stats_sw_if_index,
+ stats_n_packets, stats_n_bytes);
+ stats_n_packets = 1;
+ stats_n_bytes = len1;
+ stats_sw_if_index = sw_if_index1;
+ }
+
+ trace1:
+ b1->error = error1 ? node->errors[error1] : 0;
+
+ if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ pppoe_rx_trace_t *tr
+ = vlib_add_trace (vm, node, b1, sizeof (*tr));
+ tr->next_index = next1;
+ tr->error = error1;
+ tr->session_index = result1.fields.session_index;
+ tr->session_id = clib_net_to_host_u32(pppoe1->session_id);
+ }
+
+ vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+ to_next, n_left_to_next,
+ bi0, bi1, next0, next1);
+ }
+
+ while (n_left_from > 0 && n_left_to_next > 0)
+ {
+ u32 bi0;
+ vlib_buffer_t * b0;
+ u32 next0;
+ ethernet_header_t *h0;
+ pppoe_header_t * pppoe0;
+ u16 ppp_proto0 = 0;
+ pppoe_session_t * t0;
+ u32 error0;
+ u32 sw_if_index0, len0;
+ pppoe_entry_key_t key0;
+ pppoe_entry_result_t result0;
+ u32 bucket0;
+
+ bi0 = from[0];
+ to_next[0] = bi0;
+ from += 1;
+ to_next += 1;
+ n_left_from -= 1;
+ n_left_to_next -= 1;
+
+ b0 = vlib_get_buffer (vm, bi0);
+ error0 = 0;
+
+ /* leaves current_data pointing at the pppoe header */
+ pppoe0 = vlib_buffer_get_current (b0);
+ ppp_proto0 = clib_net_to_host_u16(pppoe0->ppp_proto);
+
+ if ((ppp_proto0 != PPP_PROTOCOL_ip4)
+ && (ppp_proto0 != PPP_PROTOCOL_ip6))
+ {
+ error0 = PPPOE_ERROR_CONTROL_PLANE;
+ next0 = PPPOE_INPUT_NEXT_CP_INPUT;
+ goto trace00;
+ }
+
+ /* get client mac */
+ vlib_buffer_reset(b0);
+ h0 = vlib_buffer_get_current (b0);
+
+ pppoe_lookup_1 (&pem->session_table, &cached_key, &cached_result,
+ h0->src_address, pppoe0->session_id,
+ &key0, &bucket0, &result0);
+ if (PREDICT_FALSE (result0.fields.session_index == ~0))
+ {
+ error0 = PPPOE_ERROR_NO_SUCH_SESSION;
+ next0 = PPPOE_INPUT_NEXT_DROP;
+ goto trace00;
+ }
+
+ t0 = pool_elt_at_index (pem->sessions,
+ result0.fields.session_index);
+
+ /* Pop Eth and PPPPoE header */
+ vlib_buffer_advance(b0, sizeof(*h0)+sizeof(*pppoe0));
+
+ next0 = (ppp_proto0==PPP_PROTOCOL_ip4)?
+ PPPOE_INPUT_NEXT_IP4_INPUT
+ : PPPOE_INPUT_NEXT_IP6_INPUT;
+
+ sw_if_index0 = t0->sw_if_index;
+ len0 = vlib_buffer_length_in_chain (vm, b0);
+
+ pkts_decapsulated ++;
+ stats_n_packets += 1;
+ stats_n_bytes += len0;
+
+ /* Batch stats increment on the same pppoe session so counter
+ is not incremented per packet */
+ if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index))
+ {
+ stats_n_packets -= 1;
+ stats_n_bytes -= len0;
+ if (stats_n_packets)
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+ thread_index, stats_sw_if_index,
+ stats_n_packets, stats_n_bytes);
+ stats_n_packets = 1;
+ stats_n_bytes = len0;
+ stats_sw_if_index = sw_if_index0;
+ }
+
+ trace00:
+ b0->error = error0 ? node->errors[error0] : 0;
+
+ if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ pppoe_rx_trace_t *tr
+ = vlib_add_trace (vm, node, b0, sizeof (*tr));
+ tr->next_index = next0;
+ tr->error = error0;
+ tr->session_index = result0.fields.session_index;
+ tr->session_id = clib_net_to_host_u16(pppoe0->session_id);
+ }
+ vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+ to_next, n_left_to_next,
+ bi0, next0);
+ }
+
+ vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+ }
+ /* Do we still need this now that session tx stats is kept? */
+ vlib_node_increment_counter (vm, pppoe_input_node.index,
+ PPPOE_ERROR_DECAPSULATED,
+ pkts_decapsulated);
+
+ /* Increment any remaining batch stats */
+ if (stats_n_packets)
+ {
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+ thread_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+ node->runtime_data[0] = stats_sw_if_index;
+ }
+
+ return from_frame->n_vectors;
+}
+
+static char * pppoe_error_strings[] = {
+#define pppoe_error(n,s) s,
+#include <pppoe/pppoe_error.def>
+#undef pppoe_error
+#undef _
+};
+
+VLIB_REGISTER_NODE (pppoe_input_node) = {
+ .function = pppoe_input,
+ .name = "pppoe-input",
+ /* Takes a vector of packets. */
+ .vector_size = sizeof (u32),
+
+ .n_errors = PPPOE_N_ERROR,
+ .error_strings = pppoe_error_strings,
+
+ .n_next_nodes = PPPOE_INPUT_N_NEXT,
+ .next_nodes = {
+#define _(s,n) [PPPOE_INPUT_NEXT_##s] = n,
+ foreach_pppoe_input_next
+#undef _
+ },
+
+ .format_trace = format_pppoe_rx_trace,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (pppoe_input_node, pppoe_input)
+
+
diff --git a/src/plugins/pppoe/pppoe_encap.c b/src/plugins/pppoe/pppoe_encap.c
new file mode 100644
index 00000000000..69bec61dec1
--- /dev/null
+++ b/src/plugins/pppoe/pppoe_encap.c
@@ -0,0 +1,384 @@
+/*
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ethernet/ethernet.h>
+#include <pppoe/pppoe.h>
+
+/* Statistics (not all errors) */
+#define foreach_pppoe_encap_error \
+_(ENCAPSULATED, "good packets encapsulated")
+
+static char * pppoe_encap_error_strings[] = {
+#define _(sym,string) string,
+ foreach_pppoe_encap_error
+#undef _
+};
+
+typedef enum {
+#define _(sym,str) PPPOE_ENCAP_ERROR_##sym,
+ foreach_pppoe_encap_error
+#undef _
+ PPPOE_ENCAP_N_ERROR,
+} pppoe_encap_error_t;
+
+#define foreach_pppoe_encap_next \
+_(DROP, "error-drop") \
+_(INTERFACE, "interface-output" ) \
+
+typedef enum
+{
+#define _(s,n) PPPOE_ENCAP_NEXT_##s,
+ foreach_pppoe_encap_next
+#undef _
+ PPPOE_ENCAP_N_NEXT,
+} pppoe_encap_next_t;
+
+typedef struct {
+ u32 session_index;
+ u32 session_id;
+} pppoe_encap_trace_t;
+
+u8 * format_pppoe_encap_trace (u8 * s, va_list * args)
+{
+ CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+ CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+ pppoe_encap_trace_t * t
+ = va_arg (*args, pppoe_encap_trace_t *);
+
+ s = format (s, "PPPOE encap to pppoe_session%d session_id %d",
+ t->session_index, t->session_id);
+ return s;
+}
+
+
+#define foreach_fixed_header2_offset \
+ _(0) _(1)
+
+
+static uword
+pppoe_encap (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * from_frame)
+{
+ u32 n_left_from, next_index, * from, * to_next;
+ pppoe_main_t * pem = &pppoe_main;
+ vnet_main_t * vnm = pem->vnet_main;
+ vnet_interface_main_t * im = &vnm->interface_main;
+ u32 pkts_encapsulated = 0;
+ u32 thread_index = vlib_get_thread_index();
+ u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
+ u32 sw_if_index0 = 0, sw_if_index1 = 0;
+ u32 next0 = 0, next1 = 0;
+ pppoe_session_t * t0 = NULL, * t1 = NULL;
+
+ from = vlib_frame_vector_args (from_frame);
+ n_left_from = from_frame->n_vectors;
+
+ next_index = node->cached_next_index;
+ stats_sw_if_index = node->runtime_data[0];
+ stats_n_packets = stats_n_bytes = 0;
+
+ while (n_left_from > 0)
+ {
+ u32 n_left_to_next;
+
+ vlib_get_next_frame (vm, node, next_index,
+ to_next, n_left_to_next);
+
+ while (n_left_from >= 4 && n_left_to_next >= 2)
+ {
+ u32 bi0, bi1;
+ vlib_buffer_t * b0, * b1;
+ u32 len0, len1;
+ ethernet_header_t * eth0, * eth1;
+ pppoe_header_t * pppoe0, * pppoe1;
+ u64 * copy_src0, * copy_dst0;
+ u64 * copy_src1, * copy_dst1;
+ u16 * copy_src_last0, * copy_dst_last0;
+ u16 * copy_src_last1, * copy_dst_last1;
+ u16 new_l0, new_l1;
+ u32 session_id0, session_id1;
+
+ /* Prefetch next iteration. */
+ {
+ vlib_buffer_t * p2, * p3;
+
+ p2 = vlib_get_buffer (vm, from[2]);
+ p3 = vlib_get_buffer (vm, from[3]);
+
+ vlib_prefetch_buffer_header (p2, LOAD);
+ vlib_prefetch_buffer_header (p3, LOAD);
+
+ CLIB_PREFETCH (p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+ CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+ }
+
+ bi0 = from[0];
+ bi1 = from[1];
+ to_next[0] = bi0;
+ to_next[1] = bi1;
+ from += 2;
+ to_next += 2;
+ n_left_to_next -= 2;
+ n_left_from -= 2;
+
+ b0 = vlib_get_buffer (vm, bi0);
+ b1 = vlib_get_buffer (vm, bi1);
+
+ /* Get next node index and if-index from session */
+ sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
+ session_id0 = pem->session_index_by_sw_if_index[sw_if_index0];
+ t0 = pool_elt_at_index(pem->sessions, session_id0);
+ next0 = PPPOE_ENCAP_NEXT_INTERFACE;
+ vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->encap_if_index;
+
+ /* Get next node index and if-index from session */
+ sw_if_index1 = vnet_buffer(b1)->sw_if_index[VLIB_TX];
+ session_id1 = pem->session_index_by_sw_if_index[sw_if_index1];
+ t1 = pool_elt_at_index(pem->sessions, session_id1);
+ next1 = PPPOE_ENCAP_NEXT_INTERFACE;
+ vnet_buffer(b1)->sw_if_index[VLIB_TX] = t1->encap_if_index;
+
+ /* Apply the rewrite string. $$$$ vnet_rewrite? */
+ vlib_buffer_advance (b0, -(word)_vec_len(t0->rewrite));
+ vlib_buffer_advance (b1, -(word)_vec_len(t1->rewrite));
+
+ eth0 = (ethernet_header_t *)(vlib_buffer_get_current(b0));
+ eth1 = (ethernet_header_t *)(vlib_buffer_get_current(b1));
+
+ /* Copy the fixed header */
+ copy_dst0 = (u64 *) eth0;
+ copy_src0 = (u64 *) t0->rewrite;
+ copy_dst1 = (u64 *) eth1;
+ copy_src1 = (u64 *) t1->rewrite;
+ /* Copy first 8-bytes at a time */
+#define _(offs) copy_dst0[offs] = copy_src0[offs];
+ foreach_fixed_header2_offset;
+#undef _
+ /* Last 6 octets. Hopefully gcc will be our friend */
+ copy_dst_last0 = (u16 *)(&copy_dst0[2]);
+ copy_src_last0 = (u16 *)(&copy_src0[2]);
+ copy_dst_last0[0] = copy_src_last0[0];
+ copy_dst_last0[1] = copy_src_last0[1];
+ copy_dst_last0[2] = copy_src_last0[2];
+
+#define _(offs) copy_dst1[offs] = copy_src1[offs];
+ foreach_fixed_header2_offset;
+#undef _
+ /* Last 6 octets. Hopefully gcc will be our friend */
+ copy_dst_last1 = (u16 *)(&copy_dst1[2]);
+ copy_src_last1 = (u16 *)(&copy_src1[2]);
+ copy_dst_last1[0] = copy_src_last1[0];
+ copy_dst_last1[1] = copy_src_last1[1];
+ copy_dst_last1[2] = copy_src_last1[2];
+
+ /* Fix PPPoE length */
+ new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain(vm, b0)
+ - sizeof (*pppoe0) - sizeof(*eth0));
+ pppoe0 = (pppoe_header_t *)(eth0 + 1);
+ pppoe0->length = new_l0;
+
+ new_l1 = clib_host_to_net_u16 (vlib_buffer_length_in_chain(vm, b1)
+ - sizeof (*pppoe1) - sizeof(*eth1));
+ pppoe1 = (pppoe_header_t *)(eth1 + 1);
+ pppoe1->length = new_l1;
+
+ pkts_encapsulated += 2;
+ len0 = vlib_buffer_length_in_chain (vm, b0);
+ len1 = vlib_buffer_length_in_chain (vm, b1);
+ stats_n_packets += 2;
+ stats_n_bytes += len0 + len1;
+
+ /* Batch stats increment on the same pppoe session so counter is not
+ incremented per packet. Note stats are still incremented for deleted
+ and admin-down session where packets are dropped. It is not worthwhile
+ to check for this rare case and affect normal path performance. */
+ if (PREDICT_FALSE ((sw_if_index0 != stats_sw_if_index) ||
+ (sw_if_index1 != stats_sw_if_index)))
+ {
+ stats_n_packets -= 2;
+ stats_n_bytes -= len0 + len1;
+ if (sw_if_index0 == sw_if_index1)
+ {
+ if (stats_n_packets)
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+ thread_index, stats_sw_if_index,
+ stats_n_packets, stats_n_bytes);
+ stats_sw_if_index = sw_if_index0;
+ stats_n_packets = 2;
+ stats_n_bytes = len0 + len1;
+ }
+ else
+ {
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+ thread_index, sw_if_index0, 1, len0);
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+ thread_index, sw_if_index1, 1, len1);
+ }
+ }
+
+ if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ pppoe_encap_trace_t *tr =
+ vlib_add_trace (vm, node, b0, sizeof (*tr));
+ tr->session_index = t0 - pem->sessions;
+ tr->session_id = t0->session_id;
+ }
+
+ if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ pppoe_encap_trace_t *tr =
+ vlib_add_trace (vm, node, b1, sizeof (*tr));
+ tr->session_index = t1 - pem->sessions;
+ tr->session_id = t1->session_id;
+ }
+
+ vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+ to_next, n_left_to_next,
+ bi0, bi1, next0, next1);
+ }
+
+ while (n_left_from > 0 && n_left_to_next > 0)
+ {
+ u32 bi0;
+ vlib_buffer_t * b0;
+ ethernet_header_t * eth0;
+ pppoe_header_t * pppoe0;
+ u64 * copy_src0, * copy_dst0;
+ u16 * copy_src_last0, * copy_dst_last0;
+ u16 new_l0;
+ u32 len0;
+ u32 session_id0;
+
+ bi0 = from[0];
+ to_next[0] = bi0;
+ from += 1;
+ to_next += 1;
+ n_left_from -= 1;
+ n_left_to_next -= 1;
+
+ b0 = vlib_get_buffer (vm, bi0);
+
+ /* Get next node index and if-index from session */
+ sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_TX];
+ session_id0 = pem->session_index_by_sw_if_index[sw_if_index0];
+ t0 = pool_elt_at_index(pem->sessions, session_id0);
+ next0 = PPPOE_ENCAP_NEXT_INTERFACE;
+ vnet_buffer(b0)->sw_if_index[VLIB_TX] = t0->encap_if_index;
+
+ /* Apply the rewrite string. $$$$ vnet_rewrite? */
+ vlib_buffer_advance (b0, -(word)_vec_len(t0->rewrite));
+
+ eth0 = (ethernet_header_t *)(vlib_buffer_get_current(b0));
+ /* Copy the fixed header */
+ copy_dst0 = (u64 *) eth0;
+ copy_src0 = (u64 *) t0->rewrite;
+
+ /* Copy first 8-bytes at a time */
+#define _(offs) copy_dst0[offs] = copy_src0[offs];
+ foreach_fixed_header2_offset;
+#undef _
+ /* Last 6 octets. Hopefully gcc will be our friend */
+ copy_dst_last0 = (u16 *)(&copy_dst0[2]);
+ copy_src_last0 = (u16 *)(&copy_src0[2]);
+ copy_dst_last0[0] = copy_src_last0[0];
+ copy_dst_last0[1] = copy_src_last0[1];
+ copy_dst_last0[2] = copy_src_last0[2];
+
+ /* Fix PPPoE length */
+ new_l0 = clib_host_to_net_u16 (vlib_buffer_length_in_chain(vm, b0)
+ - sizeof (*pppoe0) - sizeof(*eth0));
+ pppoe0 = (pppoe_header_t *)(eth0 + 1);
+ pppoe0->length = new_l0;
+
+ pkts_encapsulated ++;
+ len0 = vlib_buffer_length_in_chain (vm, b0);
+ stats_n_packets += 1;
+ stats_n_bytes += len0;
+
+ /* Batch stats increment on the same pppoe session so counter is not
+ incremented per packet. Note stats are still incremented for deleted
+ and admin-down session where packets are dropped. It is not worthwhile
+ to check for this rare case and affect normal path performance. */
+ if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index))
+ {
+ stats_n_packets -= 1;
+ stats_n_bytes -= len0;
+ if (stats_n_packets)
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+ thread_index, stats_sw_if_index,
+ stats_n_packets, stats_n_bytes);
+ stats_n_packets = 1;
+ stats_n_bytes = len0;
+ stats_sw_if_index = sw_if_index0;
+ }
+
+ if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ pppoe_encap_trace_t *tr =
+ vlib_add_trace (vm, node, b0, sizeof (*tr));
+ tr->session_index = t0 - pem->sessions;
+ tr->session_id = t0->session_id;
+ }
+ vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+ to_next, n_left_to_next,
+ bi0, next0);
+ }
+
+ vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+ }
+
+ /* Do we still need this now that session tx stats is kept? */
+ vlib_node_increment_counter (vm, node->node_index,
+ PPPOE_ENCAP_ERROR_ENCAPSULATED,
+ pkts_encapsulated);
+
+ /* Increment any remaining batch stats */
+ if (stats_n_packets)
+ {
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_TX,
+ thread_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+ node->runtime_data[0] = stats_sw_if_index;
+ }
+
+ return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (pppoe_encap_node) = {
+ .function = pppoe_encap,
+ .name = "pppoe-encap",
+ .vector_size = sizeof (u32),
+ .format_trace = format_pppoe_encap_trace,
+ .type = VLIB_NODE_TYPE_INTERNAL,
+ .n_errors = ARRAY_LEN(pppoe_encap_error_strings),
+ .error_strings = pppoe_encap_error_strings,
+ .n_next_nodes = PPPOE_ENCAP_N_NEXT,
+ .next_nodes = {
+#define _(s,n) [PPPOE_ENCAP_NEXT_##s] = n,
+ foreach_pppoe_encap_next
+#undef _
+ },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (pppoe_encap_node, pppoe_encap)
+
diff --git a/src/plugins/pppoe/pppoe_error.def b/src/plugins/pppoe/pppoe_error.def
new file mode 100644
index 00000000000..a875afd014c
--- /dev/null
+++ b/src/plugins/pppoe/pppoe_error.def
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+pppoe_error (DECAPSULATED, "good packets decapsulated")
+pppoe_error (CONTROL_PLANE, "control plane packet")
+pppoe_error (NO_SUCH_SESSION, "no such sessions")
+pppoe_error (BAD_VER_TYPE, "bad version and type in pppoe header")
diff --git a/src/plugins/pppoe/pppoe_msg_enum.h b/src/plugins/pppoe/pppoe_msg_enum.h
new file mode 100644
index 00000000000..7ca19189745
--- /dev/null
+++ b/src/plugins/pppoe/pppoe_msg_enum.h
@@ -0,0 +1,31 @@
+/*
+ * pppoe_msg_enum.h - vpp engine plug-in message enumeration
+ *
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef included_pppoe_msg_enum_h
+#define included_pppoe_msg_enum_h
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum
+{
+#include <pppoe/pppoe_all_api_h.h>
+ /* We'll want to know how many messages IDs we need... */
+ VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* included_pppoe_msg_enum_h */
diff --git a/src/plugins/pppoe/pppoe_tap.c b/src/plugins/pppoe/pppoe_tap.c
new file mode 100644
index 00000000000..60cdaafbad0
--- /dev/null
+++ b/src/plugins/pppoe/pppoe_tap.c
@@ -0,0 +1,89 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <pppoe/pppoe.h>
+#include <vnet/unix/tapcli.h>
+
+static clib_error_t *
+pppoe_add_del_tap_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
+{
+ unformat_input_t _line_input, *line_input = &_line_input;
+ pppoe_main_t *pem = &pppoe_main;
+ u8 is_add = 1;
+ u8 tap_if_index_set = 0;
+ u32 tap_if_index = 0;
+ clib_error_t *error = NULL;
+
+ /* Get a line of input. */
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (line_input, "tap-if-index %d", &tap_if_index))
+ tap_if_index_set = 1;
+ else
+ {
+ error = clib_error_return (0, "parse error: '%U'",
+ format_unformat_error, line_input);
+ goto done;
+ }
+ }
+
+ if (tap_if_index_set == 0)
+ {
+ error = clib_error_return (0, "tap if index not specified");
+ goto done;
+ }
+
+ if (is_add)
+ {
+ pem->tap_if_index = tap_if_index;
+ }
+ else
+ {
+ pem->tap_if_index = ~0;
+ }
+
+done:
+ unformat_free (line_input);
+
+ return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (create_pppoe_tap_cmd, static) =
+{
+ .path = "create pppoe tap",
+ .short_help = "create pppoe tap if-name <intfc> [del]",
+ .function = pppoe_add_del_tap_command_fn,
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/pppoe/pppoe_tap_node.c b/src/plugins/pppoe/pppoe_tap_node.c
new file mode 100644
index 00000000000..f1e0a50103f
--- /dev/null
+++ b/src/plugins/pppoe/pppoe_tap_node.c
@@ -0,0 +1,297 @@
+/*
+ *------------------------------------------------------------------
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or pemplied.
+ * See the License for the specific language governing permissions and
+ * lpemitations under the License.
+ *------------------------------------------------------------------
+ */
+
+#include <vlib/vlib.h>
+#include <vnet/ppp/packet.h>
+#include <pppoe/pppoe.h>
+
+vlib_node_registration_t pppoe_tap_dispatch_node;
+
+#define foreach_pppoe_tap_next \
+_(DROP, "error-drop") \
+_(TUNTAP, "tuntap-tx" ) \
+_(INTERFACE, "interface-output" ) \
+
+typedef enum
+{
+#define _(s,n) PPPOE_TAP_NEXT_##s,
+ foreach_pppoe_tap_next
+#undef _
+ PPPOE_TAP_N_NEXT,
+} pppoe_tap_next_t;
+
+typedef struct {
+ u32 next_index;
+ u32 sw_if_index;
+ u32 tap_if_index;
+ u8 pppoe_code;
+ u16 ppp_proto;
+ u32 error;
+} pppoe_tap_trace_t;
+
+static u8 * format_pppoe_tap_trace (u8 * s, va_list * args)
+{
+ CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+ CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+ pppoe_tap_trace_t * t = va_arg (*args, pppoe_tap_trace_t *);
+ pppoe_main_t * pem = &pppoe_main;
+
+ if (t->sw_if_index != pem->tap_if_index)
+ {
+ s = format (s, "PPPoE dispatch from sw_if_index %d next %d error %d \n"
+ " pppoe_code 0x%x ppp_proto 0x%x",
+ t->sw_if_index, t->next_index, t->error,
+ t->pppoe_code, t->ppp_proto);
+ }
+ else
+ {
+ s = format (s, "PPPoE dispatch from tap_if_index %d next %d error %d \n"
+ " pppoe_code 0x%x ppp_proto 0x%x",
+ t->tap_if_index, t->next_index, t->error,
+ t->pppoe_code, t->ppp_proto);
+ }
+ return s;
+}
+
+/**
+ * Perform learning on one packet based on the mac table lookup result.
+ * */
+static_always_inline void
+pppoe_learn_process (vlib_node_runtime_t * node,
+ pppoe_main_t * pem,
+ vlib_buffer_t * b0,
+ u32 sw_if_index0,
+ pppoe_entry_key_t * key0,
+ pppoe_entry_key_t * cached_key,
+ u32 * bucket0,
+ pppoe_entry_result_t * result0)
+{
+ /* Check mac table lookup result */
+ if (PREDICT_TRUE (result0->fields.sw_if_index == sw_if_index0))
+ {
+ /*
+ * The entry was in the table, and the sw_if_index matched, the normal case
+ */
+ return;
+ }
+ else if (result0->fields.sw_if_index == ~0)
+ {
+ /* The entry was not in table, so add it */
+ result0->fields.sw_if_index = sw_if_index0;
+ result0->fields.session_index = ~0;
+ cached_key->raw = ~0; /* invalidate the cache */
+ }
+ else
+ {
+ /* The entry was in the table, but with the wrong sw_if_index mapping (mac move) */
+ result0->fields.sw_if_index = sw_if_index0;
+ }
+
+ /* Update the entry */
+ BVT (clib_bihash_kv) kv;
+ kv.key = key0->raw;
+ kv.value = result0->raw;
+ BV (clib_bihash_add_del) (&pem->session_table, &kv, 1 /* is_add */ );
+}
+
+static uword
+pppoe_tap_dispatch (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * from_frame)
+{
+ u32 n_left_from, next_index, * from, * to_next;
+ pppoe_main_t * pem = &pppoe_main;
+ vnet_main_t * vnm = pem->vnet_main;
+ vnet_interface_main_t * im = &vnm->interface_main;
+ u32 pkts_decapsulated = 0;
+ u32 thread_index = vlib_get_thread_index();
+ u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
+ pppoe_entry_key_t cached_key;
+ pppoe_entry_result_t cached_result;
+
+ from = vlib_frame_vector_args (from_frame);
+ n_left_from = from_frame->n_vectors;
+
+ /* Clear the one-entry cache in case session table was updated */
+ cached_key.raw = ~0;
+ cached_result.raw = ~0; /* warning be gone */
+
+ next_index = node->cached_next_index;
+ stats_sw_if_index = node->runtime_data[0];
+ stats_n_packets = stats_n_bytes = 0;
+
+ while (n_left_from > 0)
+ {
+ u32 n_left_to_next;
+
+ vlib_get_next_frame (vm, node, next_index,
+ to_next, n_left_to_next);
+
+ while (n_left_from > 0 && n_left_to_next > 0)
+ {
+ u32 bi0;
+ vlib_buffer_t * b0;
+ ethernet_header_t *h0;
+ pppoe_header_t * pppoe0;
+ pppoe_entry_key_t key0;
+ pppoe_entry_result_t result0;
+
+ u32 bucket0;
+ u32 next0;
+ u32 error0 = 0;
+ u32 rx_sw_if_index0=~0, tx_sw_if_index0=~0, len0;
+ vnet_hw_interface_t *hi;
+ vnet_sw_interface_t *si;
+
+ bi0 = from[0];
+ to_next[0] = bi0;
+ from += 1;
+ to_next += 1;
+ n_left_from -= 1;
+ n_left_to_next -= 1;
+
+ b0 = vlib_get_buffer (vm, bi0);
+ /* leaves current_data pointing at the pppoe header */
+ pppoe0 = vlib_buffer_get_current (b0);
+ rx_sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
+
+ if (PREDICT_FALSE (pppoe0->ver_type != PPPOE_VER_TYPE))
+ {
+ error0 = PPPOE_ERROR_BAD_VER_TYPE;
+ next0 = PPPOE_INPUT_NEXT_DROP;
+ goto trace00;
+ }
+
+ vlib_buffer_reset(b0);
+ h0 = vlib_buffer_get_current (b0);
+
+ if(rx_sw_if_index0 == pem->tap_if_index)
+ {
+ pppoe_lookup_1 (&pem->session_table, &cached_key, &cached_result,
+ h0->dst_address, 0,
+ &key0, &bucket0, &result0);
+ tx_sw_if_index0 = result0.fields.sw_if_index;
+
+ if (PREDICT_FALSE (tx_sw_if_index0 == ~0))
+ {
+ error0 = PPPOE_ERROR_NO_SUCH_SESSION;
+ next0 = PPPOE_INPUT_NEXT_DROP;
+ goto trace00;
+ }
+
+ next0 = PPPOE_TAP_NEXT_INTERFACE;
+ vnet_buffer(b0)->sw_if_index[VLIB_TX] = tx_sw_if_index0;
+
+ /* set src mac address */
+ si = vnet_get_sw_interface(vnm, tx_sw_if_index0);
+ hi = vnet_get_hw_interface (vnm, si->hw_if_index);
+ clib_memcpy (vlib_buffer_get_current (b0)+6, hi->hw_address, 6);
+ }
+ else
+ {
+ pppoe_lookup_1 (&pem->session_table, &cached_key, &cached_result,
+ h0->src_address, pppoe0->session_id,
+ &key0, &bucket0, &result0);
+ tx_sw_if_index0 = result0.fields.sw_if_index;
+
+ /* learn client session */
+ pppoe_learn_process (node, pem, b0, rx_sw_if_index0,
+ &key0, &cached_key,
+ &bucket0, &result0);
+
+ next0 = PPPOE_TAP_NEXT_TUNTAP;
+ vnet_buffer(b0)->sw_if_index[VLIB_TX] = pem->tap_if_index;
+ }
+
+ len0 = vlib_buffer_length_in_chain (vm, b0);
+
+ pkts_decapsulated ++;
+ stats_n_packets += 1;
+ stats_n_bytes += len0;
+
+ /* Batch stats increment on the same pppoe session so counter
+ is not incremented per packet */
+ if (PREDICT_FALSE (rx_sw_if_index0 != stats_sw_if_index))
+ {
+ stats_n_packets -= 1;
+ stats_n_bytes -= len0;
+ if (stats_n_packets)
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+ thread_index, stats_sw_if_index,
+ stats_n_packets, stats_n_bytes);
+ stats_n_packets = 1;
+ stats_n_bytes = len0;
+ stats_sw_if_index = rx_sw_if_index0;
+ }
+
+ trace00:
+ b0->error = error0 ? node->errors[error0] : 0;
+
+ if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ pppoe_tap_trace_t *tr
+ = vlib_add_trace (vm, node, b0, sizeof (*tr));
+ tr->next_index = next0;
+ tr->error = error0;
+ tr->sw_if_index = tx_sw_if_index0;
+ tr->tap_if_index = pem->tap_if_index;
+ tr->pppoe_code = pppoe0->code;
+ tr->ppp_proto = clib_net_to_host_u16(pppoe0->ppp_proto);
+ }
+ vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+ to_next, n_left_to_next,
+ bi0, next0);
+ }
+
+ vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+ }
+ /* Do we still need this now that session tx stats is kept? */
+ vlib_node_increment_counter (vm, pppoe_input_node.index,
+ PPPOE_ERROR_DECAPSULATED,
+ pkts_decapsulated);
+
+ /* Increment any remaining batch stats */
+ if (stats_n_packets)
+ {
+ vlib_increment_combined_counter
+ (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+ thread_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
+ node->runtime_data[0] = stats_sw_if_index;
+ }
+
+ return from_frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (pppoe_tap_dispatch_node) = {
+ .function = pppoe_tap_dispatch,
+ .name = "pppoe-tap-dispatch",
+ /* Takes a vector of packets. */
+ .vector_size = sizeof (u32),
+
+ .n_next_nodes = PPPOE_TAP_N_NEXT,
+ .next_nodes = {
+#define _(s,n) [PPPOE_TAP_NEXT_##s] = n,
+ foreach_pppoe_tap_next
+#undef _
+ },
+
+ .format_trace = format_pppoe_tap_trace,
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (pppoe_tap_dispatch_node, pppoe_tap_dispatch)
+
diff --git a/src/plugins/pppoe/pppoe_test.c b/src/plugins/pppoe/pppoe_test.c
new file mode 100644
index 00000000000..2b67d989418
--- /dev/null
+++ b/src/plugins/pppoe/pppoe_test.c
@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2017 Intel and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vat/vat.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <vlibsocket/api.h>
+#include <vppinfra/error.h>
+#include <pppoe/pppoe.h>
+
+#define __plugin_msg_base pppoe_test_main.msg_id_base
+#include <vlibapi/vat_helper_macros.h>
+
+
+uword unformat_ip46_address (unformat_input_t * input, va_list * args)
+{
+ ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+ ip46_type_t type = va_arg (*args, ip46_type_t);
+ if ((type != IP46_TYPE_IP6) &&
+ unformat(input, "%U", unformat_ip4_address, &ip46->ip4)) {
+ ip46_address_mask_ip4(ip46);
+ return 1;
+ } else if ((type != IP46_TYPE_IP4) &&
+ unformat(input, "%U", unformat_ip6_address, &ip46->ip6)) {
+ return 1;
+ }
+ return 0;
+}
+uword unformat_ip46_prefix (unformat_input_t * input, va_list * args)
+{
+ ip46_address_t *ip46 = va_arg (*args, ip46_address_t *);
+ u8 *len = va_arg (*args, u8 *);
+ ip46_type_t type = va_arg (*args, ip46_type_t);
+
+ u32 l;
+ if ((type != IP46_TYPE_IP6) && unformat(input, "%U/%u", unformat_ip4_address, &ip46->ip4, &l)) {
+ if (l > 32)
+ return 0;
+ *len = l + 96;
+ ip46->pad[0] = ip46->pad[1] = ip46->pad[2] = 0;
+ } else if ((type != IP46_TYPE_IP4) && unformat(input, "%U/%u", unformat_ip6_address, &ip46->ip6, &l)) {
+ if (l > 128)
+ return 0;
+ *len = l;
+ } else {
+ return 0;
+ }
+ return 1;
+}
+/////////////////////////
+
+#define vl_msg_id(n,h) n,
+typedef enum {
+#include <pppoe/pppoe.api.h>
+ /* We'll want to know how many messages IDs we need... */
+ VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+/* define message structures */
+#define vl_typedefs
+#include <pppoe/pppoe.api.h>
+#undef vl_typedefs
+
+/* declare message handlers for each api */
+
+#define vl_endianfun /* define message structures */
+#include <pppoe/pppoe.api.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <pppoe/pppoe.api.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <pppoe/pppoe.api.h>
+#undef vl_api_version
+
+typedef struct {
+ /* API message ID base */
+ u16 msg_id_base;
+ vat_main_t *vat_main;
+} pppoe_test_main_t;
+
+pppoe_test_main_t pppoe_test_main;
+
+static void vl_api_pppoe_add_del_session_reply_t_handler
+ (vl_api_pppoe_add_del_session_reply_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ i32 retval = ntohl (mp->retval);
+ if (vam->async_mode)
+ {
+ vam->async_errors += (retval < 0);
+ }
+ else
+ {
+ vam->retval = retval;
+ vam->sw_if_index = ntohl (mp->sw_if_index);
+ vam->result_ready = 1;
+ }
+}
+
+
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_vpe_api_reply_msg \
+ _(PPPOE_ADD_DEL_SESSION_REPLY, pppoe_add_del_session_reply) \
+ _(PPPOE_SESSION_DETAILS, pppoe_session_details)
+
+
+static int
+api_pppoe_add_del_session (vat_main_t * vam)
+{
+ unformat_input_t *line_input = vam->input;
+ vl_api_pppoe_add_del_session_t *mp;
+ u16 session_id = 0;
+ ip46_address_t client_ip;
+ u8 is_add = 1;
+ u8 client_ip_set = 0;
+ u8 ipv4_set = 0;
+ u8 ipv6_set = 0;
+ u32 decap_vrf_id = 0;
+ u8 client_mac[6] = { 0 };
+ u8 client_mac_set = 0;
+ int ret;
+
+ /* Can't "universally zero init" (={0}) due to GCC bug 53119 */
+ memset (&client_ip, 0, sizeof client_ip);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "del"))
+ {
+ is_add = 0;
+ }
+ else if (unformat (line_input, "session_id %d", &session_id))
+ ;
+ else if (unformat (line_input, "client-ip %U",
+ unformat_ip4_address, &client_ip.ip4))
+ {
+ client_ip_set = 1;
+ ipv4_set = 1;
+ }
+ else if (unformat (line_input, "client-ip %U",
+ unformat_ip6_address, &client_ip.ip6))
+ {
+ client_ip_set = 1;
+ ipv6_set = 1;
+ }
+ else if (unformat (line_input, "decap-vrf-id %d", &decap_vrf_id))
+ ;
+ else if (unformat (line_input, "client-mac %U", unformat_ethernet_address, client_mac))
+ client_mac_set = 1;
+ else
+ {
+ return -99;
+ }
+ }
+
+ if (client_ip_set == 0)
+ {
+ errmsg ("session client_ip address not specified");
+ return -99;
+ }
+
+ if (ipv4_set && ipv6_set)
+ {
+ errmsg ("both IPv4 and IPv6 addresses specified");
+ return -99;
+ }
+
+ if (client_mac_set == 0)
+ {
+ errmsg("session client mac not specified");
+ return -99;
+ }
+
+ M (PPPOE_ADD_DEL_SESSION, mp);
+
+ if (ipv6_set)
+ {
+ clib_memcpy (mp->client_ip, &client_ip.ip6, sizeof (client_ip.ip6));
+ }
+ else
+ {
+ clib_memcpy (mp->client_ip, &client_ip.ip4, sizeof (client_ip.ip4));
+ }
+
+ mp->decap_vrf_id = ntohl (decap_vrf_id);
+ mp->session_id = ntohl (session_id);
+ mp->is_add = is_add;
+ mp->is_ipv6 = ipv6_set;
+ memcpy (mp->client_mac, client_mac, 6);
+
+ S (mp);
+ W (ret);
+ return ret;
+}
+
+static void vl_api_pppoe_session_details_t_handler
+ (vl_api_pppoe_session_details_t * mp)
+{
+ vat_main_t *vam = &vat_main;
+ ip46_address_t client_ip = to_ip46 (mp->is_ipv6, mp->client_ip);
+
+ print (vam->ofp, "%11d%14d%24U%14d%14d%30U%30U",
+ ntohl (mp->sw_if_index), ntohl (mp->session_id),
+ format_ip46_address, &client_ip, IP46_TYPE_ANY,
+ ntohl (mp->encap_if_index), ntohl (mp->decap_vrf_id),
+ format_ethernet_address, mp->local_mac,
+ format_ethernet_address, mp->client_mac);
+}
+
+static int
+api_pppoe_session_dump (vat_main_t * vam)
+{
+ unformat_input_t *i = vam->input;
+ vl_api_pppoe_session_dump_t *mp;
+ u32 sw_if_index;
+ u8 sw_if_index_set = 0;
+ int ret;
+
+ /* Parse args required to build the message */
+ while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (i, "sw_if_index %d", &sw_if_index))
+ sw_if_index_set = 1;
+ else
+ break;
+ }
+
+ if (sw_if_index_set == 0)
+ {
+ sw_if_index = ~0;
+ }
+
+ if (!vam->json_output)
+ {
+ print (vam->ofp, "%11s%24s%14s%14s%14s",
+ "sw_if_index", "client_ip", "session_id",
+ "encap_if_index", "decap_fib_index",
+ "local-mac", "client-mac");
+ }
+
+ /* Get list of pppoe-session interfaces */
+ M (PPPOE_SESSION_DUMP, mp);
+
+ mp->sw_if_index = htonl (sw_if_index);
+
+ S (mp);
+
+ W (ret);
+ return ret;
+}
+
+/*
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_vpe_api_msg \
+_(pppoe_add_del_session, \
+ " client-addr <client-addr> session-id <nn>" \
+ " [encap-if-index <nn>] [decap-next [ip4|ip6|node <name>]]" \
+ " local-mac <local-mac> client-mac <client-mac> [del]") \
+_(pppoe_session_dump, "[<intfc> | sw_if_index <nn>]") \
+
+static void
+pppoe_vat_api_hookup (vat_main_t *vam)
+{
+ pppoe_test_main_t * pem = &pppoe_test_main;
+ /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n) \
+ vl_msg_api_set_handlers((VL_API_##N + pem->msg_id_base), \
+ #n, \
+ vl_api_##n##_t_handler, \
+ vl_noop_handler, \
+ vl_api_##n##_t_endian, \
+ vl_api_##n##_t_print, \
+ sizeof(vl_api_##n##_t), 1);
+ foreach_vpe_api_reply_msg;
+#undef _
+
+ /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+ foreach_vpe_api_msg;
+#undef _
+
+ /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+ foreach_vpe_api_msg;
+#undef _
+}
+
+clib_error_t * vat_plugin_register (vat_main_t *vam)
+{
+ pppoe_test_main_t * pem = &pppoe_test_main;
+
+ u8 * name;
+
+ pem->vat_main = vam;
+
+ /* Ask the vpp engine for the first assigned message-id */
+ name = format (0, "pppoe_%08x%c", api_version, 0);
+ pem->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+ if (pem->msg_id_base != (u16) ~0)
+ pppoe_vat_api_hookup (vam);
+
+ vec_free(name);
+
+ return 0;
+}
diff --git a/src/vpp-api/java/Makefile.am b/src/vpp-api/java/Makefile.am
index 4f1f7ed24f0..e0f5203d7ad 100644
--- a/src/vpp-api/java/Makefile.am
+++ b/src/vpp-api/java/Makefile.am
@@ -149,6 +149,26 @@ jvpp-gtpu/io_fd_vpp_jvpp_gtpu_JVppGtpuImpl.h: $(jvpp_registry_ok) $(jvpp_gtpu_js
endif
#
+# PPPOE Plugin
+#
+if ENABLE_PPPOE_PLUGIN
+noinst_LTLIBRARIES += libjvpp_pppoe.la
+libjvpp_pppoe_la_SOURCES = jvpp-pppoe/jvpp_pppoe.c
+libjvpp_pppoe_la_CPPFLAGS = -Ijvpp-pppoe
+libjvpp_pppoe_la_LIBADD = $(JVPP_LIBS)
+libjvpp_pppoe_la_DEPENDENCIES = libjvpp_common.la
+
+BUILT_SOURCES += jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h
+JAR_FILES += jvpp-pppoe-$(PACKAGE_VERSION).jar
+CLEANDIRS += jvpp-pppoe/target
+
+jvpp_pppoe_json_files = @top_builddir@/plugins/pppoe/pppoe.api.json
+
+jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h: $(jvpp_registry_ok) $(jvpp_pppoe_json_files)
+ $(call japigen,pppoe,JVppPppoeImpl)
+endif
+
+#
# SNAT Plugin
#
if ENABLE_SNAT_PLUGIN
diff --git a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c b/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c
new file mode 100644
index 00000000000..c9c30305728
--- /dev/null
+++ b/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/vnet.h>
+
+#include <pppoe/pppoe_msg_enum.h>
+#define vl_typedefs /* define message structures */
+#include <pppoe/pppoe_all_api_h.h>
+#undef vl_typedefs
+
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+
+#if VPPJNI_DEBUG == 1
+ #define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
+#else
+ #define DEBUG_LOG(...)
+#endif
+
+#include <jvpp-common/jvpp_common.h>
+
+#include "jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h"
+#include "jvpp_pppoe.h"
+#include "jvpp-pppoe/jvpp_pppoe_gen.h"
+
+/*
+ * Class: io_fd_vpp_jvpp_pppoe_JVpppppoeImpl
+ * Method: init0
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_init0
+ (JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
+ pppoe_main_t * plugin_main = &pppoe_main;
+ clib_warning ("Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_init0");
+
+ plugin_main->my_client_index = my_client_index;
+ plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
+
+ plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
+ plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
+
+ // verify API has not changed since jar generation
+ #define _(N) \
+ get_message_id(env, #N); \
+ foreach_supported_api_message;
+ #undef _
+
+ #define _(N,n) \
+ vl_msg_api_set_handlers(get_message_id(env, #N), #n, \
+ vl_api_##n##_t_handler, \
+ vl_noop_handler, \
+ vl_noop_handler, \
+ vl_noop_handler, \
+ sizeof(vl_api_##n##_t), 1);
+ foreach_api_reply_handler;
+ #undef _
+}
+
+JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_pppoe_JVppPppoeImpl_close0
+(JNIEnv *env, jclass clazz) {
+ pppoe_main_t * plugin_main = &pppoe_main;
+
+ // cleanup:
+ (*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
+ (*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
+
+ plugin_main->callbackClass = NULL;
+ plugin_main->callbackObject = NULL;
+}
+
+/* Attach thread to JVM and cache class references when initiating JVPP ACL */
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+ JNIEnv* env;
+
+ if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+ return JNI_EVERSION;
+ }
+
+ if (cache_class_references(env) != 0) {
+ clib_warning ("Failed to cache class references\n");
+ return JNI_ERR;
+ }
+
+ return JNI_VERSION_1_8;
+}
+
+/* Clean up cached references when disposing JVPP ACL */
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+ JNIEnv* env;
+ if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
+ return;
+ }
+ delete_class_references(env);
+}
diff --git a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h b/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h
new file mode 100644
index 00000000000..4523ba9cd96
--- /dev/null
+++ b/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_jvpp_pppoe_h__
+#define __included_jvpp_pppoe_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+
+/* Global state for JVPP-pppoe */
+typedef struct {
+ /* Pointer to shared memory queue */
+ unix_shared_memory_queue_t * vl_input_queue;
+
+ /* VPP api client index */
+ u32 my_client_index;
+
+ /* Callback object and class references enabling asynchronous Java calls */
+ jobject callbackObject;
+ jclass callbackClass;
+
+} pppoe_main_t;
+
+pppoe_main_t pppoe_main __attribute__((aligned (64)));
+
+
+#endif /* __included_jvpp_pppoe_h__ */
diff --git a/test/test_pppoe.py b/test/test_pppoe.py
new file mode 100644
index 00000000000..0baf45467e5
--- /dev/null
+++ b/test/test_pppoe.py
@@ -0,0 +1,605 @@
+#!/usr/bin/env python
+
+import unittest
+from logging import *
+
+from framework import VppTestCase, VppTestRunner
+from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_pppoe_interface import VppPppoeInterface, VppPppoe6Interface
+from vpp_papi_provider import L2_VTR_OP
+
+from scapy.packet import Raw
+from scapy.layers.l2 import Ether
+from scapy.layers.ppp import PPPoE, PPPoED, PPP
+from scapy.layers.inet import IP, UDP
+from scapy.layers.inet6 import IPv6
+from scapy.volatile import RandMAC, RandIP
+
+from util import ppp, ppc, mactobinary
+import socket
+
+
+class TestPPPoE(VppTestCase):
+ """ PPPoE Test Case """
+
+ @classmethod
+ def setUpClass(cls):
+ super(TestPPPoE, cls).setUpClass()
+
+ cls.session_id = 1
+ cls.dst_ip = "100.1.1.100"
+ cls.dst_ipn = socket.inet_pton(socket.AF_INET, cls.dst_ip)
+
+ def setUp(self):
+ super(TestPPPoE, self).setUp()
+
+ # create 2 pg interfaces
+ self.create_pg_interfaces(range(3))
+
+ for i in self.pg_interfaces:
+ i.admin_up()
+ i.config_ip4()
+ i.resolve_arp()
+
+ def tearDown(self):
+ super(TestPPPoE, self).tearDown()
+
+ self.logger.info(self.vapi.cli("show int"))
+ self.logger.info(self.vapi.cli("show pppoe fib"))
+ self.logger.info(self.vapi.cli("show pppoe session"))
+ self.logger.info(self.vapi.cli("show ip fib"))
+ self.logger.info(self.vapi.cli("show trace"))
+
+ for i in self.pg_interfaces:
+ i.unconfig_ip4()
+ i.admin_down()
+
+ def create_stream_pppoe_discovery(self, src_if, dst_if,
+ client_mac, count=1):
+ packets = []
+ for i in range(count):
+ # create packet info stored in the test case instance
+ info = self.create_packet_info(src_if, dst_if)
+ # convert the info into packet payload
+ payload = self.info_to_payload(info)
+ # create the packet itself
+ p = (Ether(dst=src_if.local_mac, src=client_mac) /
+ PPPoED(sessionid=0) /
+ Raw(payload))
+ # store a copy of the packet in the packet info
+ info.data = p.copy()
+ # append the packet to the list
+ packets.append(p)
+
+ # return the created packet list
+ return packets
+
+ def create_stream_pppoe_lcp(self, src_if, dst_if,
+ client_mac, session_id, count=1):
+ packets = []
+ for i in range(count):
+ # create packet info stored in the test case instance
+ info = self.create_packet_info(src_if, dst_if)
+ # convert the info into packet payload
+ payload = self.info_to_payload(info)
+ # create the packet itself
+ p = (Ether(dst=src_if.local_mac, src=client_mac) /
+ PPPoE(sessionid=session_id) /
+ PPP(proto=0xc021) /
+ Raw(payload))
+ # store a copy of the packet in the packet info
+ info.data = p.copy()
+ # append the packet to the list
+ packets.append(p)
+
+ # return the created packet list
+ return packets
+
+ def create_stream_pppoe_ip4(self, src_if, dst_if,
+ client_mac, session_id, client_ip, count=1):
+ packets = []
+ for i in range(count):
+ # create packet info stored in the test case instance
+ info = self.create_packet_info(src_if, dst_if)
+ # convert the info into packet payload
+ payload = self.info_to_payload(info)
+ # create the packet itself
+ p = (Ether(dst=src_if.local_mac, src=client_mac) /
+ PPPoE(sessionid=session_id) /
+ PPP(proto=0x0021) /
+ IP(src=client_ip, dst=self.dst_ip) /
+ Raw(payload))
+ # store a copy of the packet in the packet info
+ info.data = p.copy()
+ # append the packet to the list
+ packets.append(p)
+
+ # return the created packet list
+ return packets
+
+ def create_stream_ip4(self, src_if, dst_if, client_ip, dst_ip, count=1):
+ pkts = []
+ for i in range(count):
+ # create packet info stored in the test case instance
+ info = self.create_packet_info(src_if, dst_if)
+ # convert the info into packet payload
+ payload = self.info_to_payload(info)
+ # create the packet itself
+ p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) /
+ IP(src=dst_ip, dst=client_ip) /
+ Raw(payload))
+ # store a copy of the packet in the packet info
+ info.data = p.copy()
+ # append the packet to the list
+ pkts.append(p)
+
+ # return the created packet list
+ return pkts
+
+ def verify_decapped_pppoe(self, src_if, capture, sent):
+ self.assertEqual(len(capture), len(sent))
+
+ for i in range(len(capture)):
+ try:
+ tx = sent[i]
+ rx = capture[i]
+
+ tx_ip = tx[IP]
+ rx_ip = rx[IP]
+
+ self.assertEqual(rx_ip.src, tx_ip.src)
+ self.assertEqual(rx_ip.dst, tx_ip.dst)
+
+ except:
+ self.logger.error(ppp("Rx:", rx))
+ self.logger.error(ppp("Tx:", tx))
+ raise
+
+ def verify_encaped_pppoe(self, src_if, capture, sent, session_id):
+
+ self.assertEqual(len(capture), len(sent))
+
+ for i in range(len(capture)):
+ try:
+ tx = sent[i]
+ rx = capture[i]
+
+ tx_ip = tx[IP]
+ rx_ip = rx[IP]
+
+ self.assertEqual(rx_ip.src, tx_ip.src)
+ self.assertEqual(rx_ip.dst, tx_ip.dst)
+
+ rx_pppoe = rx[PPPoE]
+
+ self.assertEqual(rx_pppoe.sessionid, session_id)
+
+ except:
+ self.logger.error(ppp("Rx:", rx))
+ self.logger.error(ppp("Tx:", tx))
+ raise
+
+ def test_PPPoE_Decap(self):
+ """ PPPoE Decap Test """
+
+ self.vapi.cli("clear trace")
+
+ #
+ # Add a route that resolves the server's destination
+ #
+ route_sever_dst = VppIpRoute(self, "100.1.1.100", 32,
+ [VppRoutePath(self.pg1.remote_ip4,
+ self.pg1.sw_if_index)])
+ route_sever_dst.add_vpp_config()
+
+ # Send PPPoE Discovery
+ tx0 = self.create_stream_pppoe_discovery(self.pg0, self.pg1,
+ self.pg0.remote_mac)
+ self.pg0.add_stream(tx0)
+ self.pg_start()
+
+ # Send PPPoE PPP LCP
+ tx1 = self.create_stream_pppoe_lcp(self.pg0, self.pg1,
+ self.pg0.remote_mac,
+ self.session_id)
+ self.pg0.add_stream(tx1)
+ self.pg_start()
+
+ # Create PPPoE session
+ pppoe_if = VppPppoeInterface(self,
+ self.pg0.remote_ip4,
+ self.pg0.remote_mac,
+ self.session_id)
+ pppoe_if.add_vpp_config()
+
+ #
+ # Send tunneled packets that match the created tunnel and
+ # are decapped and forwarded
+ #
+ tx2 = self.create_stream_pppoe_ip4(self.pg0, self.pg1,
+ self.pg0.remote_mac,
+ self.session_id,
+ self.pg0.remote_ip4)
+ self.pg0.add_stream(tx2)
+
+ self.pg_enable_capture(self.pg_interfaces)
+ self.pg_start()
+
+ rx2 = self.pg1.get_capture(len(tx2))
+ self.verify_decapped_pppoe(self.pg0, rx2, tx2)
+
+ self.logger.info(self.vapi.cli("show pppoe fib"))
+ self.logger.info(self.vapi.cli("show pppoe session"))
+ self.logger.info(self.vapi.cli("show ip fib"))
+
+ #
+ # test case cleanup
+ #
+
+ # Delete PPPoE session
+ pppoe_if.remove_vpp_config()
+
+ # Delete a route that resolves the server's destination
+ route_sever_dst.remove_vpp_config()
+
+ def test_PPPoE_Encap(self):
+ """ PPPoE Encap Test """
+
+ self.vapi.cli("clear trace")
+
+ #
+ # Add a route that resolves the server's destination
+ #
+ route_sever_dst = VppIpRoute(self, "100.1.1.100", 32,
+ [VppRoutePath(self.pg1.remote_ip4,
+ self.pg1.sw_if_index)])
+ route_sever_dst.add_vpp_config()
+
+ # Send PPPoE Discovery
+ tx0 = self.create_stream_pppoe_discovery(self.pg0, self.pg1,
+ self.pg0.remote_mac)
+ self.pg0.add_stream(tx0)
+ self.pg_start()
+
+ # Send PPPoE PPP LCP
+ tx1 = self.create_stream_pppoe_lcp(self.pg0, self.pg1,
+ self.pg0.remote_mac,
+ self.session_id)
+ self.pg0.add_stream(tx1)
+ self.pg_start()
+
+ # Create PPPoE session
+ pppoe_if = VppPppoeInterface(self,
+ self.pg0.remote_ip4,
+ self.pg0.remote_mac,
+ self.session_id)
+ pppoe_if.add_vpp_config()
+
+ #
+ # Send a packet stream that is routed into the session
+ # - packets are PPPoE encapped
+ #
+ self.vapi.cli("clear trace")
+ tx2 = self.create_stream_ip4(self.pg1, self.pg0,
+ self.pg0.remote_ip4, self.dst_ip)
+ self.pg1.add_stream(tx2)
+
+ self.pg_enable_capture(self.pg_interfaces)
+ self.pg_start()
+
+ rx2 = self.pg0.get_capture(len(tx2))
+ self.verify_encaped_pppoe(self.pg1, rx2, tx2, self.session_id)
+
+ self.logger.info(self.vapi.cli("show pppoe fib"))
+ self.logger.info(self.vapi.cli("show pppoe session"))
+ self.logger.info(self.vapi.cli("show ip fib"))
+
+ #
+ # test case cleanup
+ #
+
+ # Delete PPPoE session
+ pppoe_if.remove_vpp_config()
+
+ # Delete a route that resolves the server's destination
+ route_sever_dst.remove_vpp_config()
+
+ def test_PPPoE_Add_Twice(self):
+ """ PPPoE Add Same Session Twice Test """
+
+ self.vapi.cli("clear trace")
+
+ #
+ # Add a route that resolves the server's destination
+ #
+ route_sever_dst = VppIpRoute(self, "100.1.1.100", 32,
+ [VppRoutePath(self.pg1.remote_ip4,
+ self.pg1.sw_if_index)])
+ route_sever_dst.add_vpp_config()
+
+ # Send PPPoE Discovery
+ tx0 = self.create_stream_pppoe_discovery(self.pg0, self.pg1,
+ self.pg0.remote_mac)
+ self.pg0.add_stream(tx0)
+ self.pg_start()
+
+ # Send PPPoE PPP LCP
+ tx1 = self.create_stream_pppoe_lcp(self.pg0, self.pg1,
+ self.pg0.remote_mac,
+ self.session_id)
+ self.pg0.add_stream(tx1)
+ self.pg_start()
+
+ # Create PPPoE session
+ pppoe_if = VppPppoeInterface(self,
+ self.pg0.remote_ip4,
+ self.pg0.remote_mac,
+ self.session_id)
+ pppoe_if.add_vpp_config()
+
+ #
+ # The double create (create the same session twice) should fail,
+ # and we should still be able to use the original
+ #
+ try:
+ gre_if.add_vpp_config()
+ except Exception:
+ pass
+ else:
+ self.fail("Double GRE tunnel add does not fail")
+
+ #
+ # test case cleanup
+ #
+
+ # Delete PPPoE session
+ pppoe_if.remove_vpp_config()
+
+ # Delete a route that resolves the server's destination
+ route_sever_dst.remove_vpp_config()
+
+ def test_PPPoE_Del_Twice(self):
+ """ PPPoE Delete Same Session Twice Test """
+
+ self.vapi.cli("clear trace")
+
+ #
+ # Add a route that resolves the server's destination
+ #
+ route_sever_dst = VppIpRoute(self, "100.1.1.100", 32,
+ [VppRoutePath(self.pg1.remote_ip4,
+ self.pg1.sw_if_index)])
+ route_sever_dst.add_vpp_config()
+
+ # Send PPPoE Discovery
+ tx0 = self.create_stream_pppoe_discovery(self.pg0, self.pg1,
+ self.pg0.remote_mac)
+ self.pg0.add_stream(tx0)
+ self.pg_start()
+
+ # Send PPPoE PPP LCP
+ tx1 = self.create_stream_pppoe_lcp(self.pg0, self.pg1,
+ self.pg0.remote_mac,
+ self.session_id)
+ self.pg0.add_stream(tx1)
+ self.pg_start()
+
+ # Create PPPoE session
+ pppoe_if = VppPppoeInterface(self,
+ self.pg0.remote_ip4,
+ self.pg0.remote_mac,
+ self.session_id)
+ pppoe_if.add_vpp_config()
+
+ # Delete PPPoE session
+ pppoe_if.remove_vpp_config()
+
+ #
+ # The double del (del the same session twice) should fail,
+ # and we should still be able to use the original
+ #
+ try:
+ gre_if.remove_vpp_config()
+ except Exception:
+ pass
+ else:
+ self.fail("Double GRE tunnel del does not fail")
+
+ #
+ # test case cleanup
+ #
+
+ # Delete a route that resolves the server's destination
+ route_sever_dst.remove_vpp_config()
+
+ def test_PPPoE_Decap_Multiple(self):
+ """ PPPoE Decap Multiple Sessions Test """
+
+ self.vapi.cli("clear trace")
+
+ #
+ # Add a route that resolves the server's destination
+ #
+ route_sever_dst = VppIpRoute(self, "100.1.1.100", 32,
+ [VppRoutePath(self.pg1.remote_ip4,
+ self.pg1.sw_if_index)])
+ route_sever_dst.add_vpp_config()
+
+ # Send PPPoE Discovery 1
+ tx0 = self.create_stream_pppoe_discovery(self.pg0, self.pg1,
+ self.pg0.remote_mac)
+ self.pg0.add_stream(tx0)
+ self.pg_start()
+
+ # Send PPPoE PPP LCP 1
+ tx1 = self.create_stream_pppoe_lcp(self.pg0, self.pg1,
+ self.pg0.remote_mac,
+ self.session_id)
+ self.pg0.add_stream(tx1)
+ self.pg_start()
+
+ # Create PPPoE session 1
+ pppoe_if1 = VppPppoeInterface(self,
+ self.pg0.remote_ip4,
+ self.pg0.remote_mac,
+ self.session_id)
+ pppoe_if1.add_vpp_config()
+
+ # Send PPPoE Discovery 2
+ tx3 = self.create_stream_pppoe_discovery(self.pg2, self.pg1,
+ self.pg2.remote_mac)
+ self.pg2.add_stream(tx3)
+ self.pg_start()
+
+ # Send PPPoE PPP LCP 2
+ tx4 = self.create_stream_pppoe_lcp(self.pg2, self.pg1,
+ self.pg2.remote_mac,
+ self.session_id + 1)
+ self.pg2.add_stream(tx4)
+ self.pg_start()
+
+ # Create PPPoE session 2
+ pppoe_if2 = VppPppoeInterface(self,
+ self.pg2.remote_ip4,
+ self.pg2.remote_mac,
+ self.session_id + 1)
+ pppoe_if2.add_vpp_config()
+
+ #
+ # Send tunneled packets that match the created tunnel and
+ # are decapped and forwarded
+ #
+ tx2 = self.create_stream_pppoe_ip4(self.pg0, self.pg1,
+ self.pg0.remote_mac,
+ self.session_id,
+ self.pg0.remote_ip4)
+ self.pg0.add_stream(tx2)
+
+ self.pg_enable_capture(self.pg_interfaces)
+ self.pg_start()
+
+ rx2 = self.pg1.get_capture(len(tx2))
+ self.verify_decapped_pppoe(self.pg0, rx2, tx2)
+
+ tx5 = self.create_stream_pppoe_ip4(self.pg2, self.pg1,
+ self.pg2.remote_mac,
+ self.session_id + 1,
+ self.pg2.remote_ip4)
+ self.pg2.add_stream(tx5)
+
+ self.pg_enable_capture(self.pg_interfaces)
+ self.pg_start()
+
+ rx5 = self.pg1.get_capture(len(tx5))
+ self.verify_decapped_pppoe(self.pg2, rx5, tx5)
+
+ self.logger.info(self.vapi.cli("show pppoe fib"))
+ self.logger.info(self.vapi.cli("show pppoe session"))
+ self.logger.info(self.vapi.cli("show ip fib"))
+
+ #
+ # test case cleanup
+ #
+
+ # Delete PPPoE session
+ pppoe_if1.remove_vpp_config()
+ pppoe_if2.remove_vpp_config()
+
+ # Delete a route that resolves the server's destination
+ route_sever_dst.remove_vpp_config()
+
+ def test_PPPoE_Encap_Multiple(self):
+ """ PPPoE Encap Multiple Sessions Test """
+
+ self.vapi.cli("clear trace")
+
+ #
+ # Add a route that resolves the server's destination
+ #
+ route_sever_dst = VppIpRoute(self, "100.1.1.100", 32,
+ [VppRoutePath(self.pg1.remote_ip4,
+ self.pg1.sw_if_index)])
+ route_sever_dst.add_vpp_config()
+
+ # Send PPPoE Discovery 1
+ tx0 = self.create_stream_pppoe_discovery(self.pg0, self.pg1,
+ self.pg0.remote_mac)
+ self.pg0.add_stream(tx0)
+ self.pg_start()
+
+ # Send PPPoE PPP LCP 1
+ tx1 = self.create_stream_pppoe_lcp(self.pg0, self.pg1,
+ self.pg0.remote_mac,
+ self.session_id)
+ self.pg0.add_stream(tx1)
+ self.pg_start()
+
+ # Create PPPoE session 1
+ pppoe_if1 = VppPppoeInterface(self,
+ self.pg0.remote_ip4,
+ self.pg0.remote_mac,
+ self.session_id)
+ pppoe_if1.add_vpp_config()
+
+ # Send PPPoE Discovery 2
+ tx3 = self.create_stream_pppoe_discovery(self.pg2, self.pg1,
+ self.pg2.remote_mac)
+ self.pg2.add_stream(tx3)
+ self.pg_start()
+
+ # Send PPPoE PPP LCP 2
+ tx4 = self.create_stream_pppoe_lcp(self.pg2, self.pg1,
+ self.pg2.remote_mac,
+ self.session_id + 1)
+ self.pg2.add_stream(tx4)
+ self.pg_start()
+
+ # Create PPPoE session 2
+ pppoe_if2 = VppPppoeInterface(self,
+ self.pg2.remote_ip4,
+ self.pg2.remote_mac,
+ self.session_id + 1)
+ pppoe_if2.add_vpp_config()
+
+ #
+ # Send a packet stream that is routed into the session
+ # - packets are PPPoE encapped
+ #
+ self.vapi.cli("clear trace")
+ tx2 = self.create_stream_ip4(self.pg1, self.pg0,
+ self.pg0.remote_ip4, self.dst_ip)
+ self.pg1.add_stream(tx2)
+
+ self.pg_enable_capture(self.pg_interfaces)
+ self.pg_start()
+
+ rx2 = self.pg0.get_capture(len(tx2))
+ self.verify_encaped_pppoe(self.pg1, rx2, tx2, self.session_id)
+
+ tx5 = self.create_stream_ip4(self.pg1, self.pg2,
+ self.pg2.remote_ip4, self.dst_ip)
+ self.pg1.add_stream(tx5)
+
+ self.pg_enable_capture(self.pg_interfaces)
+ self.pg_start()
+
+ rx5 = self.pg2.get_capture(len(tx5))
+ self.verify_encaped_pppoe(self.pg1, rx5, tx5, self.session_id + 1)
+
+ self.logger.info(self.vapi.cli("show pppoe fib"))
+ self.logger.info(self.vapi.cli("show pppoe session"))
+ self.logger.info(self.vapi.cli("show ip fib"))
+
+ #
+ # test case cleanup
+ #
+
+ # Delete PPPoE session
+ pppoe_if1.remove_vpp_config()
+ pppoe_if2.remove_vpp_config()
+
+ # Delete a route that resolves the server's destination
+ route_sever_dst.remove_vpp_config()
+
+if __name__ == '__main__':
+ unittest.main(testRunner=VppTestRunner)
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 3ba2ad4aacf..4d017c1fd4f 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -2087,3 +2087,29 @@ class VppPapiProvider(object):
'decap_vrf_id': decap_vrf_id,
'protocol': protocol,
'vni': vni})
+
+ def pppoe_add_del_session(
+ self,
+ client_ip,
+ client_mac,
+ session_id=0,
+ is_add=1,
+ is_ipv6=0,
+ decap_vrf_id=0):
+ """
+
+ :param is_add: (Default value = 1)
+ :param is_ipv6: (Default value = 0)
+ :param client_ip:
+ :param session_id: (Default value = 0)
+ :param client_mac:
+ :param decap_vrf_id: (Default value = 0)
+
+ """
+ return self.api(self.papi.pppoe_add_del_session,
+ {'is_add': is_add,
+ 'is_ipv6': is_ipv6,
+ 'session_id': session_id,
+ 'client_ip': client_ip,
+ 'decap_vrf_id': decap_vrf_id,
+ 'client_mac': client_mac})
diff --git a/test/vpp_pppoe_interface.py b/test/vpp_pppoe_interface.py
new file mode 100644
index 00000000000..9a8b8699328
--- /dev/null
+++ b/test/vpp_pppoe_interface.py
@@ -0,0 +1,79 @@
+
+from vpp_interface import VppInterface
+import socket
+from util import ppp, ppc, mactobinary
+
+
+class VppPppoeInterface(VppInterface):
+ """
+ VPP Pppoe interface
+ """
+
+ def __init__(self, test, client_ip, client_mac,
+ session_id, decap_vrf_id=0):
+ """ Create VPP PPPoE4 interface """
+ self._sw_if_index = 0
+ super(VppPppoeInterface, self).__init__(test)
+ self._test = test
+ self.client_ip = client_ip
+ self.client_mac = client_mac
+ self.session_id = session_id
+ self.decap_vrf_id = decap_vrf_id
+
+ def add_vpp_config(self):
+ cip = socket.inet_pton(socket.AF_INET, self.client_ip)
+ cmac = mactobinary(self.client_mac)
+ r = self.test.vapi.pppoe_add_del_session(
+ cip, cmac,
+ session_id=self.session_id,
+ decap_vrf_id=self.decap_vrf_id)
+ self._sw_if_index = r.sw_if_index
+ self.generate_remote_hosts()
+
+ def remove_vpp_config(self):
+ cip = socket.inet_pton(socket.AF_INET, self.client_ip)
+ cmac = mactobinary(self.client_mac)
+ self.unconfig()
+ r = self.test.vapi.pppoe_add_del_session(
+ cip, cmac,
+ session_id=self.session_id,
+ decap_vrf_id=self.decap_vrf_id,
+ is_add=0)
+
+
+class VppPppoe6Interface(VppInterface):
+ """
+ VPP Pppoe IPv6 interface
+ """
+
+ def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
+ """ Create VPP PPPoE6 interface """
+ self._sw_if_index = 0
+ super(VppPppoe6Interface, self).__init__(test)
+ self._test = test
+ self.client_ip = client_ip
+ self.client_mac = client_mac
+ self.session_id = session_id
+ self.decap_vrf_id = decap_vrf_id
+
+ def add_vpp_config(self):
+ cip = socket.inet_pton(socket.AF_INET6, self.client_ip)
+ cmac = mactobinary(self.client_mac)
+ r = self.test.vapi.pppoe_add_del_session(
+ cip, cmac,
+ session_id=self.session_id,
+ decap_vrf_id=self.decap_vrf_id,
+ is_ip6=1)
+ self._sw_if_index = r.sw_if_index
+ self.generate_remote_hosts()
+
+ def remove_vpp_config(self):
+ cip = socket.inet_pton(socket.AF_INET6, self.client_ip)
+ cmac = mactobinary(self.client_mac)
+ self.unconfig()
+ r = self.test.vapi.pppoe_add_del_session(
+ cip, cmac,
+ session_id=self.session_id,
+ decap_vrf_id=self.decap_vrf_id,
+ is_add=0,
+ is_ip6=1)