sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
427 discussions

git:master:03763216: app_sqlang: implemented KSR.x.exit() using context field
by Daniel-Constantin Mierla 20 Apr '17

20 Apr '17

Module: kamailio Branch: master Commit: 037632161767262c3c562d20985ae8c66637f0d8 URL: https://github.com/kamailio/kamailio/commit/037632161767262c3c562d20985ae8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-20T20:07:55+02:00 app_sqlang: implemented KSR.x.exit() using context field --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/037632161767262c3c562d20985ae8c… Patch: https://github.com/kamailio/kamailio/commit/037632161767262c3c562d20985ae8c… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index d5e3f86..e654cdc 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -52,7 +52,9 @@ void sqlang_sr_kemi_register_libs(HSQUIRRELVM J); typedef struct _sr_sqlang_env { HSQUIRRELVM J; + int J_exit; HSQUIRRELVM JJ; + int JJ_exit; sip_msg_t *msg; unsigned int flags; unsigned int nload; /* number of scripts loaded */ @@ -248,7 +250,15 @@ static int sqlang_isfunction(HSQUIRRELVM J, int idx) static char* sqlang_safe_tostring(HSQUIRRELVM J, int idx) { - return "Error on sqlang"; + const SQChar *s = NULL; + + if(idx>=0) { + idx += 2; + } + if(sqlang_isstring(J, idx)) { + sq_getstring(J, idx, &s); + } + return (s)?(char*)s:"Error on sqlang"; } static int sqlang_gettype(HSQUIRRELVM J, int idx) @@ -508,6 +518,11 @@ const SQRegFunction _sr_kemi_pv_J_Map[] = { */ static SQInteger sqlang_sr_exit (HSQUIRRELVM J) { + if(_sr_J_env.JJ==J) { + _sr_J_env.JJ_exit = 1; + } else { + _sr_J_env.J_exit = 1; + } return sq_throwerror(J, _SC("~~ksr~exit~~")); } @@ -516,6 +531,11 @@ static SQInteger sqlang_sr_exit (HSQUIRRELVM J) */ static SQInteger sqlang_sr_drop (HSQUIRRELVM J) { + if(_sr_J_env.JJ==J) { + _sr_J_env.JJ_exit = 1; + } else { + _sr_J_env.J_exit = 1; + } sr_kemi_core_drop(NULL); return sq_throwerror(J, _SC("~~ksr~exit~~")); } @@ -693,11 +713,23 @@ const SQRegFunction _sr_kemi_x_J_Map[] = { /** * */ -void sqlang_errorfunc(HSQUIRRELVM SQ_UNUSED_ARG(J), const SQChar *fmt,...) +void sqlang_errorfunc(HSQUIRRELVM J, const SQChar *fmt, ...) { char ebuf[4096]; va_list ap; + if(_sr_J_env.JJ==J) { + if(_sr_J_env.JJ_exit == 1) { + LM_DBG("exception on ksr exit (JJ)\n"); + return; + } + } else { + if(_sr_J_env.J_exit == 1) { + LM_DBG("exception on ksr exit (J)\n"); + return; + } + } + ebuf[0] = '\0'; va_start(ap, fmt); vsnprintf(ebuf, 4094, fmt, ap); @@ -965,16 +997,23 @@ int app_sqlang_run_ex(sip_msg_t *msg, char *func, char *p1, char *p2, LM_DBG("executing sqlang function: [[%s]] (n: %d)\n", func, n); bmsg = _sr_J_env.msg; _sr_J_env.msg = msg; + _sr_J_env.JJ_exit = 0; /* call the function */ rv = sq_call(_sr_J_env.JJ, n, SQFalse, SQTrue); if(SQ_SUCCEEDED(rv)) { ret = 1; } else { - LM_ERR("failed to execute the func: %s (%d)\n", func, (int)rv); - sqstd_printcallstack(_sr_J_env.JJ); - ret = -1; + if(_sr_J_env.JJ_exit==0) { + LM_ERR("failed to execute the func: %s (%d)\n", func, (int)rv); + sqstd_printcallstack(_sr_J_env.JJ); + ret = -1; + } else { + LM_DBG("script execution exit\n"); + ret = 1; + } } _sr_J_env.msg = bmsg; + _sr_J_env.JJ_exit = 0; sq_settop(_sr_J_env.JJ, (top<=0)?1:top); /* restores the original stack size */ return ret;

1 0

git:master:9b7f4bb1: modules: readme files regenerated - app_jsdt ... [skip ci]
by Kamailio Dev 20 Apr '17

