sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

Dressing up for release
by Olle E. Johansson 18 Jan '13

18 Jan '13

Hi! Trying to figure out what needs to be done in git and the wiki to get to release state: - README's and INSTALL "Welcome to Kamailio 4.0 - the best thing since sliced bread!" - Verify all module README's Do we have all functions covered, are all MI's and RPC's documented, pseudovariables in the cookbook? - Core Are all the settings documented in the core cookbook? There are some that have no explanation and some I think we have agreed to mark "deprecated" in there. - Selects Update documentation, maybe move to Kamailio wiki and have a 4.0 version document instead of one generic - LUA and other app api's Start documentes per version, move to Kamailio wiki Anything else? Everyone can contribute. Users, developers, hang-arounds! If you have commit access, fix it. Documentation files are excluded from code freeze. This is the time to update them, make sure they document everything you have in your module, maybe add a few examples. If you find a problem and are unsure on how to fix it, at least mail sr-dev. For the Wiki, anyone can edit. Again, if you are not sure, mail sr-dev. Let's prepare the best release of 2013!!! /O

1 0

git:master: Update to current module set for 4.0
by Olle E. Johansson 18 Jan '13

18 Jan '13

Module: sip-router Branch: master Commit: 5b6231d2d85f2a5a07b09e7e534f25e16f5e43b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b6231d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Fri Jan 18 09:41:42 2013 +0100 Update to current module set for 4.0 --- README-MODULES | 142 +++++++++++++++++++++++++++++--------------------------- 1 files changed, 73 insertions(+), 69 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5b6…

1 0

git:master: carrierroute: fix cross-compilation
by Ovidiu Sas 18 Jan '13

18 Jan '13

Module: sip-router Branch: master Commit: ebde66ba5f97ff5587e36b8e952b19a1becd08ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebde66b… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jan 17 19:19:37 2013 -0500 carrierroute: fix cross-compilation --- modules/carrierroute/Makefile | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/modules/carrierroute/Makefile b/modules/carrierroute/Makefile index d4bc7bc..b06441a 100644 --- a/modules/carrierroute/Makefile +++ b/modules/carrierroute/Makefile @@ -10,28 +10,22 @@ auto_gen= NAME=carrierroute.so ifeq ($(CROSS_COMPILE),) -BUILDER = $(shell which confuse-config) +CONFUSE_BUILDER = $(shell \ + if which confuse-config &>/dev/null;then \ + echo 'confuse-config'; \ + elif pkg-config --exists libconfuse; then \ + echo 'pkg-config libconfuse'; \ + fi) endif -ifeq ($(BUILDER),) - ifeq ($(CROSS_COMPILE),) - BUILDER = $(shell which pkg-config) - endif - ifeq ($(BUILDER),) - CONFUSEDEFS=-I$(LOCALBASE)/include - CONFUSELIBS=-L$(LOCALBASE)/lib -lconfuse - else - CONFUSEDEFS = $(shell pkg-config --cflags libconfuse) - CONFUSELIBS = $(shell pkg-config --libs libconfuse) - endif +ifeq ($(CONFUSE_BUILDER),) + DEFS += -I$(LOCALBASE)/include + LIBS += -L$(LOCALBASE)/lib -lconfuse else - CONFUSEDEFS = $(shell confuse-config --cflags) - CONFUSELIBS = $(shell confuse-config --libs) + DEFS += $(shell $(CONFUSE_BUILDER) --cflags) + LIBS += $(shell $(CONFUSE_BUILDER) --libs) endif -DEFS+=$(CONFUSEDEFS) -LIBS=$(CONFUSELIBS) - DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib

1 0

sipcapture uses reserved SQL key word as column name
by Øyvind Kolbu 17 Jan '13

17 Jan '13

Hi, while porting the MySQL schema to PostgreSQL I've found that it has a column named "authorization", which is a reserved SQL key word, see <http://www.postgresql.org/docs/9.2/static/sql-keywords-appendix.html>. MySQL should not have accepted it. Would be nice if this could be changed before 4.0. -- Øyvind Kolbu

3 4

kamailio core-cookbook update request for stateless core functions "send" and "forward"
by Klaus Feichtinger 17 Jan '13

17 Jan '13

