diff options
Diffstat (limited to 'vnet/vnet/ppp/node.c')
| -rw-r--r-- | vnet/vnet/ppp/node.c | 125 |
1 files changed, 78 insertions, 47 deletions
diff --git a/vnet/vnet/ppp/node.c b/vnet/vnet/ppp/node.c index 4f813732df2..4f1f6a715e6 100644 --- a/vnet/vnet/ppp/node.c +++ b/vnet/vnet/ppp/node.c @@ -46,43 +46,46 @@ _ (PUNT, "error-punt") \ _ (DROP, "error-drop") -typedef enum { +typedef enum +{ #define _(s,n) PPP_INPUT_NEXT_##s, foreach_ppp_input_next #undef _ - PPP_INPUT_N_NEXT, + PPP_INPUT_N_NEXT, } ppp_input_next_t; -typedef struct { +typedef struct +{ u8 packet_data[32]; } ppp_input_trace_t; -static u8 * format_ppp_input_trace (u8 * s, va_list * va) +static u8 * +format_ppp_input_trace (u8 * s, va_list * va) { CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *); - ppp_input_trace_t * t = va_arg (*va, ppp_input_trace_t *); + ppp_input_trace_t *t = va_arg (*va, ppp_input_trace_t *); s = format (s, "%U", format_ppp_header, t->packet_data); return s; } -typedef struct { +typedef struct +{ /* Sparse vector mapping ppp protocol in network byte order to next index. */ - u16 * next_by_protocol; + u16 *next_by_protocol; - u32 * sparse_index_by_next_index; + u32 *sparse_index_by_next_index; } ppp_input_runtime_t; static uword ppp_input (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * from_frame) + vlib_node_runtime_t * node, vlib_frame_t * from_frame) { - ppp_input_runtime_t * rt = (void *) node->runtime_data; - u32 n_left_from, next_index, i_next, * from, * to_next; + ppp_input_runtime_t *rt = (void *) node->runtime_data; + u32 n_left_from, next_index, i_next, *from, *to_next; from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; @@ -101,19 +104,18 @@ ppp_input (vlib_main_t * vm, { u32 n_left_to_next; - vlib_get_next_frame (vm, node, next_index, - to_next, 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; - ppp_header_t * h0, * h1; + vlib_buffer_t *b0, *b1; + ppp_header_t *h0, *h1; u32 i0, i1, protocol0, protocol1, enqueue_code; /* Prefetch next iteration. */ { - vlib_buffer_t * p2, * p3; + vlib_buffer_t *p2, *p3; p2 = vlib_get_buffer (vm, from[2]); p3 = vlib_get_buffer (vm, from[3]); @@ -149,12 +151,19 @@ ppp_input (vlib_main_t * vm, /* Index sparse array with network byte order. */ protocol0 = h0->protocol; protocol1 = h1->protocol; - sparse_vec_index2 (rt->next_by_protocol, protocol0, protocol1, &i0, &i1); + sparse_vec_index2 (rt->next_by_protocol, protocol0, protocol1, &i0, + &i1); - b0->error = node->errors[i0 == SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL : PPP_ERROR_NONE]; - b1->error = node->errors[i1 == SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL : PPP_ERROR_NONE]; + b0->error = + node->errors[i0 == + SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL + : PPP_ERROR_NONE]; + b1->error = + node->errors[i1 == + SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL + : PPP_ERROR_NONE]; - enqueue_code = (i0 != i_next) + 2*(i1 != i_next); + enqueue_code = (i0 != i_next) + 2 * (i1 != i_next); if (PREDICT_FALSE (enqueue_code != 0)) { @@ -165,39 +174,48 @@ ppp_input (vlib_main_t * vm, to_next[-2] = bi1; to_next -= 1; n_left_to_next += 1; - vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i0), bi0); + vlib_set_next_frame_buffer (vm, node, + vec_elt (rt->next_by_protocol, + i0), bi0); break; case 2: /* A A B */ to_next -= 1; n_left_to_next += 1; - vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i1), bi1); + vlib_set_next_frame_buffer (vm, node, + vec_elt (rt->next_by_protocol, + i1), bi1); break; case 3: /* A B B or A B C */ to_next -= 2; n_left_to_next += 2; - vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i0), bi0); - vlib_set_next_frame_buffer (vm, node, vec_elt (rt->next_by_protocol, i1), bi1); + vlib_set_next_frame_buffer (vm, node, + vec_elt (rt->next_by_protocol, + i0), bi0); + vlib_set_next_frame_buffer (vm, node, + vec_elt (rt->next_by_protocol, + i1), bi1); if (i0 == i1) { vlib_put_next_frame (vm, node, next_index, n_left_to_next); i_next = i1; next_index = vec_elt (rt->next_by_protocol, i_next); - vlib_get_next_frame (vm, node, next_index, to_next, 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; - ppp_header_t * h0; + vlib_buffer_t *b0; + ppp_header_t *h0; u32 i0, protocol0; bi0 = from[0]; @@ -217,8 +235,11 @@ ppp_input (vlib_main_t * vm, protocol0 = h0->protocol; i0 = sparse_vec_index (rt->next_by_protocol, protocol0); - b0->error = node->errors[i0 == SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL : PPP_ERROR_NONE]; - + b0->error = + node->errors[i0 == + SPARSE_VEC_INVALID_INDEX ? PPP_ERROR_UNKNOWN_PROTOCOL + : PPP_ERROR_NONE]; + /* Sent packet to wrong next? */ if (PREDICT_FALSE (i0 != i_next)) { @@ -242,12 +263,13 @@ ppp_input (vlib_main_t * vm, return from_frame->n_vectors; } -static char * ppp_error_strings[] = { +static char *ppp_error_strings[] = { #define ppp_error(n,s) s, #include "error.def" #undef ppp_error }; +/* *INDENT-OFF* */ VLIB_REGISTER_NODE (ppp_input_node) = { .function = ppp_input, .name = "ppp-input", @@ -270,13 +292,15 @@ VLIB_REGISTER_NODE (ppp_input_node) = { .format_trace = format_ppp_input_trace, .unformat_buffer = unformat_ppp_header, }; +/* *INDENT-ON* */ -static clib_error_t * ppp_input_init (vlib_main_t * vm) +static clib_error_t * +ppp_input_init (vlib_main_t * vm) { - ppp_input_runtime_t * rt; + ppp_input_runtime_t *rt; { - clib_error_t * error = vlib_call_init_function (vm, ppp_init); + clib_error_t *error = vlib_call_init_function (vm, ppp_init); if (error) clib_error_report (error); } @@ -286,7 +310,7 @@ static clib_error_t * ppp_input_init (vlib_main_t * vm) rt = vlib_node_get_runtime_data (vm, ppp_input_node.index); rt->next_by_protocol = sparse_vec_new - (/* elt bytes */ sizeof (rt->next_by_protocol[0]), + ( /* elt bytes */ sizeof (rt->next_by_protocol[0]), /* bits in index */ BITS (((ppp_header_t *) 0)->protocol)); vec_validate (rt->sparse_index_by_next_index, PPP_INPUT_NEXT_DROP); @@ -303,30 +327,29 @@ VLIB_INIT_FUNCTION (ppp_input_init); void ppp_register_input_protocol (vlib_main_t * vm, - ppp_protocol_t protocol, - u32 node_index) + ppp_protocol_t protocol, u32 node_index) { - ppp_main_t * em = &ppp_main; - ppp_protocol_info_t * pi; - ppp_input_runtime_t * rt; - u16 * n; + ppp_main_t *em = &ppp_main; + ppp_protocol_info_t *pi; + ppp_input_runtime_t *rt; + u16 *n; u32 i; { - clib_error_t * error = vlib_call_init_function (vm, ppp_input_init); + clib_error_t *error = vlib_call_init_function (vm, ppp_input_init); if (error) clib_error_report (error); } pi = ppp_get_protocol_info (em, protocol); pi->node_index = node_index; - pi->next_index = vlib_node_add_next (vm, - ppp_input_node.index, - node_index); + pi->next_index = vlib_node_add_next (vm, ppp_input_node.index, node_index); /* Setup ppp protocol -> next index sparse vector mapping. */ rt = vlib_node_get_runtime_data (vm, ppp_input_node.index); - n = sparse_vec_validate (rt->next_by_protocol, clib_host_to_net_u16 (protocol)); + n = + sparse_vec_validate (rt->next_by_protocol, + clib_host_to_net_u16 (protocol)); n[0] = pi->next_index; /* Rebuild next index -> sparse index inverse mapping when sparse vector @@ -335,3 +358,11 @@ ppp_register_input_protocol (vlib_main_t * vm, for (i = 1; i < vec_len (rt->next_by_protocol); i++) rt->sparse_index_by_next_index[rt->next_by_protocol[i]] = i; } + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ |