sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:bb24683b: htable: more details about kemi callback function parameter
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: master Commit: bb24683ba00dac15428ed4c1a6f2f9f2e8f60106 URL: https://github.com/kamailio/kamailio/commit/bb24683ba00dac15428ed4c1a6f2f9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T15:49:43+02:00 htable: more details about kemi callback function parameter --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bb24683ba00dac15428ed4c1a6f2f9f… Patch: https://github.com/kamailio/kamailio/commit/bb24683ba00dac15428ed4c1a6f2f9f… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index f7d98ce..8c99ed8 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -677,8 +677,12 @@ modparam("htable", "timer_procs", 4) <para> The name of the function in the kemi configuration file (embedded scripting language such as Lua, Python, ...) to be executed instead - of event_route[...] blocks. The function receives a string parameter - with the name of the event. + of event_route[...] blocks. + </para> + <para> + The function receives a string parameter with the name of the event, + the values can be: 'htable:mod-init', 'htable:expired:htname' + ('htname' being the name of hash table). </para> <para> <emphasis>

1 0

git:master:5b7838c9: dialog: enable execution of dialog event routes via kemi
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: master Commit: 5b7838c9a5a865158c9572835c876d19a06780fb URL: https://github.com/kamailio/kamailio/commit/5b7838c9a5a865158c9572835c876d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T15:23:07+02:00 dialog: enable execution of dialog event routes via kemi - requires to set the event_callback parameters --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/5b7838c9a5a865158c9572835c876d1… Patch: https://github.com/kamailio/kamailio/commit/5b7838c9a5a865158c9572835c876d1…

1 0

git:master:9b72c40a: dispatcher: documentation for event_callback parameter
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: master Commit: 9b72c40ab7ddba0766961557067a969dfc3a000a URL: https://github.com/kamailio/kamailio/commit/9b72c40ab7ddba0766961557067a969… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T14:35:03+02:00 dispatcher: documentation for event_callback parameter --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9b72c40ab7ddba0766961557067a969… Patch: https://github.com/kamailio/kamailio/commit/9b72c40ab7ddba0766961557067a969… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index d0dc575..6950a2d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -869,6 +869,34 @@ modparam("dispatcher", "force_dst", 1) </programlisting> </example> </section> + <section id="dispatcher.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks. The function receives a string parameter + with the name of the event. + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dispatcher", "event_callback", "ksr_dispatcher_event") +... +-- event callback function implemented in Lua +function ksr_dispatcher_event(evname) + KSR.info("===== dispatcher module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> </section>

1 0

git:master:6aa21738: dispatcher: enable execution of event routes via kemi
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: master Commit: 6aa21738dd860eee60b433a48d11c58f5d67618f URL: https://github.com/kamailio/kamailio/commit/6aa21738dd860eee60b433a48d11c58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T14:22:33+02:00 dispatcher: enable execution of event routes via kemi --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/6aa21738dd860eee60b433a48d11c58… Patch: https://github.com/kamailio/kamailio/commit/6aa21738dd860eee60b433a48d11c58… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index da0cb4e..e63ca93 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -51,6 +51,7 @@ #include "../../lib/srdb1/db_res.h" #include "../../core/str.h" #include "../../core/script_cb.h" +#include "../../core/kemi.h" #include "../../core/fmsg.h" #include "ds_ht.h" @@ -72,6 +73,7 @@ static ds_ht_t *_dsht_load = NULL; static int *_ds_ping_active = NULL; extern int ds_force_dst; +extern str ds_event_callback; static db_func_t ds_dbf; static db1_con_t *ds_db_handle = NULL; @@ -2263,6 +2265,8 @@ static void ds_run_route(sip_msg_t *msg, str *uri, char *route) int rt, backup_rt; struct run_act_ctx ctx; sip_msg_t *fmsg; + sr_kemi_eng_t *keng = NULL; + str evname; if(route == NULL) { LM_ERR("bad route\n"); @@ -2271,10 +2275,20 @@ static void ds_run_route(sip_msg_t *msg, str *uri, char *route) LM_DBG("ds_run_route event_route[%s]\n", route); - rt = route_get(&event_rt, route); - if(rt < 0 || event_rt.rlist[rt] == NULL) { - LM_DBG("route does not exist"); - return; + rt = -1; + if(ds_event_callback.s==NULL || ds_event_callback.len<=0) { + rt = route_lookup(&event_rt, route); + if(rt < 0 || event_rt.rlist[rt] == NULL) { + LM_DBG("route does not exist"); + return; + } + } else { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + ds_event_callback.s); + return; + } } if(msg == NULL) { @@ -2289,11 +2303,24 @@ static void ds_run_route(sip_msg_t *msg, str *uri, char *route) fmsg = msg; } - backup_rt = get_route_type(); - set_route_type(REQUEST_ROUTE); - init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); - set_route_type(backup_rt); + if(rt>=0 || ds_event_callback.len>0) { + backup_rt = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + if(rt>=0) { + run_top_route(event_rt.rlist[rt], fmsg, 0); + } else { + if(keng!=NULL) { + evname.s = route; + evname.len = strlen(evname.s); + if(keng->froute(fmsg, EVENT_ROUTE, + &ds_event_callback, &evname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } + } + set_route_type(backup_rt); + } } diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 748f470..d0399e0 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -136,6 +136,8 @@ pv_spec_t ds_setid_pv; str ds_attrs_pvname = STR_NULL; pv_spec_t ds_attrs_pv; +str ds_event_callback = STR_NULL; + /** module functions */ static int mod_init(void); static int child_init(int); @@ -248,6 +250,7 @@ static param_export_t params[]={ {"outbound_proxy", PARAM_STR, &ds_outbound_proxy}, {"ds_default_socket", PARAM_STR, &ds_default_socket}, {"ds_timer_mode", PARAM_INT, &ds_timer_mode}, + {"event_callback", PARAM_STR, &ds_event_callback}, {0,0,0} }; diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index d04143d..1876b28 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -263,7 +263,7 @@ static int child_init(int rank) rtb = get_route_type(); set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); - if(rt>0) { + if(rt>=0) { run_top_route(event_rt.rlist[rt], fmsg, &ctx); } else { if(keng!=NULL) { @@ -274,11 +274,11 @@ static int child_init(int rank) } } } + set_route_type(rtb); if(ctx.run_flags&DROP_R_F) { LM_ERR("exit due to 'drop' in event route\n"); return -1; } - set_route_type(rtb); } done:

