netfilter: nf_conntrack_sip: pass data offset to NAT functions

[net-next-2.6.git] / include / linux / netfilter / nf_conntrack_sip.h

diff --git a/include/linux/netfilter/nf_conntrack_sip.h b/include/linux/netfilter/nf_conntrack_sip.h
index 7cc84ed0c5da331d2fa4cccbf66fa6fa4bbd2124..2c6950b8bf7e5919de050e7abb7e69b453fc98d6 100644 (file)
--- a/include/linux/netfilter/nf_conntrack_sip.h
+++ b/include/linux/netfilter/nf_conntrack_sip.h
@@ -7,22 +7,37 @@
 
 struct nf_ct_sip_master {
        unsigned int    register_cseq;
+       unsigned int    invite_cseq;
 };
 
 enum sip_expectation_classes {
        SIP_EXPECT_SIGNALLING,
        SIP_EXPECT_AUDIO,
+       SIP_EXPECT_VIDEO,
        __SIP_EXPECT_MAX
 };
 #define SIP_EXPECT_MAX (__SIP_EXPECT_MAX - 1)
 
+struct sdp_media_type {
+       const char                      *name;
+       unsigned int                    len;
+       enum sip_expectation_classes    class;
+};
+
+#define SDP_MEDIA_TYPE(__name, __class)                                        \
+{                                                                      \
+       .name   = (__name),                                             \
+       .len    = sizeof(__name) - 1,                                   \
+       .class  = (__class),                                            \
+}
+
 struct sip_handler {
        const char      *method;
        unsigned int    len;
-       int             (*request)(struct sk_buff *skb,
+       int             (*request)(struct sk_buff *skb, unsigned int dataoff,
                                   const char **dptr, unsigned int *datalen,
                                   unsigned int cseq);
-       int             (*response)(struct sk_buff *skb,
+       int             (*response)(struct sk_buff *skb, unsigned int dataoff,
                                    const char **dptr, unsigned int *datalen,
                                    unsigned int cseq, unsigned int code);
 };
@@ -85,18 +100,46 @@ enum sdp_header_types {
 };
 
 extern unsigned int (*nf_nat_sip_hook)(struct sk_buff *skb,
+                                      unsigned int dataoff,
                                       const char **dptr,
                                       unsigned int *datalen);
 extern unsigned int (*nf_nat_sip_expect_hook)(struct sk_buff *skb,
+                                             unsigned int dataoff,
                                              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,
-                                      struct nf_conntrack_expect *exp);
+extern unsigned int (*nf_nat_sdp_addr_hook)(struct sk_buff *skb,
+                                           unsigned int dataoff,
+                                           const char **dptr,
+                                           unsigned int *datalen,
+                                           unsigned int sdpoff,
+                                           enum sdp_header_types type,
+                                           enum sdp_header_types term,
+                                           const union nf_inet_addr *addr);
+extern unsigned int (*nf_nat_sdp_port_hook)(struct sk_buff *skb,
+                                           unsigned int dataoff,
+                                           const char **dptr,
+                                           unsigned int *datalen,
+                                           unsigned int matchoff,
+                                           unsigned int matchlen,
+                                           u_int16_t port);
+extern unsigned int (*nf_nat_sdp_session_hook)(struct sk_buff *skb,
+                                              unsigned int dataoff,
+                                              const char **dptr,
+                                              unsigned int *datalen,
+                                              unsigned int sdpoff,
+                                              const union nf_inet_addr *addr);
+extern unsigned int (*nf_nat_sdp_media_hook)(struct sk_buff *skb,
+                                            unsigned int dataoff,
+                                            const char **dptr,
+                                            unsigned int *datalen,
+                                            struct nf_conntrack_expect *rtp_exp,
+                                            struct nf_conntrack_expect *rtcp_exp,
+                                            unsigned int mediaoff,
+                                            unsigned int medialen,
+                                            union nf_inet_addr *rtp_addr);
 
 extern int ct_sip_parse_request(const struct nf_conn *ct,
                                const char *dptr, unsigned int datalen,