Add 'icmp' support to nbpf

Author: cardigliano

userland/nbpf/grammar.y

@@ -49,7 +49,7 @@ static void yyerror(const char *msg) {
 %token OUTER INNER
 %token DST SRC HOST
 %token NET NETMASK PORT PORTRANGE PROTO
-%token ARP RARP IP SCTP TCP UDP
+%token ARP RARP IP SCTP TCP UDP ICMP
 %token NUM
 %token DIR
 %token LINK
@@ -177,6 +177,7 @@ pname:	  LINK			{ $$ = NBPF_Q_LINK; }
 	| SCTP			{ $$ = NBPF_Q_SCTP; }
 	| TCP			{ $$ = NBPF_Q_TCP; }
 	| UDP			{ $$ = NBPF_Q_UDP; }
+	| ICMP			{ $$ = NBPF_Q_ICMP; }
 	| IPV6			{ $$ = NBPF_Q_IPV6; }
 	;
 other:	  VLAN pnum		{ $$.n = nbpf_create_vlan_node($2); }

userland/nbpf/nbpf.h

@@ -85,6 +85,7 @@ nbpf_ip_addr;
 #define NBPF_Q_UDP		5
 #define NBPF_Q_IPV6		6
 #define NBPF_Q_GTP		7
+#define NBPF_Q_ICMP		8
 
 /* Direction qualifiers */
 #define NBPF_Q_SRC		1

userland/nbpf/nbpftest.c

@@ -76,6 +76,7 @@ static char *proto_to_string(int protoq) {
   switch(protoq) {
     case NBPF_Q_LINK: return "Eth";
     case NBPF_Q_IP:   return "IP";
+    case NBPF_Q_ICMP: return "ICMP";
     case NBPF_Q_SCTP: return "SCTP";
     case NBPF_Q_TCP:  return "TCP";
     case NBPF_Q_UDP:  return "UDP";

userland/nbpf/parser.c

@@ -530,6 +530,7 @@ nbpf_node_t *nbpf_create_protocol_node(int proto) {
     case NBPF_Q_TCP:
     case NBPF_Q_UDP:
     case NBPF_Q_SCTP:
+    case NBPF_Q_ICMP:
       n->qualifiers.protocol = NBPF_Q_IP;
       break;
     default:
@@ -542,6 +543,7 @@ nbpf_node_t *nbpf_create_protocol_node(int proto) {
     case NBPF_Q_TCP:  n->protocol = 6;      break;
     case NBPF_Q_UDP:  n->protocol = 17;     break;
     case NBPF_Q_SCTP: n->protocol = 132;    break;
+    case NBPF_Q_ICMP: n->protocol = 1;      break;
     //default:     n->protocol = proto;  break;
   }
 

userland/nbpf/scanner.l

@@ -74,6 +74,7 @@ ip	return IP;
 sctp	return SCTP;
 tcp	return TCP;
 udp	return UDP;
+icmp	return ICMP;
 ip6	return IPV6;
 
 host	return HOST;