Fixed ip options in Pbforwarder and solved temporary directory in packetcapture service

Author: DavideAG

src/services/pcn-packetcapture/src/Packetcapture.cpp

@@ -131,12 +131,13 @@ void Packetcapture::writeDump(const std::vector<uint8_t> &packet){
         if (folder == 0){
           folder = getenv("TEMPDIR");
           if (folder == 0){
-            folder = "/tmp/";
+            folder = "/tmp";
           }
         }
       }
     }
     temp_folder = std::string(folder);
+    temp_folder.append("/");
     random_number = std::to_string(rand()%1000);    //to avoid two files that using the same name
   }
 

src/services/pcn-pbforwarder/src/Pbforwarder_dp_parsing.c

@@ -90,16 +90,17 @@ static __always_inline int handle_rx(struct CTXTYPE *ctx,
     pkt->srcIp = ip->saddr;
     pkt->dstIp = ip->daddr;
 #if LEVEL == 4
+    uint8_t header_len = 4 * ip->ihl;
     if (ip->protocol == IPPROTO_TCP) {
-      tcp = data + sizeof(*ethernet) + sizeof(*ip);
-      if (data + sizeof(*ethernet) + sizeof(*ip) + sizeof(*tcp) > data_end)
+      tcp = data + sizeof(*ethernet) + header_len;
+      if (data + sizeof(*ethernet) + header_len + sizeof(*tcp) > data_end)
         return RX_DROP;
       pkt->l4proto = IPPROTO_TCP;
       pkt->srcPort = tcp->source;
       pkt->dstPort = tcp->dest;
     } else if (ip->protocol == IPPROTO_UDP) {
-      udp = data + sizeof(*ethernet) + sizeof(*ip);
-      if (data + sizeof(*ethernet) + sizeof(*ip) + sizeof(*udp) > data_end)
+      udp = data + sizeof(*ethernet) + header_len;
+      if (data + sizeof(*ethernet) + header_len + sizeof(*udp) > data_end)
         return RX_DROP;
       pkt->l4proto = IPPROTO_UDP;
       pkt->srcPort = udp->source;