ipsec: USE_EXTENDED_SEQ_NUM -> USE_ESN

[vpp.git] / src / vnet / dhcp / dhcp4_proxy_node.c

diff --git a/src/vnet/dhcp/dhcp4_proxy_node.c b/src/vnet/dhcp/dhcp4_proxy_node.c
index c1ae514..d0def3f 100644 (file)
--- a/src/vnet/dhcp/dhcp4_proxy_node.c
+++ b/src/vnet/dhcp/dhcp4_proxy_node.c
@@ -181,7 +181,14 @@ dhcp_proxy_to_server_input (vlib_main_t * vm,
              goto do_trace;
            }
 
-         space_left = vlib_buffer_chain_linearize (vm, b0);
+         if (!vlib_buffer_chain_linearize (vm, b0))
+           {
+             error0 = DHCP_PROXY_ERROR_PKT_TOO_BIG;
+             next0 = DHCP_PROXY_TO_SERVER_INPUT_NEXT_DROP;
+             pkts_too_big++;
+             goto do_trace;
+           }
+         space_left = vlib_buffer_space_left_at_end (vm, b0);
          /* cant parse chains...
           * and we need some space for option 82*/
          if ((b0->flags & VLIB_BUFFER_NEXT_PRESENT) != 0 ||
@@ -351,6 +358,7 @@ dhcp_proxy_to_server_input (vlib_main_t * vm,
                  u32 ci0;
 
                  c0 = vlib_buffer_copy (vm, b0);
+                 VLIB_BUFFER_TRACE_TRAJECTORY_INIT (c0);
                  ci0 = vlib_get_buffer_index (vm, c0);
                  server = &proxy->dhcp_servers[ii];
 
@@ -377,6 +385,7 @@ dhcp_proxy_to_server_input (vlib_main_t * vm,
                    {
                      dhcp_proxy_trace_t *tr;
 
+                     vlib_buffer_copy_trace_flag (vm, b0, ci0);
                      tr = vlib_add_trace (vm, node, c0, sizeof (*tr));
                      tr->which = 0;    /* to server */
                      tr->error = error0;
@@ -528,8 +537,8 @@ dhcp_proxy_to_client_input (vlib_main_t * vm,
       if (1 /* dpm->insert_option_82 */ )
        {
          /* linearize needed to "unclone" and scan options */
-         int space_left = vlib_buffer_chain_linearize (vm, b0);
-         if ((b0->flags & VLIB_BUFFER_NEXT_PRESENT) != 0 || space_left < 0)
+         int rv = vlib_buffer_chain_linearize (vm, b0);
+         if ((b0->flags & VLIB_BUFFER_NEXT_PRESENT) != 0 || !rv)
            {
              error0 = DHCP_PROXY_ERROR_PKT_TOO_BIG;
              goto drop_packet;