sr-dev May 2014

sr-dev@lists.kamailio.org

34 participants
238 discussions

git:master: Added app_java to modules list

by Konstantin Mosesov

Module: sip-router Branch: master Commit: ea56896eb36a8fffd96bb4ec1e5af4d5defa24d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea56896… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Sat May 24 17:16:07 2014 +0400 Added app_java to modules list --- README-MODULES | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/README-MODULES b/README-MODULES index 2499370..88b4807 100644 --- a/README-MODULES +++ b/README-MODULES @@ -37,6 +37,7 @@ app_lua Lang :: Execute embedded LUA scripts app_mono Lang :: Execute embedded MONO scripts (like C#, Java, javascript) app_perl Lang :: Embedded perl script support app_python Lang :: Execute embedded Python scripts +app_java Lang :: Execute embedded Java compiled code async Asynchronus SIP request handling functions auth MD5 digest authentication support auth_db Authentication using a database module

10 years, 7 months

git:master: Added requirements for modules app_python and app_java

by Konstantin Mosesov

Module: sip-router Branch: master Commit: 815dbe7a4b0fa93380bf75bfb30afe5e174360c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=815dbe7… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Sat May 24 17:14:30 2014 +0400 Added requirements for modules app_python and app_java --- INSTALL | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/INSTALL b/INSTALL index b69b409..dcf8766 100644 --- a/INSTALL +++ b/INSTALL @@ -131,6 +131,8 @@ Requirements: - libsctp devel headers - if you want to compile the SCTP transport in the core - libssl devel headers (openssl project) - if you want to compule the TLS module - linunistring - for the Websockets module +- python and devel headers for python module +- jdk and gcj for java module OS Notes:

10 years, 7 months

websockets in kamailio

by mustafa safe

Please help us by video explaining how to configure websockets in kamailio I'm trying to do the since two months ago, and i failure

10 years, 7 months

git:master: Added application name in error description.

by Konstantin Mosesov

Module: sip-router Branch: master Commit: e8f67102e75ed3ef310afe66849dee96e064f033 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8f6710… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Sat May 24 05:59:56 2014 +0400 Added application name in error description. --- modules/app_java/global.h | 2 + modules/app_java/java_iface.c | 14 ++++---- modules/app_java/java_mod.c | 8 ++-- modules/app_java/java_msgobj.c | 32 +++++++++--------- modules/app_java/java_native_methods.c | 56 ++++++++++++++++---------------- modules/app_java/java_sig_parser.c | 52 +++++++++++++++--------------- modules/app_java/java_support.c | 16 ++++---- modules/app_java/utils.c | 4 +- 8 files changed, 93 insertions(+), 91 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e8f…

10 years, 7 months

git:master: New generated file

by Konstantin Mosesov

Module: sip-router Branch: master Commit: 379f2ae99385996a167495e9a3f5075d5de68baa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=379f2ae… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Sat May 24 06:00:47 2014 +0400 New generated file --- modules/app_java/README | 154 ++++++++++++++++++++++++---------------------- 1 files changed, 80 insertions(+), 74 deletions(-) diff --git a/modules/app_java/README b/modules/app_java/README index 5bbad0b..d7fd0fc 100644 --- a/modules/app_java/README +++ b/modules/app_java/README @@ -6,7 +6,7 @@ Edited by Konstantin Mosesov - Copyright © 2013 Konstantin Mosesov + Copyright © 2013, 2014 Konstantin Mosesov __________________________________________________________________ Table of Contents @@ -21,7 +21,7 @@ Konstantin Mosesov 3. Java runtime - 3.1. + 3.1. JRE or JDK is required to use this module 4. Parameters @@ -84,7 +84,7 @@ Chapter 1. Admin Guide 3. Java runtime - 3.1. + 3.1. JRE or JDK is required to use this module 4. Parameters @@ -155,11 +155,12 @@ Chapter 1. Admin Guide 3. Java runtime - 3.1. + 3.1. JRE or JDK is required to use this module -3.1. +3.1. JRE or JDK is required to use this module - Java runtime library (JRE or JDK) is required to use this module. + Java runtime library (JRE and JDK for building app_java) is required to + use this module. 4. Parameters @@ -205,24 +206,25 @@ modparam("app_java", "java_options", "-Djava.compiler=NONE") Example 1.4. Set java_options parameter (live configuration) ... # Assumes "application java folder" is located at /opt/kamailio/java -modparam("app_java", "java_options", "-Djava.compiler=NONE -Djava.class.path=/pa -th/to/kamailio/modules:/opt/kamailio/java:/opt/kamailio/java/kamailio.jar") +modparam("app_java", "java_options", "-Djava.compiler=NONE + -Djava.class.path=/path/to/kamailio/modules:/opt/kamailio/java: + /opt/kamailio/java/kamailio.jar") ... Example 1.5. Set java_options parameter (verbose configuration) ... # Assumes "application java folder" is located at /opt/kamailio/java -modparam("app_java", "java_options", "-verbose:gc,class,jni -Djava.compiler=NONE - -Djava.class.path=/path/to/kamailio/modules:/opt/kamailio/java:/opt/kamailio/ja -va/kamailio.jar") +modparam("app_java", "java_options", "-verbose:gc,class,jni + -Djava.compiler=NONE -Djava.class.path=/path/to/kamailio/modules: + /opt/kamailio/java:/opt/kamailio/java/kamailio.jar") ... Example 1.6. Set java_options parameter (debug configuration) ... # Assumes "application java folder" is located at /opt/kamailio/java -modparam("app_java", "java_options", "-Xdebug -verbose:gc,class,jni -Djava.compi -ler=NONE -Djava.class.path=/path/to/kamailio/modules:/opt/kamailio/java:/opt/kam -ailio/java/kamailio.jar") +modparam("app_java", "java_options", "-Xdebug -verbose:gc,class,jni + -Djava.compiler=NONE -Djava.class.path=/path/to/kamailio/modules: + /opt/kamailio/java:/opt/kamailio/java/kamailio.jar") ... 4.4. force_cmd_exec (int) @@ -269,8 +271,8 @@ modparam("app_java", "force_cmd_exec", 1) object L short S void V - Note that to specify an object, the "L" is followed by the objec -t's class name and ends with a semi-colon, ';' . + Note that to specify an object, the "L" is followed by the + object's class name and ends with a semi-colon, ';' . app_java supports the following signatures: Primitives: Z,B,C,D,F,I,J,L,S,V @@ -294,7 +296,8 @@ ure. Parameters count should be exactly the same as signature count. Note 1: Arrays representation (symbol '[') is not supported yet. Note 2: You shall use a correct signature, e.g. the following examples o -f combinations are invalid: +f + combinations are invalid: java_method_exec("ExampleMethod", "ZI", "False"); java_method_exec("ExampleMethod", "LI", "something", "5"); @@ -314,8 +317,8 @@ java_method_exec("ExampleMethod", "V"); # Java public int ExampleMethod() { - ... do something; - return 1; + ... do something; + return 1; } * Example 1.9. Signature: "Ljava/lang/String;I" Kamailio prototype @@ -331,8 +334,8 @@ java_method_exec("ExampleMethod", "Ljava/lang/String;I", "$mb", "$ml"); # Java public int ExampleMethod(String SipMessageBuffer, int SipMessageLenght) { - ... do something with buffer; - return 1; + ... do something with buffer; + return 1; } * Example 1.10. Signature: "ZB" Kamailio prototype @@ -348,11 +351,12 @@ java_method_exec("ExampleMethod", "ZB", "true", "0x05"); # Java public int ExampleMethod(boolean flagSet, byte bFlag); { - if (flagSet) - { - ... do something with flags; - } - return 1; + if (flagSet) + { + ... do something with flags; + } + + return 1; } 5.3. java_staticmethod_exec(method, method_signature, [param1[, param2[, @@ -372,8 +376,8 @@ java_staticmethod_exec("ExampleMethod", "V"); # Java public static int ExampleMethod() { - ... do something; - return 1; + ... do something; + return 1; } * Example 1.12. Signature: "Ljava/lang/String;I" Kamailio prototype @@ -390,8 +394,8 @@ java_staticmethod_exec("ExampleMethod", "Ljava/lang/String;I", "$mb", "$ml"); # Java public static int ExampleMethod(String SipMessageBuffer, int SipMessageLenght) { - ... do something with buffer; - return 1; + ... do something with buffer; + return 1; } * Example 1.13. Signature: "ZB" Kamailio prototype @@ -407,11 +411,12 @@ java_staticmethod_exec("ExampleMethod", "ZB", "true", "0x05"); # Java public static int ExampleMethod(boolean flagSet, byte bFlag); { - if (flagSet) - { - ... do something with flags; - } - return 1; + if (flagSet) + { + ... do something with flags; + } + + return 1; } 5.4. java_s_method_exec(method, method_signature, [param1[, param2[, ...]]]) @@ -432,8 +437,8 @@ java_s_method_exec("ExampleMethod", "V"); # Java public synchronized int ExampleMethod() { - ... do something; - return 1; + ... do something; + return 1; } * Example 1.15. Signature: "Ljava/lang/String;I" Kamailio prototype @@ -450,8 +455,8 @@ java_s_method_exec("ExampleMethod", "Ljava/lang/String;I", "$mb", "$ml"); public synchronized int ExampleMethod(String SipMessageBuffer, int SipMessageLen ght) { - ... do something with buffer; - return 1; + ... do something with buffer; + return 1; } * Example 1.16. Signature: "ZB" Kamailio prototype @@ -467,11 +472,12 @@ java_s_method_exec("ExampleMethod", "ZB", "true", "0x05"); # Java public synchronized int ExampleMethod(boolean flagSet, byte bFlag); { - if (flagSet) - { - ... do something with flags; - } - return 1; + if (flagSet) + { + ... do something with flags; + } + + return 1; } 5.5. java_s_staticmethod_exec(method, method_signature, [param1[, param2[, @@ -493,8 +499,8 @@ java_s_staticmethod_exec("ExampleMethod", "V"); # Java public static synchronized int ExampleMethod() { - ... do something; - return 1; + ... do something; + return 1; } * Example 1.18. Signature: "Ljava/lang/String;I" Kamailio prototype @@ -512,8 +518,8 @@ java_s_staticmethod_exec("ExampleMethod", "Ljava/lang/String;I", "$mb", "$ml"); public static synchronized int ExampleMethod(String SipMessageBuffer, int SipMes sageLenght) { - ... do something with buffer; - return 1; + ... do something with buffer; + return 1; } * Example 1.19. Signature: "ZB" Kamailio prototype @@ -529,11 +535,12 @@ java_s_staticmethod_exec("ExampleMethod", "ZB", "true", "0x05"); # Java public static synchronized int ExampleMethod(boolean flagSet, byte bFlag); { - if (flagSet) - { - ... do something with flags; - } - return 1; + if (flagSet) + { + ... do something with flags; + } + + return 1; } 6. Java Module API @@ -549,25 +556,24 @@ import org.siprouter.NativeInterface.*; public class Kamailio extends NativeMethods { - /* Here you should specify a full path to app_java.so */ - static - { - System.load("/opt/kamailio/lib/kamailio/modules/ -app_java.so"); - } - - /* Constructor. Do not remove !!! */ - public Kamailio() - { - } - - /* - This method should be executed for each children process, immedi -ately after forking. - Required. Do not remove !!! - */ - public int child_init(int rank) - { - return 1; - } + /* Here you should specify a full path to app_java.so */ + static + { + System.load("/opt/kamailio/lib/kamailio/modules/app_java.so"); + } + + /* Constructor. Do not remove !!! */ + public Kamailio() + { + } + + /* + This method should be executed for each children process, immediately af +ter forking. + Required. Do not remove !!! + */ + public int child_init(int rank) + { + return 1; + } }

10 years, 7 months

git:master: Fixed misstypes and indents in docs.

by Konstantin Mosesov

Module: sip-router Branch: master Commit: 5bede9a9a77ad01e06d849485d6ce4274eca3fd4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5bede9a… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Sat May 24 05:58:19 2014 +0400 Fixed misstypes and indents in docs. --- modules/app_java/doc/app_java.xml | 10 +- modules/app_java/doc/app_java_admin.xml | 136 +++++++++++++++++-------------- 2 files changed, 79 insertions(+), 67 deletions(-) diff --git a/modules/app_java/doc/app_java.xml b/modules/app_java/doc/app_java.xml index 0360392..17800cc 100644 --- a/modules/app_java/doc/app_java.xml +++ b/modules/app_java/doc/app_java.xml @@ -6,7 +6,6 @@  <!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> %docentities; - ]> <book xmlns:xi="http://www.w3.org/2001/XInclude"> @@ -15,8 +14,8 @@ <productname class="trade">&kamailioname;</productname> <authorgroup> <author> - <firstname>Konstantin</firstname> - <surname>Mosesov</surname> + <firstname>Konstantin</firstname> + <surname>Mosesov</surname> </author> <editor> <firstname>Konstantin</firstname> @@ -25,11 +24,12 @@ </authorgroup> <copyright> <year>2013</year> - <holder>Konstantin Mosesov</holder> + <year>2014</year> + <holder>Konstantin Mosesov</holder> </copyright> </bookinfo> <toc></toc> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="app_java_admin.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="app_java_admin.xml"/> </book> diff --git a/modules/app_java/doc/app_java_admin.xml b/modules/app_java/doc/app_java_admin.xml index f69f8ee..43f9fa1 100644 --- a/modules/app_java/doc/app_java_admin.xml +++ b/modules/app_java/doc/app_java_admin.xml @@ -88,8 +88,8 @@ <section> <title>Java runtime</title> <section> - <title/> - <para>Java runtime library (JRE or JDK) is required to use this module.</para> + <title>JRE or JDK is required to use this module</title> + <para>Java runtime library (JRE and JDK for building app_java) is required to use this module.</para> </section> </section>  @@ -166,7 +166,9 @@ modparam("app_java", "java_options", "-Djava.compiler=NONE") <programlisting format="linespecific"> ... # Assumes "application java folder" is located at /opt/kamailio/java -modparam("app_java", "java_options", "-Djava.compiler=NONE -Djava.class.path=/path/to/kamailio/modules:/opt/kamailio/java:/opt/kamailio/java/kamailio.jar") +modparam("app_java", "java_options", "-Djava.compiler=NONE + -Djava.class.path=/path/to/kamailio/modules:/opt/kamailio/java: + /opt/kamailio/java/kamailio.jar") ... </programlisting> </example> @@ -175,7 +177,9 @@ modparam("app_java", "java_options", "-Djava.compiler=NONE -Djava.class.path=/pa <programlisting format="linespecific"> ... # Assumes "application java folder" is located at /opt/kamailio/java -modparam("app_java", "java_options", "-verbose:gc,class,jni -Djava.compiler=NONE -Djava.class.path=/path/to/kamailio/modules:/opt/kamailio/java:/opt/kamailio/java/kamailio.jar") +modparam("app_java", "java_options", "-verbose:gc,class,jni + -Djava.compiler=NONE -Djava.class.path=/path/to/kamailio/modules: + /opt/kamailio/java:/opt/kamailio/java/kamailio.jar") ... </programlisting> </example> @@ -184,7 +188,9 @@ modparam("app_java", "java_options", "-verbose:gc,class,jni -Djava.compiler=NONE <programlisting format="linespecific"> ... # Assumes "application java folder" is located at /opt/kamailio/java -modparam("app_java", "java_options", "-Xdebug -verbose:gc,class,jni -Djava.compiler=NONE -Djava.class.path=/path/to/kamailio/modules:/opt/kamailio/java:/opt/kamailio/java/kamailio.jar") +modparam("app_java", "java_options", "-Xdebug -verbose:gc,class,jni + -Djava.compiler=NONE -Djava.class.path=/path/to/kamailio/modules: + /opt/kamailio/java:/opt/kamailio/java/kamailio.jar") ... </programlisting> </example> @@ -240,7 +246,8 @@ modparam("app_java", "force_cmd_exec", 1) object L short S void V - Note that to specify an object, the "L" is followed by the object's class name and ends with a semi-colon, ';' . + Note that to specify an object, the "L" is followed by the + object's class name and ends with a semi-colon, ';' . </programlisting> </para> <para> app_java supports the following signatures: @@ -263,7 +270,8 @@ modparam("app_java", "force_cmd_exec", 1) Parameters are optional, ommitting a parameter meant the passed value is NULL. Parameters count should be exactly the same as signature count. Note 1: Arrays representation (symbol '[') is not supported yet. - Note 2: You shall use a correct signature, e.g. the following examples of combinations are invalid: + Note 2: You shall use a correct signature, e.g. the following examples of + combinations are invalid: java_method_exec("ExampleMethod", "ZI", "False"); java_method_exec("ExampleMethod", "LI", "something", "5"); </programlisting> @@ -293,8 +301,8 @@ java_method_exec("ExampleMethod", "V"); # Java public int ExampleMethod() { - ... do something; - return 1; + ... do something; + return 1; } </programlisting> </example> @@ -316,8 +324,8 @@ java_method_exec("ExampleMethod", "Ljava/lang/String;I", "$mb", "$ml"); # Java public int ExampleMethod(String SipMessageBuffer, int SipMessageLenght) { - ... do something with buffer; - return 1; + ... do something with buffer; + return 1; } </programlisting> </example> @@ -339,11 +347,12 @@ java_method_exec("ExampleMethod", "ZB", "true", "0x05"); # Java public int ExampleMethod(boolean flagSet, byte bFlag); { - if (flagSet) - { - ... do something with flags; - } - return 1; + if (flagSet) + { + ... do something with flags; + } + + return 1; } </programlisting> </example> @@ -373,8 +382,8 @@ java_staticmethod_exec("ExampleMethod", "V"); # Java public static int ExampleMethod() { - ... do something; - return 1; + ... do something; + return 1; } </programlisting> </example> @@ -396,8 +405,8 @@ java_staticmethod_exec("ExampleMethod", "Ljava/lang/String;I", "$mb", "$ml"); # Java public static int ExampleMethod(String SipMessageBuffer, int SipMessageLenght) { - ... do something with buffer; - return 1; + ... do something with buffer; + return 1; } </programlisting> </example> @@ -419,11 +428,12 @@ java_staticmethod_exec("ExampleMethod", "ZB", "true", "0x05"); # Java public static int ExampleMethod(boolean flagSet, byte bFlag); { - if (flagSet) - { - ... do something with flags; - } - return 1; + if (flagSet) + { + ... do something with flags; + } + + return 1; } </programlisting> </example> @@ -454,8 +464,8 @@ java_s_method_exec("ExampleMethod", "V"); # Java public synchronized int ExampleMethod() { - ... do something; - return 1; + ... do something; + return 1; } </programlisting> </example> @@ -477,8 +487,8 @@ java_s_method_exec("ExampleMethod", "Ljava/lang/String;I", "$mb", "$ml"); # Java public synchronized int ExampleMethod(String SipMessageBuffer, int SipMessageLenght) { - ... do something with buffer; - return 1; + ... do something with buffer; + return 1; } </programlisting> </example> @@ -500,11 +510,12 @@ java_s_method_exec("ExampleMethod", "ZB", "true", "0x05"); # Java public synchronized int ExampleMethod(boolean flagSet, byte bFlag); { - if (flagSet) - { - ... do something with flags; - } - return 1; + if (flagSet) + { + ... do something with flags; + } + + return 1; } </programlisting> </example> @@ -535,8 +546,8 @@ java_s_staticmethod_exec("ExampleMethod", "V"); # Java public static synchronized int ExampleMethod() { - ... do something; - return 1; + ... do something; + return 1; } </programlisting> </example> @@ -558,8 +569,8 @@ java_s_staticmethod_exec("ExampleMethod", "Ljava/lang/String;I", "$mb", "$ml"); # Java public static synchronized int ExampleMethod(String SipMessageBuffer, int SipMessageLenght) { - ... do something with buffer; - return 1; + ... do something with buffer; + return 1; } </programlisting> </example> @@ -581,11 +592,12 @@ java_s_staticmethod_exec("ExampleMethod", "ZB", "true", "0x05"); # Java public static synchronized int ExampleMethod(boolean flagSet, byte bFlag); { - if (flagSet) - { - ... do something with flags; - } - return 1; + if (flagSet) + { + ... do something with flags; + } + + return 1; } </programlisting> </example> @@ -616,25 +628,25 @@ import org.siprouter.NativeInterface.*; public class Kamailio extends NativeMethods { - /* Here you should specify a full path to app_java.so */ - static - { - System.load("/opt/kamailio/lib/kamailio/modules/app_java.so"); - } - - /* Constructor. Do not remove !!! */ - public Kamailio() - { - } - - /* - This method should be executed for each children process, immediately after forking. - Required. Do not remove !!! - */ - public int child_init(int rank) - { - return 1; - } + /* Here you should specify a full path to app_java.so */ + static + { + System.load("/opt/kamailio/lib/kamailio/modules/app_java.so"); + } + + /* Constructor. Do not remove !!! */ + public Kamailio() + { + } + + /* + This method should be executed for each children process, immediately after forking. + Required. Do not remove !!! + */ + public int child_init(int rank) + { + return 1; + } } </programlisting> </example>

