sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
313 discussions

git:master:9de5c4af: modules: readme files regenerated - uac_redirect ... [skip ci]
by Kamailio Dev 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: 9de5c4af712434255ecf88d60f1cf5cefed8ad22 URL: https://github.com/kamailio/kamailio/commit/9de5c4af712434255ecf88d60f1cf5c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-17T09:16:57+01:00 modules: readme files regenerated - uac_redirect ... [skip ci] --- Modified: src/modules/uac_redirect/README --- Diff: https://github.com/kamailio/kamailio/commit/9de5c4af712434255ecf88d60f1cf5c… Patch: https://github.com/kamailio/kamailio/commit/9de5c4af712434255ecf88d60f1cf5c…

1 0

git:master:37f664c4: app_ruby: added missing app_ruby.api_list rpc command
by Daniel-Constantin Mierla 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: 37f664c404c5391181fcb61e2ec2955105c47a4d URL: https://github.com/kamailio/kamailio/commit/37f664c404c5391181fcb61e2ec2955… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-17T09:04:07+01:00 app_ruby: added missing app_ruby.api_list rpc command --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/37f664c404c5391181fcb61e2ec2955… Patch: https://github.com/kamailio/kamailio/commit/37f664c404c5391181fcb61e2ec2955… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index a503cddb5b..ff944ca20e 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -1282,12 +1282,65 @@ static void app_ruby_rpc_reload(rpc_t* rpc, void* ctx) "new", *_sr_ruby_reload_version); } +static const char* app_ruby_rpc_api_list_doc[2] = { + "List kemi exports to ruby", + 0 +}; + +static void app_ruby_rpc_api_list(rpc_t* rpc, void* ctx) +{ + int i; + int n; + sr_kemi_t *ket; + void* th; + void* sh; + void* ih; + + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + n = 0; + for(i=0; i<SR_KEMI_RUBY_EXPORT_SIZE; i++) { + ket = sr_kemi_ruby_export_get(i); + if(ket==NULL) continue; + n++; + } + + if(rpc->struct_add(th, "d[", + "msize", n, + "methods", &ih)<0) + { + rpc->fault(ctx, 500, "Internal error array structure"); + return; + } + for(i=0; i<SR_KEMI_RUBY_EXPORT_SIZE; i++) { + ket = sr_kemi_ruby_export_get(i); + if(ket==NULL) continue; + if(rpc->struct_add(ih, "{", "func", &sh)<0) { + rpc->fault(ctx, 500, "Internal error internal structure"); + return; + } + if(rpc->struct_add(sh, "SSSS", + "ret", sr_kemi_param_map_get_name(ket->rtype), + "module", &ket->mname, + "name", &ket->fname, + "params", sr_kemi_param_map_get_params(ket->ptypes))<0) { + LM_ERR("failed to add the structure with attributes (%d)\n", i); + rpc->fault(ctx, 500, "Internal error creating dest struct"); + return; + } + } +} + /** * */ rpc_export_t app_ruby_rpc_cmds[] = { {"app_ruby.reload", app_ruby_rpc_reload, app_ruby_rpc_reload_doc, 0}, + {"app_ruby.api_list", app_ruby_rpc_api_list, + app_ruby_rpc_api_list_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:b6e4ebc6: uac_redirect: docs - added section ids
by Daniel-Constantin Mierla 17 Dec '18

17 Dec '18

