aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/hdlc
diff options
context:
space:
mode:
authorZhiyong Yang <zhiyong.yang@intel.com>2019-05-28 01:26:05 -0400
committerZhiyong Yang <zhiyong.yang@intel.com>2019-05-28 01:54:47 -0400
commit21dc4ece174006a779436362b12d539a91404c8e (patch)
tree23dfb349a13ce2d1fd03e2737d5a1604883a729d /src/vnet/hdlc
parentcbd0824d6cec24ea2502ffdcdb1666d090f848cf (diff)
hdlc_input: simplify code using existing functions
Change-Id: I527b7e43dfba05eab12591e193f07f5036e33f56 Signed-off-by: Zhiyong Yang <zhiyong.yang@intel.com>
Diffstat (limited to 'src/vnet/hdlc')
-rw-r--r--src/vnet/hdlc/node.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/vnet/hdlc/node.c b/src/vnet/hdlc/node.c
index 6b8c7c625d2..d36b09d4dcd 100644
--- a/src/vnet/hdlc/node.c
+++ b/src/vnet/hdlc/node.c
@@ -139,8 +139,8 @@ hdlc_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);
protocol0 = h0->protocol;
protocol1 = h1->protocol;
@@ -152,11 +152,8 @@ hdlc_input (vlib_main_t * vm,
len0 += protocol0 == clib_host_to_net_u16 (HDLC_PROTOCOL_osi);
len1 += protocol1 == clib_host_to_net_u16 (HDLC_PROTOCOL_osi);
- b0->current_data += len0;
- b1->current_data += len1;
-
- b0->current_length -= len0;
- b1->current_length -= len1;
+ vlib_buffer_advance (b0, len0);
+ vlib_buffer_advance (b1, len1);
/* Index sparse array with network byte order. */
sparse_vec_index2 (rt->next_by_protocol, protocol0, protocol1, &i0,
@@ -235,7 +232,7 @@ hdlc_input (vlib_main_t * vm,
b0 = vlib_get_buffer (vm, bi0);
- h0 = (void *) (b0->data + b0->current_data);
+ h0 = vlib_buffer_get_current (b0);
protocol0 = h0->protocol;
@@ -243,8 +240,7 @@ hdlc_input (vlib_main_t * vm,
len0 = sizeof (h0[0]);
len0 += protocol0 == clib_host_to_net_u16 (HDLC_PROTOCOL_osi);
- b0->current_data += len0;
- b0->current_length -= len0;
+ vlib_buffer_advance (b0, len0);
i0 = sparse_vec_index (rt->next_by_protocol, protocol0);
.highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
/*
 * Copyright (c) 2019 Cisco and/or its affiliates.
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at:
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#ifndef included_ip_format_fns_h
#define included_ip_format_fns_h

static inline u8 *format_vl_api_ip6_address_t (u8 * s, va_list * args);
static inline u8 *format_vl_api_ip4_address_t (u8 * s, va_list * args);

#include <vnet/ip/format.h>
#include <vnet/ip/ip_types.api_types.h>

static inline u8 *
format_vl_api_ip6_address_t (u8 * s, va_list * args)
{
  vl_api_ip6_address_t *a = va_arg (*args, vl_api_ip6_address_t *);
  u32 indent __attribute__((unused)) = va_arg (*args, u32);

  return format (s, "%U", format_ip6_address, a);
}

static inline u8 *
format_vl_api_ip6_prefix_t (u8 * s, va_list * args)
{
  vl_api_ip6_prefix_t *a = va_arg (*args, vl_api_ip6_prefix_t *);
  u32 indent __attribute__((unused)) = va_arg (*args, u32);

  return format (s, "%U/%u", format_ip6_address, &a->address, a->len);
}

static inline u8 *
format_vl_api_ip4_address_t (u8 * s, va_list * args)
{
  vl_api_ip4_address_t *a = va_arg (*args, vl_api_ip4_address_t *);
  u32 indent __attribute__((unused)) = va_arg (*args, u32);

  return format (s, "%U", format_ip4_address, a);
}

static inline u8 *
format_vl_api_ip4_prefix_t (u8 * s, va_list * args)
{
  vl_api_ip4_prefix_t *a = va_arg (*args, vl_api_ip4_prefix_t *);
  u32 indent __attribute__((unused)) = va_arg (*args, u32);

  return format (s, "%U/%u", format_ip4_address, &a->address, a->len);
}

static inline u8 *
format_vl_api_address_t (u8 * s, va_list * args)
{
  vl_api_address_t *a = va_arg (*args, vl_api_address_t *);
  u32 indent __attribute__((unused)) = va_arg (*args, u32);

  switch (a->af)  {
  case ADDRESS_IP4:
    return format(s, "%U", format_ip4_address, &a->un.ip4);
  case ADDRESS_IP6:
    return format(s, "%U", format_ip6_address, &a->un.ip6);
    }
  return format (s, "");
}

static inline u8 *
format_vl_api_prefix_t (u8 * s, va_list * args)
{
  vl_api_prefix_t *a = va_arg (*args, vl_api_prefix_t *);
  u32 indent __attribute__((unused)) = va_arg (*args, u32);

  return format (s, "%U/%u", format_vl_api_address_t, &a->address, indent, a->len);
}

static inline u8 *
format_vl_api_address_with_prefix_t (u8 * s, va_list * args)
{
  return format_vl_api_prefix_t (s, args);
}

static inline u8 *
format_vl_api_ip4_address_with_prefix_t (u8 * s, va_list * args)
{
        return format_vl_api_ip4_prefix_t (s, args);
}

static inline u8 *
format_vl_api_ip6_address_with_prefix_t (u8 * s, va_list * args)
{
        return format_vl_api_ip6_prefix_t (s, args);
}

#endif