10 years, 7 months

git:master: Fixed bug with JAVA_HOME detection.

by Konstantin Mosesov

Module: sip-router Branch: master Commit: 5a05370f35bdeb7277b2f53f5c3e95fb672d4024 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a05370… Author: Konstantin Mosesov <ez(a)voipgroup.org.ua> Committer: Konstantin Mosesov <ez(a)voipgroup.org.ua> Date: Sat May 24 05:57:16 2014 +0400 Fixed bug with JAVA_HOME detection. --- modules/app_java/Makefile | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/app_java/Makefile b/modules/app_java/Makefile index 68b8f8a..792a116 100644 --- a/modules/app_java/Makefile +++ b/modules/app_java/Makefile @@ -20,6 +20,15 @@ JAVA_HOME ?= $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::") DEFS += $(shell pkg-config libgcj12 --cflags) -I$(JAVA_HOME)/include LIBS += $(shell pkg-config libgcj12 --libs) -L$(JAVA_HOME)/lib -ljvm +# On Debian 7.5 there is a bug with JAVA_HOME detection. +# $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::") points to perl wrapper script (/usr/bin/gcj-wrapper-4.7) +# whereas the real compiler is at /usr/bin/gcj-4.7. As the result, JAVA_HOME will not be a directory, that is incorrect. +# At this point I don't see any universal method as explicit setting this variable at the compile phase. +# -- ez +ifeq ($(shell [ -d "${JAVA_HOME}" -a -f "$(JAVA_HOME)/include/jni.h" -a -f "$(JAVA_HOME)/lib/libjvm.so" ] && echo 1 || echo 0),0) + $(error Can't locate Java Development Kit. You have to specify environment JAVA_HOME to build app_java) +endif + ifeq ($(OS), freebsd) LIBS+=-pthread endif

