From: Zhiyong Yang Date: Mon, 6 May 2019 08:47:22 +0000 (-0400) Subject: ppp: simplify code using existing functions X-Git-Tag: v20.01-rc0~677 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=7107d7ef036b48cf910cb90a03978b9371b5c3ab;p=vpp.git ppp: simplify code using existing functions Change-Id: Ib5289b4d08ca7a8d7f786cc606e6c760735b2a35 Signed-off-by: Zhiyong Yang --- diff --git a/src/vnet/ppp/node.c b/src/vnet/ppp/node.c index 2f6e0c337e1..fd0105e4305 100644 --- a/src/vnet/ppp/node.c +++ b/src/vnet/ppp/node.c @@ -139,14 +139,11 @@ ppp_input (vlib_main_t * vm, b0 = vlib_get_buffer (vm, bi0); b1 = vlib_get_buffer (vm, bi1); - h0 = (void *) (b0->data + b0->current_data); - h1 = (void *) (b1->data + b1->current_data); + h0 = vlib_buffer_get_current (b0); + h1 = vlib_buffer_get_current (b1); - b0->current_data += sizeof (h0[0]); - b1->current_data += sizeof (h1[0]); - - b0->current_length -= sizeof (h0[0]); - b1->current_length -= sizeof (h1[0]); + vlib_buffer_advance (b0, sizeof (ppp_header_t)); + vlib_buffer_advance (b1, sizeof (ppp_header_t)); /* Index sparse array with network byte order. */ protocol0 = h0->protocol; @@ -227,10 +224,9 @@ ppp_input (vlib_main_t * vm, b0 = vlib_get_buffer (vm, bi0); - h0 = (void *) (b0->data + b0->current_data); + h0 = vlib_buffer_get_current (b0); - b0->current_data += sizeof (h0[0]); - b0->current_length -= sizeof (h0[0]); + vlib_buffer_advance (b0, sizeof (ppp_header_t)); protocol0 = h0->protocol; i0 = sparse_vec_index (rt->next_by_protocol, protocol0);