1 0

git:5.0:9f8d4454: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: 9f8d445458fb35a3f6f491c92ea40df92b0ec71f URL: https://github.com/kamailio/kamailio/commit/9f8d445458fb35a3f6f491c92ea40df… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-04T14:01:15+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/rabbitmq/README --- Diff: https://github.com/kamailio/kamailio/commit/9f8d445458fb35a3f6f491c92ea40df… Patch: https://github.com/kamailio/kamailio/commit/9f8d445458fb35a3f6f491c92ea40df… --- diff --git a/src/modules/rabbitmq/README b/src/modules/rabbitmq/README index e03e248..5bd0798 100644 --- a/src/modules/rabbitmq/README +++ b/src/modules/rabbitmq/README @@ -84,9 +84,10 @@ Chapter 1. Admin Guide 1. Overview This module offers amqp communication using librabbitmq. This module - was created based on rabbitmq-c C client. An new amqp connection is - setup on a per-children basis, when Kamailio starts. If connection is - lost, the process tries to re-establish it when a new amqp action is + was created using rabbitmq-c C client + (https://github.com/alanxz/rabbitmq-c). An new amqp connection is setup + on a per-children basis, when Kamailio starts. If connection is lost, + the process tries to re-establish it when a new amqp action is required. Currently librabbitmq offers no async API, but sync API, with a @@ -107,7 +108,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module: - * librabbitmq-dev. + * librabbitmq-dev - (https://github.com/alanxz/rabbitmq-c). 3. Parameters

1 0