10 years, 7 months

git:master: modules:ims_registrar_pcscf: added support for notification event deactivated

by Richard Good

Module: sip-router Branch: master Commit: 6a82057688023c2786809d8508217799c6d41c65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a82057… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri May 23 18:01:42 2014 +0200 modules:ims_registrar_pcscf: added support for notification event deactivated --- modules/ims_registrar_pcscf/notify.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/ims_registrar_pcscf/notify.c b/modules/ims_registrar_pcscf/notify.c index 9b2973e..6cdd9b0 100644 --- a/modules/ims_registrar_pcscf/notify.c +++ b/modules/ims_registrar_pcscf/notify.c @@ -68,6 +68,7 @@ #define EVENT_CREATED 3 #define EVENT_REFRESHED 4 #define EVENT_EXPIRED 5 +#define EVENT_DEACTIVATED 6 #define RESULT_ERROR -1 #define RESULT_CONTACTS_FOUND 1 @@ -182,6 +183,9 @@ int reginfo_parse_event(char * s) { if (strncmp(s, "registered", 10) == 0) return EVENT_REGISTERED; if (strncmp(s, "terminated", 10) == 0) return EVENT_TERMINATED; break; + case 11: + if (strncmp(s, "deactivated", 11) == 0) return EVENT_DEACTIVATED; + break; case 12: if (strncmp(s, "unregistered", 12) == 0) return EVENT_UNREGISTERED; break;

