Fix bug in nfpcapd for ipv6 processing

Author: phaag

src/nfpcapd/flowdump.c

@@ -122,10 +122,10 @@ static int StorePcapFlow(flowParam_t *flowParam, struct FlowNode *Node) {
         if (Node->flowKey.version == AF_INET6) {
             UpdateRecordSize(EXipv6FlowSize);
             PushExtension(recordHeader, EXipv6Flow, ipv6Flow);
-            ipv6Flow->srcAddr[0] = Node->flowKey.src_addr.v6[0];
-            ipv6Flow->srcAddr[1] = Node->flowKey.src_addr.v6[1];
-            ipv6Flow->dstAddr[0] = Node->flowKey.dst_addr.v6[0];
-            ipv6Flow->dstAddr[1] = Node->flowKey.dst_addr.v6[1];
+            ipv6Flow->srcAddr[0] = ntohll(Node->flowKey.src_addr.v6[0]);
+            ipv6Flow->srcAddr[1] = ntohll(Node->flowKey.src_addr.v6[1]);
+            ipv6Flow->dstAddr[0] = ntohll(Node->flowKey.dst_addr.v6[0]);
+            ipv6Flow->dstAddr[1] = ntohll(Node->flowKey.dst_addr.v6[1]);
         } else {
             UpdateRecordSize(EXipv4FlowSize);
             PushExtension(recordHeader, EXipv4Flow, ipv4Flow);

src/nfpcapd/pcaproc.c

@@ -921,7 +921,7 @@ int ProcessPacket(packetParam_t *packetParam, const struct pcap_pkthdr *hdr, con
     }
 
     if (ipPayloadEnd < dataptr || ipPayloadEnd > eodata) {
-        LogError("payload data length error. Check line: %u", __LINE__);
+        LogError("ProcessPacket() payload data length error line: %u", __LINE__);
         Free_Node(Node);
         goto END_FUNC;
     }
@@ -1085,7 +1085,7 @@ int ProcessPacket(packetParam_t *packetParam, const struct pcap_pkthdr *hdr, con
             // move IP to tun IP
             Node->tun_src_addr = Node->flowKey.src_addr;
             Node->tun_dst_addr = Node->flowKey.dst_addr;
-            Node->tun_proto = IPPROTO_IPIP;
+            Node->tun_proto = IPPROTO_IPV6;
             Node->tun_ip_version = Node->flowKey.version;
 
             dbg_printf("  IPIPv6 tunnel - inner IPv6:\n");