Merge pull request #155 from BonnyAD9/add-vlan-to-flow-key

Add VLAN ID to flow key

Author: cejkato2

include/ipfixprobe/packet.hpp

@@ -59,6 +59,7 @@ struct Packet : public Record {
    uint8_t     ip_flags;
    ipaddr_t    src_ip;
    ipaddr_t    dst_ip;
+   uint32_t    vlan_id;
 
    uint16_t    src_port;
    uint16_t    dst_port;
@@ -93,7 +94,7 @@ struct Packet : public Record {
       ts({0}),
       dst_mac(), src_mac(), ethertype(0),
       ip_len(0), ip_payload_len(0), ip_version(0), ip_ttl(0),
-      ip_proto(0), ip_tos(0), ip_flags(0), src_ip({0}), dst_ip({0}),
+      ip_proto(0), ip_tos(0), ip_flags(0), src_ip({0}), dst_ip({0}), vlan_id(0),
       src_port(0), dst_port(0), tcp_flags(0), tcp_window(0),
       tcp_options(0), tcp_mss(0), tcp_seq(0), tcp_ack(0),
       packet(nullptr), packet_len(0), packet_len_wire(0),

input/parser.cpp

@@ -88,15 +88,23 @@ inline uint16_t parse_eth_hdr(const u_char *data_ptr, uint16_t data_len, Packet
    memcpy(pkt->dst_mac, eth->h_dest, 6);
    memcpy(pkt->src_mac, eth->h_source, 6);
 
-   if (ethertype == ETH_P_8021AD) {
+   // set the default value in case there is no VLAN ID
+   pkt->vlan_id = 0;
+
+   if (ethertype == ETH_P_8021AD || ethertype == ETH_P_8021Q) {
       if (4 > data_len - hdr_len) {
          throw "Parser detected malformed packet";
       }
-      DEBUG_CODE(uint16_t vlan = ntohs(*(uint16_t *) (data_ptr + hdr_len)));
-      DEBUG_MSG("\t802.1ad field:\n");
+
+      // only the most outer vlan id is extracted
+      uint16_t vlan = ntohs(*(uint16_t *) (data_ptr + hdr_len));
+      // VLAN ID is the 12 LSb
+      pkt->vlan_id = vlan & 0x0FFF;
+
+      DEBUG_MSG("\t%s field:\n", (ethertype == ETH_P_8021AD ? "802.1ad" : "802.1q"));
       DEBUG_MSG("\t\tPriority:\t%u\n",    ((vlan & 0xE000) >> 12));
       DEBUG_MSG("\t\tCFI:\t\t%u\n",       ((vlan & 0x1000) >> 11));
-      DEBUG_MSG("\t\tVLAN:\t\t%u\n",      (vlan & 0x0FFF));
+      DEBUG_MSG("\t\tVLAN:\t\t%u\n",      (pkt->vlan_id));
 
       hdr_len += 4;
       ethertype = ntohs(*(uint16_t *) (data_ptr + hdr_len - 2));

storage/cache.cpp

@@ -492,13 +492,15 @@ bool NHTFlowCache::create_hash_key(Packet &pkt)
       key_v4->dst_port = pkt.dst_port;
       key_v4->src_ip = pkt.src_ip.v4;
       key_v4->dst_ip = pkt.dst_ip.v4;
+      key_v4->vlan_id = pkt.vlan_id;
 
       key_v4_inv->proto = pkt.ip_proto;
       key_v4_inv->ip_version = IP::v4;
       key_v4_inv->src_port = pkt.dst_port;
       key_v4_inv->dst_port = pkt.src_port;
       key_v4_inv->src_ip = pkt.dst_ip.v4;
       key_v4_inv->dst_ip = pkt.src_ip.v4;
+      key_v4_inv->vlan_id = pkt.vlan_id;
 
       m_keylen = sizeof(flow_key_v4_t);
       return true;
@@ -512,13 +514,15 @@ bool NHTFlowCache::create_hash_key(Packet &pkt)
       key_v6->dst_port = pkt.dst_port;
       memcpy(key_v6->src_ip, pkt.src_ip.v6, sizeof(pkt.src_ip.v6));
       memcpy(key_v6->dst_ip, pkt.dst_ip.v6, sizeof(pkt.dst_ip.v6));
+      key_v6->vlan_id = pkt.vlan_id;
 
       key_v6_inv->proto = pkt.ip_proto;
       key_v6_inv->ip_version = IP::v6;
       key_v6_inv->src_port = pkt.dst_port;
       key_v6_inv->dst_port = pkt.src_port;
       memcpy(key_v6_inv->src_ip, pkt.dst_ip.v6, sizeof(pkt.dst_ip.v6));
       memcpy(key_v6_inv->dst_ip, pkt.src_ip.v6, sizeof(pkt.src_ip.v6));
+      key_v6_inv->vlan_id = pkt.vlan_id;
 
       m_keylen = sizeof(flow_key_v6_t);
       return true;

storage/cache.hpp

@@ -48,6 +48,7 @@ struct __attribute__((packed)) flow_key_v4_t {
    uint8_t ip_version;
    uint32_t src_ip;
    uint32_t dst_ip;
+   uint16_t vlan_id;
 };
 
 struct __attribute__((packed)) flow_key_v6_t {
@@ -57,6 +58,7 @@ struct __attribute__((packed)) flow_key_v6_t {
    uint8_t ip_version;
    uint8_t src_ip[16];
    uint8_t dst_ip[16];
+   uint16_t vlan_id;
 };
 
 #define MAX_KEY_LENGTH (max<size_t>(sizeof(flow_key_v4_t), sizeof(flow_key_v6_t)))