May 2014 - sr-dev - kamailio.org

siremis compatibility issues with PHP 5.5.12-1~dotdeb.1
by Peter Villeneuve 25 May '14

25 May '14

Hi, Just installed latest Siremis and Kamailio 4.1 on debian 7 server with PHP 5.5.12-1~dotdeb.1. everything seemed to be ok until I tried to edit the subscribers database and perform other routine operations. It seems that latest PHP version doesn't work with Siremis. What's the currently recommended version? Cheers, Peter [2014-05-25 19:30:56 (GMT)] An exception occurred while executing this script: Error message: #8192, preg_replace(): The /e modifier is deprecated, use preg_replace_callback instead Script name and line number of error: /var/www/siremis-4.1.0/openbiz/others/Smarty/libs/Smarty_Compiler.class.php:270 *function:* errorHandler ( 8192, "preg_replace(): The /e modifier is deprecated, use preg_replace_...", "/var/www/siremis-4.1.0/openbiz/others/Smarty/libs/Smarty_Compile...", 270, Array(8) ) @ /var/www/siremis-4.1.0/openbiz/bin/sysheader.inc 117 *function:* userErrorHandler ( 8192, "preg_replace(): The /e modifier is deprecated, use preg_replace_...", "/var/www/siremis-4.1.0/openbiz/others/Smarty/libs/Smarty_Compile...", 270, Array(8) ) @ *function:* preg_replace ( "~\{\*(.*?)\*\}|\{\s*literal\s*\}(.*?)\{\s*/literal\s*\}|\{\s*php...", "'{php' . str_repeat(" ", substr_count('\0', " ")) .'}'", "{php} $this->assign('template_file', 'system_right_detailform.t..." ) @ /var/www/siremis-4.1.0/openbiz/others/Smarty/libs/Smarty_Compiler.class.php 270 *function:* _compile_file ( "/var/www/siremis-4.1.0/siremis/modules/ser/template/detail.tpl", "{php} $this->assign('template_file', 'system_right_detailform.t...", Null ) @ /var/www/siremis-4.1.0/openbiz/others/Smarty/libs/Smarty.class.php 1484 *function:* _compile_source ( "/var/www/siremis-4.1.0/siremis/modules/ser/template/detail.tpl", "{php} $this->assign('template_file', 'system_right_detailform.t...", Null, "/var/www/siremis-4.1.0/siremis/themes/default/template/cpl/%%CE^..." ) @ /var/www/siremis-4.1.0/openbiz/others/Smarty/libs/Smarty.class.php 1417 *function:* _compile_resource ( "/var/www/siremis-4.1.0/siremis/modules/ser/template/detail.tpl", "/var/www/siremis-4.1.0/siremis/themes/default/template/cpl/%%CE^..." ) @ /var/www/siremis-4.1.0/openbiz/others/Smarty/libs/Smarty.class.php 1256 *function:* fetch ( "/var/www/siremis-4.1.0/siremis/modules/ser/template/detail.tpl" ) @ /var/www/siremis-4.1.0/openbiz/bin/easy/FormRenderer.php 95 *function:* renderSmarty ( Object(EasyForm), "/var/www/siremis-4.1.0/siremis/modules/ser/template/detail.tpl" ) @ /var/www/siremis-4.1.0/openbiz/bin/easy/FormRenderer.php 45 *function:* render ( Object(EasyForm) ) @ /var/www/siremis-4.1.0/openbiz/bin/easy/EasyForm.php 1648 *function:* renderHTML ( ) @ /var/www/siremis-4.1.0/openbiz/bin/easy/EasyForm.php 1538 *function:* render ( ) @ /var/www/siremis-4.1.0/openbiz/bin/easy/EasyForm.php 955 *function:* _showForm ( "ser.sbs.authdb.form.SubscriberEditForm", "", Array(1) ) @ /var/www/siremis-4.1.0/openbiz/bin/easy/EasyForm.php 1800 *function:* processPostAction ( ) @ /var/www/siremis-4.1.0/openbiz/bin/easy/EasyForm.php 917 *function:* editRecord ( ) @ /var/www/siremis-4.1.0/openbiz/bin/BizController.php 310 *function:* invoke ( ) @ /var/www/siremis-4.1.0/openbiz/bin/BizController.php 110 *function:* dispatchRequest ( ) @ /var/www/siremis-4.1.0/openbiz/bin/BizController.php 32 *function:* include_once ( "/var/www/siremis-4.1.0/openbiz/bin/BizController.php" ) @ /var/www/siremis-4.1.0/siremis/bin/controller.php 6

1 0

git:vseva/6565: debugger: create _dbg_get_json function
by Victor Seva 24 May '14

24 May '14