git:5.0:0c2a5b7d: pkg: create /var/run/kamailio with user permissions in centos 7 spec
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: 0c2a5b7dc31751e6753a13f6956795e3ad15cf73 URL: https://github.com/kamailio/kamailio/commit/0c2a5b7dc31751e6753a13f6956795e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T13:54:05+02:00 pkg: create /var/run/kamailio with user permissions in centos 7 spec (cherry picked from commit 8f407a915785a2bd594567399cd52a305ccb274e) --- Modified: pkg/kamailio/centos/7/kamailio.init Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0c2a5b7dc31751e6753a13f6956795e… Patch: https://github.com/kamailio/kamailio/commit/0c2a5b7dc31751e6753a13f6956795e… --- diff --git a/pkg/kamailio/centos/7/kamailio.init b/pkg/kamailio/centos/7/kamailio.init index 3ee9677..2cdae7a 100644 --- a/pkg/kamailio/centos/7/kamailio.init +++ b/pkg/kamailio/centos/7/kamailio.init @@ -23,7 +23,8 @@ KAM=/usr/sbin/kamailio KAMCFG=/etc/kamailio/kamailio.cfg PROG=kamailio -PID_FILE=/var/run/kamailio.pid +HOMEDIR=/var/run/$PROG +PID_FILE=/var/run/$PROG/kamailio.pid LOCK_FILE=/var/lock/subsys/kamailio RETVAL=0 DEFAULTS=/etc/sysconfig/kamailio @@ -101,6 +102,12 @@ if test "$DUMP_CORE" = "yes" ; then echo "$COREDIR/core.%e.sig%s.%p" > /proc/sys/kernel/core_pattern fi +# /var/run can be a tmpfs +if [ ! -d $HOMEDIR ]; then + mkdir -p $HOMEDIR + chown ${USER}:${GROUP} $HOMEDIR +fi + OPTIONS="-P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 053fe9a..bb5c414 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -622,6 +622,8 @@ install -m644 pkg/kamailio/centos/%{?centos}/kamailio.sysconfig \ /usr/sbin/groupadd -r kamailio 2> /dev/null || : /usr/sbin/useradd -r -g kamailio -s /bin/false -c "Kamailio daemon" -d \ %{_libdir}/kamailio kamailio 2> /dev/null || : +mkdir -p %{_var}/run/kamailio 2> /dev/null || : +chown kamailio:kamailio %{_var}/run/kamailio 2> /dev/null || :

1 0

git:5.0:30668abe: topoh: add additional safety checks
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: 30668abe2499d56d63efd4b860a154076e2150e7 URL: https://github.com/kamailio/kamailio/commit/30668abe2499d56d63efd4b860a1540… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T13:53:48+02:00 topoh: add additional safety checks - verify that headers contain expected prefix (including mask ip) before trying to unmask them; otherwise there may be issues when kamailio receives messages that are not masked and topoh is enabled. (cherry picked from commit 055fca8dd2ca9c2ea683a2ea3748d6728d54e5a5) --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/30668abe2499d56d63efd4b860a1540… Patch: https://github.com/kamailio/kamailio/commit/30668abe2499d56d63efd4b860a1540… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index a320c4a..a1f117e3 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -390,6 +390,14 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) LM_DBG("body: %d: [%.*s]\n", vlen, vlen, via->name.s); if(i!=1) { + /* Skip if via is not encoded */ + if (via->host.len!=th_ip.len + || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0) + { + LM_DBG("via %d is not encoded",i); + continue; + } + vp = th_get_via_param(via, &th_vparam_name); if(vp==NULL) { @@ -404,7 +412,7 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) &th_vparam_prefix, 0, &out.len); if(out.s==NULL) { - LM_ERR("cannot encode via %d\n", i); + LM_ERR("cannot decode via %d\n", i); return -1; } @@ -475,6 +483,14 @@ int th_unmask_callid(sip_msg_t *msg) LM_ERR("cannot get Call-Id header\n"); return -1; } + + /* Do nothing if call-id is not encoded */ + if ((msg->callid->body.len<th_callid_prefix.len) || + (strncasecmp(msg->callid->body.s,th_callid_prefix.s,th_callid_prefix.len)!=0)) + { + LM_DBG("call-id [%.*s] not encoded",msg->callid->body.len,msg->callid->body.s); + return 0; + } out.s = th_mask_decode(msg->callid->body.s, msg->callid->body.len, &th_callid_prefix, 0, &out.len); @@ -670,6 +686,15 @@ int th_unmask_route(sip_msg_t *msg) i++; if(i!=1) { + /* Skip if route is not encoded */ + if ((rr->nameaddr.uri.len<th_uri_prefix.len) || + (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + { + LM_DBG("rr %d is not encoded: [%.*s]",i,rr->nameaddr.uri.len,rr->nameaddr.uri.s); + rr = rr->next; + continue; + } + if(th_get_uri_param_value(&rr->nameaddr.uri, &th_uparam_name, &eval)<0 || eval.len<=0) return -1; @@ -710,6 +735,14 @@ int th_unmask_ruri(sip_msg_t *msg) struct lump* l; str out; + /* Do nothing if ruri is not encoded */ + if ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || + (strncasecmp(REQ_LINE(msg).uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + { + LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); + return 0; + } + if(th_get_uri_param_value(&REQ_LINE(msg).uri, &th_uparam_name, &eval)<0 || eval.len<=0) return -1; @@ -763,6 +796,15 @@ int th_unmask_refer_to(sip_msg_t *msg) } uri = &(get_refer_to(msg)->uri); + + /* Do nothing if refer_to is not encoded */ + if ((uri->len<th_uri_prefix.len) + || (strncasecmp(uri->s, th_uri_prefix.s, th_uri_prefix.len)!=0)) + { + LM_DBG("refer-to [%.*s] is not encoded",uri->len,uri->s); + return 0; + } + if(th_get_uri_param_value(uri, &th_uparam_name, &eval)<0 || eval.len<=0) return -1;

