[NETFILTER]: nf_conntrack_sip: create signalling expectations

Create expectations for incoming signalling connections when seeing
a REGISTER request. This is needed when the registrar uses a
different source port number for signalling messages and for receiving
incoming calls from other endpoints than the registrar.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 21 insertions, 1 deletions

diff --git a/include/linux/netfilter/nf_conntrack_sip.h b/include/linux/netfilter/nf_conntrack_sip.h
index 87e402825dba..7cc84ed0c5da 100644
--- a/include/linux/netfilter/nf_conntrack_sip.h
+++ b/include/linux/netfilter/nf_conntrack_sip.h
@@ -5,6 +5,17 @@
 #define SIP_PORT        5060
 #define SIP_TIMEOUT     3600
 
+struct nf_ct_sip_master {
+        unsigned int    register_cseq;
+};
+
+enum sip_expectation_classes {
+        SIP_EXPECT_SIGNALLING,
+        SIP_EXPECT_AUDIO,
+        __SIP_EXPECT_MAX
+};
+#define SIP_EXPECT_MAX  (__SIP_EXPECT_MAX - 1)
+
 struct sip_handler {
         const char      *method;
         unsigned int    len;
@@ -59,6 +70,7 @@ enum sip_header_types {
         SIP_HDR_TO,
         SIP_HDR_CONTACT,
         SIP_HDR_VIA,
+        SIP_HDR_EXPIRES,
         SIP_HDR_CONTENT_LENGTH,
 };
 
@@ -75,6 +87,12 @@ enum sdp_header_types {
 extern unsigned int (*nf_nat_sip_hook)(struct sk_buff *skb,
                                        const char **dptr,
                                        unsigned int *datalen);
+extern unsigned int (*nf_nat_sip_expect_hook)(struct sk_buff *skb,
+                                              const char **dptr,
+                                              unsigned int *datalen,
+                                              struct nf_conntrack_expect *exp,
+                                              unsigned int matchoff,
+                                              unsigned int matchlen);
 extern unsigned int (*nf_nat_sdp_hook)(struct sk_buff *skb,
                                        const char **dptr,
                                        unsigned int *datalen,
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 922877133598..4a4f870d2a5e 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -46,6 +46,7 @@ union nf_conntrack_expect_proto {
 #include <linux/netfilter/nf_conntrack_pptp.h>
 #include <linux/netfilter/nf_conntrack_h323.h>
 #include <linux/netfilter/nf_conntrack_sane.h>
+#include <linux/netfilter/nf_conntrack_sip.h>
 
 /* per conntrack: application helper private data */
 union nf_conntrack_help {
@@ -54,6 +55,7 @@ union nf_conntrack_help {
         struct nf_ct_pptp_master ct_pptp_info;
         struct nf_ct_h323_master ct_h323_info;
         struct nf_ct_sane_master ct_sane_info;
+        struct nf_ct_sip_master ct_sip_info;
 };
 
 #include <linux/types.h>
@@ -76,7 +78,7 @@ do {									\
 struct nf_conntrack_helper;
 
 /* Must be kept in sync with the classes defined by helpers */
-#define NF_CT_MAX_EXPECT_CLASSES        1
+#define NF_CT_MAX_EXPECT_CLASSES        2
 
 /* nf_conn feature for connections that have a helper */
 struct nf_conn_help {