From 77d5cae4d45d1def8f41d4e89b705d2953858643 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 25 Apr 2016 17:56:51 +0200 Subject: trafgen: proto: Add ICMPv6 header generation Support for generating simple ICMPv6 headers using the 'icmp6()/icmpv6()' trafgen generation function. Fields supported: mtype Message type (default: 0) Supported keywords: echorequest, echoreply code Code (default: 0) csum Message checksum (calculated by default) Examples: { eth(), ipv6(daddr=::1), icmpv6(echorequest), 42, 42, 0, 0 }' If not explicitely specified, the lower header is initialized as Ethernet. Suggested-by: Daniel Borkmann Signed-off-by: Tobias Klauser --- trafgen_parser.y | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'trafgen_parser.y') diff --git a/trafgen_parser.y b/trafgen_parser.y index d6c9e70..bf57f47 100644 --- a/trafgen_parser.y +++ b/trafgen_parser.y @@ -20,6 +20,7 @@ #include #include #include +#include #include "xmalloc.h" #include "trafgen_parser.tab.h" @@ -355,6 +356,7 @@ static void proto_add(enum proto_id pid) %token K_OPER K_SHA K_SPA K_THA K_TPA K_REQUEST K_REPLY K_PTYPE K_HTYPE %token K_PROT K_TTL K_DSCP K_ECN K_TOS K_LEN K_ID K_FLAGS K_FRAG K_IHL K_VER K_CSUM K_DF K_MF %token K_FLOW K_NEXT_HDR K_HOP_LIMIT +%token K_MTYPE K_CODE K_ECHO_REQUEST K_ECHO_REPLY %token K_SPORT K_DPORT %token K_SEQ K_ACK_SEQ K_DOFF K_CWR K_ECE K_URG K_ACK K_PSH K_RST K_SYN K_FIN K_WINDOW K_URG_PTR %token K_TPID K_TCI K_PCP K_DEI K_1Q K_1AD @@ -364,6 +366,7 @@ static void proto_add(enum proto_id pid) %token K_VLAN K_MPLS %token K_ARP %token K_IP4 K_IP6 +%token K_ICMP6 %token K_UDP K_TCP %token ',' '{' '}' '(' ')' '[' ']' ':' '-' '+' '*' '/' '%' '&' '|' '<' '>' '^' @@ -591,6 +594,7 @@ proto | arp_proto { } | ip4_proto { } | ip6_proto { } + | icmpv6_proto { } | udp_proto { } | tcp_proto { } ; @@ -812,6 +816,36 @@ ip6 : K_IP6 { proto_add(PROTO_IP6); } ; +icmpv6_proto + : icmp6 '(' icmp6_param_list ')' { } + +icmp6_param_list + : { } + | icmp6_field { } + | icmp6_field delimiter icmp6_param_list { } + ; + +icmp6_field + : K_MTYPE skip_white '=' skip_white number + { proto_field_set_u8(hdr, ICMPV6_TYPE, $5); } + | K_MTYPE skip_white '=' K_ECHO_REQUEST + { proto_field_set_u8(hdr, ICMPV6_TYPE, ICMPV6_ECHO_REQUEST); } + | K_ECHO_REQUEST + { proto_field_set_u8(hdr, ICMPV6_TYPE, ICMPV6_ECHO_REQUEST); } + | K_MTYPE skip_white '=' K_ECHO_REPLY + { proto_field_set_u8(hdr, ICMPV6_TYPE, ICMPV6_ECHO_REPLY); } + | K_ECHO_REPLY + { proto_field_set_u8(hdr, ICMPV6_TYPE, ICMPV6_ECHO_REPLY); } + | K_CODE skip_white '=' skip_white number + { proto_field_set_u8(hdr, ICMPV6_CODE, $5); } + | K_CSUM skip_white '=' skip_white number + { proto_field_set_be16(hdr, ICMPV6_CSUM, $5); } + ; + +icmp6 + : K_ICMP6 { proto_add(PROTO_ICMP6); } + ; + udp_proto : udp '(' udp_param_list ')' { } ; -- cgit v1.2.3-54-g00ecf