20 Apr '17

Module: kamailio Branch: master Commit: 9b7f4bb1c12cc857a62d54da2e3cfb6688d72dd2 URL: https://github.com/kamailio/kamailio/commit/9b7f4bb1c12cc857a62d54da2e3cfb6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-20T19:01:20+02:00 modules: readme files regenerated - app_jsdt ... [skip ci] --- Modified: src/modules/app_jsdt/README --- Diff: https://github.com/kamailio/kamailio/commit/9b7f4bb1c12cc857a62d54da2e3cfb6… Patch: https://github.com/kamailio/kamailio/commit/9b7f4bb1c12cc857a62d54da2e3cfb6… --- diff --git a/src/modules/app_jsdt/README b/src/modules/app_jsdt/README index d9b11d9..4628263 100644 --- a/src/modules/app_jsdt/README +++ b/src/modules/app_jsdt/README @@ -36,7 +36,8 @@ Daniel-Constantin Mierla 5. RPC Commands - 5.1. app_jsrt.reload + 5.1. app_jsdt.reload + 5.2. app_jsdt.api_list 6. Example of usage @@ -71,7 +72,8 @@ Chapter 1. Admin Guide 5. RPC Commands - 5.1. app_jsrt.reload + 5.1. app_jsdt.reload + 5.2. app_jsdt.api_list 6. Example of usage @@ -194,12 +196,13 @@ if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")')) 5. RPC Commands - 5.1. app_jsrt.reload + 5.1. app_jsdt.reload + 5.2. app_jsdt.api_list -5.1. app_jsrt.reload +5.1. app_jsdt.reload Marks the need to reload the js script. The actual reload is done by - every working process when the next call to jsrt_run() function or KEMI + every working process when the next call to jsdt_run() function or KEMI config is executed. Name: app_jsdt.reload @@ -208,7 +211,20 @@ if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")')) Example: ... -kamcmd app_jsrt.reload +kamcmd app_jsdt.reload +... + +5.2. app_jsdt.api_list + + List the functions available via Kemi framework. + + Name: app_jsdt.api_list + + Parameters: none + + Example: +... +kamcmd app_jsdt.api_list ... 6. Example of usage

1 0

git:master:04cc991f: app_jsdt: documented app_jsdt.api_list rpc command
by Daniel-Constantin Mierla 20 Apr '17

20 Apr '17

Module: kamailio Branch: master Commit: 04cc991ffed78c52dda0fc405f2919c1e546a9ce URL: https://github.com/kamailio/kamailio/commit/04cc991ffed78c52dda0fc405f2919c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-20T18:51:49+02:00 app_jsdt: documented app_jsdt.api_list rpc command --- Modified: src/modules/app_jsdt/doc/app_jsdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/04cc991ffed78c52dda0fc405f2919c… Patch: https://github.com/kamailio/kamailio/commit/04cc991ffed78c52dda0fc405f2919c… --- diff --git a/src/modules/app_jsdt/doc/app_jsdt_admin.xml b/src/modules/app_jsdt/doc/app_jsdt_admin.xml index 75703f0..47f50bd 100644 --- a/src/modules/app_jsdt/doc/app_jsdt_admin.xml +++ b/src/modules/app_jsdt/doc/app_jsdt_admin.xml @@ -201,14 +201,14 @@ if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")')) <section> <title>RPC Commands</title> - <section id="app_jsrt.r.reload"> + <section id="app_jsdt.r.reload"> <title> - <function moreinfo="none">app_jsrt.reload</function> + <function moreinfo="none">app_jsdt.reload</function> </title> <para> Marks the need to reload the js script. The actual reload is done by every working process when the next - call to jsrt_run() function or KEMI config is executed. + call to jsdt_run() function or KEMI config is executed. </para> <para> Name: <emphasis>app_jsdt.reload</emphasis> @@ -219,7 +219,27 @@ if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")')) </para> <programlisting format="linespecific"> ... -&kamcmd; app_jsrt.reload +&kamcmd; app_jsdt.reload +... + </programlisting> + </section> + <section id="app_jsdt.r.api_list"> + <title> + <function moreinfo="none">app_jsdt.api_list</function> + </title> + <para> + List the functions available via Kemi framework. + </para> + <para> + Name: <emphasis>app_jsdt.api_list</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + Example: + </para> + <programlisting format="linespecific"> +... +&kamcmd; app_jsdt.api_list ... </programlisting> </section>

1 0

git:master:5757f058: app_sqlang: add -fPIC to compile options of squirrel libs
by Daniel-Constantin Mierla 20 Apr '17

