From d01b62924e13dd609ce177faad89b61170f6155c Mon Sep 17 00:00:00 2001
From: Hans Dedecker <dedeckeh@gmail.com>
Date: Fri, 3 Aug 2018 17:51:23 +0200
Subject: [PATCH] xtables-addons: rtsp: fix compile warning/issue

Fix compile issue with Werror:

nf_conntrack_rtsp.c:667:39: error: implicit declaration of function 'nf_ct_zone' [-Werror=implicit-function-declaration]
   exp_ct = nf_ct_expect_find_get(net, nf_ct_zone(ct), &t);

Fix compile warning:

nf_conntrack_rtsp.c:474:2: warning: enumeration value 'IP_CT_DIR_MAX' not handled in switch [-Wswitch]
  switch (CTINFO2DIR(ctinfo)) {
  ^~~~~~

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---
 net/xtables-addons/patches/100-add-rtsp-conntrack.patch | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
index 7ac2cc563..e280ec447 100644
--- a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
+++ b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
@@ -235,7 +235,7 @@
 +#endif /* _NETFILTER_MIME_H */
 --- /dev/null
 +++ b/extensions/rtsp/nf_conntrack_rtsp.c
-@@ -0,0 +1,732 @@
+@@ -0,0 +1,735 @@
 +/*
 + * RTSP extension for IP connection tracking
 + * (C) 2003 by Tom Marshall <tmarshall at real.com>
@@ -287,6 +287,7 @@
 +#include <net/netfilter/nf_conntrack.h>
 +#include <net/netfilter/nf_conntrack_expect.h>
 +#include <net/netfilter/nf_conntrack_helper.h>
++#include <net/netfilter/nf_conntrack_zones.h>
 +#include "nf_conntrack_rtsp.h"
 +
 +#define NF_NEED_STRNCASECMP
@@ -878,6 +879,8 @@
 +		ret = help_in(skb, rb_ptr, datalen, ct, ctinfo);
 +#endif
 +		break;
++	default:
++		break;
 +	}
 +
 +	spin_unlock_bh(&rtsp_buffer_lock);