1 files changed, 43 insertions, 6 deletions

diff --git a/include/linux/netfilter/nf_conntrack_sip.h b/include/linux/netfilter/nf_conntrack_sip.h
index b94de3d60303..9131cbc9b9de 100644
--- a/include/linux/netfilter/nf_conntrack_sip.h
+++ b/include/linux/netfilter/nf_conntrack_sip.h
@@ -13,12 +13,42 @@ enum sip_header_pos {
         POS_VIA,
         POS_CONTACT,
         POS_CONTENT,
-        POS_MEDIA,
-        POS_OWNER_IP4,
-        POS_CONNECTION_IP4,
-        POS_OWNER_IP6,
-        POS_CONNECTION_IP6,
-        POS_SDP_HEADER,
+};
+
+struct sip_header {
+        const char      *name;
+        const char      *cname;
+        const char      *search;
+        unsigned int    len;
+        unsigned int    clen;
+        unsigned int    slen;
+        int             (*match_len)(const struct nf_conn *ct,
+                                     const char *dptr, const char *limit,
+                                     int *shift);
+};
+
+#define __SIP_HDR(__name, __cname, __search, __match)                   \
+{                                                                       \
+        .name           = (__name),                                     \
+        .len            = sizeof(__name) - 1,                           \
+        .cname          = (__cname),                                    \
+        .clen           = (__cname) ? sizeof(__cname) - 1 : 0,          \
+        .search         = (__search),                                   \
+        .slen           = (__search) ? sizeof(__search) - 1 : 0,        \
+        .match_len      = (__match),                                    \
+}
+
+#define SDP_HDR(__name, __search, __match) \
+        __SIP_HDR(__name, NULL, __search, __match)
+
+enum sdp_header_types {
+        SDP_HDR_UNSPEC,
+        SDP_HDR_VERSION,
+        SDP_HDR_OWNER_IP4,
+        SDP_HDR_CONNECTION_IP4,
+        SDP_HDR_OWNER_IP6,
+        SDP_HDR_CONNECTION_IP6,
+        SDP_HDR_MEDIA,
 };
 
 extern unsigned int (*nf_nat_sip_hook)(struct sk_buff *skb,
@@ -36,5 +66,12 @@ extern int ct_sip_lnlen(const char *line, const char *limit);
 extern const char *ct_sip_search(const char *needle, const char *haystack,
                                  size_t needle_len, size_t haystack_len,
                                  int case_sensitive);
+
+extern int ct_sip_get_sdp_header(const struct nf_conn *ct, const char *dptr,
+                                 unsigned int dataoff, unsigned int datalen,
+                                 enum sdp_header_types type,
+                                 enum sdp_header_types term,
+                                 unsigned int *matchoff, unsigned int *matchlen);
+
 #endif /* __KERNEL__ */
 #endif /* __NF_CONNTRACK_SIP_H__ */