20 Apr '17

Module: kamailio Branch: master Commit: 5757f05832d9cb896b1a5da74a11d2465fad8fd2 URL: https://github.com/kamailio/kamailio/commit/5757f05832d9cb896b1a5da74a11d24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-20T18:44:11+02:00 app_sqlang: add -fPIC to compile options of squirrel libs --- Modified: src/modules/app_sqlang/squirrel/sqstdlib/Makefile Modified: src/modules/app_sqlang/squirrel/squirrel/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/5757f05832d9cb896b1a5da74a11d24… Patch: https://github.com/kamailio/kamailio/commit/5757f05832d9cb896b1a5da74a11d24… --- diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile index 62235a1..a2066b2 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/Makefile +++ b/src/modules/app_sqlang/squirrel/sqstdlib/Makefile @@ -26,7 +26,7 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) + gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) ar rc $(OUT) *.o rm *.o @@ -36,6 +36,6 @@ sqprof: rm *.o sq64: - gcc -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) + gcc -O2 -m64 -fno-exceptions -fPIC -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) ar rc $(OUT) *.o rm *.o diff --git a/src/modules/app_sqlang/squirrel/squirrel/Makefile b/src/modules/app_sqlang/squirrel/squirrel/Makefile index 379b95d..3f62f58 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/Makefile +++ b/src/modules/app_sqlang/squirrel/squirrel/Makefile @@ -37,7 +37,7 @@ SRCS= \ sq32: - gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + gcc -O2 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o @@ -47,6 +47,6 @@ sqprof: rm *.o sq64: - gcc -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) + gcc -O2 -m64 -D_SQ64 -fno-exceptions -fPIC -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS) ar rc $(OUT) *.o rm *.o

1 0

Planning next IRC devel meeting - Apr 20, 2017
by Daniel-Constantin Mierla 20 Apr '17

20 Apr '17

Hello, probably it is the time to have another IRC devel meeting to discuss the plans for the project and the roadmap to next major release, v5.1. First proposed date would be Apr 20, with secondary options for Apr 24 or 25, but other dates can be taken in consideration if more convenient for a consistent group of developers. I created the wiki page for it at: * https://www.kamailio.org/wiki/devel/irc-meetings/2017a Feel free to add there the subjects you want to discuss, I also have several other topics to add. It would be good to list yourself if you are going to participate (or want to participate) in a specific day in order to see who are we relying on being present. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - May 22-24 (USA) - www.asipto.com Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

1 4

git:5.0:5afe7c29: carrierroute: fix in check if conf file writable
by Lucian Balaceanu 20 Apr '17

20 Apr '17

Module: kamailio Branch: 5.0 Commit: 5afe7c2998694bc96bd6562f354f9bfca708cf8c URL: https://github.com/kamailio/kamailio/commit/5afe7c2998694bc96bd6562f354f9bf… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-04-20T14:53:44+03:00 carrierroute: fix in check if conf file writable (cherry picked from commit f06ffc51d653448d1712dd9752899ca33ef39db3) --- Modified: src/modules/carrierroute/carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/5afe7c2998694bc96bd6562f354f9bf… Patch: https://github.com/kamailio/kamailio/commit/5afe7c2998694bc96bd6562f354f9bf… --- diff --git a/src/modules/carrierroute/carrierroute.c b/src/modules/carrierroute/carrierroute.c index 05a90c4..7f477cf 100644 --- a/src/modules/carrierroute/carrierroute.c +++ b/src/modules/carrierroute/carrierroute.c @@ -230,8 +230,8 @@ static int mod_init(void) { } if( !( fs.st_mode & S_IWOTH) && - !((fs.st_mode & S_IWGRP) && (fs.st_gid == uid)) && - !((fs.st_mode & S_IWUSR) && (fs.st_uid == gid))) { + !((fs.st_mode & S_IWGRP) && (fs.st_gid == gid)) && + !((fs.st_mode & S_IWUSR) && (fs.st_uid == uid))) { LM_ERR("config file %s not writable\n", config_file); return -1; }

1 0

git:4.4:a32af10e: carrierroute: fix in check if conf file writable
by Lucian Balaceanu 20 Apr '17

20 Apr '17

