[sr-dev] git:master: modules/nathelper: use ser_memmem from core

[Juha Heinanen]

Module: sip-router
Branch: master
Commit: 2d4d54b4f4593dee767db240a3eafce5489d628f
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d4d54b4f4593dee767db240a3eafce5489d628f

Author: Juha Heinanen <jh at tutpro.com>
Committer: Juha Heinanen <jh at tutpro.com>
Date:   Wed Apr  9 20:45:12 2014 +0300

modules/nathelper: use ser_memmem from core

---

 modules/nathelper/nhelpr_funcs.c |   31 -------------------------------
 modules/nathelper/nhelpr_funcs.h |    1 -
 2 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/modules/nathelper/nhelpr_funcs.c b/modules/nathelper/nhelpr_funcs.c
index bfc3828..0efef68 100644
--- a/modules/nathelper/nhelpr_funcs.c
+++ b/modules/nathelper/nhelpr_funcs.c
@@ -282,37 +282,6 @@ done:
 	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.
diff --git a/modules/nathelper/nhelpr_funcs.h b/modules/nathelper/nhelpr_funcs.h
index 6778668..1c6b1ea 100644
--- a/modules/nathelper/nhelpr_funcs.h
+++ b/modules/nathelper/nhelpr_funcs.h
@@ -30,7 +30,6 @@
 
 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_contact_uri(struct sip_msg *, struct sip_uri *, contact_t **);
 
 #endif