1 0

git:5.0:16a54ceb: htable: handle blob/text columns when loading from database
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: 16a54ceb0b5443aebe8d6e6a87838847343b7f54 URL: https://github.com/kamailio/kamailio/commit/16a54ceb0b5443aebe8d6e6a8783884… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T13:53:31+02:00 htable: handle blob/text columns when loading from database - reported by Patrick Ginhoux (cherry picked from commit 24e729698017b5d898a92cdf7acb024e44252b84) --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/16a54ceb0b5443aebe8d6e6a8783884… Patch: https://github.com/kamailio/kamailio/commit/16a54ceb0b5443aebe8d6e6a8783884… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 6ce3fc9..83a9f01 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -114,7 +114,8 @@ static char ht_name_buf[HT_NAME_BUF_SIZE]; static int ht_pack_values(ht_t *ht, db1_res_t* db_res, int row, int cols, str *hvalue) { - static char vbuf[4096]; +#define HTABLE_PACK_BUF_SIZE 4096 + static char vbuf[HTABLE_PACK_BUF_SIZE]; int c; int len; char *p; @@ -128,6 +129,8 @@ static int ht_pack_values(ht_t *ht, db1_res_t* db_res, len += strlen(RES_ROWS(db_res)[row].values[c].val.string_val); } else if(RES_ROWS(db_res)[row].values[c].type == DB1_STR) { len += RES_ROWS(db_res)[row].values[c].val.str_val.len; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_BLOB) { + len += RES_ROWS(db_res)[row].values[c].val.blob_val.len; } else if(RES_ROWS(db_res)[row].values[c].type == DB1_INT) { len += 12; } else { @@ -135,8 +138,9 @@ static int ht_pack_values(ht_t *ht, db1_res_t* db_res, return -1; } } - if(len + c>=4096) { - LM_ERR("too large values (need %d)\n", len+c); + if(len + c>=HTABLE_PACK_BUF_SIZE) { + LM_ERR("too large values (need %d, have %d)\n", len+c, + HTABLE_PACK_BUF_SIZE); return -1; } p = vbuf; @@ -151,6 +155,10 @@ static int ht_pack_values(ht_t *ht, db1_res_t* db_res, strncpy(p, RES_ROWS(db_res)[row].values[c].val.str_val.s, RES_ROWS(db_res)[row].values[c].val.str_val.len); p += RES_ROWS(db_res)[row].values[c].val.str_val.len; + } else if(RES_ROWS(db_res)[row].values[c].type == DB1_BLOB) { + memcpy(p, RES_ROWS(db_res)[row].values[c].val.blob_val.s, + RES_ROWS(db_res)[row].values[c].val.blob_val.len); + p += RES_ROWS(db_res)[row].values[c].val.blob_val.len; } else if(RES_ROWS(db_res)[row].values[c].type == DB1_INT) { iv.s = sint2str(RES_ROWS(db_res)[row].values[c].val.int_val, &iv.len); strncpy(p, iv.s, iv.len); @@ -280,6 +288,14 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } kname.len = (RES_ROWS(db_res)[i].values[0].val.str_val.len); break; + case DB1_BLOB: + kname.s = (RES_ROWS(db_res)[i].values[0].val.blob_val.s); + if(kname.s==NULL) { + LM_ERR("null key in row %d\n", i); + goto error; + } + kname.len = (RES_ROWS(db_res)[i].values[0].val.blob_val.len); + break; case DB1_STRING: kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); if(kname.s==NULL) { @@ -392,6 +408,14 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } str2sint(&kvalue, &val.n); break; + case DB1_BLOB: + kvalue = RES_ROWS(db_res)[i].values[3].val.blob_val; + if(kvalue.s==NULL) { + LM_ERR("null value in row %d\n", i); + goto error; + } + str2sint(&kvalue, &val.n); + break; case DB1_STRING: kvalue.s = (char*)(RES_ROWS(db_res)[i].values[3].val.string_val); if(kvalue.s==NULL) { @@ -423,6 +447,14 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) } val.s = kvalue; break; + case DB1_BLOB: + kvalue = RES_ROWS(db_res)[i].values[3].val.blob_val; + if(kvalue.s==NULL) { + LM_ERR("null value in row %d\n", i); + goto error; + } + val.s = kvalue; + break; case DB1_STRING: kvalue.s = (char*)(RES_ROWS(db_res)[i].values[3].val.string_val); if(kvalue.s==NULL) {