Hello, could you please update the core cookbook for Kamailio release 4.0.0? The core functions "send" and "send_tcp" are including wrong examples of usage (since many previous versions....). You have written the example send("10.10.10.10:5070"); which is representing a socket, but not a hostname. However, caused by the double quote it is interpreted as a hostname and kamailio is trying to resolve that string. As it is (mostly) not resolvable, kamailio cannot start. Many newbies are having a problem with this fault. I guess forward() and its variations will have the same problem, when a target is added within the brackets (instead of using pseudo variables). I recommend adding a second example - one for an ip address based target and one for a domain target with correct forms e.g. send(10.10.10.10, 5070); send("kamailio.org"); thanks Klaus -------- Original-Nachricht -------- Betreff: kamailio doc update Datum: Tue, 15 Jan 2013 14:50:14 +0000 Von: FEICHTINGER Klaus <Klaus.FEICHTINGER(a)frequentis.com> An: Klaus Feichtinger (klaus.feichtinger(a)inode.at) <klaus.feichtinger(a)inode.at> Please update CORE Cookbook *send* Send the original SIP message to a specific destination in stateless mode. No changes are applied to received message, no Via header is added. Host can be an IP or hostname. Used protocol: UDP Parameter is mandatory and has string format. Example of usage: send("10.10.10.10:5070"); Is not a valid example. Correct would be: send(10.10.10.10, 5070); for IP address + port or send("myHost.com");

2 1

git:master: dialog: fix for is_in_profile()
by Daniel-Constantin Mierla 16 Jan '13

16 Jan '13