10 years, 7 months

git:master: modules:ims_registrar_scscf: notify partial reg info body incorrect when q is set

by Richard Good

Module: sip-router Branch: master Commit: 8aa989618f79a0bd17a025b2f3ab38943fd6d6e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8aa9896… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri May 23 18:06:03 2014 +0200 modules:ims_registrar_scscf: notify partial reg info body incorrect when q is set --- modules/ims_registrar_scscf/registrar_notify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index f953a86..aee2352 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -1601,7 +1601,7 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type) { } if (c->q != -1) { float q = (float) c->q / 1000; - sprintf(pad.s, contact_s_q.s, c, r_active.len, r_active.s, r_registered.len, r_registered.s, c->expires - act_time, q); + sprintf(pad.s, contact_s_q.s, c, state.len, state.s, event.len, event.s, expires, q); } else sprintf(pad.s, contact_s.s, c, state.len, state.s, event.len, event.s, expires); pad.len = strlen(pad.s);

10 years, 7 months

git:master: modules:ims_registrar_scscf: fixed domain lockup when generating notifications if impu not found

by Richard Good

Module: sip-router Branch: master Commit: f10fd6f868df40f12f4c878c0321b414709d2c56 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f10fd6f… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri May 23 18:04:03 2014 +0200 modules:ims_registrar_scscf: fixed domain lockup when generating notifications if impu not found --- modules/ims_registrar_scscf/registrar_notify.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index e5086a5..f953a86 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -1444,6 +1444,7 @@ str generate_reginfo_full(udomain_t* _t, str* impu_list, int num_impus) { res = ul.get_impurecord(_t, &(impu_list[i]), &r); if (res != 0) { LM_WARN("impu disappeared, ignoring it\n"); + ul.unlock_udomain(_t, &impu_list[i]); continue; } LM_DBG("Retrieved IMPU record");

10 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2014