From e275bed64d12009726fcf43943f1684195cd1e5d Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Wed, 6 Mar 2019 00:06:56 -0800 Subject: tcp: migrate old MULTIARCH macros to VLIB_NODE_FN Change-Id: Ifd9fa30eed343e2c5d40582b3e3aa589b070637d Signed-off-by: Filip Tehlar --- src/vnet/tcp/tcp.h | 8 +++ src/vnet/tcp/tcp_input.c | 122 ++++++++++++++++------------------------- src/vnet/tcp/tcp_output.c | 45 ++++++--------- src/vnet/tcp/tcp_syn_filter4.c | 11 ++-- 4 files changed, 77 insertions(+), 109 deletions(-) (limited to 'src/vnet/tcp') diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h index 7ab7ee681c5..511f0131025 100644 --- a/src/vnet/tcp/tcp.h +++ b/src/vnet/tcp/tcp.h @@ -515,6 +515,14 @@ extern vlib_node_registration_t tcp4_input_node; extern vlib_node_registration_t tcp6_input_node; extern vlib_node_registration_t tcp4_output_node; extern vlib_node_registration_t tcp6_output_node; +extern vlib_node_registration_t tcp4_established_node; +extern vlib_node_registration_t tcp6_established_node; +extern vlib_node_registration_t tcp4_syn_sent_node; +extern vlib_node_registration_t tcp6_syn_sent_node; +extern vlib_node_registration_t tcp4_rcv_process_node; +extern vlib_node_registration_t tcp6_rcv_process_node; +extern vlib_node_registration_t tcp4_listen_node; +extern vlib_node_registration_t tcp6_listen_node; always_inline tcp_main_t * vnet_get_tcp_main () diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index e31fbac1bb0..b7838e2e1a0 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -79,9 +79,6 @@ typedef enum _tcp_state_next #define tcp_next_drop(is_ip4) (is_ip4 ? TCP_NEXT_DROP4 \ : TCP_NEXT_DROP6) -vlib_node_registration_t tcp4_established_node; -vlib_node_registration_t tcp6_established_node; - /** * Validate segment sequence number. As per RFC793: * @@ -447,12 +444,14 @@ tcp_estimate_rtt (tcp_connection_t * tc, u32 mrtt) } } +#ifndef CLIB_MARCH_VARIANT void tcp_update_rto (tcp_connection_t * tc) { tc->rto = clib_min (tc->srtt + (tc->rttvar << 2), TCP_RTO_MAX); tc->rto = clib_max (tc->rto, TCP_RTO_MIN); } +#endif /* CLIB_MARCH_VARIANT */ /** * Update RTT estimate and RTO timer @@ -625,6 +624,7 @@ tcp_ack_is_cc_event (tcp_connection_t * tc, vlib_buffer_t * b, return ((*is_dack || tcp_in_cong_recovery (tc)) && !tcp_is_lost_fin (tc)); } +#ifndef CLIB_MARCH_VARIANT static u32 scoreboard_hole_index (sack_scoreboard_t * sb, sack_scoreboard_hole_t * hole) { @@ -749,7 +749,9 @@ scoreboard_insert_hole (sack_scoreboard_t * sb, u32 prev_index, return hole; } +#endif /* CLIB_MARCH_VARIANT */ +#ifndef CLIB_MARCH_VARIANT static void scoreboard_update_bytes (tcp_connection_t * tc, sack_scoreboard_t * sb) { @@ -853,6 +855,7 @@ scoreboard_next_rxt_hole (sack_scoreboard_t * sb, return hole; } +#endif /* CLIB_MARCH_VARIANT */ static void scoreboard_init_high_rxt (sack_scoreboard_t * sb, u32 snd_una) @@ -868,6 +871,7 @@ scoreboard_init_high_rxt (sack_scoreboard_t * sb, u32 snd_una) sb->rescue_rxt = snd_una - 1; } +#ifndef CLIB_MARCH_VARIANT void scoreboard_init (sack_scoreboard_t * sb) { @@ -895,6 +899,7 @@ scoreboard_clear (sack_scoreboard_t * sb) sb->lost_bytes = 0; sb->cur_rxt_hole = TCP_INVALID_SACK_HOLE_INDEX; } +#endif /* CLIB_MARCH_VARIANT */ /** * Test that scoreboard is sane after recovery @@ -911,6 +916,7 @@ tcp_scoreboard_is_sane_post_recovery (tcp_connection_t * tc) && seq_lt (hole->end, tc->snd_una_max))); } +#ifndef CLIB_MARCH_VARIANT void tcp_rcv_sacks (tcp_connection_t * tc, u32 ack) { @@ -1089,6 +1095,7 @@ tcp_rcv_sacks (tcp_connection_t * tc, u32 ack) || sb->holes[sb->head].start == ack + sb->snd_una_adv); TCP_EVT_DBG (TCP_EVT_CC_SCOREBOARD, tc); } +#endif /* CLIB_MARCH_VARIANT */ /** * Try to update snd_wnd based on feedback received from peer. @@ -1128,6 +1135,7 @@ tcp_update_snd_wnd (tcp_connection_t * tc, u32 seq, u32 ack, u32 snd_wnd) } } +#ifndef CLIB_MARCH_VARIANT /** * Init loss recovery/fast recovery. * @@ -1146,6 +1154,7 @@ tcp_cc_init_congestion (tcp_connection_t * tc) tc->cc_algo->congestion (tc); TCP_EVT_DBG (TCP_EVT_CC_EVT, tc, 4); } +#endif /* CLIB_MARCH_VARIANT */ static void tcp_cc_recovery_exit (tcp_connection_t * tc) @@ -1159,6 +1168,7 @@ tcp_cc_recovery_exit (tcp_connection_t * tc) TCP_EVT_DBG (TCP_EVT_CC_EVT, tc, 3); } +#ifndef CLIB_MARCH_VARIANT void tcp_cc_fastrecovery_exit (tcp_connection_t * tc) { @@ -1174,6 +1184,7 @@ tcp_cc_fastrecovery_exit (tcp_connection_t * tc) TCP_EVT_DBG (TCP_EVT_CC_EVT, tc, 3); } +#endif /* CLIB_MARCH_VARIANT */ static void tcp_cc_congestion_undo (tcp_connection_t * tc) @@ -1268,6 +1279,7 @@ tcp_should_fastrecover (tcp_connection_t * tc) || tcp_should_fastrecover_sack (tc)); } +#ifndef CLIB_MARCH_VARIANT void tcp_program_fastretransmit (tcp_worker_ctx_t * wrk, tcp_connection_t * tc) { @@ -1336,6 +1348,7 @@ tcp_do_fastretransmits (tcp_worker_ctx_t * wrk) _vec_len (ongoing_fast_rxt) = 0; wrk->ongoing_fast_rxt = ongoing_fast_rxt; } +#endif /* CLIB_MARCH_VARIANT */ /** * One function to rule them all ... and in the darkness bind them @@ -1693,6 +1706,7 @@ tcp_rcv_fin (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, vlib_buffer_t * b, *error = TCP_ERROR_FIN_RCVD; } +#ifndef CLIB_MARCH_VARIANT static u8 tcp_sack_vector_is_sane (sack_block_t * sacks) { @@ -1779,6 +1793,7 @@ tcp_sack_list_bytes (tcp_connection_t * tc) bytes += tc->snd_sacks[i].end - tc->snd_sacks[i].start; return bytes; } +#endif /* CLIB_MARCH_VARIANT */ /** Enqueue data for delivery to application */ static int @@ -2203,16 +2218,16 @@ tcp46_established_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } -static uword -tcp4_established (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp4_established_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_established_inline (vm, node, from_frame, 1 /* is_ip4 */ ); } -static uword -tcp6_established (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp6_established_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_established_inline (vm, node, from_frame, 0 /* is_ip4 */ ); } @@ -2220,7 +2235,6 @@ tcp6_established (vlib_main_t * vm, vlib_node_runtime_t * node, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp4_established_node) = { - .function = tcp4_established, .name = "tcp4-established", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -2237,12 +2251,9 @@ VLIB_REGISTER_NODE (tcp4_established_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp4_established_node, tcp4_established); - /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp6_established_node) = { - .function = tcp6_established, .name = "tcp6-established", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -2260,11 +2271,6 @@ VLIB_REGISTER_NODE (tcp6_established_node) = /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp6_established_node, tcp6_established); - -vlib_node_registration_t tcp4_syn_sent_node; -vlib_node_registration_t tcp6_syn_sent_node; - static u8 tcp_lookup_is_valid (tcp_connection_t * tc, tcp_header_t * hdr) { @@ -2597,16 +2603,16 @@ tcp46_syn_sent_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return from_frame->n_vectors; } -static uword -tcp4_syn_sent (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp4_syn_sent_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_syn_sent_inline (vm, node, from_frame, 1 /* is_ip4 */ ); } -static uword -tcp6_syn_sent_rcv (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp6_syn_sent_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_syn_sent_inline (vm, node, from_frame, 0 /* is_ip4 */ ); } @@ -2614,7 +2620,6 @@ tcp6_syn_sent_rcv (vlib_main_t * vm, vlib_node_runtime_t * node, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp4_syn_sent_node) = { - .function = tcp4_syn_sent, .name = "tcp4-syn-sent", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -2631,12 +2636,9 @@ VLIB_REGISTER_NODE (tcp4_syn_sent_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp4_syn_sent_node, tcp4_syn_sent); - /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp6_syn_sent_node) = { - .function = tcp6_syn_sent_rcv, .name = "tcp6-syn-sent", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -2653,11 +2655,6 @@ VLIB_REGISTER_NODE (tcp6_syn_sent_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp6_syn_sent_node, tcp6_syn_sent_rcv); - -vlib_node_registration_t tcp4_rcv_process_node; -vlib_node_registration_t tcp6_rcv_process_node; - /** * Handles reception for all states except LISTEN, SYN-SENT and ESTABLISHED * as per RFC793 p. 64 @@ -3005,16 +3002,16 @@ tcp46_rcv_process_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return from_frame->n_vectors; } -static uword -tcp4_rcv_process (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp4_rcv_process_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_rcv_process_inline (vm, node, from_frame, 1 /* is_ip4 */ ); } -static uword -tcp6_rcv_process (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp6_rcv_process_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_rcv_process_inline (vm, node, from_frame, 0 /* is_ip4 */ ); } @@ -3022,7 +3019,6 @@ tcp6_rcv_process (vlib_main_t * vm, vlib_node_runtime_t * node, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp4_rcv_process_node) = { - .function = tcp4_rcv_process, .name = "tcp4-rcv-process", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -3039,12 +3035,9 @@ VLIB_REGISTER_NODE (tcp4_rcv_process_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp4_rcv_process_node, tcp4_rcv_process); - /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp6_rcv_process_node) = { - .function = tcp6_rcv_process, .name = "tcp6-rcv-process", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -3061,11 +3054,6 @@ VLIB_REGISTER_NODE (tcp6_rcv_process_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp6_rcv_process_node, tcp6_rcv_process); - -vlib_node_registration_t tcp4_listen_node; -vlib_node_registration_t tcp6_listen_node; - /** * LISTEN state processing as per RFC 793 p. 65 */ @@ -3219,16 +3207,14 @@ tcp46_listen_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return from_frame->n_vectors; } -static uword -tcp4_listen (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp4_listen_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_listen_inline (vm, node, from_frame, 1 /* is_ip4 */ ); } -static uword -tcp6_listen (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp6_listen_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_listen_inline (vm, node, from_frame, 0 /* is_ip4 */ ); } @@ -3236,7 +3222,6 @@ tcp6_listen (vlib_main_t * vm, vlib_node_runtime_t * node, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp4_listen_node) = { - .function = tcp4_listen, .name = "tcp4-listen", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -3253,12 +3238,9 @@ VLIB_REGISTER_NODE (tcp4_listen_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp4_listen_node, tcp4_listen); - /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp6_listen_node) = { - .function = tcp6_listen, .name = "tcp6-listen", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -3275,11 +3257,6 @@ VLIB_REGISTER_NODE (tcp6_listen_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp6_listen_node, tcp6_listen); - -vlib_node_registration_t tcp4_input_node; -vlib_node_registration_t tcp6_input_node; - typedef enum _tcp_input_next { TCP_INPUT_NEXT_DROP, @@ -3568,16 +3545,14 @@ tcp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } -static uword -tcp4_input (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp4_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_input_inline (vm, node, from_frame, 1 /* is_ip4 */ ); } -static uword -tcp6_input (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp6_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_input_inline (vm, node, from_frame, 0 /* is_ip4 */ ); } @@ -3585,7 +3560,6 @@ tcp6_input (vlib_main_t * vm, vlib_node_runtime_t * node, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp4_input_node) = { - .function = tcp4_input, .name = "tcp4-input", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -3603,12 +3577,9 @@ VLIB_REGISTER_NODE (tcp4_input_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp4_input_node, tcp4_input); - /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp6_input_node) = { - .function = tcp6_input, .name = "tcp6-input", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -3626,8 +3597,7 @@ VLIB_REGISTER_NODE (tcp6_input_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp6_input_node, tcp6_input); - +#ifndef CLIB_MARCH_VARIANT static void tcp_dispatch_table_init (tcp_main_t * tm) { @@ -3873,6 +3843,8 @@ tcp_input_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (tcp_input_init); +#endif /* CLIB_MARCH_VARIANT */ + /* * fd.io coding-style-patch-verification: ON * diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index 2e9fc58cefb..66651e87fe2 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -16,9 +16,6 @@ #include #include -vlib_node_registration_t tcp4_output_node; -vlib_node_registration_t tcp6_output_node; - typedef enum _tcp_output_next { TCP_OUTPUT_NEXT_DROP, @@ -52,9 +49,11 @@ typedef struct tcp_connection_t tcp_connection; } tcp_tx_trace_t; +#ifndef CLIB_MARCH_VARIANT u16 dummy_mtu = 1460; +#endif /* CLIB_MARCH_VARIANT */ -u8 * +static u8 * format_tcp_tx_trace (u8 * s, va_list * args) { CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); @@ -70,6 +69,7 @@ format_tcp_tx_trace (u8 * s, va_list * args) return s; } +#ifndef CLIB_MARCH_VARIANT static u8 tcp_window_compute_scale (u32 window) { @@ -464,6 +464,7 @@ tcp_init_mss (tcp_connection_t * tc) if (tcp_opts_tstamp (&tc->rcv_opts)) tc->snd_mss -= TCP_OPTION_LEN_TIMESTAMP; } +#endif /* CLIB_MARCH_VARIANT */ static void * tcp_reuse_buffer (vlib_main_t * vm, vlib_buffer_t * b) @@ -481,6 +482,7 @@ tcp_reuse_buffer (vlib_main_t * vm, vlib_buffer_t * b) return vlib_buffer_make_headroom (b, TRANSPORT_MAX_HDRS_LEN); } +#ifndef CLIB_MARCH_VARIANT static void * tcp_init_buffer (vlib_main_t * vm, vlib_buffer_t * b) { @@ -688,6 +690,7 @@ tcp_enqueue_to_output_now (tcp_worker_ctx_t * wrk, vlib_buffer_t * b, u32 bi, { tcp_enqueue_to_output_i (wrk, b, bi, is_ip4, 1); } +#endif /* CLIB_MARCH_VARIANT */ static int tcp_make_reset_in_place (vlib_main_t * vm, vlib_buffer_t * b0, @@ -768,6 +771,7 @@ tcp_make_reset_in_place (vlib_main_t * vm, vlib_buffer_t * b0, return 0; } +#ifndef CLIB_MARCH_VARIANT /** * Send reset without reusing existing buffer * @@ -2015,6 +2019,7 @@ tcp_fast_retransmit (tcp_worker_ctx_t * wrk, tcp_connection_t * tc, else return tcp_fast_retransmit_no_sack (wrk, tc, burst_size); } +#endif /* CLIB_MARCH_VARIANT */ static void tcp_output_handle_link_local (tcp_connection_t * tc0, vlib_buffer_t * b0, @@ -2200,16 +2205,14 @@ tcp46_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } -static uword -tcp4_output (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp4_output_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_output_inline (vm, node, from_frame, 1 /* is_ip4 */ ); } -static uword -tcp6_output (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp6_output_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_output_inline (vm, node, from_frame, 0 /* is_ip4 */ ); } @@ -2217,7 +2220,6 @@ tcp6_output (vlib_main_t * vm, vlib_node_runtime_t * node, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp4_output_node) = { - .function = tcp4_output, .name = "tcp4-output", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -2235,12 +2237,9 @@ VLIB_REGISTER_NODE (tcp4_output_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp4_output_node, tcp4_output); - /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp6_output_node) = { - .function = tcp6_output, .name = "tcp6-output", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -2258,8 +2257,6 @@ VLIB_REGISTER_NODE (tcp6_output_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp6_output_node, tcp6_output); - typedef enum _tcp_reset_next { TCP_RESET_NEXT_DROP, @@ -2345,23 +2342,20 @@ tcp46_send_reset_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return from_frame->n_vectors; } -static uword -tcp4_send_reset (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp4_reset_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_send_reset_inline (vm, node, from_frame, 1); } -static uword -tcp6_send_reset (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (tcp6_reset_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return tcp46_send_reset_inline (vm, node, from_frame, 0); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp4_reset_node) = { - .function = tcp4_send_reset, .name = "tcp4-reset", .vector_size = sizeof (u32), .n_errors = TCP_N_ERROR, @@ -2376,11 +2370,8 @@ VLIB_REGISTER_NODE (tcp4_reset_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp4_reset_node, tcp4_send_reset); - /* *INDENT-OFF* */ VLIB_REGISTER_NODE (tcp6_reset_node) = { - .function = tcp6_send_reset, .name = "tcp6-reset", .vector_size = sizeof (u32), .n_errors = TCP_N_ERROR, @@ -2395,8 +2386,6 @@ VLIB_REGISTER_NODE (tcp6_reset_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (tcp6_reset_node, tcp6_send_reset); - /* * fd.io coding-style-patch-verification: ON * diff --git a/src/vnet/tcp/tcp_syn_filter4.c b/src/vnet/tcp/tcp_syn_filter4.c index 6ec39a7bbeb..e32dd39262f 100644 --- a/src/vnet/tcp/tcp_syn_filter4.c +++ b/src/vnet/tcp/tcp_syn_filter4.c @@ -80,9 +80,9 @@ typedef enum extern vnet_feature_arc_registration_t vnet_feat_arc_ip4_local; -static uword -syn_filter4_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (syn_filter4_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_left_from, *from, *to_next; syn_filter_next_t next_index; @@ -402,7 +402,6 @@ syn_filter4_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (syn_filter4_node, static) = { - .function = syn_filter4_node_fn, .name = "syn-filter-4", .vector_size = sizeof (u32), .format_trace = format_syn_filter4_trace, @@ -421,8 +420,6 @@ VLIB_REGISTER_NODE (syn_filter4_node, static) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (syn_filter4_node, syn_filter4_node_fn); - /* *INDENT-OFF* */ VNET_FEATURE_INIT (syn_filter_4, static) = { @@ -432,6 +429,7 @@ VNET_FEATURE_INIT (syn_filter_4, static) = }; /* *INDENT-ON* */ +#ifndef CLIB_MARCH_VARIANT int syn_filter_enable_disable (u32 sw_if_index, int enable_disable) { @@ -535,6 +533,7 @@ VLIB_CLI_COMMAND (sr_content_command, static) = .function = syn_filter_enable_disable_command_fn, }; /* *INDENT-ON* */ +#endif /* CLIB_MARCH_VARIANT */ /* * fd.io coding-style-patch-verification: ON -- cgit 1.2.3-korg