Module: kamailio Branch: master Commit: b6e4ebc666877549796e09b721e1234e011b325e URL: https://github.com/kamailio/kamailio/commit/b6e4ebc666877549796e09b721e1234… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-17T08:57:35+01:00 uac_redirect: docs - added section ids --- Modified: src/modules/uac_redirect/doc/uac_redirect_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b6e4ebc666877549796e09b721e1234… Patch: https://github.com/kamailio/kamailio/commit/b6e4ebc666877549796e09b721e1234… --- diff --git a/src/modules/uac_redirect/doc/uac_redirect_admin.xml b/src/modules/uac_redirect/doc/uac_redirect_admin.xml index 7e80126482..68eebccfe2 100644 --- a/src/modules/uac_redirect/doc/uac_redirect_admin.xml +++ b/src/modules/uac_redirect/doc/uac_redirect_admin.xml @@ -123,7 +123,7 @@ <section> <title>Parameters</title> - <section> + <section id="uac_redirect.p.default_filter"> <title><varname>default_filter</varname> (string)</title> <para> The default behavior in filtering contacts. It may be @@ -144,7 +144,7 @@ modparam("uac_redirect","default_filter","deny") </programlisting> </example> </section> - <section> + <sectionid="uac_redirect.p.deny_filter"> <title><varname>deny_filter</varname> (string)</title> <para> The regular expression for default deny filtering. It makes sense @@ -176,7 +176,7 @@ modparam("uac_redirect","deny_filter",".*(a)siphub\.net") </programlisting> </example> </section> - <section> + <sectionid="uac_redirect.p.accept_filter"> <title><varname>accept_filter</varname> (string)</title> <para> The regular expression for default accept filtering. It makes sense @@ -208,7 +208,7 @@ modparam("uac_redirect","accept_filter",".*(a)siphub\.net") </programlisting> </example> </section> - <section> + <section id="uac_redirect.p.acc_function"> <title><varname>acc_function</varname> (string)</title> <para> Specifies the accounting function to be used. Just by defining @@ -248,7 +248,7 @@ modparam("uac_redirect","acc_function","acc_db_request") </programlisting> </example> </section> - <section> + <section id="uac_redirect.p.acc_db_table"> <title><varname>acc_db_table</varname> (string)</title> <para> Specifies the accounting table to be used if DB accounting was @@ -273,7 +273,7 @@ modparam("uac_redirect","acc_db_table","acc_redirect") </programlisting> </example> </section> - <section> + <section id="uac_redirect.p.bflags"> <title><varname>bflags</varname> (int)</title> <para> This parameter defines the branch-flags to be set for new, added branch. @@ -306,7 +306,7 @@ branch_route[1] { <section> <title>Functions</title> - <section> + <section id="uac_redirect.f.set_deny_filter"> <title> <function moreinfo="none">set_deny_filter(filter,flags) </function> @@ -356,7 +356,7 @@ set_deny_filter(".*(a)domain1.net",""); </example> </section> - <section> + <section id="uac_redirect.f.set_accept_filter"> <title> <function moreinfo="none">set_accept_filter(filter,flags) </function> @@ -406,7 +406,7 @@ set_accept_filter(".*(a)domain1.net",""); </example> </section> - <section> + <section id="uac_redirect.f.get_redirects1"> <title> <function moreinfo="none">get_redirects(max)</function> </title> @@ -465,7 +465,7 @@ get_redirects("*"); </example> </section> - <section> + <section id="uac_redirect.f.get_redirects2"> <title> <function moreinfo="none">get_redirects(max,reason)</function> </title> @@ -556,7 +556,5 @@ failure_route[REDIRECT_ACC] { </section> - - </chapter>

1 0

Radio dispatcher development
by Andrés Cabezas 16 Dec '18

16 Dec '18

Hello to everyone, We are searching for a dispatcher solution connected to a radio network based on Tait products. Tait is using AIS, a sip protocole with additional functionalities like a push to talk. Do you think possible to add this functionality to your sip server and maybe working together to propose this product to our client. Regards. Andrés Cabezas Triangle - Vos projets au sommet

2 1

