VPP-266: style change for vnet/vnet/osi
Change-Id: I6004a96f9f791fb9fbc961440c9988f7a3ca7db0
Signed-off-by: Calvin <calvin.ference@gmail.com>
diff --git a/vnet/vnet/osi/node.c b/vnet/vnet/osi/node.c
index 723cf47..12075aa 100644
--- a/vnet/vnet/osi/node.c
+++ b/vnet/vnet/osi/node.c
@@ -48,22 +48,25 @@
_ (PUNT, "error-punt") \
_ (DROP, "error-drop")
-typedef enum {
+typedef enum
+{
#define _(s,n) OSI_INPUT_NEXT_##s,
foreach_osi_input_next
#undef _
- OSI_INPUT_N_NEXT,
+ OSI_INPUT_N_NEXT,
} osi_input_next_t;
-typedef struct {
+typedef struct
+{
u8 packet_data[32];
} osi_input_trace_t;
-static u8 * format_osi_input_trace (u8 * s, va_list * va)
+static u8 *
+format_osi_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 *);
- osi_input_trace_t * t = va_arg (*va, osi_input_trace_t *);
+ osi_input_trace_t *t = va_arg (*va, osi_input_trace_t *);
s = format (s, "%U", format_osi_header, t->packet_data);
@@ -72,11 +75,10 @@
static uword
osi_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)
{
- osi_main_t * lm = &osi_main;
- u32 n_left_from, next_index, * from, * to_next;
+ osi_main_t *lm = &osi_main;
+ u32 n_left_from, next_index, *from, *to_next;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
@@ -94,19 +96,18 @@
{
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;
- osi_header_t * h0, * h1;
+ vlib_buffer_t *b0, *b1;
+ osi_header_t *h0, *h1;
u8 next0, next1, enqueue_code;
/* Prefetch next iteration. */
{
- vlib_buffer_t * b2, * b3;
+ vlib_buffer_t *b2, *b3;
b2 = vlib_get_buffer (vm, from[2]);
b3 = vlib_get_buffer (vm, from[3]);
@@ -136,10 +137,16 @@
next0 = lm->input_next_by_protocol[h0->protocol];
next1 = lm->input_next_by_protocol[h1->protocol];
- b0->error = node->errors[next0 == OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL : OSI_ERROR_NONE];
- b1->error = node->errors[next1 == OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL : OSI_ERROR_NONE];
+ b0->error =
+ node->errors[next0 ==
+ OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL :
+ OSI_ERROR_NONE];
+ b1->error =
+ node->errors[next1 ==
+ OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL :
+ OSI_ERROR_NONE];
- enqueue_code = (next0 != next_index) + 2*(next1 != next_index);
+ enqueue_code = (next0 != next_index) + 2 * (next1 != next_index);
if (PREDICT_FALSE (enqueue_code != 0))
{
@@ -171,17 +178,18 @@
vlib_put_next_frame (vm, node, next_index,
n_left_to_next);
next_index = next1;
- 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;
- osi_header_t * h0;
+ vlib_buffer_t *b0;
+ osi_header_t *h0;
u8 next0;
bi0 = from[0];
@@ -197,7 +205,10 @@
next0 = lm->input_next_by_protocol[h0->protocol];
- b0->error = node->errors[next0 == OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL : OSI_ERROR_NONE];
+ b0->error =
+ node->errors[next0 ==
+ OSI_INPUT_NEXT_DROP ? OSI_ERROR_UNKNOWN_PROTOCOL :
+ OSI_ERROR_NONE];
/* Sent packet to wrong next? */
if (PREDICT_FALSE (next0 != next_index))
@@ -207,8 +218,8 @@
/* Send to correct next. */
next_index = next0;
- 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);
to_next[0] = bi0;
to_next += 1;
@@ -222,12 +233,13 @@
return from_frame->n_vectors;
}
-static char * osi_error_strings[] = {
+static char *osi_error_strings[] = {
#define _(f,s) s,
foreach_osi_error
#undef _
};
+/* *INDENT-OFF* */
VLIB_REGISTER_NODE (osi_input_node) = {
.function = osi_input,
.name = "osi-input",
@@ -248,11 +260,13 @@
.format_trace = format_osi_input_trace,
.unformat_buffer = unformat_osi_header,
};
+/* *INDENT-ON* */
-static clib_error_t * osi_input_init (vlib_main_t * vm)
+static clib_error_t *
+osi_input_init (vlib_main_t * vm)
{
- clib_error_t * error = 0;
- osi_main_t * lm = &osi_main;
+ clib_error_t *error = 0;
+ osi_main_t *lm = &osi_main;
if ((error = vlib_call_init_function (vm, osi_init)))
return error;
@@ -267,11 +281,16 @@
ppp_register_input_protocol (vm, PPP_PROTOCOL_osi, osi_input_node.index);
hdlc_register_input_protocol (vm, HDLC_PROTOCOL_osi, osi_input_node.index);
- llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer1, osi_input_node.index);
- llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer2, osi_input_node.index);
- llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer3, osi_input_node.index);
- llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer4, osi_input_node.index);
- llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer5, osi_input_node.index);
+ llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer1,
+ osi_input_node.index);
+ llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer2,
+ osi_input_node.index);
+ llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer3,
+ osi_input_node.index);
+ llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer4,
+ osi_input_node.index);
+ llc_register_input_protocol (vm, LLC_PROTOCOL_osi_layer5,
+ osi_input_node.index);
return 0;
}
@@ -279,24 +298,29 @@
VLIB_INIT_FUNCTION (osi_input_init);
void
-osi_register_input_protocol (osi_protocol_t protocol,
- u32 node_index)
+osi_register_input_protocol (osi_protocol_t protocol, u32 node_index)
{
- osi_main_t * lm = &osi_main;
- vlib_main_t * vm = lm->vlib_main;
- osi_protocol_info_t * pi;
+ osi_main_t *lm = &osi_main;
+ vlib_main_t *vm = lm->vlib_main;
+ osi_protocol_info_t *pi;
{
- clib_error_t * error = vlib_call_init_function (vm, osi_input_init);
+ clib_error_t *error = vlib_call_init_function (vm, osi_input_init);
if (error)
clib_error_report (error);
}
pi = osi_get_protocol_info (lm, protocol);
pi->node_index = node_index;
- pi->next_index = vlib_node_add_next (vm,
- osi_input_node.index,
- node_index);
+ pi->next_index = vlib_node_add_next (vm, osi_input_node.index, node_index);
lm->input_next_by_protocol[protocol] = pi->next_index;
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/osi/osi.c b/vnet/vnet/osi/osi.c
index 5398fce..34c867f 100644
--- a/vnet/vnet/osi/osi.c
+++ b/vnet/vnet/osi/osi.c
@@ -43,11 +43,12 @@
/* Global main structure. */
osi_main_t osi_main;
-u8 * format_osi_protocol (u8 * s, va_list * args)
+u8 *
+format_osi_protocol (u8 * s, va_list * args)
{
osi_protocol_t p = va_arg (*args, u32);
- osi_main_t * pm = &osi_main;
- osi_protocol_info_t * pi = osi_get_protocol_info (pm, p);
+ osi_main_t *pm = &osi_main;
+ osi_protocol_info_t *pi = osi_get_protocol_info (pm, p);
if (pi)
s = format (s, "%s", pi->name);
@@ -57,10 +58,11 @@
return s;
}
-u8 * format_osi_header_with_length (u8 * s, va_list * args)
+u8 *
+format_osi_header_with_length (u8 * s, va_list * args)
{
- osi_main_t * pm = &osi_main;
- osi_header_t * h = va_arg (*args, osi_header_t *);
+ osi_main_t *pm = &osi_main;
+ osi_header_t *h = va_arg (*args, osi_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
osi_protocol_t p = h->protocol;
uword indent, header_bytes;
@@ -75,8 +77,8 @@
if (max_header_bytes != 0 && header_bytes > max_header_bytes)
{
- osi_protocol_info_t * pi = osi_get_protocol_info (pm, p);
- vlib_node_t * node = vlib_get_node (pm->vlib_main, pi->node_index);
+ osi_protocol_info_t *pi = osi_get_protocol_info (pm, p);
+ vlib_node_t *node = vlib_get_node (pm->vlib_main, pi->node_index);
if (node->format_buffer)
s = format (s, "\n%U%U",
format_white_space, indent,
@@ -87,9 +89,10 @@
return s;
}
-u8 * format_osi_header (u8 * s, va_list * args)
+u8 *
+format_osi_header (u8 * s, va_list * args)
{
- osi_header_t * h = va_arg (*args, osi_header_t *);
+ osi_header_t *h = va_arg (*args, osi_header_t *);
return format (s, "%U", format_osi_header_with_length, h, 0);
}
@@ -97,13 +100,12 @@
uword
unformat_osi_protocol (unformat_input_t * input, va_list * args)
{
- u8 * result = va_arg (*args, u8 *);
- osi_main_t * pm = &osi_main;
+ u8 *result = va_arg (*args, u8 *);
+ osi_main_t *pm = &osi_main;
int p, i;
/* Numeric type. */
- if (unformat (input, "0x%x", &p)
- || unformat (input, "%d", &p))
+ if (unformat (input, "0x%x", &p) || unformat (input, "%d", &p))
{
if (p >= (1 << 8))
return 0;
@@ -115,7 +117,7 @@
if (unformat_user (input, unformat_vlib_number_by_name,
pm->protocol_info_by_name, &i))
{
- osi_protocol_info_t * pi = vec_elt_at_index (pm->protocol_infos, i);
+ osi_protocol_info_t *pi = vec_elt_at_index (pm->protocol_infos, i);
*result = pi->protocol;
return 1;
}
@@ -126,32 +128,31 @@
uword
unformat_osi_header (unformat_input_t * input, va_list * args)
{
- u8 ** result = va_arg (*args, u8 **);
- osi_header_t _h, * h = &_h;
+ u8 **result = va_arg (*args, u8 **);
+ osi_header_t _h, *h = &_h;
u8 p;
- if (! unformat (input, "%U", unformat_osi_protocol, &p))
+ if (!unformat (input, "%U", unformat_osi_protocol, &p))
return 0;
h->protocol = p;
/* Add header to result. */
{
- void * p;
+ void *p;
u32 n_bytes = sizeof (h[0]);
vec_add2 (*result, p, n_bytes);
clib_memcpy (p, h, n_bytes);
}
-
+
return 1;
}
-static void add_protocol (osi_main_t * pm,
- osi_protocol_t protocol,
- char * protocol_name)
+static void
+add_protocol (osi_main_t * pm, osi_protocol_t protocol, char *protocol_name)
{
- osi_protocol_info_t * pi;
+ osi_protocol_info_t *pi;
u32 i;
vec_add2 (pm->protocol_infos, pi, 1);
@@ -165,13 +166,14 @@
hash_set_mem (pm->protocol_info_by_name, pi->name, i);
}
-static clib_error_t * osi_init (vlib_main_t * vm)
+static clib_error_t *
+osi_init (vlib_main_t * vm)
{
- clib_error_t * error = 0;
- osi_main_t * pm = &osi_main;
+ clib_error_t *error = 0;
+ osi_main_t *pm = &osi_main;
/* init order dependency: llc_init -> osi_init */
- if ((error = vlib_call_init_function(vm, llc_init)))
+ if ((error = vlib_call_init_function (vm, llc_init)))
return error;
memset (pm, 0, sizeof (pm[0]));
@@ -189,3 +191,11 @@
VLIB_INIT_FUNCTION (osi_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/osi/osi.h b/vnet/vnet/osi/osi.h
index e213b1b..ee21f0c 100644
--- a/vnet/vnet/osi/osi.h
+++ b/vnet/vnet/osi/osi.h
@@ -65,21 +65,24 @@
_ (ip4, 0xcc) \
_ (ppp, 0xcf)
-typedef enum {
+typedef enum
+{
#define _(f,n) OSI_PROTOCOL_##f = n,
foreach_osi_protocol
#undef _
} osi_protocol_t;
-typedef struct {
+typedef struct
+{
u8 protocol;
u8 payload[0];
} osi_header_t;
-typedef struct {
+typedef struct
+{
/* Name (a c string). */
- char * name;
+ char *name;
/* OSI protocol (SAP type). */
osi_protocol_t protocol;
@@ -95,20 +98,22 @@
_ (NONE, "no error") \
_ (UNKNOWN_PROTOCOL, "unknown osi protocol")
-typedef enum {
+typedef enum
+{
#define _(f,s) OSI_ERROR_##f,
foreach_osi_error
#undef _
- OSI_N_ERROR,
+ OSI_N_ERROR,
} osi_error_t;
-typedef struct {
- vlib_main_t * vlib_main;
+typedef struct
+{
+ vlib_main_t *vlib_main;
- osi_protocol_info_t * protocol_infos;
+ osi_protocol_info_t *protocol_infos;
/* Hash tables mapping name/protocol to protocol info index. */
- uword * protocol_info_by_name, * protocol_info_by_protocol;
+ uword *protocol_info_by_name, *protocol_info_by_protocol;
/* osi-input next index indexed by protocol. */
u8 input_next_by_protocol[256];
@@ -117,20 +122,17 @@
always_inline osi_protocol_info_t *
osi_get_protocol_info (osi_main_t * m, osi_protocol_t protocol)
{
- uword * p = hash_get (m->protocol_info_by_protocol, protocol);
+ uword *p = hash_get (m->protocol_info_by_protocol, protocol);
return p ? vec_elt_at_index (m->protocol_infos, p[0]) : 0;
}
extern osi_main_t osi_main;
/* Register given node index to take input for given osi type. */
-void
-osi_register_input_protocol (osi_protocol_t protocol,
- u32 node_index);
+void osi_register_input_protocol (osi_protocol_t protocol, u32 node_index);
void osi_set_adjacency (vnet_rewrite_header_t * rw,
- uword max_data_bytes,
- osi_protocol_t protocol);
+ uword max_data_bytes, osi_protocol_t protocol);
format_function_t format_osi_protocol;
format_function_t format_osi_header;
@@ -146,18 +148,24 @@
always_inline void
osi_setup_node (vlib_main_t * vm, u32 node_index)
{
- vlib_node_t * n = vlib_get_node (vm, node_index);
- pg_node_t * pn = pg_get_node (node_index);
+ vlib_node_t *n = vlib_get_node (vm, node_index);
+ pg_node_t *pn = pg_get_node (node_index);
n->format_buffer = format_osi_header_with_length;
n->unformat_buffer = unformat_osi_header;
pn->unformat_edit = unformat_pg_osi_header;
}
-void
-osi_register_input_protocol (osi_protocol_t protocol,
- u32 node_index);
+void osi_register_input_protocol (osi_protocol_t protocol, u32 node_index);
format_function_t format_osi_header;
#endif /* included_osi_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/osi/pg.c b/vnet/vnet/osi/pg.c
index c3eb1a6..c87a869 100644
--- a/vnet/vnet/osi/pg.c
+++ b/vnet/vnet/osi/pg.c
@@ -41,7 +41,8 @@
#include <vnet/pg/pg.h>
#include <vnet/osi/osi.h>
-typedef struct {
+typedef struct
+{
pg_edit_t protocol;
} pg_osi_header_t;
@@ -54,24 +55,23 @@
uword
unformat_pg_osi_header (unformat_input_t * input, va_list * args)
{
- pg_stream_t * s = va_arg (*args, pg_stream_t *);
- pg_osi_header_t * h;
+ pg_stream_t *s = va_arg (*args, pg_stream_t *);
+ pg_osi_header_t *h;
u32 group_index, error;
-
+
h = pg_create_edit_group (s, sizeof (h[0]), sizeof (osi_header_t),
&group_index);
pg_osi_header_init (h);
error = 1;
- if (! unformat (input, "%U",
- unformat_pg_edit,
- unformat_osi_protocol, &h->protocol))
+ if (!unformat (input, "%U",
+ unformat_pg_edit, unformat_osi_protocol, &h->protocol))
goto done;
{
- osi_main_t * pm = &osi_main;
- osi_protocol_info_t * pi = 0;
- pg_node_t * pg_node = 0;
+ osi_main_t *pm = &osi_main;
+ osi_protocol_info_t *pi = 0;
+ pg_node_t *pg_node = 0;
if (h->protocol.type == PG_EDIT_FIXED)
{
@@ -85,14 +85,22 @@
&& unformat_user (input, pg_node->unformat_edit, s))
;
- else if (! unformat_user (input, unformat_pg_payload, s))
+ else if (!unformat_user (input, unformat_pg_payload, s))
goto done;
}
error = 0;
- done:
+done:
if (error)
pg_free_edit_group (s);
return error == 0;
}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */