Move helper functions out from overly long nathelper.c.

modules_s/nathelper/nathelper.c

@@ -593,142 +593,6 @@ isnulladdr(str *sx, int pf)
 	return (sx->len == 7 && memcmp("0.0.0.0", sx->s, 7) == 0);
 }
 
-/*
- * ser_memmem() returns the location of the first occurrence of data
- * pattern b2 of size len2 in memory block b1 of size len1 or
- * NULL if none is found. Obtained from NetBSD.
- */
-static void *
-ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2)
-{
-
-	/* Initialize search pointer */
-	char *sp = (char *) b1;
-
-	/* Initialize pattern pointer */
-	char *pp = (char *) b2;
-
-	/* Initialize end of search address space pointer */
-	char *eos = sp + len1 - len2;
-
-	/* Sanity check */
-	if(!(b1 && b2 && len1 && len2))
-		return NULL;
-
-	while (sp <= eos) {
-		if (*sp == *pp)
-			if (memcmp(sp, pp, len2) == 0)
-				return sp;
-
-			sp++;
-	}
-
-	return NULL;
-}
-
-/*
- * Some helper functions taken verbatim from tm module.
- */
-
-/*
- * Extract tag from To header field of a response
- * assumes the to header is already parsed, so
- * make sure it really is before calling this function
- */
-static inline int
-get_to_tag(struct sip_msg* _m, str* _tag)
-{
-
-	if (!_m->to) {
-		LOG(L_ERR, "get_to_tag(): To header field missing\n");
-		return -1;
-	}
-
-	if (get_to(_m)->tag_value.len) {
-		_tag->s = get_to(_m)->tag_value.s;
-		_tag->len = get_to(_m)->tag_value.len;
-	} else {
-		_tag->s = 0; /* fixes gcc 4.0 warnings */
-		_tag->len = 0;
-	}
-
-	return 0;
-}
-
-
-/*
- * Extract tag from From header field of a request
- */
-static inline int
-get_from_tag(struct sip_msg* _m, str* _tag)
-{
-
-	if (parse_from_header(_m) == -1) {
-		LOG(L_ERR, "get_from_tag(): Error while parsing From header\n");
-		return -1;
-	}
-
-	if (get_from(_m)->tag_value.len) {
-		_tag->s = get_from(_m)->tag_value.s;
-		_tag->len = get_from(_m)->tag_value.len;
-	} else {
-		_tag->len = 0;
-	}
-
-	return 0;
-}
-
-/*
- * Extract Call-ID value
- * assumes the callid header is already parsed
- * (so make sure it is, before calling this function or
- * it might fail even if the message _has_ a callid)
- */
-static inline int
-get_callid(struct sip_msg* _m, str* _cid)
-{
-
-	if ((parse_headers(_m, HDR_CALLID_F, 0) == -1)) {
-		LOG(L_ERR, "get_callid(): parse_headers() failed\n");
-		return -1;
-	}
-
-	if (_m->callid == NULL) {
-		LOG(L_ERR, "get_callid(): Call-ID not found\n");
-		return -1;
-	}
-
-	_cid->s = _m->callid->body.s;
-	_cid->len = _m->callid->body.len;
-	trim(_cid);
-	return 0;
-}
-
-/*
- * Extract URI from the Contact header field
- */
-static inline int
-get_contact_uri(struct sip_msg* _m, struct sip_uri *uri, contact_t** _c)
-{
-
-	if ((parse_headers(_m, HDR_CONTACT_F, 0) == -1) || !_m->contact)
-		return -1;
-	if (!_m->contact->parsed && parse_contact(_m->contact) < 0) {
-		DBG("nathelper: Error while parsing Contact body\n");
-		return -1;
-	}
-	*_c = ((contact_body_t*)_m->contact->parsed)->contacts;
-	if (*_c == NULL) {
-		DBG("nathelper: Error while parsing Contact body\n");
-		return -1;
-	}
-	if (parse_uri((*_c)->uri.s, (*_c)->uri.len, uri) < 0 || uri->host.len <= 0) {
-		DBG("nathelper: Error while parsing Contact URI\n");
-		return -1;
-	}
-	return 0;
-}
-
 /*
  * Replaces ip:port pair in the Contact: field with the source address
  * of the packet.

modules_s/nathelper/nhelpr_funcs.c

@@ -46,9 +46,10 @@
 #include "../../udp_server.h"
 #include "../../pt.h"
 #include "../../parser/msg_parser.h"
-
-
-
+#include "../../trim.h"
+#include "../../parser/parse_from.h"
+#include "../../parser/contact/parse_contact.h"
+#include "../../parser/parse_uri.h"
 
 #define READ(val) \
 	(*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24))
@@ -201,3 +202,137 @@ error:
 	return -1;
 }
 
+/*
+ * ser_memmem() returns the location of the first occurrence of data
+ * pattern b2 of size len2 in memory block b1 of size len1 or
+ * NULL if none is found. Obtained from NetBSD.
+ */
+void *
+ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2)
+{
+
+        /* Initialize search pointer */
+        char *sp = (char *) b1;
+
+        /* Initialize pattern pointer */
+        char *pp = (char *) b2;
+
+        /* Initialize end of search address space pointer */
+        char *eos = sp + len1 - len2;
+
+        /* Sanity check */
+        if(!(b1 && b2 && len1 && len2))
+                return NULL;
+
+        while (sp <= eos) {
+                if (*sp == *pp)
+                        if (memcmp(sp, pp, len2) == 0)
+                                return sp;
+
+                        sp++;
+        }
+
+        return NULL;
+}
+
+/*
+ * Some helper functions taken verbatim from tm module.
+ */
+
+/*
+ * Extract Call-ID value
+ * assumes the callid header is already parsed
+ * (so make sure it is, before calling this function or
+ * it might fail even if the message _has_ a callid)
+ */
+int
+get_callid(struct sip_msg* _m, str* _cid)
+{
+
+        if ((parse_headers(_m, HDR_CALLID_F, 0) == -1)) {
+                LOG(L_ERR, "get_callid(): parse_headers() failed\n");
+                return -1;
+        }
+
+        if (_m->callid == NULL) {
+                LOG(L_ERR, "get_callid(): Call-ID not found\n");
+                return -1;
+        }
+
+        _cid->s = _m->callid->body.s;
+        _cid->len = _m->callid->body.len;
+        trim(_cid);
+        return 0;
+}
+
+/*
+ * Extract tag from To header field of a response
+ * assumes the to header is already parsed, so
+ * make sure it really is before calling this function
+ */
+int
+get_to_tag(struct sip_msg* _m, str* _tag)
+{
+
+        if (!_m->to) {
+                LOG(L_ERR, "get_to_tag(): To header field missing\n");
+                return -1;
+        }
+
+        if (get_to(_m)->tag_value.len) {
+                _tag->s = get_to(_m)->tag_value.s;
+                _tag->len = get_to(_m)->tag_value.len;
+        } else {
+                _tag->s = 0; /* fixes gcc 4.0 warnings */
+                _tag->len = 0;
+        }
+
+        return 0;
+}
+
+/*
+ * Extract tag from From header field of a request
+ */
+int
+get_from_tag(struct sip_msg* _m, str* _tag)
+{
+
+        if (parse_from_header(_m) == -1) {
+                LOG(L_ERR, "get_from_tag(): Error while parsing From header\n");
+                return -1;
+        }
+
+        if (get_from(_m)->tag_value.len) {
+                _tag->s = get_from(_m)->tag_value.s;
+                _tag->len = get_from(_m)->tag_value.len;
+        } else {
+                _tag->len = 0;
+        }
+
+        return 0;
+}
+
+/*
+ * Extract URI from the Contact header field
+ */
+int
+get_contact_uri(struct sip_msg* _m, struct sip_uri *uri, contact_t** _c)
+{
+
+        if ((parse_headers(_m, HDR_CONTACT_F, 0) == -1) || !_m->contact)
+                return -1;
+        if (!_m->contact->parsed && parse_contact(_m->contact) < 0) {
+                DBG("nathelper: Error while parsing Contact body\n");
+                return -1;
+        }
+        *_c = ((contact_body_t*)_m->contact->parsed)->contacts;
+        if (*_c == NULL) {
+                DBG("nathelper: Error while parsing Contact body\n");
+                return -1;
+        }
+        if (parse_uri((*_c)->uri.s, (*_c)->uri.len, uri) < 0 || uri->host.len <= 0) {
+                DBG("nathelper: Error while parsing Contact URI\n");
+                return -1;
+        }
+        return 0;
+}

modules_s/nathelper/nhelpr_funcs.h

@@ -32,8 +32,14 @@
 
 #include "../../str.h"
 #include "../../parser/msg_parser.h"
+#include "../../parser/contact/contact.h"
 
 int extract_body(struct sip_msg * , str *);
 int check_content_type(struct sip_msg * );
+void *ser_memmem(const void *, const void *, size_t, size_t);
+int get_callid(struct sip_msg *, str *);
+int get_to_tag(struct sip_msg *, str *);
+int get_from_tag(struct sip_msg *, str *);
+int get_contact_uri(struct sip_msg *, struct sip_uri *, contact_t **);
 
 #endif