Merge pull request #236 from DavideAG/packetcapture_service

Documentation updated; fixed IP parsing in pbforwarder
polycube-network · Nov 17, 2019 · ac19182 · ac19182
2 parents 0951ca4 + ce82ecf
commit ac19182
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 13 deletions.
diff --git a/Documentation/components/k8s/pcn-kubernetes.rst b/Documentation/components/k8s/pcn-kubernetes.rst
@@ -269,7 +269,7 @@ In case you hit any problems, please follow the next steps to recover from a fai
     kubectl -n kube-system scale --replicas=1 deployment/kube-dns
 
 Inspect cube status inside pcn-k8s
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ``pcn-k8s`` is deployed as container in each node, sometimes it is helpful to inspect the cube(s) status
 within the container for debugging or other purposes. You can login into each node where the pcn-k8s container
 is running and get the information via :doc:`polycubectl<../../quickstart#docker>` command locally.
@@ -324,6 +324,6 @@ Developing
 Refer to :doc:`Developers <developers>`
 
 Compatibility
-----------
+-------------
 
 Pcn-k8s is compatible with all versions equal or greater than 1.9, although we recommend the latest version of Kubernetes.
diff --git a/Documentation/services/index.rst b/Documentation/services/index.rst
@@ -22,3 +22,4 @@ This folder contains the list of services (a.k.a. *cubes*) currently available i
     pcn-simplebridge/simplebridge
     pcn-simpleforwarder/simpleforwarder
     pcn-synflood/synflood
+    pcn-packetcapture/packetcapture
diff --git a/Documentation/services/pcn-bridge/example1/example1.rst b/Documentation/services/pcn-bridge/example1/example1.rst
@@ -1,5 +1,5 @@
 Example 1 - Connectivity
-=========
+========================
 
 In this example two network namespaces will be connected together by a bridge instance.
 

diff --git a/Documentation/services/pcn-bridge/example2/example2.rst b/Documentation/services/pcn-bridge/example2/example2.rst
@@ -1,5 +1,5 @@
 Example 2 - VLAN
-=========
+=================
 
 In this example we will test the VLAN support.
 We will configure two bridges, and four network namespaces connected to them.

diff --git a/Documentation/services/pcn-bridge/example3/example3.rst b/Documentation/services/pcn-bridge/example3/example3.rst
@@ -1,5 +1,5 @@
 Example 3 - Spanning Tree
-=========
+=========================
 
 In this example we will test the Spanning Tree configuration.
 We will have three bridges connected each other in a triangle.

diff --git a/...vices/pcn-packetcapture/Packetcapture.rst → ...vices/pcn-packetcapture/packetcapture.rst b/...vices/pcn-packetcapture/Packetcapture.rst → ...vices/pcn-packetcapture/packetcapture.rst
@@ -51,9 +51,9 @@ Attach to a cube port
 
 Now the packetcapture service is attached to the port *toveth1* of the bridge *br1*
 
-                +----------+
- veth1 ---**x**-|   br1    |------ veth2    
-                +----------+
+
+ veth1 ---**x**- |   br1    | ------ veth2    
+
 
 
 Filters

diff --git a/Documentation/services/pcn-pbforwarder/pbforwarder.rst b/Documentation/services/pcn-pbforwarder/pbforwarder.rst
@@ -15,6 +15,7 @@ Supported features:
   - IPv4 source/destination
   - L4 protocol (TCP/UDP)
   - L4 source/destination port
+
 - Possible actions:
   - Forward packet on a given output port
   - Send packet to slow path

diff --git a/src/services/pcn-packetcapture/src/Packetcapture.cpp b/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
   }
 

diff --git a/src/services/pcn-pbforwarder/src/Pbforwarder_dp_parsing.c b/src/services/pcn-pbforwarder/src/Pbforwarder_dp_parsing.c
@@ -90,16 +90,18 @@ 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)
+      uint8_t header_len = 4 * ip->ihl;       //we have to redefine this to avoid errors
+      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;