Module: sip-router Branch: vseva/6565 Commit: f9d8d2b24f8840fe9ef1acab44502d346bb77457 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9d8d2b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri May 23 19:30:35 2014 +0200 debugger: create _dbg_get_json function --- modules/debugger/debugger_api.c | 71 +++++++++++++++++++++++--------------- 1 files changed, 43 insertions(+), 28 deletions(-) diff --git a/modules/debugger/debugger_api.c b/modules/debugger/debugger_api.c index c611fa1..9655491 100644 --- a/modules/debugger/debugger_api.c +++ b/modules/debugger/debugger_api.c @@ -1622,36 +1622,27 @@ int _dbg_get_obj_xavp_vals(struct sip_msg *msg, return 0; } -int dbg_dump_json(struct sip_msg* msg, unsigned int mask, int level) +int _dbg_get_json(struct sip_msg* msg, unsigned int mask, srjson_doc_t *jdoc) { int i; pv_value_t value; pv_cache_t **_pv_cache = pv_cache_get_table(); pv_cache_t *el = NULL; - srjson_doc_t jdoc; srjson_t *jobj = NULL; - char *output = NULL; str item_name = STR_NULL; static char iname[128]; - int result = -1; if(_pv_cache==NULL) { LM_ERR("cannot access pv_cache\n"); return -1; } + if(jdoc==NULL){ + LM_ERR("jdoc is null\n"); + return -1; + } memset(_dbg_xavp_dump, 0, sizeof(str*)*DBG_XAVP_DUMP_SIZE); - srjson_InitDoc(&jdoc, NULL); - if(jdoc.root==NULL) - { - jdoc.root = srjson_CreateObject(&jdoc); - if(jdoc.root==NULL) - { - LM_ERR("cannot create json root\n"); - goto error; - } - } for(i=0;i<PV_CACHE_SIZE;i++) { el = _pv_cache[i]; @@ -1684,13 +1675,13 @@ int dbg_dump_json(struct sip_msg* msg, unsigned int mask, int level) } else { - if(_dbg_get_array_avp_vals(msg, &el->spec.pvp, &jdoc, &jobj, &item_name)!=0) + if(_dbg_get_array_avp_vals(msg, &el->spec.pvp, jdoc, &jobj, &item_name)!=0) { LM_WARN("can't get value[%.*s]\n", el->pvname.len, el->pvname.s); el = el->next; continue; } - if(srjson_GetArraySize(&jdoc, jobj)==0 && !(mask&DBG_DP_NULL)) + if(srjson_GetArraySize(jdoc, jobj)==0 && !(mask&DBG_DP_NULL)) { el = el->next; continue; @@ -1705,13 +1696,13 @@ int dbg_dump_json(struct sip_msg* msg, unsigned int mask, int level) el = el->next; continue; } - if(_dbg_get_obj_xavp_vals(msg, &el->spec.pvp, &jdoc, &jobj, &item_name)!=0) + if(_dbg_get_obj_xavp_vals(msg, &el->spec.pvp, jdoc, &jobj, &item_name)!=0) { LM_WARN("can't get value[%.*s]\n", el->pvname.len, el->pvname.s); el = el->next; continue; } - if(srjson_GetArraySize(&jdoc, jobj)==0 && !(mask&DBG_DP_NULL)) + if(srjson_GetArraySize(jdoc, jobj)==0 && !(mask&DBG_DP_NULL)) { el = el->next; continue; @@ -1730,7 +1721,7 @@ int dbg_dump_json(struct sip_msg* msg, unsigned int mask, int level) { if(mask&DBG_DP_NULL) { - jobj = srjson_CreateNull(&jdoc); + jobj = srjson_CreateNull(jdoc); } else { @@ -1738,9 +1729,9 @@ int dbg_dump_json(struct sip_msg* msg, unsigned int mask, int level) continue; } }else if(value.flags&(PV_VAL_INT)){ - jobj = srjson_CreateNumber(&jdoc, value.ri); + jobj = srjson_CreateNumber(jdoc, value.ri); }else if(value.flags&(PV_VAL_STR)){ - jobj = srjson_CreateStr(&jdoc, value.rs.s, value.rs.len); + jobj = srjson_CreateStr(jdoc, value.rs.s, value.rs.len); }else { LM_WARN("el->pvname[%.*s] value[%d] unhandled\n", el->pvname.len, el->pvname.s, value.flags); @@ -1757,23 +1748,47 @@ int dbg_dump_json(struct sip_msg* msg, unsigned int mask, int level) } if(jobj!=NULL) { - srjson_AddItemToObject(&jdoc, jdoc.root, iname, jobj); + srjson_AddItemToObject(jdoc, jdoc->root, iname, jobj); } el = el->next; } } + return 0; + +error: + srjson_DestroyDoc(jdoc); + return -1; +} + +int dbg_dump_json(struct sip_msg* msg, unsigned int mask, int level) +{ + char *output = NULL; + srjson_doc_t jdoc; + + srjson_InitDoc(&jdoc, NULL); + if(jdoc.root==NULL) + { + jdoc.root = srjson_CreateObject(&jdoc); + if(jdoc.root==NULL) + { + LM_ERR("cannot create json root\n"); + goto error; + } + } + + if(_dbg_get_json(msg, mask, &jdoc)<0) return -1; output = srjson_PrintUnformatted(&jdoc, jdoc.root); if(output==NULL) { LM_ERR("cannot print json doc\n"); - goto error; + srjson_DestroyDoc(&jdoc); } LOG(level, "%s\n", output); - result = 0; + jdoc.free_fn(output); + srjson_DestroyDoc(&jdoc); + return 0; error: - if(output!=NULL) jdoc.free_fn(output); srjson_DestroyDoc(&jdoc); - - return result; -} + return -1; +} \ No newline at end of file

1 0

git:master: Added app_java to modules list
by Konstantin Mosesov 24 May '14

24 May '14

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

1 0

git:master: Added requirements for modules app_python and app_java
by Konstantin Mosesov 24 May '14

24 May '14

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:

1 0

websockets in kamailio
by mustafa safe 24 May '14

24 May '14

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

1 0

git:master: Added application name in error description.
by Konstantin Mosesov 24 May '14

24 May '14

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…

1 0

git:master: New generated file
by Konstantin Mosesov 24 May '14

24 May '14

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; + } }

1 0

git:master: Fixed misstypes and indents in docs.
by Konstantin Mosesov 24 May '14

24 May '14

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>

1 0

git:master: Fixed bug with JAVA_HOME detection.
by Konstantin Mosesov 24 May '14

24 May '14

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

1 0

git:master: modules:ims_registrar_pcscf: added support for notification event deactivated
by Richard Good 23 May '14

23 May '14

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;

1 0