Module: sip-router Branch: master Commit: 83eafc8d8f767f4705d5f76ad0ffd4349a06c927 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83eafc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 16 22:37:08 2013 +0100 dialog: fix for is_in_profile() - function was broken, reported by Klaus Darilion --- modules_k/dialog/dlg_profile.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index 5b388d8..aad87a3 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -613,6 +613,7 @@ int is_dlg_in_profile(struct sip_msg *msg, struct dlg_profile_table *profile, struct dlg_cell *dlg; struct dlg_profile_link *linker; struct dlg_entry *d_entry; + int ret; /* get current dialog */ dlg = dlg_get_msg_dialog(msg); @@ -620,6 +621,7 @@ int is_dlg_in_profile(struct sip_msg *msg, struct dlg_profile_table *profile, if (dlg==NULL) return -1; + ret = -1; /* check the dialog linkers */ d_entry = &d_table->entries[dlg->h_entry]; dlg_lock( d_table, d_entry); @@ -627,10 +629,12 @@ int is_dlg_in_profile(struct sip_msg *msg, struct dlg_profile_table *profile, if (linker->profile==profile) { if (profile->has_value==0) { dlg_unlock( d_table, d_entry); + ret = 1; goto done; } else if (value && value->len==linker->hash_linker.value.len && memcmp(value->s,linker->hash_linker.value.s,value->len)==0){ dlg_unlock( d_table, d_entry); + ret = 1; goto done; } /* allow further search - maybe the dialog is inserted twice in @@ -642,7 +646,7 @@ int is_dlg_in_profile(struct sip_msg *msg, struct dlg_profile_table *profile, done: dlg_release(dlg); - return -1; + return ret; }

1 0

git:master: app_java:
by Konstantin Mosesov 16 Jan '13

16 Jan '13

Module: sip-router Branch: master Commit: db74e5230a26fdfebbf88f9575ea8a7636719743 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db74e52… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Wed Jan 16 21:08:42 2013 +0200 app_java: - code cleanup - changed all *alloc to pkg_*alloc - added examples module configuration file --- modules/app_java/config_examples/app_java.mod | 10 +++ modules/app_java/config_examples/modules.cfg | 1 + modules/app_java/global.h | 10 --- modules/app_java/java_examples/Makefile | 11 +--- modules/app_java/java_examples/build.sh | 3 +- modules/app_java/java_mod.c | 3 - modules/app_java/utils.c | 83 ++++--------------------- modules/app_java/utils.h | 2 - 8 files changed, 26 insertions(+), 97 deletions(-) diff --git a/modules/app_java/config_examples/app_java.mod b/modules/app_java/config_examples/app_java.mod new file mode 100644 index 0000000..b7606ff --- /dev/null +++ b/modules/app_java/config_examples/app_java.mod @@ -0,0 +1,10 @@ + +loadmodule "app_java.so" +modparam("app_java", "script_name", "/opt/kamailio/java/Kamailio.class") +modparam("app_java", "pkg_tree_path", "") +modparam("app_java", "class_name", "Kamailio") +#modparam("app_java", "java_options", "-Xdebug -Djava.compiler=NONE -Djava.class.path=/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java -Djava.library.path=/usr/lib/jvm/java-gcj-4.7:/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java -verbose:gc,class,jni") +#modparam("app_java", "java_options", "-Xdebug -Djava.compiler=NONE -Djava.class.path=/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java -verbose:gc,class,jni") +modparam("app_java", "java_options", "-Djava.compiler=NONE -Djava.class.path=/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java -verbose:gc,jni") +modparam("app_java", "child_init_method", "child_init") + diff --git a/modules/app_java/config_examples/modules.cfg b/modules/app_java/config_examples/modules.cfg new file mode 100644 index 0000000..94156ac --- /dev/null +++ b/modules/app_java/config_examples/modules.cfg @@ -0,0 +1 @@ +include_file "app_java.mod" diff --git a/modules/app_java/global.h b/modules/app_java/global.h index 4a08fb1..c4cf292 100644 --- a/modules/app_java/global.h +++ b/modules/app_java/global.h @@ -33,18 +33,8 @@ #define JAVA_MODULE_PKG_PATH "org/sip-router" -typedef struct threadData -{ - JNIEnv *env; - JavaVM *jvm; - char *sClassName; - int iThreadIndex; -} tstThreadData; - - JavaVM *jvm; JNIEnv *env; -tstThreadData *pThreadData; jclass KamailioClass; jclass KamailioClassInstanceRef; jobject KamailioClassInstance; diff --git a/modules/app_java/java_examples/Makefile b/modules/app_java/java_examples/Makefile index 12a99c7..f1a5eaa 100644 --- a/modules/app_java/java_examples/Makefile +++ b/modules/app_java/java_examples/Makefile @@ -1,16 +1,7 @@ -#JAVA_HOME=$(readlink -f $(which javac) | sed "s:bin/javac::") -#CLASSPATH := /usr/local/lib/kamailio/modules - -JAVA_HOME ?= /usr/lib/jvm/java-gcj-4.7/ - all: -# export JAVA_HOME=/usr/lib/jvm/java-gcj-4.7:/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java -# export CLASSPATH=/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java javac Kamailio.java clean: - rm -f *.class - - + rm -f Kamailio.class diff --git a/modules/app_java/java_examples/build.sh b/modules/app_java/java_examples/build.sh index 869038d..d1d7815 100755 --- a/modules/app_java/java_examples/build.sh +++ b/modules/app_java/java_examples/build.sh @@ -1,4 +1,3 @@ #!/bin/bash -make clean -make +make clean all diff --git a/modules/app_java/java_mod.c b/modules/app_java/java_mod.c index d354f52..443b063 100644 --- a/modules/app_java/java_mod.c +++ b/modules/app_java/java_mod.c @@ -163,7 +163,6 @@ static int mod_init(void) } -// KamailioClass = (*env)->FindClass(env, class_name.s); KamailioClass = (*env)->FindClass(env, class_object_name); pkg_free(class_object_name); if (!KamailioClass || (*env)->ExceptionCheck(env)) @@ -244,7 +243,6 @@ static int child_init(int rank) (*env)->DeleteLocalRef(env, child_init_id); - if (jvm != NULL) (*jvm)->DetachCurrentThread(jvm); @@ -261,7 +259,6 @@ static void mod_destroy(void) if (jvm != NULL) { - (*jvm)->DetachCurrentThread(jvm); (*jvm)->DestroyJavaVM(jvm); } diff --git a/modules/app_java/utils.c b/modules/app_java/utils.c index 688710e..dd12d1f 100644 --- a/modules/app_java/utils.c +++ b/modules/app_java/utils.c @@ -27,6 +27,8 @@ #include <time.h> #include "utils.h" +#include "../../sr_module.h" + char **split(char *str, char *sep) { @@ -35,11 +37,13 @@ char **split(char *str, char *sep) char *saveptr = NULL; int i; - buf = (char **)calloc(1, sizeof(char *)); + buf = (char **)pkg_realloc(NULL, sizeof(char *)); if (!buf) { - return '\0'; + LM_ERR("pkg_realloc() has failed. Not enough memory!\n"); + return NULL; } + memset(&buf, 0, sizeof(char *)); if (str == NULL) return buf; @@ -59,79 +63,18 @@ char **split(char *str, char *sep) if (token == NULL || !strcmp(token, "")) break; - buf = (char **)realloc(buf, (i+1) * sizeof(char *)); + buf = (char **)pkg_realloc(buf, (i+1) * sizeof(char *)); + if (!buf) + { + LM_ERR("pkg_realloc() has failed. Not enough memory!\n"); + return NULL; + } buf[i] = strdup(token); } - buf[i] = '\0'; + buf[i] = NULL; free(token); return buf; } - -char *rand_string(const int len) -{ - char *buf; - const char alphanum[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - int i; - - buf = (char *)calloc(len+1, sizeof(char)); - if (!buf) - return NULL; - - srand(time(NULL)); - for (i=0; i<len; i++) - { - buf[i] = alphanum[rand() % (sizeof(alphanum) - 1)]; - } - - buf[len] = '\0'; - - return buf; -} - -char *str_replace(char *original, char *pattern, char *replacement) -{ - char *oriptr, *patloc, *retptr, *returned; - size_t replen, patlen, orilen, patcnt, retlen, skplen; - - replen = strlen(replacement); - patlen = strlen(pattern); - orilen = strlen(original); - patcnt = 0; - - // find how many times the pattern occurs in the original string - for (oriptr = original; (patloc = strstr(oriptr, pattern)); oriptr = patloc + patlen) - { - patcnt++; - } - - // allocate memory for the new string - retlen = orilen + patcnt * (replen - patlen); - returned = (char *)malloc((retlen+1) * sizeof(char)); - - if (returned != NULL) - { - // copy the original string, - // replacing all the instances of the pattern - retptr = returned; - for (oriptr = original; (patloc = strstr(oriptr, pattern)); oriptr = patloc + patlen) - { - skplen = patloc - oriptr; - - // copy the section until the occurence of the pattern - strncpy(retptr, oriptr, skplen); - retptr += skplen; - - // copy the replacement - strncpy(retptr, replacement, replen); - retptr += replen; - } - - // copy the rest of the string. - strcpy(retptr, oriptr); - } - - return returned; -} diff --git a/modules/app_java/utils.h b/modules/app_java/utils.h index 1478137..f477716 100644 --- a/modules/app_java/utils.h +++ b/modules/app_java/utils.h @@ -28,7 +28,5 @@ #include <string.h> char **split(char *, char *); -char *rand_string(const int); -char *str_replace(char *, char *, char *); #endif

3 2

git:master: Revert "First commit (raw code) of new module: app_java ( Java Native Interface support for Kamailio)."
by Daniel-Constantin Mierla 16 Jan '13

16 Jan '13

Module: sip-router Branch: master Commit: ac2a3acddef3d5dd3a8033859f8a245624944d8e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac2a3ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 16 22:28:30 2013 +0100 Revert "First commit (raw code) of new module: app_java (Java Native Interface support for Kamailio)." This reverts commit 3cc85a3915ed69471966cf741d7cf2adee4f3b0b. - code in master is frozen for v4.0.0 --- modules/app_java/Makefile | 23 --- modules/app_java/build.sh | 9 - modules/app_java/global.h | 53 ----- modules/app_java/java_examples/Kamailio.java | 44 ----- modules/app_java/java_examples/Makefile | 16 -- modules/app_java/java_examples/build.sh | 4 - modules/app_java/java_iface.c | 43 ---- modules/app_java/java_iface.h | 35 ---- modules/app_java/java_mod.c | 268 -------------------------- modules/app_java/java_mod.h | 40 ---- modules/app_java/java_native_methods.c | 234 ---------------------- modules/app_java/java_native_methods.h | 36 ---- modules/app_java/java_support.c | 207 -------------------- modules/app_java/java_support.h | 37 ---- modules/app_java/utils.c | 137 ------------- modules/app_java/utils.h | 34 ---- 16 files changed, 0 insertions(+), 1220 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ac2…

1 0

git:master: Revert "app_java:"
by Daniel-Constantin Mierla 16 Jan '13

16 Jan '13

Module: sip-router Branch: master Commit: ebaab480a74fdde6036b471ec1175c4ad294c758 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ebaab48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 16 22:27:34 2013 +0100 Revert "app_java:" This reverts commit db74e5230a26fdfebbf88f9575ea8a7636719743. - code is master is fronzen for v4.0.0 --- modules/app_java/config_examples/app_java.mod | 10 --- modules/app_java/config_examples/modules.cfg | 1 - modules/app_java/global.h | 10 +++ modules/app_java/java_examples/Makefile | 11 +++- modules/app_java/java_examples/build.sh | 3 +- modules/app_java/java_mod.c | 3 + modules/app_java/utils.c | 83 +++++++++++++++++++++---- modules/app_java/utils.h | 2 + 8 files changed, 97 insertions(+), 26 deletions(-) diff --git a/modules/app_java/config_examples/app_java.mod b/modules/app_java/config_examples/app_java.mod deleted file mode 100644 index b7606ff..0000000 --- a/modules/app_java/config_examples/app_java.mod +++ /dev/null @@ -1,10 +0,0 @@ - -loadmodule "app_java.so" -modparam("app_java", "script_name", "/opt/kamailio/java/Kamailio.class") -modparam("app_java", "pkg_tree_path", "") -modparam("app_java", "class_name", "Kamailio") -#modparam("app_java", "java_options", "-Xdebug -Djava.compiler=NONE -Djava.class.path=/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java -Djava.library.path=/usr/lib/jvm/java-gcj-4.7:/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java -verbose:gc,class,jni") -#modparam("app_java", "java_options", "-Xdebug -Djava.compiler=NONE -Djava.class.path=/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java -verbose:gc,class,jni") -modparam("app_java", "java_options", "-Djava.compiler=NONE -Djava.class.path=/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java -verbose:gc,jni") -modparam("app_java", "child_init_method", "child_init") - diff --git a/modules/app_java/config_examples/modules.cfg b/modules/app_java/config_examples/modules.cfg deleted file mode 100644 index 94156ac..0000000 --- a/modules/app_java/config_examples/modules.cfg +++ /dev/null @@ -1 +0,0 @@ -include_file "app_java.mod" diff --git a/modules/app_java/global.h b/modules/app_java/global.h index c4cf292..4a08fb1 100644 --- a/modules/app_java/global.h +++ b/modules/app_java/global.h @@ -33,8 +33,18 @@ #define JAVA_MODULE_PKG_PATH "org/sip-router" +typedef struct threadData +{ + JNIEnv *env; + JavaVM *jvm; + char *sClassName; + int iThreadIndex; +} tstThreadData; + + JavaVM *jvm; JNIEnv *env; +tstThreadData *pThreadData; jclass KamailioClass; jclass KamailioClassInstanceRef; jobject KamailioClassInstance; diff --git a/modules/app_java/java_examples/Makefile b/modules/app_java/java_examples/Makefile index f1a5eaa..12a99c7 100644 --- a/modules/app_java/java_examples/Makefile +++ b/modules/app_java/java_examples/Makefile @@ -1,7 +1,16 @@ +#JAVA_HOME=$(readlink -f $(which javac) | sed "s:bin/javac::") +#CLASSPATH := /usr/local/lib/kamailio/modules + +JAVA_HOME ?= /usr/lib/jvm/java-gcj-4.7/ + all: +# export JAVA_HOME=/usr/lib/jvm/java-gcj-4.7:/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java +# export CLASSPATH=/opt/kamailio/lib/kamailio/modules:/opt/kamailio/java javac Kamailio.java clean: - rm -f Kamailio.class + rm -f *.class + + diff --git a/modules/app_java/java_examples/build.sh b/modules/app_java/java_examples/build.sh index d1d7815..869038d 100755 --- a/modules/app_java/java_examples/build.sh +++ b/modules/app_java/java_examples/build.sh @@ -1,3 +1,4 @@ #!/bin/bash -make clean all +make clean +make diff --git a/modules/app_java/java_mod.c b/modules/app_java/java_mod.c index 443b063..d354f52 100644 --- a/modules/app_java/java_mod.c +++ b/modules/app_java/java_mod.c @@ -163,6 +163,7 @@ static int mod_init(void) } +// KamailioClass = (*env)->FindClass(env, class_name.s); KamailioClass = (*env)->FindClass(env, class_object_name); pkg_free(class_object_name); if (!KamailioClass || (*env)->ExceptionCheck(env)) @@ -243,6 +244,7 @@ static int child_init(int rank) (*env)->DeleteLocalRef(env, child_init_id); + if (jvm != NULL) (*jvm)->DetachCurrentThread(jvm); @@ -259,6 +261,7 @@ static void mod_destroy(void) if (jvm != NULL) { + (*jvm)->DetachCurrentThread(jvm); (*jvm)->DestroyJavaVM(jvm); } diff --git a/modules/app_java/utils.c b/modules/app_java/utils.c index dd12d1f..688710e 100644 --- a/modules/app_java/utils.c +++ b/modules/app_java/utils.c @@ -27,8 +27,6 @@ #include <time.h> #include "utils.h" -#include "../../sr_module.h" - char **split(char *str, char *sep) { @@ -37,13 +35,11 @@ char **split(char *str, char *sep) char *saveptr = NULL; int i; - buf = (char **)pkg_realloc(NULL, sizeof(char *)); + buf = (char **)calloc(1, sizeof(char *)); if (!buf) { - LM_ERR("pkg_realloc() has failed. Not enough memory!\n"); - return NULL; + return '\0'; } - memset(&buf, 0, sizeof(char *)); if (str == NULL) return buf; @@ -63,18 +59,79 @@ char **split(char *str, char *sep) if (token == NULL || !strcmp(token, "")) break; - buf = (char **)pkg_realloc(buf, (i+1) * sizeof(char *)); - if (!buf) - { - LM_ERR("pkg_realloc() has failed. Not enough memory!\n"); - return NULL; - } + buf = (char **)realloc(buf, (i+1) * sizeof(char *)); buf[i] = strdup(token); } - buf[i] = NULL; + buf[i] = '\0'; free(token); return buf; } + +char *rand_string(const int len) +{ + char *buf; + const char alphanum[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + int i; + + buf = (char *)calloc(len+1, sizeof(char)); + if (!buf) + return NULL; + + srand(time(NULL)); + for (i=0; i<len; i++) + { + buf[i] = alphanum[rand() % (sizeof(alphanum) - 1)]; + } + + buf[len] = '\0'; + + return buf; +} + +char *str_replace(char *original, char *pattern, char *replacement) +{ + char *oriptr, *patloc, *retptr, *returned; + size_t replen, patlen, orilen, patcnt, retlen, skplen; + + replen = strlen(replacement); + patlen = strlen(pattern); + orilen = strlen(original); + patcnt = 0; + + // find how many times the pattern occurs in the original string + for (oriptr = original; (patloc = strstr(oriptr, pattern)); oriptr = patloc + patlen) + { + patcnt++; + } + + // allocate memory for the new string + retlen = orilen + patcnt * (replen - patlen); + returned = (char *)malloc((retlen+1) * sizeof(char)); + + if (returned != NULL) + { + // copy the original string, + // replacing all the instances of the pattern + retptr = returned; + for (oriptr = original; (patloc = strstr(oriptr, pattern)); oriptr = patloc + patlen) + { + skplen = patloc - oriptr; + + // copy the section until the occurence of the pattern + strncpy(retptr, oriptr, skplen); + retptr += skplen; + + // copy the replacement + strncpy(retptr, replacement, replen); + retptr += replen; + } + + // copy the rest of the string. + strcpy(retptr, oriptr); + } + + return returned; +} diff --git a/modules/app_java/utils.h b/modules/app_java/utils.h index f477716..1478137 100644 --- a/modules/app_java/utils.h +++ b/modules/app_java/utils.h @@ -28,5 +28,7 @@ #include <string.h> char **split(char *, char *); +char *rand_string(const int); +char *str_replace(char *, char *, char *); #endif

1 0

git:ez/newstuff: First commit (raw code) of new module: app_java ( Java Native Interface support for Kamailio).
by Konstantin Mosesov 16 Jan '13

16 Jan '13

Module: sip-router Branch: ez/newstuff Commit: 3cc85a3915ed69471966cf741d7cf2adee4f3b0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cc85a3… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Wed Jan 16 20:43:29 2013 +0200 First commit (raw code) of new module: app_java (Java Native Interface support for Kamailio). --- modules/app_java/Makefile | 23 +++ modules/app_java/build.sh | 9 + modules/app_java/global.h | 53 +++++ modules/app_java/java_examples/Kamailio.java | 44 +++++ modules/app_java/java_examples/Makefile | 16 ++ modules/app_java/java_examples/build.sh | 4 + modules/app_java/java_iface.c | 43 ++++ modules/app_java/java_iface.h | 35 ++++ modules/app_java/java_mod.c | 268 ++++++++++++++++++++++++++ modules/app_java/java_mod.h | 40 ++++ modules/app_java/java_native_methods.c | 234 ++++++++++++++++++++++ modules/app_java/java_native_methods.h | 36 ++++ modules/app_java/java_support.c | 207 ++++++++++++++++++++ modules/app_java/java_support.h | 37 ++++ modules/app_java/utils.c | 137 +++++++++++++ modules/app_java/utils.h | 34 ++++ 16 files changed, 1220 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3cc…

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013