summaryrefslogtreecommitdiffstats
path: root/src/vnet/dhcp/dhcp4_proxy_node.c
diff options
context:
space:
mode:
authorkhemendra kumar <khemendra.kumar13@gmail.com>2017-12-08 18:06:52 +0530
committerDamjan Marion <dmarion.lists@gmail.com>2017-12-09 13:24:39 +0000
commit34719e37bf820e8398ca9159725f7f4c42764aeb (patch)
tree0103490ec7c18b6c1a46ef59fcca0722e7061764 /src/vnet/dhcp/dhcp4_proxy_node.c
parent87a137c77b53753710a0706a35bee5574c0a9c1a (diff)
VPP-249 Coding standards cleanup - vnet/vnet/dhcp
Change-Id: I45a166b5780675d2bc6fe90595f413725704eaa8 Signed-off-by: khemendra kumar <khemendra.kumar13@gmail.com>
Diffstat (limited to 'src/vnet/dhcp/dhcp4_proxy_node.c')
-rw-r--r--src/vnet/dhcp/dhcp4_proxy_node.c1169
1 files changed, 591 insertions, 578 deletions
diff --git a/src/vnet/dhcp/dhcp4_proxy_node.c b/src/vnet/dhcp/dhcp4_proxy_node.c
index cd52be83f71..e84d72c0afb 100644
--- a/src/vnet/dhcp/dhcp4_proxy_node.c
+++ b/src/vnet/dhcp/dhcp4_proxy_node.c
@@ -21,7 +21,7 @@
#include <vnet/dhcp/client.h>
#include <vnet/fib/ip4_fib.h>
-static char * dhcp_proxy_error_strings[] = {
+static char *dhcp_proxy_error_strings[] = {
#define dhcp_proxy_error(n,s) s,
#include <vnet/dhcp/dhcp4_proxy_error.def>
#undef dhcp_proxy_error
@@ -32,16 +32,18 @@ static char * dhcp_proxy_error_strings[] = {
_ (LOOKUP, "ip4-lookup") \
_ (SEND_TO_CLIENT, "dhcp-proxy-to-client")
-typedef enum {
+typedef enum
+{
#define _(s,n) DHCP_PROXY_TO_SERVER_INPUT_NEXT_##s,
foreach_dhcp_proxy_to_server_input_next
#undef _
- DHCP_PROXY_TO_SERVER_INPUT_N_NEXT,
+ DHCP_PROXY_TO_SERVER_INPUT_N_NEXT,
} dhcp_proxy_to_server_input_next_t;
-typedef struct {
+typedef struct
+{
/* 0 => to server, 1 => to client */
- int which;
+ int which;
ip4_address_t trace_ip4_address;
u32 error;
u32 sw_if_index;
@@ -63,28 +65,28 @@ format_dhcp_proxy_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 *);
- dhcp_proxy_trace_t * t = va_arg (*args, dhcp_proxy_trace_t *);
-
+ dhcp_proxy_trace_t *t = va_arg (*args, dhcp_proxy_trace_t *);
+
if (t->which == 0)
s = format (s, "DHCP proxy: sent to server %U\n",
- format_ip4_address, &t->trace_ip4_address, t->error);
+ format_ip4_address, &t->trace_ip4_address, t->error);
else
s = format (s, "DHCP proxy: broadcast to client from %U\n",
- format_ip4_address, &t->trace_ip4_address);
-
- if (t->error != (u32)~0)
+ format_ip4_address, &t->trace_ip4_address);
+
+ if (t->error != (u32) ~ 0)
s = format (s, " error: %s\n", dhcp_proxy_error_strings[t->error]);
s = format (s, " original_sw_if_index: %d, sw_if_index: %d\n",
- t->original_sw_if_index, t->sw_if_index);
-
+ t->original_sw_if_index, t->sw_if_index);
+
return s;
}
static u8 *
format_dhcp_proxy_header_with_length (u8 * s, va_list * args)
{
- dhcp_header_t * h = va_arg (*args, dhcp_header_t *);
+ dhcp_header_t *h = va_arg (*args, dhcp_header_t *);
u32 max_header_bytes = va_arg (*args, u32);
u32 header_bytes;
@@ -99,17 +101,17 @@ format_dhcp_proxy_header_with_length (u8 * s, va_list * args)
static uword
dhcp_proxy_to_server_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)
{
- u32 n_left_from, next_index, * from, * to_next;
- dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
+ u32 n_left_from, next_index, *from, *to_next;
+ dhcp_proxy_main_t *dpm = &dhcp_proxy_main;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
- u32 pkts_to_server=0, pkts_to_client=0, pkts_no_server=0;
- u32 pkts_no_interface_address=0;
- u32 pkts_too_big=0;
- ip4_main_t * im = &ip4_main;
+ u32 pkts_to_server = 0, pkts_to_client = 0, pkts_no_server = 0;
+ u32 pkts_no_interface_address = 0;
+ u32 pkts_too_big = 0;
+ ip4_main_t *im = &ip4_main;
next_index = node->cached_next_index;
@@ -117,31 +119,30 @@ dhcp_proxy_to_server_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 > 0 && n_left_to_next > 0)
{
u32 bi0;
- vlib_buffer_t * b0;
- udp_header_t * u0;
- dhcp_header_t * h0;
- ip4_header_t * ip0;
+ vlib_buffer_t *b0;
+ udp_header_t *u0;
+ dhcp_header_t *h0;
+ ip4_header_t *ip0;
u32 next0;
- u32 old0, new0;
- ip_csum_t sum0;
- u32 error0 = (u32) ~0;
- u32 sw_if_index = 0;
- u32 original_sw_if_index = 0;
- u8 *end = NULL;
- u32 fib_index;
- dhcp_proxy_t *proxy;
- dhcp_server_t *server;
- u32 rx_sw_if_index;
- dhcp_option_t *o;
- u32 len = 0;
- vlib_buffer_free_list_t *fl;
- u8 is_discover = 0;
+ u32 old0, new0;
+ ip_csum_t sum0;
+ u32 error0 = (u32) ~ 0;
+ u32 sw_if_index = 0;
+ u32 original_sw_if_index = 0;
+ u8 *end = NULL;
+ u32 fib_index;
+ dhcp_proxy_t *proxy;
+ dhcp_server_t *server;
+ u32 rx_sw_if_index;
+ dhcp_option_t *o;
+ u32 len = 0;
+ vlib_buffer_free_list_t *fl;
+ u8 is_discover = 0;
bi0 = from[0];
from += 1;
@@ -149,145 +150,148 @@ dhcp_proxy_to_server_input (vlib_main_t * vm,
b0 = vlib_get_buffer (vm, bi0);
- h0 = vlib_buffer_get_current (b0);
+ h0 = vlib_buffer_get_current (b0);
- /*
- * udp_local hands us the DHCP header, need udp hdr,
- * ip hdr to relay to server
- */
- vlib_buffer_advance (b0, -(sizeof(*u0)));
+ /*
+ * udp_local hands us the DHCP header, need udp hdr,
+ * ip hdr to relay to server
+ */
+ vlib_buffer_advance (b0, -(sizeof (*u0)));
u0 = vlib_buffer_get_current (b0);
- /* This blows. Return traffic has src_port = 67, dst_port = 67 */
- if (u0->src_port == clib_net_to_host_u16(UDP_DST_PORT_dhcp_to_server))
- {
- vlib_buffer_advance (b0, sizeof(*u0));
- next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_SEND_TO_CLIENT;
- error0 = 0;
- pkts_to_client++;
- goto do_enqueue;
- }
-
- rx_sw_if_index = vnet_buffer(b0)->sw_if_index[VLIB_RX];
-
- fib_index = im->fib_index_by_sw_if_index [rx_sw_if_index];
- proxy = dhcp_get_proxy(dpm, fib_index, FIB_PROTOCOL_IP4);
-
- if (PREDICT_FALSE (NULL == proxy))
- {
- error0 = DHCP_PROXY_ERROR_NO_SERVER;
- next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
- pkts_no_server++;
- goto do_trace;
- }
-
- server = &proxy->dhcp_servers[0];
- vlib_buffer_advance (b0, -(sizeof(*ip0)));
- ip0 = vlib_buffer_get_current (b0);
-
- /* disable UDP checksum */
- u0->checksum = 0;
- sum0 = ip0->checksum;
- old0 = ip0->dst_address.as_u32;
- new0 = server->dhcp_server.ip4.as_u32;
- ip0->dst_address.as_u32 = server->dhcp_server.ip4.as_u32;
- sum0 = ip_csum_update (sum0, old0, new0,
- ip4_header_t /* structure */,
- dst_address /* changed member */);
- ip0->checksum = ip_csum_fold (sum0);
-
- sum0 = ip0->checksum;
- old0 = ip0->src_address.as_u32;
- new0 = proxy->dhcp_src_address.ip4.as_u32;
- ip0->src_address.as_u32 = new0;
- sum0 = ip_csum_update (sum0, old0, new0,
- ip4_header_t /* structure */,
- src_address /* changed member */);
- ip0->checksum = ip_csum_fold (sum0);
-
- /* Send to DHCP server via the configured FIB */
- vnet_buffer(b0)->sw_if_index[VLIB_TX] =
- server->server_fib_index;
-
- h0->gateway_ip_address.as_u32 = proxy->dhcp_src_address.ip4.as_u32;
- pkts_to_server++;
-
- o = (dhcp_option_t *) h0->options;
-
- fib_index = im->fib_index_by_sw_if_index
- [vnet_buffer(b0)->sw_if_index[VLIB_RX]];
-
- end = b0->data + b0->current_data + b0->current_length;
- /* TLVs are not performance-friendly... */
- while (o->option != 0xFF /* end of options */ && (u8 *)o < end)
- {
- if (DHCP_PACKET_OPTION_MSG_TYPE == o->option)
- {
- if (DHCP_PACKET_DISCOVER == o->data[0])
- {
- is_discover = 1;
- }
- }
- o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+ /* This blows. Return traffic has src_port = 67, dst_port = 67 */
+ if (u0->src_port ==
+ clib_net_to_host_u16 (UDP_DST_PORT_dhcp_to_server))
+ {
+ vlib_buffer_advance (b0, sizeof (*u0));
+ next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_SEND_TO_CLIENT;
+ error0 = 0;
+ pkts_to_client++;
+ goto do_enqueue;
}
- fl = vlib_buffer_get_free_list (vm, vlib_buffer_get_free_list_index (b0));
- // start write at (option*)o, some packets have padding
- if (((u8 *)o - (u8 *)b0->data + VPP_DHCP_OPTION82_SIZE) > fl->n_data_bytes)
- {
- next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
- pkts_too_big++;
- goto do_trace;
+ rx_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+ fib_index = im->fib_index_by_sw_if_index[rx_sw_if_index];
+ proxy = dhcp_get_proxy (dpm, fib_index, FIB_PROTOCOL_IP4);
+
+ if (PREDICT_FALSE (NULL == proxy))
+ {
+ error0 = DHCP_PROXY_ERROR_NO_SERVER;
+ next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+ pkts_no_server++;
+ goto do_trace;
}
- if ((o->option == 0xFF) && ((u8 *)o <= end))
- {
- vnet_main_t *vnm = vnet_get_main();
- u16 old_l0, new_l0;
- ip4_address_t _ia0, * ia0 = &_ia0;
- dhcp_vss_t *vss;
- vnet_sw_interface_t *swif;
- sw_if_index = 0;
- original_sw_if_index = 0;
-
- original_sw_if_index = sw_if_index =
- vnet_buffer(b0)->sw_if_index[VLIB_RX];
- swif = vnet_get_sw_interface (vnm, sw_if_index);
- if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
- sw_if_index = swif->unnumbered_sw_if_index;
-
- /*
- * Get the first ip4 address on the [client-side]
- * RX interface, if not unnumbered. otherwise use
- * the loopback interface's ip address.
- */
- ia0 = ip4_interface_first_address(&ip4_main, sw_if_index, 0);
-
- if (ia0 == 0)
- {
- error0 = DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS;
- next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
- pkts_no_interface_address++;
- goto do_trace;
- }
-
- /* Add option 82 */
- o->option = 82; /* option 82 */
- o->length = 12; /* 12 octets to follow */
- o->data[0] = 1; /* suboption 1, circuit ID (=FIB id) */
- o->data[1] = 4; /* length of suboption */
- u32 *o_ifid = (u32 *) &o->data[2];
+ server = &proxy->dhcp_servers[0];
+ vlib_buffer_advance (b0, -(sizeof (*ip0)));
+ ip0 = vlib_buffer_get_current (b0);
+
+ /* disable UDP checksum */
+ u0->checksum = 0;
+ sum0 = ip0->checksum;
+ old0 = ip0->dst_address.as_u32;
+ new0 = server->dhcp_server.ip4.as_u32;
+ ip0->dst_address.as_u32 = server->dhcp_server.ip4.as_u32;
+ sum0 = ip_csum_update (sum0, old0, new0,
+ ip4_header_t /* structure */ ,
+ dst_address /* changed member */ );
+ ip0->checksum = ip_csum_fold (sum0);
+
+ sum0 = ip0->checksum;
+ old0 = ip0->src_address.as_u32;
+ new0 = proxy->dhcp_src_address.ip4.as_u32;
+ ip0->src_address.as_u32 = new0;
+ sum0 = ip_csum_update (sum0, old0, new0,
+ ip4_header_t /* structure */ ,
+ src_address /* changed member */ );
+ ip0->checksum = ip_csum_fold (sum0);
+
+ /* Send to DHCP server via the configured FIB */
+ vnet_buffer (b0)->sw_if_index[VLIB_TX] = server->server_fib_index;
+
+ h0->gateway_ip_address.as_u32 = proxy->dhcp_src_address.ip4.as_u32;
+ pkts_to_server++;
+
+ o = (dhcp_option_t *) h0->options;
+
+ fib_index = im->fib_index_by_sw_if_index
+ [vnet_buffer (b0)->sw_if_index[VLIB_RX]];
+
+ end = b0->data + b0->current_data + b0->current_length;
+ /* TLVs are not performance-friendly... */
+ while (o->option != 0xFF /* end of options */ && (u8 *) o < end)
+ {
+ if (DHCP_PACKET_OPTION_MSG_TYPE == o->option)
+ {
+ if (DHCP_PACKET_DISCOVER == o->data[0])
+ {
+ is_discover = 1;
+ }
+ }
+ o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+ }
+
+ fl =
+ vlib_buffer_get_free_list (vm,
+ vlib_buffer_get_free_list_index (b0));
+ // start write at (option*)o, some packets have padding
+ if (((u8 *) o - (u8 *) b0->data + VPP_DHCP_OPTION82_SIZE) >
+ fl->n_data_bytes)
+ {
+ next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+ pkts_too_big++;
+ goto do_trace;
+ }
+
+ if ((o->option == 0xFF) && ((u8 *) o <= end))
+ {
+ vnet_main_t *vnm = vnet_get_main ();
+ u16 old_l0, new_l0;
+ ip4_address_t _ia0, *ia0 = &_ia0;
+ dhcp_vss_t *vss;
+ vnet_sw_interface_t *swif;
+ sw_if_index = 0;
+ original_sw_if_index = 0;
+
+ original_sw_if_index = sw_if_index =
+ vnet_buffer (b0)->sw_if_index[VLIB_RX];
+ swif = vnet_get_sw_interface (vnm, sw_if_index);
+ if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+ sw_if_index = swif->unnumbered_sw_if_index;
+
+ /*
+ * Get the first ip4 address on the [client-side]
+ * RX interface, if not unnumbered. otherwise use
+ * the loopback interface's ip address.
+ */
+ ia0 = ip4_interface_first_address (&ip4_main, sw_if_index, 0);
+
+ if (ia0 == 0)
+ {
+ error0 = DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS;
+ next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+ pkts_no_interface_address++;
+ goto do_trace;
+ }
+
+ /* Add option 82 */
+ o->option = 82; /* option 82 */
+ o->length = 12; /* 12 octets to follow */
+ o->data[0] = 1; /* suboption 1, circuit ID (=FIB id) */
+ o->data[1] = 4; /* length of suboption */
+ u32 *o_ifid = (u32 *) & o->data[2];
*o_ifid = clib_host_to_net_u32 (original_sw_if_index);
- o->data[6] = 5; /* suboption 5 (client RX intfc address) */
- o->data[7] = 4; /* length 4 */
- u32 *o_addr = (u32 *) &o->data[8];
+ o->data[6] = 5; /* suboption 5 (client RX intfc address) */
+ o->data[7] = 4; /* length 4 */
+ u32 *o_addr = (u32 *) & o->data[8];
*o_addr = ia0->as_u32;
- o->data[12] = 0xFF;
+ o->data[12] = 0xFF;
- vss = dhcp_get_vss_info (dpm, fib_index, FIB_PROTOCOL_IP4);
- if (vss)
- {
- u32 id_len; /* length of VPN ID */
+ vss = dhcp_get_vss_info (dpm, fib_index, FIB_PROTOCOL_IP4);
+ if (vss)
+ {
+ u32 id_len; /* length of VPN ID */
if (vss->vss_type == VSS_TYPE_VPN_ID)
{
@@ -299,120 +303,121 @@ dhcp_proxy_to_server_input (vlib_main_t * vm,
id_len = vec_len (vss->vpn_ascii_id);
memcpy (&o->data[15], vss->vpn_ascii_id, id_len);
}
- else /* must be VSS_TYPE_DEFAULT, no VPN ID */
- id_len = 0;
+ else /* must be VSS_TYPE_DEFAULT, no VPN ID */
+ id_len = 0;
- o->data[12] = 151; /* vss suboption */
+ o->data[12] = 151; /* vss suboption */
o->data[13] = id_len + 1; /* length: vss_type + id_len */
o->data[14] = vss->vss_type; /* vss option type */
o->data[15 + id_len] = 152; /* vss control suboption */
o->data[16 + id_len] = 0; /* length */
o->data[17 + id_len] = 0xFF; /* "end-of-options" (0xFF) */
/* 5 bytes for suboption headers 151+len, 152+len and 0xFF */
- o->length += id_len + 5;
- }
-
- len = o->length + 3;
- b0->current_length += len;
- /* Fix IP header length and checksum */
- old_l0 = ip0->length;
- new_l0 = clib_net_to_host_u16 (old_l0);
- new_l0 += len;
- new_l0 = clib_host_to_net_u16 (new_l0);
- ip0->length = new_l0;
- sum0 = ip0->checksum;
- sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
- length /* changed member */);
- ip0->checksum = ip_csum_fold (sum0);
-
- /* Fix UDP length */
- new_l0 = clib_net_to_host_u16 (u0->length);
- new_l0 += len;
- u0->length = clib_host_to_net_u16 (new_l0);
- }
- else
+ o->length += id_len + 5;
+ }
+
+ len = o->length + 3;
+ b0->current_length += len;
+ /* Fix IP header length and checksum */
+ old_l0 = ip0->length;
+ new_l0 = clib_net_to_host_u16 (old_l0);
+ new_l0 += len;
+ new_l0 = clib_host_to_net_u16 (new_l0);
+ ip0->length = new_l0;
+ sum0 = ip0->checksum;
+ sum0 = ip_csum_update (sum0, old_l0, new_l0, ip4_header_t,
+ length /* changed member */ );
+ ip0->checksum = ip_csum_fold (sum0);
+
+ /* Fix UDP length */
+ new_l0 = clib_net_to_host_u16 (u0->length);
+ new_l0 += len;
+ u0->length = clib_host_to_net_u16 (new_l0);
+ }
+ else
{
- vlib_node_increment_counter
- (vm, dhcp_proxy_to_server_node.index,
- DHCP_PROXY_ERROR_OPTION_82_ERROR, 1);
+ vlib_node_increment_counter
+ (vm, dhcp_proxy_to_server_node.index,
+ DHCP_PROXY_ERROR_OPTION_82_ERROR, 1);
}
-
- next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP;
-
- /*
- * If we have multiple servers configured and this is the
- * client's discover message, then send copies to each of
- * those servers
- */
- if (is_discover && vec_len(proxy->dhcp_servers) > 1)
- {
- u32 ii;
-
- for (ii = 1; ii < vec_len(proxy->dhcp_servers); ii++)
- {
- vlib_buffer_t *c0;
- u32 ci0;
-
- c0 = vlib_buffer_copy(vm, b0);
- ci0 = vlib_get_buffer_index(vm, c0);
- server = &proxy->dhcp_servers[ii];
-
- ip0 = vlib_buffer_get_current (c0);
-
- sum0 = ip0->checksum;
- old0 = ip0->dst_address.as_u32;
- new0 = server->dhcp_server.ip4.as_u32;
- ip0->dst_address.as_u32 = server->dhcp_server.ip4.as_u32;
- sum0 = ip_csum_update (sum0, old0, new0,
- ip4_header_t /* structure */,
- dst_address /* changed member */);
- ip0->checksum = ip_csum_fold (sum0);
-
- to_next[0] = ci0;
- to_next += 1;
- n_left_to_next -= 1;
-
- vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
- to_next, n_left_to_next,
- ci0, next0);
-
- if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
- {
- dhcp_proxy_trace_t *tr;
-
- tr = vlib_add_trace (vm, node, c0, sizeof (*tr));
- tr->which = 0; /* to server */
- tr->error = error0;
- tr->original_sw_if_index = original_sw_if_index;
- tr->sw_if_index = sw_if_index;
- if (next0 == DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP)
- tr->trace_ip4_address.as_u32 = server->dhcp_server.ip4.as_u32;
+
+ next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP;
+
+ /*
+ * If we have multiple servers configured and this is the
+ * client's discover message, then send copies to each of
+ * those servers
+ */
+ if (is_discover && vec_len (proxy->dhcp_servers) > 1)
+ {
+ u32 ii;
+
+ for (ii = 1; ii < vec_len (proxy->dhcp_servers); ii++)
+ {
+ vlib_buffer_t *c0;
+ u32 ci0;
+
+ c0 = vlib_buffer_copy (vm, b0);
+ ci0 = vlib_get_buffer_index (vm, c0);
+ server = &proxy->dhcp_servers[ii];
+
+ ip0 = vlib_buffer_get_current (c0);
+
+ sum0 = ip0->checksum;
+ old0 = ip0->dst_address.as_u32;
+ new0 = server->dhcp_server.ip4.as_u32;
+ ip0->dst_address.as_u32 = server->dhcp_server.ip4.as_u32;
+ sum0 = ip_csum_update (sum0, old0, new0,
+ ip4_header_t /* structure */ ,
+ dst_address /* changed member */ );
+ ip0->checksum = ip_csum_fold (sum0);
+
+ to_next[0] = ci0;
+ to_next += 1;
+ n_left_to_next -= 1;
+
+ vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+ to_next, n_left_to_next,
+ ci0, next0);
+
+ if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ dhcp_proxy_trace_t *tr;
+
+ tr = vlib_add_trace (vm, node, c0, sizeof (*tr));
+ tr->which = 0; /* to server */
+ tr->error = error0;
+ tr->original_sw_if_index = original_sw_if_index;
+ tr->sw_if_index = sw_if_index;
+ if (next0 == DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP)
+ tr->trace_ip4_address.as_u32 =
+ server->dhcp_server.ip4.as_u32;
}
- if (PREDICT_FALSE(0 == n_left_to_next))
- {
- vlib_put_next_frame (vm, node, next_index,
- n_left_to_next);
- vlib_get_next_frame (vm, node, next_index,
- to_next, n_left_to_next);
- }
- }
- }
- do_trace:
- if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
- {
- dhcp_proxy_trace_t *tr = vlib_add_trace (vm, node,
- b0, sizeof (*tr));
- tr->which = 0; /* to server */
- tr->error = error0;
- tr->original_sw_if_index = original_sw_if_index;
- tr->sw_if_index = sw_if_index;
- if (next0 == DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP)
- tr->trace_ip4_address.as_u32 =
- proxy->dhcp_servers[0].dhcp_server.ip4.as_u32;
- }
-
- do_enqueue:
+ if (PREDICT_FALSE (0 == n_left_to_next))
+ {
+ vlib_put_next_frame (vm, node, next_index,
+ n_left_to_next);
+ vlib_get_next_frame (vm, node, next_index,
+ to_next, n_left_to_next);
+ }
+ }
+ }
+ do_trace:
+ if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ dhcp_proxy_trace_t *tr = vlib_add_trace (vm, node,
+ b0, sizeof (*tr));
+ tr->which = 0; /* to server */
+ tr->error = error0;
+ tr->original_sw_if_index = original_sw_if_index;
+ tr->sw_if_index = sw_if_index;
+ if (next0 == DHCP_PROXY_TO_SERVER_INPUT_NEXT_LOOKUP)
+ tr->trace_ip4_address.as_u32 =
+ proxy->dhcp_servers[0].dhcp_server.ip4.as_u32;
+ }
+
+ do_enqueue:
to_next[0] = bi0;
to_next += 1;
n_left_to_next -= 1;
@@ -426,23 +431,22 @@ dhcp_proxy_to_server_input (vlib_main_t * vm,
}
vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
- DHCP_PROXY_ERROR_RELAY_TO_CLIENT,
- pkts_to_client);
+ DHCP_PROXY_ERROR_RELAY_TO_CLIENT,
+ pkts_to_client);
+ vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
+ DHCP_PROXY_ERROR_RELAY_TO_SERVER,
+ pkts_to_server);
vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
- DHCP_PROXY_ERROR_RELAY_TO_SERVER,
- pkts_to_server);
+ DHCP_PROXY_ERROR_NO_SERVER, pkts_no_server);
vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
- DHCP_PROXY_ERROR_NO_SERVER,
- pkts_no_server);
+ DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS,
+ pkts_no_interface_address);
vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
- DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS,
- pkts_no_interface_address);
- vlib_node_increment_counter (vm, dhcp_proxy_to_server_node.index,
- DHCP_PROXY_ERROR_PKT_TOO_BIG,
- pkts_too_big);
+ DHCP_PROXY_ERROR_PKT_TOO_BIG, pkts_too_big);
return from_frame->n_vectors;
}
+/* *INDENT-OFF* */
VLIB_REGISTER_NODE (dhcp_proxy_to_server_node, static) = {
.function = dhcp_proxy_to_server_input,
.name = "dhcp-proxy-to-server",
@@ -465,17 +469,18 @@ VLIB_REGISTER_NODE (dhcp_proxy_to_server_node, static) = {
.unformat_buffer = unformat_dhcp_proxy_header,
#endif
};
+/* *INDENT-ON* */
static uword
dhcp_proxy_to_client_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)
{
- u32 n_left_from, * from;
+ u32 n_left_from, *from;
ethernet_main_t *em = ethernet_get_main (vm);
- dhcp_proxy_main_t * dpm = &dhcp_proxy_main;
- vnet_main_t * vnm = vnet_get_main();
- ip4_main_t * im = &ip4_main;
+ dhcp_proxy_main_t *dpm = &dhcp_proxy_main;
+ vnet_main_t *vnm = vnet_get_main ();
+ ip4_main_t *im = &ip4_main;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
@@ -483,28 +488,28 @@ dhcp_proxy_to_client_input (vlib_main_t * vm,
while (n_left_from > 0)
{
u32 bi0;
- vlib_buffer_t * b0;
- udp_header_t * u0;
- dhcp_header_t * h0;
- ip4_header_t * ip0 = 0;
- ip4_address_t * ia0 = 0;
+ vlib_buffer_t *b0;
+ udp_header_t *u0;
+ dhcp_header_t *h0;
+ ip4_header_t *ip0 = 0;
+ ip4_address_t *ia0 = 0;
u32 old0, new0;
ip_csum_t sum0;
ethernet_interface_t *ei0;
ethernet_header_t *mac0;
vnet_hw_interface_t *hi0;
vlib_frame_t *f0;
- u32 * to_next0;
+ u32 *to_next0;
u32 sw_if_index = ~0;
vnet_sw_interface_t *si0;
- u32 error0 = (u32)~0;
+ u32 error0 = (u32) ~ 0;
vnet_sw_interface_t *swif;
u32 fib_index;
dhcp_proxy_t *proxy;
dhcp_server_t *server;
- u32 original_sw_if_index = (u32) ~0;
+ u32 original_sw_if_index = (u32) ~ 0;
ip4_address_t relay_addr = {
- .as_u32 = 0,
+ .as_u32 = 0,
};
bi0 = from[0];
@@ -514,118 +519,119 @@ dhcp_proxy_to_client_input (vlib_main_t * vm,
b0 = vlib_get_buffer (vm, bi0);
h0 = vlib_buffer_get_current (b0);
- /*
- * udp_local hands us the DHCP header, need udp hdr,
+ /*
+ * udp_local hands us the DHCP header, need udp hdr,
* ip hdr to relay to client
*/
- vlib_buffer_advance (b0, -(sizeof(*u0)));
+ vlib_buffer_advance (b0, -(sizeof (*u0)));
u0 = vlib_buffer_get_current (b0);
- vlib_buffer_advance (b0, -(sizeof(*ip0)));
+ vlib_buffer_advance (b0, -(sizeof (*ip0)));
ip0 = vlib_buffer_get_current (b0);
/* Consumed by dhcp client code? */
if (dhcp_client_for_us (bi0, b0, ip0, u0, h0))
- continue;
-
- if (1 /* dpm->insert_option_82 */)
- {
- dhcp_option_t *o = (dhcp_option_t *) h0->options;
- dhcp_option_t *sub;
-
- /* Parse through TLVs looking for option 82.
- The circuit-ID is the FIB number we need
- to track down the client-facing interface */
-
- while (o->option != 0xFF /* end of options */ &&
- (u8 *) o < (b0->data + b0->current_data + b0->current_length))
- {
- if (o->option == 82)
- {
- u32 vss_exist = 0;
- u32 vss_ctrl = 0;
- sub = (dhcp_option_t *) &o->data[0];
- while (sub->option != 0xFF /* end of options */ &&
- (u8 *) sub < (u8 *)(o + o->length)) {
- /* If this is one of ours, it will have
- total length 12, circuit-id suboption type,
- and the sw_if_index */
- if (sub->option == 1 && sub->length == 4)
- {
- sw_if_index = ((sub->data[0] << 24) |
- (sub->data[1] << 16) |
- (sub->data[2] << 8) |
- (sub->data[3]));
- }
- else if (sub->option == 5 && sub->length == 4)
- {
- relay_addr.as_u8[0] = sub->data[0];
- relay_addr.as_u8[1] = sub->data[1];
- relay_addr.as_u8[2] = sub->data[2];
- relay_addr.as_u8[3] = sub->data[3];
- }
- else if (sub->option == 151 &&
- sub->length == 7 &&
- sub->data[0] == 1)
- vss_exist = 1;
- else if (sub->option == 152 && sub->length == 0)
- vss_ctrl = 1;
- sub = (dhcp_option_t *)
- (((uword) sub) + (sub->length + 2));
- }
- if (vss_ctrl && vss_exist)
- vlib_node_increment_counter
- (vm, dhcp_proxy_to_client_node.index,
- DHCP_PROXY_ERROR_OPTION_82_VSS_NOT_PROCESSED, 1);
-
- }
- o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
- }
- }
-
- if (sw_if_index == (u32)~0)
- {
- error0 = DHCP_PROXY_ERROR_NO_OPTION_82;
-
- drop_packet:
- vlib_node_increment_counter (vm, dhcp_proxy_to_client_node.index,
- error0, 1);
- f0 = vlib_get_frame_to_node (vm, dpm->error_drop_node_index);
- to_next0 = vlib_frame_vector_args (f0);
- to_next0[0] = bi0;
- f0->n_vectors = 1;
- vlib_put_frame_to_node (vm, dpm->error_drop_node_index, f0);
- goto do_trace;
- }
-
+ continue;
+
+ if (1 /* dpm->insert_option_82 */ )
+ {
+ dhcp_option_t *o = (dhcp_option_t *) h0->options;
+ dhcp_option_t *sub;
+
+ /* Parse through TLVs looking for option 82.
+ The circuit-ID is the FIB number we need
+ to track down the client-facing interface */
+
+ while (o->option != 0xFF /* end of options */ &&
+ (u8 *) o <
+ (b0->data + b0->current_data + b0->current_length))
+ {
+ if (o->option == 82)
+ {
+ u32 vss_exist = 0;
+ u32 vss_ctrl = 0;
+ sub = (dhcp_option_t *) & o->data[0];
+ while (sub->option != 0xFF /* end of options */ &&
+ (u8 *) sub < (u8 *) (o + o->length))
+ {
+ /* If this is one of ours, it will have
+ total length 12, circuit-id suboption type,
+ and the sw_if_index */
+ if (sub->option == 1 && sub->length == 4)
+ {
+ sw_if_index = ((sub->data[0] << 24) |
+ (sub->data[1] << 16) |
+ (sub->data[2] << 8) |
+ (sub->data[3]));
+ }
+ else if (sub->option == 5 && sub->length == 4)
+ {
+ relay_addr.as_u8[0] = sub->data[0];
+ relay_addr.as_u8[1] = sub->data[1];
+ relay_addr.as_u8[2] = sub->data[2];
+ relay_addr.as_u8[3] = sub->data[3];
+ }
+ else if (sub->option == 151 &&
+ sub->length == 7 && sub->data[0] == 1)
+ vss_exist = 1;
+ else if (sub->option == 152 && sub->length == 0)
+ vss_ctrl = 1;
+ sub = (dhcp_option_t *)
+ (((uword) sub) + (sub->length + 2));
+ }
+ if (vss_ctrl && vss_exist)
+ vlib_node_increment_counter
+ (vm, dhcp_proxy_to_client_node.index,
+ DHCP_PROXY_ERROR_OPTION_82_VSS_NOT_PROCESSED, 1);
+
+ }
+ o = (dhcp_option_t *) (((uword) o) + (o->length + 2));
+ }
+ }
+
+ if (sw_if_index == (u32) ~ 0)
+ {
+ error0 = DHCP_PROXY_ERROR_NO_OPTION_82;
+
+ drop_packet:
+ vlib_node_increment_counter (vm, dhcp_proxy_to_client_node.index,
+ error0, 1);
+ f0 = vlib_get_frame_to_node (vm, dpm->error_drop_node_index);
+ to_next0 = vlib_frame_vector_args (f0);
+ to_next0[0] = bi0;
+ f0->n_vectors = 1;
+ vlib_put_frame_to_node (vm, dpm->error_drop_node_index, f0);
+ goto do_trace;
+ }
+
if (relay_addr.as_u32 == 0)
- {
- error0 = DHCP_PROXY_ERROR_BAD_OPTION_82_ADDR;
- goto drop_packet;
- }
+ {
+ error0 = DHCP_PROXY_ERROR_BAD_OPTION_82_ADDR;
+ goto drop_packet;
+ }
if (sw_if_index >= vec_len (im->fib_index_by_sw_if_index))
- {
- error0 = DHCP_PROXY_ERROR_BAD_OPTION_82_ITF;
- goto drop_packet;
- }
+ {
+ error0 = DHCP_PROXY_ERROR_BAD_OPTION_82_ITF;
+ goto drop_packet;
+ }
- fib_index = im->fib_index_by_sw_if_index [sw_if_index];
- proxy = dhcp_get_proxy(dpm, fib_index, FIB_PROTOCOL_IP4);
+ fib_index = im->fib_index_by_sw_if_index[sw_if_index];
+ proxy = dhcp_get_proxy (dpm, fib_index, FIB_PROTOCOL_IP4);
if (PREDICT_FALSE (NULL == proxy))
- {
- error0 = DHCP_PROXY_ERROR_NO_SERVER;
- goto drop_packet;
- }
-
- vec_foreach(server, proxy->dhcp_servers)
- {
- if (ip0->src_address.as_u32 == server->dhcp_server.ip4.as_u32)
- {
- goto server_found;
- }
- }
+ {
+ error0 = DHCP_PROXY_ERROR_NO_SERVER;
+ goto drop_packet;
+ }
+
+ vec_foreach (server, proxy->dhcp_servers)
+ {
+ if (ip0->src_address.as_u32 == server->dhcp_server.ip4.as_u32)
+ {
+ goto server_found;
+ }
+ }
error0 = DHCP_PROXY_ERROR_BAD_SVR_FIB_OR_ADDRESS;
goto drop_packet;
@@ -636,20 +642,20 @@ dhcp_proxy_to_client_input (vlib_main_t * vm,
swif = vnet_get_sw_interface (vnm, sw_if_index);
original_sw_if_index = sw_if_index;
if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
- sw_if_index = swif->unnumbered_sw_if_index;
+ sw_if_index = swif->unnumbered_sw_if_index;
ia0 = ip4_interface_first_address (&ip4_main, sw_if_index, 0);
if (ia0 == 0)
- {
- error0 = DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS;
- goto drop_packet;
- }
+ {
+ error0 = DHCP_PROXY_ERROR_NO_INTERFACE_ADDRESS;
+ goto drop_packet;
+ }
if (relay_addr.as_u32 != ia0->as_u32)
- {
- error0 = DHCP_PROXY_ERROR_BAD_YIADDR;
- goto drop_packet;
- }
+ {
+ error0 = DHCP_PROXY_ERROR_BAD_YIADDR;
+ goto drop_packet;
+ }
u0->checksum = 0;
u0->dst_port = clib_net_to_host_u16 (UDP_DST_PORT_dhcp_to_client);
@@ -657,24 +663,22 @@ dhcp_proxy_to_client_input (vlib_main_t * vm,
old0 = ip0->dst_address.as_u32;
new0 = 0xFFFFFFFF;
ip0->dst_address.as_u32 = new0;
- sum0 = ip_csum_update (sum0, old0, new0,
- ip4_header_t /* structure */,
- dst_address /* offset of changed member */);
+ sum0 = ip_csum_update (sum0, old0, new0, ip4_header_t /* structure */ ,
+ dst_address /* offset of changed member */ );
ip0->checksum = ip_csum_fold (sum0);
sum0 = ip0->checksum;
old0 = ip0->src_address.as_u32;
new0 = ia0->as_u32;
ip0->src_address.as_u32 = new0;
- sum0 = ip_csum_update (sum0, old0, new0,
- ip4_header_t /* structure */,
- src_address /* offset of changed member */);
+ sum0 = ip_csum_update (sum0, old0, new0, ip4_header_t /* structure */ ,
+ src_address /* offset of changed member */ );
ip0->checksum = ip_csum_fold (sum0);
- vlib_buffer_advance (b0, -(sizeof(ethernet_header_t)));
+ vlib_buffer_advance (b0, -(sizeof (ethernet_header_t)));
si0 = vnet_get_sw_interface (vnm, original_sw_if_index);
if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
- vlib_buffer_advance (b0, -4 /* space for VLAN tag */);
+ vlib_buffer_advance (b0, -4 /* space for VLAN tag */ );
mac0 = vlib_buffer_get_current (b0);
@@ -683,11 +687,11 @@ dhcp_proxy_to_client_input (vlib_main_t * vm,
clib_memcpy (mac0->src_address, ei0->address, sizeof (ei0->address));
memset (mac0->dst_address, 0xff, sizeof (mac0->dst_address));
mac0->type = (si0->type == VNET_SW_INTERFACE_TYPE_SUB) ?
- clib_net_to_host_u16(0x8100) : clib_net_to_host_u16 (0x0800);
+ clib_net_to_host_u16 (0x8100) : clib_net_to_host_u16 (0x0800);
if (si0->type == VNET_SW_INTERFACE_TYPE_SUB)
{
- u32 * vlan_tag = (u32 *)(mac0+1);
+ u32 *vlan_tag = (u32 *) (mac0 + 1);
u32 tmp;
tmp = (si0->sub.id << 16) | 0x0800;
*vlan_tag = clib_host_to_net_u32 (tmp);
@@ -701,20 +705,21 @@ dhcp_proxy_to_client_input (vlib_main_t * vm,
vlib_put_frame_to_node (vm, hi0->output_node_index, f0);
do_trace:
- if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
- {
- dhcp_proxy_trace_t *tr = vlib_add_trace (vm, node,
- b0, sizeof (*tr));
- tr->which = 1; /* to client */
- tr->trace_ip4_address.as_u32 = ia0 ? ia0->as_u32 : 0;
- tr->error = error0;
- tr->original_sw_if_index = original_sw_if_index;
- tr->sw_if_index = sw_if_index;
- }
+ if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+ {
+ dhcp_proxy_trace_t *tr = vlib_add_trace (vm, node,
+ b0, sizeof (*tr));
+ tr->which = 1; /* to client */
+ tr->trace_ip4_address.as_u32 = ia0 ? ia0->as_u32 : 0;
+ tr->error = error0;
+ tr->original_sw_if_index = original_sw_if_index;
+ tr->sw_if_index = sw_if_index;
+ }
}
return from_frame->n_vectors;
}
+/* *INDENT-OFF* */
VLIB_REGISTER_NODE (dhcp_proxy_to_client_node, static) = {
.function = dhcp_proxy_to_client_input,
.name = "dhcp-proxy-to-client",
@@ -729,21 +734,22 @@ VLIB_REGISTER_NODE (dhcp_proxy_to_client_node, static) = {
.unformat_buffer = unformat_dhcp_proxy_header,
#endif
};
+/* *INDENT-ON* */
static clib_error_t *
dhcp4_proxy_init (vlib_main_t * vm)
{
- dhcp_proxy_main_t * dm = &dhcp_proxy_main;
- vlib_node_t * error_drop_node;
+ dhcp_proxy_main_t *dm = &dhcp_proxy_main;
+ vlib_node_t *error_drop_node;
error_drop_node = vlib_get_node_by_name (vm, (u8 *) "error-drop");
dm->error_drop_node_index = error_drop_node->index;
- udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_client,
- dhcp_proxy_to_client_node.index, 1 /* is_ip4 */);
+ udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_client,
+ dhcp_proxy_to_client_node.index, 1 /* is_ip4 */ );
- udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_server,
- dhcp_proxy_to_server_node.index, 1 /* is_ip4 */);
+ udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_server,
+ dhcp_proxy_to_server_node.index, 1 /* is_ip4 */ );
return 0;
}
@@ -752,56 +758,51 @@ dhcp4_proxy_init (vlib_main_t * vm)
VLIB_INIT_FUNCTION (dhcp4_proxy_init);
int
-dhcp4_proxy_set_server (ip46_address_t *addr,
- ip46_address_t *src_addr,
- u32 rx_table_id,
- u32 server_table_id,
- int is_del)
+dhcp4_proxy_set_server (ip46_address_t * addr,
+ ip46_address_t * src_addr,
+ u32 rx_table_id, u32 server_table_id, int is_del)
{
u32 rx_fib_index = 0;
int rc = 0;
- const fib_prefix_t all_1s =
- {
- .fp_len = 32,
- .fp_addr.ip4.as_u32 = 0xffffffff,
- .fp_proto = FIB_PROTOCOL_IP4,
+ const fib_prefix_t all_1s = {
+ .fp_len = 32,
+ .fp_addr.ip4.as_u32 = 0xffffffff,
+ .fp_proto = FIB_PROTOCOL_IP4,
};
- if (ip46_address_is_zero(addr))
+ if (ip46_address_is_zero (addr))
return VNET_API_ERROR_INVALID_DST_ADDRESS;
-
- if (ip46_address_is_zero(src_addr))
+
+ if (ip46_address_is_zero (src_addr))
return VNET_API_ERROR_INVALID_SRC_ADDRESS;
- rx_fib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4,
- rx_table_id,
- FIB_SOURCE_DHCP);
+ rx_fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4,
+ rx_table_id,
+ FIB_SOURCE_DHCP);
if (is_del)
{
if (dhcp_proxy_server_del (FIB_PROTOCOL_IP4, rx_fib_index,
- addr, server_table_id))
- {
- fib_table_entry_special_remove(rx_fib_index,
- &all_1s,
- FIB_SOURCE_DHCP);
- fib_table_unlock (rx_fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_DHCP);
- }
+ addr, server_table_id))
+ {
+ fib_table_entry_special_remove (rx_fib_index,
+ &all_1s, FIB_SOURCE_DHCP);
+ fib_table_unlock (rx_fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_DHCP);
+ }
}
else
- {
+ {
if (dhcp_proxy_server_add (FIB_PROTOCOL_IP4,
- addr, src_addr,
- rx_fib_index, server_table_id))
- {
- fib_table_entry_special_add(rx_fib_index,
- &all_1s,
- FIB_SOURCE_DHCP,
- FIB_ENTRY_FLAG_LOCAL);
- fib_table_lock (rx_fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_DHCP);
- }
- }
+ addr, src_addr,
+ rx_fib_index, server_table_id))
+ {
+ fib_table_entry_special_add (rx_fib_index,
+ &all_1s,
+ FIB_SOURCE_DHCP, FIB_ENTRY_FLAG_LOCAL);
+ fib_table_lock (rx_fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_DHCP);
+ }
+ }
fib_table_unlock (rx_fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_DHCP);
return (rc);
@@ -809,243 +810,255 @@ dhcp4_proxy_set_server (ip46_address_t *addr,
static clib_error_t *
dhcp4_proxy_set_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
ip46_address_t server_addr, src_addr;
u32 server_table_id = 0, rx_table_id = 0;
int is_del = 0;
int set_src = 0, set_server = 0;
- memset(&server_addr, 0, sizeof(server_addr));
- memset(&src_addr, 0, sizeof(src_addr));
+ memset (&server_addr, 0, sizeof (server_addr));
+ memset (&src_addr, 0, sizeof (src_addr));
- while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
- if (unformat (input, "server %U",
- unformat_ip4_address, &server_addr.ip4))
- set_server = 1;
+ if (unformat (input, "server %U",
+ unformat_ip4_address, &server_addr.ip4))
+ set_server = 1;
else if (unformat (input, "server-fib-id %d", &server_table_id))
- ;
+ ;
else if (unformat (input, "rx-fib-id %d", &rx_table_id))
- ;
- else if (unformat(input, "src-address %U",
- unformat_ip4_address, &src_addr.ip4))
- set_src = 1;
- else if (unformat (input, "delete") ||
- unformat (input, "del"))
- is_del = 1;
+ ;
+ else if (unformat (input, "src-address %U",
+ unformat_ip4_address, &src_addr.ip4))
+ set_src = 1;
+ else if (unformat (input, "delete") || unformat (input, "del"))
+ is_del = 1;
else
- break;
+ break;
}
if (is_del || (set_server && set_src))
{
int rv;
- rv = dhcp4_proxy_set_server (&server_addr, &src_addr, rx_table_id,
- server_table_id, is_del);
+ rv = dhcp4_proxy_set_server (&server_addr, &src_addr, rx_table_id,
+ server_table_id, is_del);
switch (rv)
- {
- case 0:
- return 0;
-
- case VNET_API_ERROR_INVALID_DST_ADDRESS:
- return clib_error_return (0, "Invalid server address");
-
- case VNET_API_ERROR_INVALID_SRC_ADDRESS:
- return clib_error_return (0, "Invalid src address");
-
- case VNET_API_ERROR_NO_SUCH_ENTRY:
- return clib_error_return
- (0, "Fib id %d: no per-fib DHCP server configured", rx_table_id);
-
- default:
- return clib_error_return (0, "BUG: rv %d", rv);
- }
+ {
+ case 0:
+ return 0;
+
+ case VNET_API_ERROR_INVALID_DST_ADDRESS:
+ return clib_error_return (0, "Invalid server address");
+
+ case VNET_API_ERROR_INVALID_SRC_ADDRESS:
+ return clib_error_return (0, "Invalid src address");
+
+ case VNET_API_ERROR_NO_SUCH_ENTRY:
+ return clib_error_return
+ (0, "Fib id %d: no per-fib DHCP server configured", rx_table_id);
+
+ default:
+ return clib_error_return (0, "BUG: rv %d", rv);
+ }
}
else
return clib_error_return (0, "parse error`%U'",
- format_unformat_error, input);
+ format_unformat_error, input);
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (dhcp_proxy_set_command, static) = {
.path = "set dhcp proxy",
.short_help = "set dhcp proxy [del] server <ip-addr> src-address <ip-addr> [server-fib-id <n>] [rx-fib-id <n>]",
.function = dhcp4_proxy_set_command_fn,
};
+/* *INDENT-ON* */
static u8 *
format_dhcp4_proxy_server (u8 * s, va_list * args)
{
dhcp_proxy_t *proxy = va_arg (*args, dhcp_proxy_t *);
- ip4_fib_t * rx_fib, * server_fib;
+ ip4_fib_t *rx_fib, *server_fib;
dhcp_server_t *server;
if (proxy == 0)
{
- s = format (s, "%=14s%=16s%s", "RX FIB", "Src Address",
- "Servers FIB,Address");
+ s = format (s, "%=14s%=16s%s", "RX FIB", "Src Address",
+ "Servers FIB,Address");
return s;
}
- rx_fib = ip4_fib_get(proxy->rx_fib_index);
+ rx_fib = ip4_fib_get (proxy->rx_fib_index);
s = format (s, "%=14u%=16U",
- rx_fib->table_id,
- format_ip46_address, &proxy->dhcp_src_address, IP46_TYPE_ANY);
+ rx_fib->table_id,
+ format_ip46_address, &proxy->dhcp_src_address, IP46_TYPE_ANY);
- vec_foreach(server, proxy->dhcp_servers)
+ vec_foreach (server, proxy->dhcp_servers)
{
- server_fib = ip4_fib_get(server->server_fib_index);
- s = format (s, "%u,%U ",
- server_fib->table_id,
- format_ip46_address, &server->dhcp_server, IP46_TYPE_ANY);
+ server_fib = ip4_fib_get (server->server_fib_index);
+ s = format (s, "%u,%U ",
+ server_fib->table_id,
+ format_ip46_address, &server->dhcp_server, IP46_TYPE_ANY);
}
return s;
}
static int
-dhcp4_proxy_show_walk (dhcp_proxy_t *server,
- void *ctx)
+dhcp4_proxy_show_walk (dhcp_proxy_t * server, void *ctx)
{
- vlib_main_t * vm = ctx;
+ vlib_main_t *vm = ctx;
- vlib_cli_output (vm, "%U", format_dhcp4_proxy_server, server);
+ vlib_cli_output (vm, "%U", format_dhcp4_proxy_server, server);
- return (1);
+ return (1);
}
static clib_error_t *
dhcp4_proxy_show_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- vlib_cli_output (vm, "%U", format_dhcp4_proxy_server, NULL /* header line */);
+ vlib_cli_output (vm, "%U", format_dhcp4_proxy_server,
+ NULL /* header line */ );
- dhcp_proxy_walk(FIB_PROTOCOL_IP4, dhcp4_proxy_show_walk, vm);
+ dhcp_proxy_walk (FIB_PROTOCOL_IP4, dhcp4_proxy_show_walk, vm);
return (NULL);
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (dhcp_proxy_show_command, static) = {
.path = "show dhcp proxy",
.short_help = "Display dhcp proxy server info",
.function = dhcp4_proxy_show_command_fn,
};
+/* *INDENT-ON* */
static clib_error_t *
dhcp_option_82_vss_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
u8 is_del = 0, vss_type = VSS_TYPE_DEFAULT;
u32 oui = 0, fib_id = 0, tbl_id = ~0;
u8 *vpn_ascii_id = 0;
- while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "table %d", &tbl_id))
- ;
+ ;
else if (unformat (input, "oui %d", &oui))
- vss_type = VSS_TYPE_VPN_ID;
+ vss_type = VSS_TYPE_VPN_ID;
else if (unformat (input, "vpn-id %d", &fib_id))
- vss_type = VSS_TYPE_VPN_ID;
+ vss_type = VSS_TYPE_VPN_ID;
else if (unformat (input, "vpn-ascii-id %s", &vpn_ascii_id))
- vss_type = VSS_TYPE_ASCII;
- else if (unformat(input, "delete") || unformat(input, "del"))
- is_del = 1;
+ vss_type = VSS_TYPE_ASCII;
+ else if (unformat (input, "delete") || unformat (input, "del"))
+ is_del = 1;
else
- break;
+ break;
}
if (tbl_id == ~0)
- return clib_error_return (0, "no table ID specified.");
-
- int rv = dhcp_proxy_set_vss (FIB_PROTOCOL_IP4, tbl_id, vss_type,
+ return clib_error_return (0, "no table ID specified.");
+
+ int rv = dhcp_proxy_set_vss (FIB_PROTOCOL_IP4, tbl_id, vss_type,
vpn_ascii_id, oui, fib_id, is_del);
switch (rv)
{
case 0:
- return 0;
+ return 0;
case VNET_API_ERROR_NO_SUCH_ENTRY:
- return clib_error_return (0, "option 82 vss for table %d not found in in pool.",
- tbl_id);
+ return clib_error_return (0,
+ "option 82 vss for table %d not found in in pool.",
+ tbl_id);
default:
- return clib_error_return (0, "BUG: rv %d", rv);
+ return clib_error_return (0, "BUG: rv %d", rv);
}
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (dhcp_proxy_vss_command,static) = {
.path = "set dhcp option-82 vss",
.short_help = "set dhcp option-82 vss [del] table <table id> [oui <n> vpn-id <n> | vpn-ascii-id <text>]",
.function = dhcp_option_82_vss_fn,
};
+/* *INDENT-ON* */
static clib_error_t *
dhcp_vss_show_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
-
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
- dhcp_vss_walk(FIB_PROTOCOL_IP4, dhcp_vss_show_walk, vm);
+ dhcp_vss_walk (FIB_PROTOCOL_IP4, dhcp_vss_show_walk, vm);
return (NULL);
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (dhcp_proxy_vss_show_command, static) = {
.path = "show dhcp vss",
.short_help = "show dhcp VSS",
.function = dhcp_vss_show_command_fn,
};
+/* *INDENT-ON* */
static clib_error_t *
dhcp_option_82_address_show_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
-
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
- vnet_main_t *vnm = vnet_get_main();
- u32 sw_if_index0=0, sw_if_index;
+ vnet_main_t *vnm = vnet_get_main ();
+ u32 sw_if_index0 = 0, sw_if_index;
vnet_sw_interface_t *swif;
ip4_address_t *ia0;
-
- while (unformat_check_input(input) != UNFORMAT_END_OF_INPUT)
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
-
- if (unformat(input, "%U",
- unformat_vnet_sw_interface, vnm, &sw_if_index0))
- {
- swif = vnet_get_sw_interface (vnm, sw_if_index0);
- sw_if_index = (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED) ?
- swif->unnumbered_sw_if_index : sw_if_index0;
- ia0 = ip4_interface_first_address(&ip4_main, sw_if_index, 0);
- if (ia0)
- {
- vlib_cli_output (vm, "%=20s%=20s", "interface",
- "source IP address");
-
- vlib_cli_output (vm, "%=20U%=20U",
- format_vnet_sw_if_index_name,
- vnm, sw_if_index0,
- format_ip4_address, ia0);
- }
- else
- vlib_cli_output (vm, "%=34s %=20U",
- "No IPv4 address configured on",
- format_vnet_sw_if_index_name,
- vnm, sw_if_index);
- }
+
+ if (unformat (input, "%U",
+ unformat_vnet_sw_interface, vnm, &sw_if_index0))
+ {
+ swif = vnet_get_sw_interface (vnm, sw_if_index0);
+ sw_if_index = (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED) ?
+ swif->unnumbered_sw_if_index : sw_if_index0;
+ ia0 = ip4_interface_first_address (&ip4_main, sw_if_index, 0);
+ if (ia0)
+ {
+ vlib_cli_output (vm, "%=20s%=20s", "interface",
+ "source IP address");
+
+ vlib_cli_output (vm, "%=20U%=20U",
+ format_vnet_sw_if_index_name,
+ vnm, sw_if_index0, format_ip4_address, ia0);
+ }
+ else
+ vlib_cli_output (vm, "%=34s %=20U",
+ "No IPv4 address configured on",
+ format_vnet_sw_if_index_name, vnm, sw_if_index);
+ }
else
- break;
+ break;
}
-
+
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND (dhcp_proxy_address_show_command,static) = {
.path = "show dhcp option-82-address interface",
.short_help = "show dhcp option-82-address interface <interface>",
.function = dhcp_option_82_address_show_command_fn,
};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */