X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6_hop_by_hop.h;h=6ae2a2e8b519b387be6e384fecbac93ef457f175;hb=2af0e3a74c40e5df946813324574ccc18feb4761;hp=9574f0a5eccf63f2e0d5228b06ae6af26ebfc73f;hpb=fdd81af6afe6c782ad2c1a139210378badec626b;p=vpp.git

diff --git a/src/vnet/ip/ip6_hop_by_hop.h b/src/vnet/ip/ip6_hop_by_hop.h
index 9574f0a5ecc..6ae2a2e8b51 100644
--- a/src/vnet/ip/ip6_hop_by_hop.h
+++ b/src/vnet/ip/ip6_hop_by_hop.h
@@ -214,7 +214,7 @@ ioam_flow_add (u8 encap, u8 * flow_name)
   u8 i;
 
   pool_get (hm->flows, flow);
-  memset (flow, 0, sizeof (flow_data_t));
+  clib_memset (flow, 0, sizeof (flow_data_t));
 
   index = flow - hm->flows;
   strncpy ((char *) flow->flow_name, (char *) flow_name, 31);
@@ -230,6 +230,42 @@ ioam_flow_add (u8 encap, u8 * flow_name)
   return (index);
 }
 
+always_inline ip6_hop_by_hop_option_t *
+ip6_hbh_get_option (ip6_hop_by_hop_header_t * hbh0, u8 option_to_search)
+{
+  ip6_hop_by_hop_option_t *opt0, *limit0;
+  u8 type0;
+
+  if (!hbh0)
+    return NULL;
+
+  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
+  limit0 = (ip6_hop_by_hop_option_t *)
+    ((u8 *) hbh0 + ((hbh0->length + 1) << 3));
+
+  /* Scan the set of h-b-h options, process ones that we understand */
+  while (opt0 < limit0)
+    {
+      type0 = opt0->type;
+      switch (type0)
+	{
+	case 0:		/* Pad1 */
+	  opt0 = (ip6_hop_by_hop_option_t *) ((u8 *) opt0) + 1;
+	  continue;
+	case 1:		/* PadN */
+	  break;
+	default:
+	  if (type0 == option_to_search)
+	    return opt0;
+	  break;
+	}
+      opt0 =
+	(ip6_hop_by_hop_option_t *) (((u8 *) opt0) + opt0->length +
+				     sizeof (ip6_hop_by_hop_option_t));
+    }
+  return NULL;
+}
+
 #endif /* __included_ip6_hop_by_hop_ioam_h__ */
 
 /*