[NETFILTER]: sip conntrack: minor cleanup

[linux-2.6] / include / linux / netfilter_ipv4 / ip_conntrack_sip.h

diff --git a/include/linux/netfilter_ipv4/ip_conntrack_sip.h b/include/linux/netfilter_ipv4/ip_conntrack_sip.h
index 913dad66c0fb81b2cb1b954b4b1312c1ba94d586..2a15eb51fd6b885c8b25a2785b5a12dcb299812f 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_conntrack_sip.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_sip.h
@@ -5,23 +5,15 @@
 #define SIP_PORT       5060
 #define SIP_TIMEOUT    3600
 
-#define POS_VIA                0
-#define POS_CONTACT    1
-#define POS_CONTENT    2
-#define POS_MEDIA      3
-#define POS_OWNER      4
-#define POS_CONNECTION 5
-#define POS_REQ_HEADER 6
-#define POS_SDP_HEADER 7
-
-struct sip_header_nfo {
-       const char      *lname;
-       const char      *sname;
-       const char      *ln_str;
-       size_t          lnlen;
-       size_t          snlen;
-       size_t          ln_strlen;
-       int             (*match_len)(const char *, const char *, int *);
+enum sip_header_pos {
+       POS_REQ_HEADER,
+       POS_VIA,
+       POS_CONTACT,
+       POS_CONTENT,
+       POS_MEDIA,
+       POS_OWNER,
+       POS_CONNECTION,
+       POS_SDP_HEADER,
 };
 
 extern unsigned int (*ip_nat_sip_hook)(struct sk_buff **pskb,
@@ -36,7 +28,7 @@ extern unsigned int (*ip_nat_sdp_hook)(struct sk_buff **pskb,
 extern int ct_sip_get_info(const char *dptr, size_t dlen,
                           unsigned int *matchoff,
                           unsigned int *matchlen,
-                          struct sip_header_nfo *hnfo);
+                          enum sip_header_pos pos);
 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);