diff options
| author |   Florin Coras <fcoras@cisco.com> | 2019-06-26 16:27:13 -0700 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-07-05 17:49:39 +0000 |
| commit | 3ffe6cadf083d1a0bc32e4a37d56b42a1153ff7b (patch) | |
| tree | f9862c7b06e7a817a2fede8b4ca5419c5f2e5545 /src/vnet/ip | |
| parent | 1cfcb78940580c8e3645fca0419d32f9286e942d (diff) | |
sctp: move to plugins, disabled by default
Removed sctp buffer metadata from vnet/buffer.h, added it to the
plugin. Add registration APIs for plugin-based vlib_buffer_opaque /
opaque2 decoders, used by "pcap dispatch trace ..." for display in the
wireshark dissector.
Type:refactor
Not actively maintained.
Change-Id: Ie4cb6ba66f68b3b3a7d7d2c63c917fdccf994371
Signed-off-by: Florin Coras <fcoras@cisco.com>
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vnet/ip')
| -rw-r--r-- | src/vnet/ip/format.h | 5 | ||||
| -rw-r--r-- | src/vnet/ip/punt.c | 25 | ||||
| -rw-r--r-- | src/vnet/ip/punt_node.c | 1 |
3 files changed, 11 insertions, 20 deletions
diff --git a/src/vnet/ip/format.h b/src/vnet/ip/format.h index 4d63ba43653..7b1740dad04 100644 --- a/src/vnet/ip/format.h +++ b/src/vnet/ip/format.h @@ -98,10 +98,9 @@ format_function_t format_ip6_header; unformat_function_t unformat_pg_ip6_header; /* Format a TCP/UDP headers. */ -format_function_t format_tcp_header, format_udp_header, format_sctp_header; +format_function_t format_tcp_header, format_udp_header; -unformat_function_t unformat_pg_tcp_header, unformat_pg_udp_header, - unformat_pg_sctp_header; +unformat_function_t unformat_pg_tcp_header, unformat_pg_udp_header; #endif /* included_ip_format_h */ diff --git a/src/vnet/ip/punt.c b/src/vnet/ip/punt.c index b057a53306e..a979803bc1c 100644 --- a/src/vnet/ip/punt.c +++ b/src/vnet/ip/punt.c @@ -27,7 +27,6 @@ #include <vnet/pg/pg.h> #include <vnet/udp/udp.h> #include <vnet/tcp/tcp.h> -#include <vnet/sctp/sctp.h> #include <vnet/ip/punt.h> #include <vlib/unix/unix.h> @@ -355,7 +354,7 @@ vnet_punt_socket_del (vlib_main_t * vm, const punt_reg_t * pr) * @brief Request IP traffic punt to the local TCP/IP stack. * * @em Note - * - UDP, TCP and SCTP are the only protocols supported in the current implementation + * - UDP and TCP are the only protocols supported in the current implementation * * @param vm vlib_main_t corresponding to the current thread * @param af IP address family. @@ -371,13 +370,11 @@ punt_l4_add_del (vlib_main_t * vm, ip_address_family_t af, ip_protocol_t protocol, u16 port, bool is_add) { - /* For now we only support TCP, UDP and SCTP punt */ - if (protocol != IP_PROTOCOL_UDP && - protocol != IP_PROTOCOL_TCP && protocol != IP_PROTOCOL_SCTP) + /* For now we only support TCP and UDP punt */ + if (protocol != IP_PROTOCOL_UDP && protocol != IP_PROTOCOL_TCP) return clib_error_return (0, - "only UDP (%d), TCP (%d) and SCTP (%d) protocols are supported, got %d", - IP_PROTOCOL_UDP, IP_PROTOCOL_TCP, - IP_PROTOCOL_SCTP, protocol); + "only UDP (%d) and TCP (%d) protocols are supported, got %d", + IP_PROTOCOL_UDP, IP_PROTOCOL_TCP, protocol); if (port == (u16) ~ 0) { @@ -385,17 +382,14 @@ punt_l4_add_del (vlib_main_t * vm, udp_punt_unknown (vm, af == AF_IP4, is_add); else if (protocol == IP_PROTOCOL_TCP) tcp_punt_unknown (vm, af == AF_IP4, is_add); - else if (protocol == IP_PROTOCOL_SCTP) - sctp_punt_unknown (vm, af == AF_IP4, is_add); return 0; } else if (is_add) { - if (protocol == IP_PROTOCOL_TCP || protocol == IP_PROTOCOL_SCTP) - return clib_error_return (0, - "punt TCP/SCTP ports is not supported yet"); + if (protocol == IP_PROTOCOL_TCP) + return clib_error_return (0, "punt TCP ports is not supported yet"); udp_register_dst_port (vm, port, udp4_punt_node.index, af == AF_IP4); @@ -403,9 +397,8 @@ punt_l4_add_del (vlib_main_t * vm, } else { - if (protocol == IP_PROTOCOL_TCP || protocol == IP_PROTOCOL_SCTP) - return clib_error_return (0, - "punt TCP/SCTP ports is not supported yet"); + if (protocol == IP_PROTOCOL_TCP) + return clib_error_return (0, "punt TCP ports is not supported yet"); udp_unregister_dst_port (vm, port, af == AF_IP4); diff --git a/src/vnet/ip/punt_node.c b/src/vnet/ip/punt_node.c index 67f97431c19..32a0884d86b 100644 --- a/src/vnet/ip/punt_node.c +++ b/src/vnet/ip/punt_node.c @@ -27,7 +27,6 @@ #include <vnet/pg/pg.h> #include <vnet/udp/udp.h> #include <vnet/tcp/tcp.h> -#include <vnet/sctp/sctp.h> #include <vnet/ip/punt.h> #include <vlib/unix/unix.h> |