aboutsummaryrefslogtreecommitdiffstats
path: root/hicn-plugin/src/parser.h
diff options
context:
space:
mode:
authorAlberto Compagno <acompagn+fdio@cisco.com>2019-06-06 11:03:13 +0200
committerMauro Sardara <msardara@cisco.com>2019-06-06 12:32:46 +0000
commit8400addd9e21b9ba5a7e210f2cd27842dbf8cd38 (patch)
tree79f4ff9a75af0bfe99f5ee6f07cf9eccae3fd584 /hicn-plugin/src/parser.h
parent8129b8ce13febec6730fa48abbe6d3fcae3bc27f (diff)
[HICN-212] Fixed bug on ipv6 test in udp faces. Uniformed test with a single function.
Change-Id: I79cd1c0233c841d5eb111ba6247f46c7510a09bb Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'hicn-plugin/src/parser.h')
-rw-r--r--hicn-plugin/src/parser.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/hicn-plugin/src/parser.h b/hicn-plugin/src/parser.h
index cbc5696ba..0d72780ae 100644
--- a/hicn-plugin/src/parser.h
+++ b/hicn-plugin/src/parser.h
@@ -42,8 +42,7 @@ hicn_interest_parse_pkt (vlib_buffer_t * pkt, hicn_name_t * name,
hicn_header_t *pkt_hdr = vlib_buffer_get_current (pkt);
*pkt_hdrp = pkt_hdr;
u8 *ip_pkt = vlib_buffer_get_current (pkt);
- u8 version = (pkt_hdr->v4.ip.version_ihl & 0xf0) >> 4;
- *isv6 = ((version & 2) >> 1);
+ *isv6 = hicn_is_v6 (pkt_hdr);
u8 ip_proto = (*isv6) * IPPROTO_IPV6;
u8 next_proto_offset = 6 + (1 - *isv6) * 3;
//in the ipv6 header the next header field is at byte 6
@@ -72,8 +71,7 @@ hicn_data_parse_pkt (vlib_buffer_t * pkt, hicn_name_t * name,
*pkt_hdrp = pkt_hdr;
*pkt_hdrp = pkt_hdr;
u8 *ip_pkt = vlib_buffer_get_current (pkt);
- u8 version = (pkt_hdr->v4.ip.version_ihl & 0xf0) >> 4;
- *isv6 = ((version & 2) >> 1);
+ *isv6 = hicn_is_v6 (pkt_hdr);
u8 ip_proto = (*isv6) * IPPROTO_IPV6;
/*
* in the ipv6 header the next header field is at byte 6 in the ipv4