xplico: updated

3 files changed, 94 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a76e5982c45..7b4566351ed3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Nov 17 18:56:47 UTC 2017
+# Mon Nov 20 19:22:04 UTC 2017
 pkgbase = xplico
 	pkgdesc = Internet Traffic Decoder. Network Forensic Analysis Tool (NFAT)
 	pkgver = 1.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.xplico.org/
 	install = xplico.install
 	arch = i686
@@ -33,7 +33,9 @@ pkgbase = xplico
 	optdepends = ghostpdl: reconstruct document printed with network printer
 	optdepends = videosnarf: decode VoIP based on RTP
 	source = https://github.com/xplico/xplico/archive/v1.2.1.tar.gz
+	source = 1ed30f322b764cbb6d027775c275e4f0a5616a3f.patch
 	md5sums = b16b1f1dc8520b3bbc5c3cd9439ca38a
+	md5sums = 813a0ca8e13f674d3458173f90ac2e94
 
 pkgname = xplico
 
diff --git a/1ed30f322b764cbb6d027775c275e4f0a5616a3f.patch b/1ed30f322b764cbb6d027775c275e4f0a5616a3f.patch
new file mode 100644
index 000000000000..b07479c70956
--- /dev/null
+++ b/1ed30f322b764cbb6d027775c275e4f0a5616a3f.patch
@@ -0,0 +1,82 @@
+From 1ed30f322b764cbb6d027775c275e4f0a5616a3f Mon Sep 17 00:00:00 2001
+From: Gianluca Costa <g.costa@xplico.org>
+Date: Sun, 30 Jul 2017 11:35:12 +0200
+Subject: [PATCH] upgrade to nDPI 2.0
+
+---
+ dissectors/tcp_ca/tcp_analysis.c  | 4 ++--
+ dissectors/tcp_grbg/tcp_garbage.c | 2 +-
+ dissectors/udp_ca/udp_analysis.c  | 4 ++--
+ dissectors/udp_grbg/udp_garbage.c | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/dissectors/tcp_ca/tcp_analysis.c b/dissectors/tcp_ca/tcp_analysis.c
+index 25d2a71..e17ccc2 100644
+--- a/dissectors/tcp_ca/tcp_analysis.c
++++ b/dissectors/tcp_ca/tcp_analysis.c
+@@ -524,7 +524,7 @@ static int TcpCaDisFlow(tca_flow *ifw, packet *pkt)
+             else {
+                 ifw->l7prot_id = nDPIPacket(pkt, ifw->l7flow, ifw->l7dst, ifw->l7src, ifw->priv.ipv6);
+             }
+-            if (ifw->l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
++            if (ifw->l7prot_id.app_protocol != NDPI_PROTOCOL_UNKNOWN) {
+                 ifw->stage++;
+                 ifw->l7prot_type = ndpi_protocol2name(ndpi, ifw->l7prot_id, ifw->buff, TCP_CA_LINE_MAX_SIZE);
+             }
+@@ -618,7 +618,7 @@ static packet *TcpCaDisFlowEnd(tca_flow *ifw)
+         else
+             ifw->l7prot_id = ndpi_guess_undetected_protocol(ndpi, IPPROTO_TCP, ifw->priv.ip_s.uint32, ifw->priv.ip_d.uint32, ifw->priv.port_s, ifw->priv.port_d);
+         
+-        if (ifw->l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
++        if (ifw->l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
+             ifw->l7prot_type = ndpi_protocol2name(ndpi, ifw->l7prot_id, ifw->buff, TCP_CA_LINE_MAX_SIZE);
+         }
+         else {
+diff --git a/dissectors/tcp_grbg/tcp_garbage.c b/dissectors/tcp_grbg/tcp_garbage.c
+index 22cbddf..ad00a2f 100644
+--- a/dissectors/tcp_grbg/tcp_garbage.c
++++ b/dissectors/tcp_grbg/tcp_garbage.c
+@@ -675,7 +675,7 @@ packet *TcpGrbDissector(int flow_id)
+                 else {
+                     l7prot_id = nDPIPacket(pkt, l7flow, l7dst, l7src, ipv4);
+                 }
+-                if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
++                if (l7prot_id.app_protocol != NDPI_PROTOCOL_UNKNOWN) {
+                     stage++;
+                     l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, TCP_CFG_LINE_MAX_SIZE);
+                 }
+diff --git a/dissectors/udp_ca/udp_analysis.c b/dissectors/udp_ca/udp_analysis.c
+index e270eaf..d68bc1d 100644
+--- a/dissectors/udp_ca/udp_analysis.c
++++ b/dissectors/udp_ca/udp_analysis.c
+@@ -431,7 +431,7 @@ static packet *UdpCaDissector(int flow_id)
+             else {
+                 l7prot_id = nDPIPacket(pkt, l7flow, l7dst, l7src, ipv4);
+             }
+-            if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
++            if (l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
+                 l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, UDP_CA_LINE_MAX_SIZE);
+             }
+         }
+@@ -451,7 +451,7 @@ static packet *UdpCaDissector(int flow_id)
+         else
+             l7prot_id = ndpi_guess_undetected_protocol(ndpi, IPPROTO_UDP, priv.ip_s.uint32, priv.ip_d.uint32, priv.port_s, priv.port_d);
+         
+-        if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
++        if (l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
+             l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, UDP_CA_LINE_MAX_SIZE);
+         }
+         else {
+diff --git a/dissectors/udp_grbg/udp_garbage.c b/dissectors/udp_grbg/udp_garbage.c
+index 0e9592b..e26fdc1 100644
+--- a/dissectors/udp_grbg/udp_garbage.c
++++ b/dissectors/udp_grbg/udp_garbage.c
+@@ -373,7 +373,7 @@ packet* UdpGrbDissector(int flow_id)
+             else {
+                 l7prot_id = nDPIPacket(pkt, l7flow, l7dst, l7src, ipv4);
+             }
+-            if (l7prot_id.protocol != NDPI_PROTOCOL_UNKNOWN) {
++            if (l7prot_id.master_protocol != NDPI_PROTOCOL_UNKNOWN) {
+                 l7prot_type = ndpi_protocol2name(ndpi, l7prot_id, buff, UDP_CFG_LINE_MAX_SIZE);
+             }
+         }
diff --git a/PKGBUILD b/PKGBUILD
index b5c4a73c5266..5ac9dce2dd2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: robertfoster
 pkgname=xplico
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 pkgdesc="Internet Traffic Decoder. Network Forensic Analysis Tool (NFAT)"
 url="http://www.xplico.org/"
@@ -31,12 +31,15 @@ depends=(
 optdepends=('geoip-database-extra: City database for geoip IP location lookups'
 	    'ghostpdl: reconstruct document printed with network printer'
 	    'videosnarf: decode VoIP based on RTP')
-source=("https://github.com/xplico/xplico/archive/v$pkgver.tar.gz")
+source=("https://github.com/xplico/xplico/archive/v$pkgver.tar.gz"
+	1ed30f322b764cbb6d027775c275e4f0a5616a3f.patch
+)
 install=xplico.install
 
 build() {
   cd $pkgname-$pkgver 
-  make
+  patch -Np1 -i ../1ed30f322b764cbb6d027775c275e4f0a5616a3f.patch
+  make -j1
 }
 
 package() {
@@ -46,3 +49,5 @@ package() {
 }
 
 md5sums=('b16b1f1dc8520b3bbc5c3cd9439ca38a')
+md5sums=('b16b1f1dc8520b3bbc5c3cd9439ca38a'
+         '813a0ca8e13f674d3458173f90ac2e94')