1 0

git:5.0:1ed8f8aa: kamctl: added srv command
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: 1ed8f8aabe7e1e444f9fabd4728896d23a48f630 URL: https://github.com/kamailio/kamailio/commit/1ed8f8aabe7e1e444f9fabd4728896d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T13:53:10+02:00 kamctl: added srv command - shortcuts to RPC commands to print sockets, aliases and available RPC commands (cherry picked from commit e271bb60d4cb0e3e2ec1ecca4ff2833885331732) --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/1ed8f8aabe7e1e444f9fabd4728896d… Patch: https://github.com/kamailio/kamailio/commit/1ed8f8aabe7e1e444f9fabd4728896d… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 9e954c6..30d5878 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1686,6 +1686,35 @@ dispatcher() { # ##### ------------------------------------------------ ##### +### Server management +# +ksr_srv() { + case $1 in + sockets) + require_ctlengine + mecho "list listen sockets" + ctl_cmd_run corex.list_sockets corex.list_sockets + ;; + aliases) + require_ctlengine + mecho "list server aliases" + ctl_cmd_run corex.list_aliases corex.list_aliases + ;; + rpclist) + require_ctlengine + mecho "list server rpc commands" + ctl_cmd_run system.listMethods system.listMethods + ;; + *) + usage_ksr_srv + exit 1 + + esac +} + + +# +##### ------------------------------------------------ ##### ### DIALOG management # dialog() { @@ -2904,6 +2933,11 @@ case $1 in fi ;; + srv) + shift + ksr_srv "$@" + ;; + restart) kamailio_stop sleep 2 diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index fe67a0c..29ee217 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -535,6 +535,20 @@ cat <<EOF EOF } +usage_ksr_srv() { + echo + mecho " -- command 'srv' - server management commands" + echo +cat <<EOF + * Examples: srv sockets + * srv rpclist + srv sockets ................... show the list of listen sockets + srv aliases ................... show the list of server aliases + srv rpclist ................... show the list of server rpc commands +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv" + ##### ----------------------------------------------- ##### #### Common functions

1 0

git:5.0:b30edd2b: dmq: attempt to re-initialize if node becomes detatched from cluster
by Daniel-Constantin Mierla 04 Apr '17

04 Apr '17

Module: kamailio Branch: 5.0 Commit: b30edd2b19d7e30c1d2f9cef9303ae86bcd1c0f2 URL: https://github.com/kamailio/kamailio/commit/b30edd2b19d7e30c1d2f9cef9303ae8… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-04T13:52:37+02:00 dmq: attempt to re-initialize if node becomes detatched from cluster - issue reported by JosÃ© Seabra on sr-users mailing list (cherry picked from commit 666ebb63aecf2254b8efeae261452fc75c6d3aed) --- Modified: src/modules/dmq/dmq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b30edd2b19d7e30c1d2f9cef9303ae8… Patch: https://github.com/kamailio/kamailio/commit/b30edd2b19d7e30c1d2f9cef9303ae8… --- diff --git a/src/modules/dmq/dmq_funcs.c b/src/modules/dmq/dmq_funcs.c index 57c8c88..622ec42 100644 --- a/src/modules/dmq/dmq_funcs.c +++ b/src/modules/dmq/dmq_funcs.c @@ -459,12 +459,28 @@ void ping_servers(unsigned int ticks, void *param) { str* body; int ret; LM_DBG("ping_servers\n"); + + if (!node_list->nodes || (node_list->nodes->local && !node_list->nodes->next)) { + LM_DBG("node list is empty - attempt to rebuild from notification address\n"); + *dmq_init_callback_done = 0; + if(dmq_notification_address.s) { + notification_node = add_server_and_notify(&dmq_notification_address); + if(!notification_node) { + LM_ERR("cannot retrieve initial nodelist from %.*s\n", + STR_FMT(&dmq_notification_address)); + } + } else { + LM_ERR("no notification address"); + } + return; + } + body = build_notification_body(); if (!body) { LM_ERR("could not build notification body\n"); return; } - ret = bcast_dmq_message(dmq_notification_peer, body, notification_node, + ret = bcast_dmq_message(dmq_notification_peer, body, NULL, &notification_callback, 1, &notification_content_type); pkg_free(body->s); pkg_free(body);

1 0

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