Module: kamailio Branch: 4.4 Commit: a32af10e91e72dd2b29e143100c8707c0655784c URL: https://github.com/kamailio/kamailio/commit/a32af10e91e72dd2b29e143100c8707… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-04-20T14:33:50+03:00 carrierroute: fix in check if conf file writable --- Modified: modules/carrierroute/carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/a32af10e91e72dd2b29e143100c8707… Patch: https://github.com/kamailio/kamailio/commit/a32af10e91e72dd2b29e143100c8707… --- diff --git a/modules/carrierroute/carrierroute.c b/modules/carrierroute/carrierroute.c index 5f7bcd0..f91592d 100644 --- a/modules/carrierroute/carrierroute.c +++ b/modules/carrierroute/carrierroute.c @@ -231,8 +231,8 @@ static int mod_init(void) { } if( !( fs.st_mode & S_IWOTH) && - !((fs.st_mode & S_IWGRP) && (fs.st_gid == uid)) && - !((fs.st_mode & S_IWUSR) && (fs.st_uid == gid))) { + !((fs.st_mode & S_IWGRP) && (fs.st_gid == gid)) && + !((fs.st_mode & S_IWUSR) && (fs.st_uid == uid))) { LM_ERR("config file %s not writable\n", config_file); return -1; }

1 0

git:5.0:c706b93e: topos: fix incorrect contact in 183 and 200 OK responces
by Daniel-Constantin Mierla 20 Apr '17

20 Apr '17

Module: kamailio Branch: 5.0 Commit: c706b93ec3790f705f86084e9c5ca768935febb6 URL: https://github.com/kamailio/kamailio/commit/c706b93ec3790f705f86084e9c5ca76… Author: sergey-vb <sergey.v.basov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-20T13:38:31+02:00 topos: fix incorrect contact in 183 and 200 OK responces When using topos, Kamailio does not set correct contact in 183 progres and 200 OK. But for INVITE and Bye contacts are correct. This modification seems fix it. (cherry picked from commit 38d4fb46b2bd41d77facc18383bac6a760d8967e) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/c706b93ec3790f705f86084e9c5ca76… Patch: https://github.com/kamailio/kamailio/commit/c706b93ec3790f705f86084e9c5ca76… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 014ffc1..41dcd90 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1016,7 +1016,7 @@ int tps_response_sent(sip_msg_t *msg) tps_remove_headers(msg, HDR_RECORDROUTE_T); tps_remove_headers(msg, HDR_CONTACT_T); - if(direction==TPS_DIR_UPSTREAM) { + if(direction==TPS_DIR_DOWNSTREAM) { tps_reinsert_contact(msg, &stsd, &stsd.as_contact); } else { tps_reinsert_contact(msg, &stsd, &stsd.bs_contact);

1 0

[kamailio/kamailio] Incorrect contact in 183 and 200 ok when topos module used (#1077)
by sergey-vb 20 Apr '17

20 Apr '17

**Description** When using topos, Kamailio does not set correct contact in 183 progres and 200 OK. But for INVITE and Bye contacts are correct. **Troubleshooting** When loaded topoh module all work as expected without any issue. **Reproduction** Place a call from sip softphone behind NAT to PSTN GW or in opposite direction. You will have a call with 30 sec long because contact in 183 and 200 OK are incorrect. But when you get Bye from PSTN GW contact are correct. **Additional Information** version: kamailio 5.0.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 14:27:34 Apr 5 2017 with gcc 4.8.2 [wrong-contact-dump-with-topos.txt](https://github.com/kamailio/kamailio/fil… -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1077

2 3

git:master:2cab97ec: Merge pull request #1081 from sergey-vb/topos-fix-02
by GitHub 20 Apr '17

20 Apr '17

Module: kamailio Branch: master Commit: 2cab97ec215fe5c52fabe8b417f247de3c857326 URL: https://github.com/kamailio/kamailio/commit/2cab97ec215fe5c52fabe8b417f247d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-20T13:36:12+02:00 Merge pull request #1081 from sergey-vb/topos-fix-02 topos: fix incorrect contact in 183 and 200 OK responces --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/2cab97ec215fe5c52fabe8b417f247d… Patch: https://github.com/kamailio/kamailio/commit/2cab97ec215fe5c52fabe8b417f247d… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 014ffc1..41dcd90 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1016,7 +1016,7 @@ int tps_response_sent(sip_msg_t *msg) tps_remove_headers(msg, HDR_RECORDROUTE_T); tps_remove_headers(msg, HDR_CONTACT_T); - if(direction==TPS_DIR_UPSTREAM) { + if(direction==TPS_DIR_DOWNSTREAM) { tps_reinsert_contact(msg, &stsd, &stsd.as_contact); } else { tps_reinsert_contact(msg, &stsd, &stsd.bs_contact);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017