[kamailio/kamailio] kamcmd app_ruby.reload returns error: 500 - command app_ruby.reload not found (#1764)
by Fatih Orhan 14 Dec '18

14 Dec '18

### Description Hello, When I try to reload ruby scripts with (in linux CLI) : `kamcmd app_ruby.reload` This message is returned: `error: 500 - command app_ruby.reload not found` I double checked the command name, module status, and debug logs. I can run other kamcmd commands and can use ruby scripts. ### Troubleshooting #### Reproduction in linux CLI: `yum install kamailio-ruby` in kamailio.cfg `loadmodule "app_ruby.so"` `modparam("app_ruby", "load", "/etc/kamailio/ruby/myscript.rb")` in linux CLI: `kamcmd app_ruby.reload` #### Log Messages When I execute kamcmd, these debug lines appear: ``` Dec 13 14:57:30 servername /usr/sbin/kamailio[4479]: DEBUG: ctl [../../core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0x7fc7ee451320, 19, 3, 0x2b70310), fd_no=1 Dec 13 14:57:30 servername /usr/sbin/kamailio[4479]: DEBUG: ctl [io_listener.c:442]: handle_new_connect(): handle_stream read: new connection (1) on /var/run/kamailio//kamailio_ctl Dec 13 14:57:30 servername /usr/sbin/kamailio[4479]: DEBUG: ctl [io_listener.c:495]: handle_stream_read(): handle_stream read: eof on /var/run/kamailio//kamailio_ctl Dec 13 14:57:30 servername /usr/sbin/kamailio[4479]: DEBUG: ctl [../../core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x7fc7ee451320, 19, -1, 0x10) fd_no=2 called ``` ### Possible Solutions I tried to read kamcmd and app_ruby source code but quickly got lost, so no leads there :) Tried other combinations to no avail: `kamcmd ruby.reload` `kamcmd app_ruby_jsdt.reload` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.0 (x86_64/linux) 535e13 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 535e13 compiled on 10:26:34 Nov 28 2018 with gcc 4.8.5 ``` * **Operating System**: Centos 7.2 64bit ``` Linux servername 3.10.0-327.28.2.el7.x86_64 #1 SMP Wed Aug 3 11:11:39 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1764

2 8

git:master:bbabc77a: app_ruby: print new script version in rpc reload info message
by Daniel-Constantin Mierla 14 Dec '18

14 Dec '18

Module: kamailio Branch: master Commit: bbabc77a0ac34fbdc4618161360f27efc12ba1dc URL: https://github.com/kamailio/kamailio/commit/bbabc77a0ac34fbdc4618161360f27e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-14T11:20:08+01:00 app_ruby: print new script version in rpc reload info message --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/bbabc77a0ac34fbdc4618161360f27e… Patch: https://github.com/kamailio/kamailio/commit/bbabc77a0ac34fbdc4618161360f27e… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index d2550a469a..a503cddb5b 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -1268,10 +1268,10 @@ static void app_ruby_rpc_reload(rpc_t* rpc, void* ctx) } v = *_sr_ruby_reload_version; - LM_INFO("marking for reload ruby script file: %.*s (%d => %d)\n", - _sr_ruby_load_file.len, _sr_ruby_load_file.s, - _sr_ruby_local_version, v); *_sr_ruby_reload_version += 1; + LM_INFO("marking for reload ruby script file: %.*s (%d / %d => %d)\n", + _sr_ruby_load_file.len, _sr_ruby_load_file.s, + _sr_ruby_local_version, v, *_sr_ruby_reload_version); if (rpc->add(ctx, "{", &vh) < 0) { rpc->fault(ctx, 500, "Server error");

1 0

git:master:28b54dc6: app_ruby: implemented rpc app_ruby.reload command
by Daniel-Constantin Mierla 14 Dec '18

14 Dec '18

Module: kamailio Branch: master Commit: 28b54dc63c62ddef837a3f580ab97161b55f214e URL: https://github.com/kamailio/kamailio/commit/28b54dc63c62ddef837a3f580ab9716… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-14T10:05:40+01:00 app_ruby: implemented rpc app_ruby.reload command --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/28b54dc63c62ddef837a3f580ab9716… Patch: https://github.com/kamailio/kamailio/commit/28b54dc63c62ddef837a3f580ab9716… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index c1032f1b96..d2550a469a 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -1245,10 +1245,60 @@ int app_ruby_kemi_export_libs(void) return 1; } +static const char* app_ruby_rpc_reload_doc[2] = { + "Reload javascript file", + 0 +}; + + +static void app_ruby_rpc_reload(rpc_t* rpc, void* ctx) +{ + int v; + void *vh; + + if(_sr_ruby_load_file.s == NULL && _sr_ruby_load_file.len<=0) { + LM_WARN("script file path not provided\n"); + rpc->fault(ctx, 500, "No script file"); + return; + } + if(_sr_ruby_reload_version == NULL) { + LM_WARN("reload not enabled\n"); + rpc->fault(ctx, 500, "Reload not enabled"); + return; + } + + v = *_sr_ruby_reload_version; + LM_INFO("marking for reload ruby script file: %.*s (%d => %d)\n", + _sr_ruby_load_file.len, _sr_ruby_load_file.s, + _sr_ruby_local_version, v); + *_sr_ruby_reload_version += 1; + + if (rpc->add(ctx, "{", &vh) < 0) { + rpc->fault(ctx, 500, "Server error"); + return; + } + rpc->struct_add(vh, "dd", + "old", v, + "new", *_sr_ruby_reload_version); +} + /** - * + * + */ +rpc_export_t app_ruby_rpc_cmds[] = { + {"app_ruby.reload", app_ruby_rpc_reload, + app_ruby_rpc_reload_doc, 0}, + {0, 0, 0, 0} +}; + +/** + * */ int app_ruby_init_rpc(void) { + if (rpc_register_array(app_ruby_rpc_cmds)!=0) { + LM_ERR("failed to register RPC commands\n"); + return -1; + } return 0; }

1 0

git:master:1569f911: app_ruby: Makefile - updated how to detect ruby version
by Daniel-Constantin Mierla 13 Dec '18

13 Dec '18

Module: kamailio Branch: master Commit: 1569f91121a1ec00a0d59becbba587c923a21c63 URL: https://github.com/kamailio/kamailio/commit/1569f91121a1ec00a0d59becbba587c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-13T10:41:29+01:00 app_ruby: Makefile - updated how to detect ruby version - GH #1762 --- Modified: src/modules/app_ruby/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/1569f91121a1ec00a0d59becbba587c… Patch: https://github.com/kamailio/kamailio/commit/1569f91121a1ec00a0d59becbba587c… --- diff --git a/src/modules/app_ruby/Makefile b/src/modules/app_ruby/Makefile index 9198714c2a..45a7b11535 100644 --- a/src/modules/app_ruby/Makefile +++ b/src/modules/app_ruby/Makefile @@ -7,20 +7,22 @@ include ../../Makefile.defs auto_gen= NAME=app_ruby.so -RUBYVER=$(shell pkg-config --list-all | grep ruby-2 | tail -1 | cut -f 1 -d " ") -ifeq ($(RUBYVER),) -RUBYVER=ruby-2.3 -endif +PKGLIBRUBY=1 + ifeq ($(CROSS_COMPILE),) BUILDER = $(shell which pkg-config) ifneq ($(BUILDER),) + RUBYVER = $(shell $(BUILDER) --list-all | grep ruby | tail -1 | cut -f 1 -d " ") +ifneq ($(RUBYVER),) PKGLIBRUBY = $(shell $(BUILDER) --exists $(RUBYVER) > /dev/null 2>&1 ; echo $$? ) -ifneq ($(PKGLIBRUBY),0) - BUILDER = endif endif endif +ifneq ($(PKGLIBRUBY),0) + BUILDER = +endif + ifneq ($(BUILDER),) DEFS += $(shell $(BUILDER) --cflags $(RUBYVER)) LIBS = $(shell $(BUILDER) --libs $(RUBYVER))

1 0

git:master:3d43f546: tm: error log message about new final reply made info
by Daniel-Constantin Mierla 13 Dec '18

13 Dec '18

Module: kamailio Branch: master Commit: 3d43f546ddff613c50068c9d47521a15b42f1c7b URL: https://github.com/kamailio/kamailio/commit/3d43f546ddff613c50068c9d47521a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-13T10:22:35+01:00 tm: error log message about new final reply made info - can happen due to races of packets on the network --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/3d43f546ddff613c50068c9d47521a1… Patch: https://github.com/kamailio/kamailio/commit/3d43f546ddff613c50068c9d47521a1… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 859c73cd37..81f041fc60 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -477,7 +477,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, if (lock) LOCK_REPLIES( trans ); if (trans->uas.status>=200) { - LM_ERR("can't generate %d reply when a final %d was sent out\n", + LM_INFO("can't generate %d reply when a final %d was sent out\n", code, trans->uas.status); goto error2; }

1 0

git:master:fb57ccb9: app_ruby: Makefile - fixed libs for darwin os with no pkg-config
by Daniel-Constantin Mierla 13 Dec '18

13 Dec '18

Module: kamailio Branch: master Commit: fb57ccb9d56991ca10714ffaab307cd02c36542b URL: https://github.com/kamailio/kamailio/commit/fb57ccb9d56991ca10714ffaab307cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-13T10:11:18+01:00 app_ruby: Makefile - fixed libs for darwin os with no pkg-config - removed -lobj from libs for linux without no pkg-config --- Modified: src/modules/app_ruby/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/fb57ccb9d56991ca10714ffaab307cd… Patch: https://github.com/kamailio/kamailio/commit/fb57ccb9d56991ca10714ffaab307cd… --- diff --git a/src/modules/app_ruby/Makefile b/src/modules/app_ruby/Makefile index 9e54ba229e..9198714c2a 100644 --- a/src/modules/app_ruby/Makefile +++ b/src/modules/app_ruby/Makefile @@ -23,14 +23,14 @@ endif ifneq ($(BUILDER),) DEFS += $(shell $(BUILDER) --cflags $(RUBYVER)) - LIBS += $(shell $(BUILDER) --libs $(RUBYVER)) + LIBS = $(shell $(BUILDER) --libs $(RUBYVER)) else ifneq (,$(findstring darwin,$(OS))) DEFS += -I/opt/local/include -I$(LOCALBASE)/include - LIBS += -L/opt/local/lib -L$(LOCALBASE)/lib -lev + LIBS = -L/opt/local/lib -L$(LOCALBASE)/lib -lruby -lpthread -ldl else DEFS += -I$(LOCALBASE)/include -I$(SYSBASE)/include - LIBS += -L$(LOCALBASE)/lib -L$(SYSBASE)/lib -lruby -lpthread -ldl -lobjc + LIBS = -L$(LOCALBASE)/lib -L$(SYSBASE)/lib -lruby -lpthread -ldl endif endif

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018