- sr-dev - kamailio.org

git:master:886f14e1: nat_traversal: handle local generated transactions (#1344)
by Daniel-Constantin Mierla 29 Nov '17

29 Nov '17

Module: kamailio Branch: master Commit: 886f14e11e3e5fe9d2bc56fd37d2102ae5b99645 URL: https://github.com/kamailio/kamailio/commit/886f14e11e3e5fe9d2bc56fd37d2102… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-29T12:00:01+01:00 nat_traversal: handle local generated transactions (#1344) * nat_traversal: fix local generated transactions * nat_traversal: handle TMCB_RESPONSE_SENT only for FAKED_REPLY * nat_traversal: free allocated buffer --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/886f14e11e3e5fe9d2bc56fd37d2102… Patch: https://github.com/kamailio/kamailio/commit/886f14e11e3e5fe9d2bc56fd37d2102… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index ae38d7653b..3ddee233d6 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1358,17 +1358,42 @@ __sl_reply_out(sl_cbp_t *slcbp) static void __tm_reply_in(struct cell *trans, int type, struct tmcb_params *param) { - time_t expire; + time_t expire = 0; if (param->req==NULL || param->rpl==NULL) return; + if(type == TMCB_RESPONSE_SENT && param->rpl!=FAKED_REPLY) + return; + if (param->code >= 200 && param->code < 300) { switch (param->req->REQ_METHOD) { case METHOD_SUBSCRIBE: - expire = get_expires(param->rpl); - if (expire > 0) + if(type == TMCB_RESPONSE_SENT) { + char* tmp = pkg_malloc(param->send_buf.len+1); + if(tmp) { + sip_msg_t msg; + strncpy(tmp, param->send_buf.s, param->send_buf.len); + tmp[param->send_buf.len] = '\0'; + memset(&msg, 0, sizeof(sip_msg_t)); + msg.buf=tmp; + msg.len=param->send_buf.len; + if(parse_msg(tmp, param->send_buf.len, &msg) != 0) { + LM_ERR("ERROR PARSING REPLY\n"); + } else { + expire = get_expires(&msg); + } + free_sip_msg(&msg); + pkg_free(tmp); + } + } else { + expire = get_expires(param->rpl); + } + if (expire > 0) { keepalive_subscription(param->req, expire); + } else { + LM_DBG("expires == 0\n"); + } break; case METHOD_REGISTER: expire = get_register_expire(param->req, param->rpl); @@ -1404,7 +1429,7 @@ NAT_Keepalive(struct sip_msg *msg) // fallthrough case METHOD_SUBSCRIBE: msg->msg_flags |= FL_DO_KEEPALIVE; - if (tm_api.register_tmcb(msg, 0, TMCB_RESPONSE_IN, __tm_reply_in, 0, 0) <= 0) { + if (tm_api.register_tmcb(msg, 0, TMCB_RESPONSE_IN | TMCB_RESPONSE_SENT, __tm_reply_in, 0, 0) <= 0) { LM_ERR("cannot register TM callback for incoming replies\n"); return -1; }

1 0

git:master:75bbbe40: ndb_redis: detect argument specifiers for redis_cmd() with three params
by Daniel-Constantin Mierla 29 Nov '17

29 Nov '17

Module: kamailio Branch: master Commit: 75bbbe4059cb6fde4c74fa9157f400a24e6f7496 URL: https://github.com/kamailio/kamailio/commit/75bbbe4059cb6fde4c74fa9157f400a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-29T10:58:53+01:00 ndb_redis: detect argument specifiers for redis_cmd() with three params - check if %s or %d is part of the command, because it makes the redis api expect more params to the commands and can crash if none is found - reported by GH #1342 --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/75bbbe4059cb6fde4c74fa9157f400a… Patch: https://github.com/kamailio/kamailio/commit/75bbbe4059cb6fde4c74fa9157f400a… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 64f2b46897..e984a902bd 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -177,6 +177,7 @@ static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres) { str s[3]; + int i; if(fixup_get_svalue(msg, (gparam_t*)ssrv, &s[0])!=0) { @@ -188,6 +189,14 @@ static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, LM_ERR("no redis command\n"); return -1; } + for(i=0; i<s[1].len-1; i++) { + if(s[1].s[i]=='%') { + if(s[1].s[i+1]=='s' || s[1].s[i+1]=='b') { + LM_ERR("command argument specifier found, but no params\n"); + return -1; + } + } + } if(fixup_get_svalue(msg, (gparam_t*)sres, &s[2])!=0) { LM_ERR("no redis reply name\n"); @@ -928,6 +937,19 @@ int bind_ndb_redis(ndb_redis_api_t *api) */ static int ki_redis_cmd(sip_msg_t *msg, str *srv, str *rcmd, str *sres) { + int i; + if(rcmd==NULL || rcmd->s==NULL) { + LM_ERR("invalid command\n"); + return -1; + } + for(i=0; i<rcmd->len-1; i++) { + if(rcmd->s[i]=='%') { + if(rcmd->s[i+1]=='s' || rcmd->s[i+1]=='b') { + LM_ERR("command argument specifier found, but no params\n"); + return -1; + } + } + } return redisc_exec(srv, sres, rcmd); } @@ -1007,4 +1029,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_ndb_redis_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:49272f23: presence: update contact in update_subs_db
by lazedo 29 Nov '17

29 Nov '17

Module: kamailio Branch: master Commit: 49272f23b22445415721766709bf5841865e8609 URL: https://github.com/kamailio/kamailio/commit/49272f23b22445415721766709bf584… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-11-29T09:50:51Z presence: update contact in update_subs_db --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/49272f23b22445415721766709bf584… Patch: https://github.com/kamailio/kamailio/commit/49272f23b22445415721766709bf584… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index ee90bf7c85..f199f95c58 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -420,6 +420,13 @@ int update_subs_db(subs_t* subs, int type) update_vals[n_update_cols].nul = 0; update_vals[n_update_cols].val.int_val = subs->updated_winfo; n_update_cols++; + + update_keys[n_update_cols] = &str_contact_col; + update_vals[n_update_cols].type = DB1_STR; + update_vals[n_update_cols].nul = 0; + update_vals[n_update_cols].val.str_val = subs->contact; + n_update_cols++; + } if(type & LOCAL_TYPE) {

1 0

[kamailio/kamailio] presence: update contact in update_subs_db (#1341)
by lazedo 29 Nov '17

29 Nov '17

when using presence with dbmode = 3, the contact is never updated. if using dbmode != 3 the contact is updated in the hash table. we've seen some UAs re-subscribing with a different contact port of the initial subscribe. it works with dbmode != 3 but not with dbmode == 3 this should be backported to 5.0/5.1 branch Thanks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1341 -- Commit Summary -- * presence: update contact in update_subs_db -- File Changes -- M src/modules/presence/subscribe.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1341.patch https://github.com/kamailio/kamailio/pull/1341.diff -- 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/pull/1341

2 2

git:master:209032fc: ldap: use core fixup function for ldap_search()
by Daniel-Constantin Mierla 29 Nov '17

29 Nov '17

Module: kamailio Branch: master Commit: 209032fc134afb90e4e12b194d1368ed9fb67ee9 URL: https://github.com/kamailio/kamailio/commit/209032fc134afb90e4e12b194d1368e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-29T08:33:38+01:00 ldap: use core fixup function for ldap_search() --- Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/209032fc134afb90e4e12b194d1368e… Patch: https://github.com/kamailio/kamailio/commit/209032fc134afb90e4e12b194d1368e… --- diff --git a/src/modules/ldap/ldap_exp_fn.c b/src/modules/ldap/ldap_exp_fn.c index 77a92c2bf7..c68e00895e 100644 --- a/src/modules/ldap/ldap_exp_fn.c +++ b/src/modules/ldap/ldap_exp_fn.c @@ -52,31 +52,22 @@ static char esc_buf[ESC_BUF_SIZE]; * exported functions */ -int ldap_search_impl(struct sip_msg *_msg, pv_elem_t *_ldap_url) +int ldap_search_impl(struct sip_msg *_msg, str *ldap_url) { - str ldap_url; int ld_result_count = 0; /* * do variable substitution for _ldap_url (pv_printf_s) */ - if(_ldap_url == NULL) { + if(ldap_url == NULL || ldap_url->s==NULL || ldap_url->len<=0) { LM_ERR("empty ldap_url\n"); return -2; } - if(_ldap_url->spec != NULL && _ldap_url->spec->getf != NULL) { - if(pv_printf_s(_msg, _ldap_url, &ldap_url) != 0 || ldap_url.len <= 0) { - LM_ERR("pv_printf_s failed\n"); - return -2; - } - } else { - ldap_url = _ldap_url->text; - } /* * perform LDAP search */ - if(ldap_url_search(ldap_url.s, &ld_result_count) != 0) { + if(ldap_url_search(ldap_url->s, &ld_result_count) != 0) { /* LDAP search error */ return -2; } diff --git a/src/modules/ldap/ldap_exp_fn.h b/src/modules/ldap/ldap_exp_fn.h index 695dbc198e..20d4149de6 100644 --- a/src/modules/ldap/ldap_exp_fn.h +++ b/src/modules/ldap/ldap_exp_fn.h @@ -47,7 +47,7 @@ struct ldap_result_check_params pv_elem_p check_str_elem_p; }; -int ldap_search_impl(struct sip_msg *_msg, pv_elem_t *_ldap_url); +int ldap_search_impl(struct sip_msg *_msg, str *ldap_url); int ldap_write_result(struct sip_msg *_msg, struct ldap_result_params *_lrp, struct subst_expr *_se); diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index f167bcadbb..2364f0a7cf 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -33,6 +33,7 @@ #include "../../core/parser/hf.h" #include "../../core/sr_module.h" #include "../../core/pvar.h" +#include "../../core/mod_fix.h" #include "../../core/mem/mem.h" #include "ld_session.h" @@ -54,7 +55,6 @@ static int child_init(int rank); /* * fixup functions */ -static int ldap_search_fixup(void **param, int param_no); static int ldap_result_fixup(void **param, int param_no); static int ldap_filter_url_encode_fixup(void **param, int param_no); static int ldap_result_check_fixup(void **param, int param_no); @@ -92,7 +92,7 @@ static dictionary *config_vals = NULL; /* clang-format off */ static cmd_export_t cmds[] = { {"ldap_search", (cmd_function)w_ldap_search, 1, - ldap_search_fixup, 0, + fixup_spve_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"ldap_result", (cmd_function)w_ldap_result1, 1, ldap_result_fixup, 0, @@ -246,7 +246,13 @@ static void destroy(void) static int w_ldap_search(struct sip_msg *msg, char *ldap_url, char *param) { - return ldap_search_impl(msg, (pv_elem_t *)ldap_url); + str ldap_url_val = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)ldap_url, &ldap_url_val)<0) { + LM_ERR("failed to get ldap url parameter\n"); + return -1; + } + return ldap_search_impl(msg, &ldap_url_val); } static int w_ldap_result1(struct sip_msg *msg, char *src, char *param) @@ -291,28 +297,6 @@ static int w_ldap_result_check_2( * FIXUP functions */ -static int ldap_search_fixup(void **param, int param_no) -{ - pv_elem_t *model; - str s; - - if(param_no == 1) { - s.s = (char *)*param; - s.len = strlen(s.s); - if(s.len == 0) { - LM_ERR("ldap url is empty string!\n"); - return E_CFG; - } - if(pv_parse_format(&s, &model) || model == NULL) { - LM_ERR("wrong format [%s] for ldap url!\n", s.s); - return E_CFG; - } - *param = (void *)model; - } - - return 0; -} - static int ldap_result_fixup(void **param, int param_no) { struct ldap_result_params *lp;

1 0

git:master:855d5d0f: ldap: clang format the code
by Daniel-Constantin Mierla 28 Nov '17

28 Nov '17

Module: kamailio Branch: master Commit: 855d5d0f976e89962c541a34690dcb212e127e6b URL: https://github.com/kamailio/kamailio/commit/855d5d0f976e89962c541a34690dcb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-28T17:51:33+01:00 ldap: clang format the code --- Modified: src/modules/ldap/api.h Modified: src/modules/ldap/iniparser.c Modified: src/modules/ldap/iniparser.h Modified: src/modules/ldap/ld_session.c Modified: src/modules/ldap/ld_session.h Modified: src/modules/ldap/ldap_api_fn.c Modified: src/modules/ldap/ldap_api_fn.h Modified: src/modules/ldap/ldap_connect.c Modified: src/modules/ldap/ldap_connect.h Modified: src/modules/ldap/ldap_escape.c Modified: src/modules/ldap/ldap_exp_fn.c Modified: src/modules/ldap/ldap_exp_fn.h Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/855d5d0f976e89962c541a34690dcb2… Patch: https://github.com/kamailio/kamailio/commit/855d5d0f976e89962c541a34690dcb2…

1 0

git:master:9f353bad: tcpops: exported functions to kemi framework
by Daniel-Constantin Mierla 28 Nov '17

28 Nov '17

Module: kamailio Branch: master Commit: 9f353bad0036f602e4f1ec39096658c1c7809a9b URL: https://github.com/kamailio/kamailio/commit/9f353bad0036f602e4f1ec39096658c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-28T13:25:35+01:00 tcpops: exported functions to kemi framework --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9f353bad0036f602e4f1ec39096658c… Patch: https://github.com/kamailio/kamailio/commit/9f353bad0036f602e4f1ec39096658c…

1 0

git:master:3d22063e: core: timer - use uint type instead of short for flags and slow index
by Daniel-Constantin Mierla 28 Nov '17

28 Nov '17

Module: kamailio Branch: master Commit: 3d22063ebd4cfa8b54ec3e83a04e92770c6d7319 URL: https://github.com/kamailio/kamailio/commit/3d22063ebd4cfa8b54ec3e83a04e927… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-28T10:49:30+01:00 core: timer - use uint type instead of short for flags and slow index - get rid of unused padding field --- Modified: src/core/timer.c Modified: src/core/timer.h --- Diff: https://github.com/kamailio/kamailio/commit/3d22063ebd4cfa8b54ec3e83a04e927… Patch: https://github.com/kamailio/kamailio/commit/3d22063ebd4cfa8b54ec3e83a04e927… --- diff --git a/src/core/timer.c b/src/core/timer.c index 3a4e610f3e..0e0dc8812e 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -530,7 +530,7 @@ static inline int _timer_add(ticks_t t, struct timer_ln* tl) ticks_t delta; #ifdef USE_SLOW_TIMER - tl->flags&=~((unsigned short)F_TIMER_ON_SLOW_LIST); + tl->flags&=~(F_TIMER_ON_SLOW_LIST); tl->slow_idx=0; #endif delta=tl->initial_timeout; diff --git a/src/core/timer.h b/src/core/timer.h index 6414fb106b..3b1669ab19 100644 --- a/src/core/timer.h +++ b/src/core/timer.h @@ -52,7 +52,7 @@ #ifdef USE_SLOW_TIMER #include <sys/types.h> -typedef unsigned short slow_idx_t; /* type fot the slow index */ +typedef unsigned int slow_idx_t; /* type fot the slow index */ extern pid_t slow_timer_pid; #endif @@ -102,11 +102,9 @@ struct timer_ln{ /* timer_link already used in tm */ ticks_t initial_timeout; void* data; timer_handler_f* f; - volatile unsigned short flags; + volatile unsigned int flags; #ifdef USE_SLOW_TIMER volatile slow_idx_t slow_idx; -#else - unsigned short reserved; #endif #ifdef TIMER_DEBUG unsigned int expires_no; /* timer handler calls */ @@ -144,15 +142,13 @@ void timer_free(struct timer_ln* t); /* use for a deleted/expired timer that you want to add again */ #define timer_reinit(tl) \ do{ \ - (tl)->flags&=~((unsigned short)(F_TIMER_ON_SLOW_LIST | \ - F_TIMER_ACTIVE));\ + (tl)->flags&=~(F_TIMER_ON_SLOW_LIST | F_TIMER_ACTIVE);\ (tl)->init++; \ }while(0) #else /* use for a deleted/expired timer that you want to add again */ #define timer_reinit(tl) \ - (tl)->flags&=~((unsigned short)(F_TIMER_ON_SLOW_LIST | \ - F_TIMER_ACTIVE)) + (tl)->flags&=~(F_TIMER_ON_SLOW_LIST | F_TIMER_ACTIVE) #endif #define timer_init(tl, fun, param, flgs) \

1 0

git:master:7bdf8f00: cnxcc: removed unused variable
by Daniel-Constantin Mierla 28 Nov '17

28 Nov '17

Module: kamailio Branch: master Commit: 7bdf8f003bbf5e153d7835d09533c7e22377e8db URL: https://github.com/kamailio/kamailio/commit/7bdf8f003bbf5e153d7835d09533c7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-28T10:49:30+01:00 cnxcc: removed unused variable --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7bdf8f003bbf5e153d7835d09533c7e… Patch: https://github.com/kamailio/kamailio/commit/7bdf8f003bbf5e153d7835d09533c7e… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index e77345d745..2cd8a87c6a 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -1755,7 +1755,6 @@ static int __get_channel_count_helper(sip_msg_t *msg, str *sclient, static int __get_channel_count(sip_msg_t *msg, char *pclient, char *pcount) { - pv_spec_t *pvcount = (pv_spec_t *)pcount; str sclient; if(fixup_get_svalue(msg, (gparam_t*)pclient, &sclient)<0) {

1 0

git:master:f8d0a395: .clang-format: do not use bleeding edge keys
by Juha Heinanen 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: f8d0a395074cd066a9f3df26debf14cf26e21a12 URL: https://github.com/kamailio/kamailio/commit/f8d0a395074cd066a9f3df26debf14c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-11-28T00:22:36+02:00 .clang-format: do not use bleeding edge keys --- Modified: .clang-format --- Diff: https://github.com/kamailio/kamailio/commit/f8d0a395074cd066a9f3df26debf14c… Patch: https://github.com/kamailio/kamailio/commit/f8d0a395074cd066a9f3df26debf14c… --- diff --git a/.clang-format b/.clang-format index b44f1c4a54..d805149083 100644 --- a/.clang-format +++ b/.clang-format @@ -36,8 +36,6 @@ BreakBeforeBinaryOperators: NonAssignment BreakBeforeBraces: Mozilla BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: false -BreakAfterJavaFieldAnnotations: false -BreakStringLiterals: true ColumnLimit: 80 CommentPragmas: '^ IWYU pragma:' ConstructorInitializerAllOnOneLineOrOnePerLine: false @@ -55,12 +53,9 @@ IncludeCategories: Priority: 3 - Regex: '.*' Priority: 1 -IncludeIsMainRegex: '$' IndentCaseLabels: true IndentWidth: 4 IndentWrappedFunctionNames: false -JavaScriptQuotes: Leave -JavaScriptWrapImports: true KeepEmptyLinesAtTheStartOfBlocks: true MacroBlockBegin: '' MacroBlockEnd: ''

1 0

git:5.1:1e05eaa1: pkg/kamailio/deb: version set to 5.1.0~rc2
by Victor Seva 27 Nov '17

27 Nov '17

Module: kamailio Branch: 5.1 Commit: 1e05eaa12e97ddddf761a6356c134bccc99aff11 URL: https://github.com/kamailio/kamailio/commit/1e05eaa12e97ddddf761a6356c134bc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-27T09:48:51+01:00 pkg/kamailio/deb: version set to 5.1.0~rc2 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/1e05eaa12e97ddddf761a6356c134bc… Patch: https://github.com/kamailio/kamailio/commit/1e05eaa12e97ddddf761a6356c134bc… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index ad1f4be0f2..ffe4d96e9a 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc2) unstable; urgency=medium + + * version set to 5.1.0~rc2 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Nov 2017 09:48:18 +0100 + kamailio (5.1.0~rc1) unstable; urgency=medium * version set to 5.1.0~rc1 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index ad1f4be0f2..ffe4d96e9a 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc2) unstable; urgency=medium + + * version set to 5.1.0~rc2 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Nov 2017 09:48:18 +0100 + kamailio (5.1.0~rc1) unstable; urgency=medium * version set to 5.1.0~rc1 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index ad1f4be0f2..ffe4d96e9a 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc2) unstable; urgency=medium + + * version set to 5.1.0~rc2 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Nov 2017 09:48:18 +0100 + kamailio (5.1.0~rc1) unstable; urgency=medium * version set to 5.1.0~rc1 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index ad1f4be0f2..ffe4d96e9a 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc2) unstable; urgency=medium + + * version set to 5.1.0~rc2 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Nov 2017 09:48:18 +0100 + kamailio (5.1.0~rc1) unstable; urgency=medium * version set to 5.1.0~rc1 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index ad1f4be0f2..ffe4d96e9a 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc2) unstable; urgency=medium + + * version set to 5.1.0~rc2 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Nov 2017 09:48:18 +0100 + kamailio (5.1.0~rc1) unstable; urgency=medium * version set to 5.1.0~rc1 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index ad1f4be0f2..ffe4d96e9a 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc2) unstable; urgency=medium + + * version set to 5.1.0~rc2 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Nov 2017 09:48:18 +0100 + kamailio (5.1.0~rc1) unstable; urgency=medium * version set to 5.1.0~rc1 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index ad1f4be0f2..ffe4d96e9a 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc2) unstable; urgency=medium + + * version set to 5.1.0~rc2 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Nov 2017 09:48:18 +0100 + kamailio (5.1.0~rc1) unstable; urgency=medium * version set to 5.1.0~rc1 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index ad1f4be0f2..ffe4d96e9a 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc2) unstable; urgency=medium + + * version set to 5.1.0~rc2 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Nov 2017 09:48:18 +0100 + kamailio (5.1.0~rc1) unstable; urgency=medium * version set to 5.1.0~rc1 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index ad1f4be0f2..ffe4d96e9a 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc2) unstable; urgency=medium + + * version set to 5.1.0~rc2 + + -- Victor Seva <vseva(a)debian.org> Mon, 27 Nov 2017 09:48:18 +0100 + kamailio (5.1.0~rc1) unstable; urgency=medium * version set to 5.1.0~rc1

1 0

git:5.1:5d66d4b4: Makefile.defs: version set to 5.1.0-rc2
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: 5.1 Commit: 5d66d4b4d9775de463e031b849d96a3fd201f986 URL: https://github.com/kamailio/kamailio/commit/5d66d4b4d9775de463e031b849d96a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:41:55+01:00 Makefile.defs: version set to 5.1.0-rc2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/5d66d4b4d9775de463e031b849d96a3… Patch: https://github.com/kamailio/kamailio/commit/5d66d4b4d9775de463e031b849d96a3… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5553d721b8..4ad22ca7ff 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

- URL: https://github.com/kamailio/kamailio/commit/4bb2267e65af9079699b7248b86c1b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:25:50+01:00 textops: more functions exported to kemi (cherry picked from commit 18ebd5fe71baee236c8b2ee720028c5c90f622c5) - URL: https://github.com/kamailio/kamailio/commit/7f4cdb2f3c94ef7869db767906b3448… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:26:16+01:00 textops: split the code for msg_apply_changes() - exported msg_set_buffer(...) to kemi framework (cherry picked from commit 0a626a257dceb0c7cee13bf4ed173b644a5e5fd7) - URL: https://github.com/kamailio/kamailio/commit/75bb317825fdf3c9fb0f6c1e97235a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:26:29+01:00 textopsx: exported header management functions to kemi framework (cherry picked from commit 80bed453cfcc5ec8753e4bb823097e711b1b5385) - URL: https://github.com/kamailio/kamailio/commit/5ae1d7e8ee0673fc22adff5a1a6a09d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:26:42+01:00 tsilo: exported functions to kemi framework (cherry picked from commit 19f7d568a7bb17a88dd06f0b78775a559a1ca683) - URL: https://github.com/kamailio/kamailio/commit/2541ea693b69dc705ff5e1ba0e8218f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:26:55+01:00 misc/examples: fixed position of ] in log message from kemi examples - based on a reporte by GH #1324 (cherry picked from commit d9ca0f6fcbd479dc82f75d301e43e45daf36a658) - URL: https://github.com/kamailio/kamailio/commit/89bdf5edb485e636f3592c37ac9ce5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:27:08+01:00 dialog: proper description of is_in_profile() to match the code - reported by GH #1320 (cherry picked from commit d319c449c8c15334ed913633cfece869a7d955aa) - URL: https://github.com/kamailio/kamailio/commit/b4f53652d39a65e4dc5364e801038e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:27:19+01:00 drouting: use core fixup helper functions (cherry picked from commit db6eae95e2c9a17eef8f823c30a39812429158d3) - URL: https://github.com/kamailio/kamailio/commit/2178c95ccdc14086b3f23deba9fb836… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:27:33+01:00 drouting: exported functions to kemi interface (cherry picked from commit 51837d8dd4bb42d4ad59da39ab9be9f5db58231e) - URL: https://github.com/kamailio/kamailio/commit/b6c1b0e35e5ce9ea9ad938f7681f6d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:27:46+01:00 drouting: updates to documentation (cherry picked from commit ce96966593c9f7e12595b74c2a6bf50b248e64c8) - URL: https://github.com/kamailio/kamailio/commit/eb746c0b6486b2cef6d9a5ffd0a0b37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:28:02+01:00 drouting: exported next_routing() to kemi framework (cherry picked from commit 57c14e65d3cea754c88374b8dd1d67cb5be3f295) - URL: https://github.com/kamailio/kamailio/commit/be53e5d24707d8248a904124a6c8891… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:28:19+01:00 tm: default port checking in via_matching() (cherry picked from commit 5fabdea4d86c527a2e38caaae7a54884367d6a7c) - URL: https://github.com/kamailio/kamailio/commit/41bfcaab0d403d2290d353e9fa522af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:28:37+01:00 tm: fixed condition in via_matching() - introduced in previous commit (cherry picked from commit 4bd1d70c2804ee2a1d29bd911275aa241577cfc1) - URL: https://github.com/kamailio/kamailio/commit/b9b0f7b480ff5003a19a9d3e86712ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:28:55+01:00 app_python: implemented rpc command to list kemi functions - kamctl rpc app_python.api_list (cherry picked from commit bea0b53ce57f08ab9fc019c19f616b3b67795d64) - URL: https://github.com/kamailio/kamailio/commit/4268a9b36d741d72cb412729c1619b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:29:08+01:00 app_python: documented rpc commands (cherry picked from commit cbaceaf891e16e9b0a1ef4883b8fec5e33698a86) - URL: https://github.com/kamailio/kamailio/commit/ae6c62f17a92e43bd83f2993cc18889… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:29:23+01:00 http_client: print url in log messages if query return code is not ok - safety check for search of end-of-line in a one line result type (cherry picked from commit ccbd1176242632fae2af39a168e4692dcf7ebcf9) - URL: https://github.com/kamailio/kamailio/commit/989be5fe82b0b6ad503a804353e1519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:29:35+01:00 ndb_redis: exported redis_cmd() and redis_free() to kemi framework (cherry picked from commit a9ef7fe010492710e0a81a4505337accb5e1fea6) - URL: https://github.com/kamailio/kamailio/commit/57942a0b20b0bf57d40c6266aaf855e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:29:54+01:00 lcr: clang format the code (cherry picked from commit e8a79182a76b306fad13c9cb12eb9f2c4c658b14) - URL: https://github.com/kamailio/kamailio/commit/5d9d92328ac0b7fd4315dae76cf62da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:30:05+01:00 lcr: exported load_gws() variants to kemi framework (cherry picked from commit 8fbf7d83b1dbeedf1ee53895aadbf6e99321432d) - URL: https://github.com/kamailio/kamailio/commit/7a054ff4aeef952940f28d6f75e4676… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:30:18+01:00 lcr: exported functions to kemi framework (cherry picked from commit a8b4bd942794c864d8455ca9fb144c1daa76e164) - URL: https://github.com/kamailio/kamailio/commit/71b5f6df20f6a13ad43a3ff6eacbfb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:30:31+01:00 cnxcc: clang format the code (cherry picked from commit db004a73d21c29a6a375d46eb15a6ba0b58910a7) - URL: https://github.com/kamailio/kamailio/commit/9fd7d3cead49b935e53be3b814874db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:30:42+01:00 core: mod_fix - typedefed struct to pvs_fixup_t (cherry picked from commit 3205c5970652bba56e2e3904a565491503fb6206) - URL: https://github.com/kamailio/kamailio/commit/fac694b66257f20b6d6a70bc5671c4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:30:53+01:00 cnxcc: use fixup function helper for core to get string and int params (cherry picked from commit 41953f192185989b5ba3ee7154202b6c390fe84c) - URL: https://github.com/kamailio/kamailio/commit/57f11e58aa6c17c9276ea78f8fc38d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:31:07+01:00 cnxcc: docs - added parameters to functions (cherry picked from commit b24cae28dcb8ba3289e0320a1e406e4667371258) - URL: https://github.com/kamailio/kamailio/commit/7093572c5ca65f805e4421d6d821eb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:31:20+01:00 app_lua: detect if a kemi function was already added in the exports list (cherry picked from commit d98a005ac57b957231f8bda26c711bf7c7260049) - URL: https://github.com/kamailio/kamailio/commit/68c7ea18ebfe3d26e53fbe04713b6a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:31:31+01:00 drouting: removed unused variable (cherry picked from commit 6c7bc0390fc1d9972ca9fc330c25dd9b29f2476a) - URL: https://github.com/kamailio/kamailio/commit/d56ec1c20796e9a32790d880c0ab9a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:31:41+01:00 app_lua: updated the utils/app_lua_ctl (cherry picked from commit ac8cc0a3735325ec79a4a634eea6bcdcea4affe7) - URL: https://github.com/kamailio/kamailio/commit/ba8bc6a23aed88625512b963862fe71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:31:52+01:00 app_python: updated the ctl tool to generate the exports (cherry picked from commit f4c6365f2678e5c30d4a1fc287206b82a7eee459) - URL: https://github.com/kamailio/kamailio/commit/a56d3f8552d3926e8b69bd5cd0bdcd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:32:14+01:00 app_lua: updated paths to included files from core in the ctl tool (cherry picked from commit 50a9e2ec1cb86590a067dc23b2298b96a12bc232) - URL: https://github.com/kamailio/kamailio/commit/1dbc2f40554a72ce4757ccbb0501b25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:32:26+01:00 app_jsdt: detect if a kemi function is already in exported list (cherry picked from commit 48d55652fa36cb2b20540d1ebc7665476dfb1b1e) - URL: https://github.com/kamailio/kamailio/commit/25f1a480becfa0dc4359b03e862ec9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:32:37+01:00 app_sqlang: detect if a kemi function was already added in exports list (cherry picked from commit e177266e8f113f1541b31496f9fb0c71ac751f17) - URL: https://github.com/kamailio/kamailio/commit/98e99c38d72bffbf3fbd58e5f8b4da0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:32:48+01:00 app_lua: print special kemi functions via rpc (cherry picked from commit 7cbece0e2e60f8c334bea97333b029d51e5b7e33) - URL: https://github.com/kamailio/kamailio/commit/107c37675cbc6956a448c44b66e8d2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:33:01+01:00 app_lua: count also the special function when generating the rpc response (cherry picked from commit f95fda89d4532ba333aed835c72f102a7c032980) - URL: https://github.com/kamailio/kamailio/commit/d47f62e185cc5891269943806cf4774… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:33:21+01:00 textops: kemi search_append() and search_append_body() have two params - reported by GH #1333 (cherry picked from commit b524d25a3ba327d7a52544489d847932f1ee1a28) - URL: https://github.com/kamailio/kamailio/commit/f561a37efe35e33ac73172e7808bfc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:33:35+01:00 textops: fixed name of in_list() function export to kemi - reported by GH #1332 (cherry picked from commit ebd51daea816a6bab3436e24de22d23d079d7c91) - URL: https://github.com/kamailio/kamailio/commit/5c44038e0c4dfae0ad0042222f21381… Author: Vasiliy Ganchev <vance(a)ukr.net> Date: 2017-11-27T09:33:49+01:00 http_client: add missed useragent parameter While preparing query_params, "useragent" was missed - add it. (cherry picked from commit 65a777f3316fb3a3adfa61739a091bb9d61582a8) - URL: https://github.com/kamailio/kamailio/commit/49ab70feb630634977a11809d40b60a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:34:21+01:00 rtpengine: proper check for empty string inside add_rtpengine_socks() - reported by GH #1325 (cherry picked from commit 991fe9b28e0e201309048f3b38a135037e40357a) - URL: https://github.com/kamailio/kamailio/commit/02f6ef0c3ffa648b30d5bee20187a61… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:34:35+01:00 dialog: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters (cherry picked from commit ed2c91533960c2b94a1394a671292c07d94b049b) - URL: https://github.com/kamailio/kamailio/commit/551069342576ed1d9d5b68065cc9cd0… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:34:45+01:00 path: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters (cherry picked from commit 2fda4db20ef258ac09c3680b8fab50b988a90f43) - URL: https://github.com/kamailio/kamailio/commit/b6629e300453c8a80c44da0563383d3… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:34:56+01:00 permissions: correcting KEMI allow_address - Updating which function KEMI function allow_address actually calls upon (cherry picked from commit c39905759ec8f2d888e17e6e8e6590d2e42504ff) - URL: https://github.com/kamailio/kamailio/commit/c6f1ac98d7b544cb454dcf51ed3fb36… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:35:06+01:00 rtpengine: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters (cherry picked from commit ede35768d58fcadb484eafc2babc72ec3be42b87) - URL: https://github.com/kamailio/kamailio/commit/216e7ced7188f03f252c8efc127fc19… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:35:23+01:00 sipcapture: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters (cherry picked from commit 171b7ada1cc2bd658b8b05efde0c5681ac9c4eed) - URL: https://github.com/kamailio/kamailio/commit/12ce193bca67d3f18666a4300698131… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:35:32+01:00 textopsx: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters (cherry picked from commit c921556e77b787d2462d251e7f1fa928bd22467a) - URL: https://github.com/kamailio/kamailio/commit/c45e00b33fac09097d2d360c4f7cfe3… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:35:43+01:00 xhttp: updating name of function and parameter type - Updating the name to reflect the original name. Mismatch between export and function declaration with regards to the type of parameters. (cherry picked from commit 74c0dc87e1cfc4f25ac5ebae3f4ad9317ed8ca9e) - URL: https://github.com/kamailio/kamailio/commit/b3f8845bcb0b3395c2de52b422ca2df… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:35:55+01:00 debugger: correcting function utilized by KEMI - Since constants are used as arguments on the called function I suppose the parameters are not necessary on the parent function (cherry picked from commit fcc4908fdbb555c09b8431f25211d93a90e2fac3) - URL: https://github.com/kamailio/kamailio/commit/35b8b54a46c0f42ff85752c1fc5b113… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:36:05+01:00 kex: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters (cherry picked from commit ac0ff86a0a7c29782903a385e7dda7be298a678f) - URL: https://github.com/kamailio/kamailio/commit/2b6af1cea0232f428d5a1c1b03e4ed5… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:36:15+01:00 lcr: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters (cherry picked from commit bb35d3aff777ac3a125a10cd0fba3f6dc1586516) - URL: https://github.com/kamailio/kamailio/commit/2b4c29062d0b616c83e8c85724bbe4f… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:36:27+01:00 maxfwd: Updating code formatting - Utilize same formatting as all other KEMI exports (cherry picked from commit ca75ae0e0db9ac6efb42f97245d8f3ba8f8986a0) - URL: https://github.com/kamailio/kamailio/commit/c2f41bf302e497c97e918cd8c0b616d… Author: Samuel <samuel_is_kewl(a)hotmail.com> Date: 2017-11-27T09:36:38+01:00 nathelper: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters (cherry picked from commit 3c64668df34fb0708a34ae103d78c8884f8337cf) - URL: https://github.com/kamailio/kamailio/commit/03bba9fcf51dc1ee66d3144c610812a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:36:53+01:00 cnxcc: exported functions to kemi framework (cherry picked from commit b1899d28061e3df8e333230588127fc41f949566) - URL: https://github.com/kamailio/kamailio/commit/b2c42031cdad58aecf88444ed5ba6ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:37:04+01:00 textops: simplified the code for set_multipart_body() - use formatted string instead of a sequence of allocs and memcopy - split helper function to have a wrapper for evaluating the cfg function params (cherry picked from commit 043894a539e3e73f7add2e66179aecb71066313a) - URL: https://github.com/kamailio/kamailio/commit/c0908af8c2f7c7fb98c4c263d063e7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T09:37:15+01:00 textops: exported multipart functions to kemi (cherry picked from commit 5295a4f5eac08c1bb100bf554a995833c434c4dc)

1 0

git:master:5295a4f5: textops: exported multipart functions to kemi
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: 5295a4f5eac08c1bb100bf554a995833c434c4dc URL: https://github.com/kamailio/kamailio/commit/5295a4f5eac08c1bb100bf554a99583… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:30:15+01:00 textops: exported multipart functions to kemi --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/5295a4f5eac08c1bb100bf554a99583… Patch: https://github.com/kamailio/kamailio/commit/5295a4f5eac08c1bb100bf554a99583…

1 0

git:master:043894a5: textops: simplified the code for set_multipart_body()
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: 043894a539e3e73f7add2e66179aecb71066313a URL: https://github.com/kamailio/kamailio/commit/043894a539e3e73f7add2e66179aecb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:30:15+01:00 textops: simplified the code for set_multipart_body() - use formatted string instead of a sequence of allocs and memcopy - split helper function to have a wrapper for evaluating the cfg function params --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/043894a539e3e73f7add2e66179aecb… Patch: https://github.com/kamailio/kamailio/commit/043894a539e3e73f7add2e66179aecb…

1 0

git:master:b1899d28: cnxcc: exported functions to kemi framework
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: b1899d28061e3df8e333230588127fc41f949566 URL: https://github.com/kamailio/kamailio/commit/b1899d28061e3df8e333230588127fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:30:15+01:00 cnxcc: exported functions to kemi framework --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b1899d28061e3df8e333230588127fc… Patch: https://github.com/kamailio/kamailio/commit/b1899d28061e3df8e333230588127fc…

1 0

git:5.1:bfbc06a3: pkg/docker: Updated reference to docker scripts
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: 5.1 Commit: bfbc06a33a1f06e11d45ca2ea15fba110c9abb61 URL: https://github.com/kamailio/kamailio/commit/bfbc06a33a1f06e11d45ca2ea15fba1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:52+01:00 pkg/docker: Updated reference to docker scripts --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/bfbc06a33a1f06e11d45ca2ea15fba1… Patch: https://github.com/kamailio/kamailio/commit/bfbc06a33a1f06e11d45ca2ea15fba1… --- diff --git a/pkg/docker b/pkg/docker index 27cd32c1c5..1368cea8a4 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 27cd32c1c5fa799cb3b240c25e90ed83a0812b6c +Subproject commit 1368cea8a47edae754ded68ff61e263fcad29fee

1 0

[kamailio/kamailio] Updated alpine packaging. 5.1 branch (#1335)
by sergey-safarov 27 Nov '17

27 Nov '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1335 -- Commit Summary -- * pkg/docker: Updated reference to docker scripts * pkg/kamailio/alpine: Added sqlang, rabbitmq, sqlang packages -- File Changes -- M pkg/docker (2) M pkg/kamailio/alpine/APKBUILD (33) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1335.patch https://github.com/kamailio/kamailio/pull/1335.diff -- 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/pull/1335

2 1

git:5.1:fdb253d2: pkg/kamailio/alpine: Added sqlang, rabbitmq, sqlang packages
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: 5.1 Commit: fdb253d2be5aa48d483407aa3646562880b578cb URL: https://github.com/kamailio/kamailio/commit/fdb253d2be5aa48d483407aa3646562… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:52+01:00 pkg/kamailio/alpine: Added sqlang, rabbitmq, sqlang packages --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/fdb253d2be5aa48d483407aa3646562… Patch: https://github.com/kamailio/kamailio/commit/fdb253d2be5aa48d483407aa3646562… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 6401924fad..eebe8d64c3 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -9,7 +9,7 @@ pkgrel=0 # If building from a git snapshot, specify the gitcommit # If building a proper release, leave gitcommit blank -_gitcommit=c5ffc265cf83c7e329ee8d21c3bafba78b670c58 +_gitcommit=991fe9b28e0e201309048f3b38a135037e40357a [ ! -z "${_gitcommit}" ] && pkgver="${pkgver}.$(date +%Y%m%d)" [ ! -z "${_gitcommit}" ] && _suffix="-${_gitcommit:0:7}" @@ -23,7 +23,7 @@ pkgusers="kamailio" pkggroups="kamailio" arch="all" license="GPL2+" -depends="" +depends="gawk" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python2-dev pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev libressl-dev net-snmp-dev libuuid libev-dev @@ -179,7 +179,7 @@ _mod_list_redis="ndb_redis topos_redis" _mod_list_mono="app_mono" # - modules related to IMS extensions -_mod_list_ims="cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos \ +_mod_list_ims="cdp cdp_avp ims_dialog ims_diameter_server ims_auth ims_isc ims_icscf ims_qos \ ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ ims_usrloc_scscf ims_charging" @@ -213,6 +213,15 @@ _mod_list_jansson="jansson janssonrpcc" # - modules depending on libm _mod_list_jsdt="app_jsdt" +# - modules depending on sqlang +_mod_list_sqlang="app_sqlang" + +# - modules depending on rabbitmq +_mod_list_rabbitmq="rabbitmq" + +# - modules depending on sipdump +_mod_list_sipdump="sipdump" + # Alpine Specific _mod_list_debugger="$_mod_list_devel benchmark debugger" @@ -228,7 +237,7 @@ for _i in db postgres sqlite dbtext mysql \ cpl xml unixodbc snmpstats xmpp carrierroute \ ldap utils tls presence lua ims outbound debugger \ extras json websocket authephemeral \ - uuid ev memcached redis geoip2 jansson \ + uuid ev memcached redis geoip2 jansson sqlang sipdump \ jsdt http_async kazoo rabbitmq sctp radius perl python; do subpackages="$subpackages $pkgname-$_i" @@ -509,8 +518,22 @@ python() { "$_mod_list_python" } +sqlang() { + _generic_pkg "Squirrel Language (SQLang) for Kamailio" \ + "$_mod_list_sqlang" +} + +rabbitmq() { + _generic_pkg "RabbitMQ related modules for Kamailio" \ + "$_mod_list_rabbitmq" +} + +sipdump() { + _generic_pkg "This module writes SIP traffic and some associated details into local files" \ + "$_mod_list_sipdump" +} -sha512sums="245411ac2445f4865cd09f56a3cfc4d10a64c9a1be90bfb35cfe80149e845c34c1a867ff661bbd9dac1c48a0416bc577b57ae6133edb69e2a2b43d3a2305ffde kamailio-5.1.0.20170930-c5ffc26.tar.gz +sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz 6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd"

1 0

[kamailio/kamailio] Updated alpine packaging (#1334)
by sergey-safarov 27 Nov '17

27 Nov '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1334 -- Commit Summary -- * pkg/docker: Updated reference to docker scripts * pkg/kamailio/alpine: Added sqlang, rabbitmq, sqlang packages -- File Changes -- M pkg/docker (2) M pkg/kamailio/alpine/APKBUILD (33) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1334.patch https://github.com/kamailio/kamailio/pull/1334.diff -- 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/pull/1334

2 1

git:master:d6198f2c: pkg/docker: Updated reference to docker scripts
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: d6198f2c85db7c871954e4bfcdb6183a20d4d5bc URL: https://github.com/kamailio/kamailio/commit/d6198f2c85db7c871954e4bfcdb6183… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:40+01:00 pkg/docker: Updated reference to docker scripts --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/d6198f2c85db7c871954e4bfcdb6183… Patch: https://github.com/kamailio/kamailio/commit/d6198f2c85db7c871954e4bfcdb6183… --- diff --git a/pkg/docker b/pkg/docker index 27cd32c1c5..1368cea8a4 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 27cd32c1c5fa799cb3b240c25e90ed83a0812b6c +Subproject commit 1368cea8a47edae754ded68ff61e263fcad29fee

1 0

git:master:44263839: pkg/kamailio/alpine: Added sqlang, rabbitmq, sqlang packages
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: 4426383998d403e9edccc62332702188540d01ff URL: https://github.com/kamailio/kamailio/commit/4426383998d403e9edccc6233270218… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:40+01:00 pkg/kamailio/alpine: Added sqlang, rabbitmq, sqlang packages --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/4426383998d403e9edccc6233270218… Patch: https://github.com/kamailio/kamailio/commit/4426383998d403e9edccc6233270218… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 6401924fad..eebe8d64c3 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -9,7 +9,7 @@ pkgrel=0 # If building from a git snapshot, specify the gitcommit # If building a proper release, leave gitcommit blank -_gitcommit=c5ffc265cf83c7e329ee8d21c3bafba78b670c58 +_gitcommit=991fe9b28e0e201309048f3b38a135037e40357a [ ! -z "${_gitcommit}" ] && pkgver="${pkgver}.$(date +%Y%m%d)" [ ! -z "${_gitcommit}" ] && _suffix="-${_gitcommit:0:7}" @@ -23,7 +23,7 @@ pkgusers="kamailio" pkggroups="kamailio" arch="all" license="GPL2+" -depends="" +depends="gawk" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python2-dev pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev libressl-dev net-snmp-dev libuuid libev-dev @@ -179,7 +179,7 @@ _mod_list_redis="ndb_redis topos_redis" _mod_list_mono="app_mono" # - modules related to IMS extensions -_mod_list_ims="cdp cdp_avp ims_dialog ims_auth ims_isc ims_icscf ims_qos \ +_mod_list_ims="cdp cdp_avp ims_dialog ims_diameter_server ims_auth ims_isc ims_icscf ims_qos \ ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \ ims_usrloc_scscf ims_charging" @@ -213,6 +213,15 @@ _mod_list_jansson="jansson janssonrpcc" # - modules depending on libm _mod_list_jsdt="app_jsdt" +# - modules depending on sqlang +_mod_list_sqlang="app_sqlang" + +# - modules depending on rabbitmq +_mod_list_rabbitmq="rabbitmq" + +# - modules depending on sipdump +_mod_list_sipdump="sipdump" + # Alpine Specific _mod_list_debugger="$_mod_list_devel benchmark debugger" @@ -228,7 +237,7 @@ for _i in db postgres sqlite dbtext mysql \ cpl xml unixodbc snmpstats xmpp carrierroute \ ldap utils tls presence lua ims outbound debugger \ extras json websocket authephemeral \ - uuid ev memcached redis geoip2 jansson \ + uuid ev memcached redis geoip2 jansson sqlang sipdump \ jsdt http_async kazoo rabbitmq sctp radius perl python; do subpackages="$subpackages $pkgname-$_i" @@ -509,8 +518,22 @@ python() { "$_mod_list_python" } +sqlang() { + _generic_pkg "Squirrel Language (SQLang) for Kamailio" \ + "$_mod_list_sqlang" +} + +rabbitmq() { + _generic_pkg "RabbitMQ related modules for Kamailio" \ + "$_mod_list_rabbitmq" +} + +sipdump() { + _generic_pkg "This module writes SIP traffic and some associated details into local files" \ + "$_mod_list_sipdump" +} -sha512sums="245411ac2445f4865cd09f56a3cfc4d10a64c9a1be90bfb35cfe80149e845c34c1a867ff661bbd9dac1c48a0416bc577b57ae6133edb69e2a2b43d3a2305ffde kamailio-5.1.0.20170930-c5ffc26.tar.gz +sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz 6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd"

1 0

git:master:3c64668d: nathelper: updating the exported expected parameters to match the functions
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: 3c64668df34fb0708a34ae103d78c8884f8337cf URL: https://github.com/kamailio/kamailio/commit/3c64668df34fb0708a34ae103d78c88… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 nathelper: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/3c64668df34fb0708a34ae103d78c88… Patch: https://github.com/kamailio/kamailio/commit/3c64668df34fb0708a34ae103d78c88… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 5e7b82b617..440033db1a 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2394,7 +2394,7 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { }, { str_init("nathelper"), str_init("is_rfc1918"), SR_KEMIP_INT, is_rfc1918, - { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("nathelper"), str_init("add_contact_alias"),

1 0

git:master:bb35d3af: lcr: updating the exported expected parameters to match the functions
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: bb35d3aff777ac3a125a10cd0fba3f6dc1586516 URL: https://github.com/kamailio/kamailio/commit/bb35d3aff777ac3a125a10cd0fba3f6… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 lcr: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bb35d3aff777ac3a125a10cd0fba3f6… Patch: https://github.com/kamailio/kamailio/commit/bb35d3aff777ac3a125a10cd0fba3f6… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 2689e10b84..eecab748f6 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -3374,7 +3374,7 @@ static sr_kemi_t sr_kemi_lcr_exports[] = { }, { str_init("lcr"), str_init("load_gws_furi"), SR_KEMIP_INT, ki_load_gws_furi, - { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("lcr"), str_init("next_gw"),

1 0

git:master:ca75ae0e: maxfwd: Updating code formatting
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: ca75ae0e0db9ac6efb42f97245d8f3ba8f8986a0 URL: https://github.com/kamailio/kamailio/commit/ca75ae0e0db9ac6efb42f97245d8f3b… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 maxfwd: Updating code formatting - Utilize same formatting as all other KEMI exports --- Modified: src/modules/maxfwd/maxfwd.c --- Diff: https://github.com/kamailio/kamailio/commit/ca75ae0e0db9ac6efb42f97245d8f3b… Patch: https://github.com/kamailio/kamailio/commit/ca75ae0e0db9ac6efb42f97245d8f3b… --- diff --git a/src/modules/maxfwd/maxfwd.c b/src/modules/maxfwd/maxfwd.c index c9679c1cad..39344af919 100644 --- a/src/modules/maxfwd/maxfwd.c +++ b/src/modules/maxfwd/maxfwd.c @@ -223,10 +223,11 @@ int bind_maxfwd(maxfwd_api_t *api) * */ static sr_kemi_t sr_kemi_maxfwd_exports[] = { - {str_init("maxfwd"), str_init("process_maxfwd"), SR_KEMIP_INT, - process_maxfwd_header, - {SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE}}, + { str_init("maxfwd"), str_init("process_maxfwd"), + SR_KEMIP_INT, process_maxfwd_header, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}}};

1 0

git:master:ac0ff86a: kex: updating the exported expected parameters to match the functions
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: ac0ff86a0a7c29782903a385e7dda7be298a678f URL: https://github.com/kamailio/kamailio/commit/ac0ff86a0a7c29782903a385e7dda7b… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 kex: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/kex/kex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac0ff86a0a7c29782903a385e7dda7b… Patch: https://github.com/kamailio/kamailio/commit/ac0ff86a0a7c29782903a385e7dda7b… --- diff --git a/src/modules/kex/kex_mod.c b/src/modules/kex/kex_mod.c index f58cf189b6..1f738c11a6 100644 --- a/src/modules/kex/kex_mod.c +++ b/src/modules/kex/kex_mod.c @@ -264,7 +264,7 @@ static sr_kemi_t sr_kemi_kex_exports[] = { }, { str_init("kex"), str_init("resetdebug"), SR_KEMIP_INT, ki_kex_resetdebug, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:fcc4908f: debugger: correcting function utilized by KEMI
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: fcc4908fdbb555c09b8431f25211d93a90e2fac3 URL: https://github.com/kamailio/kamailio/commit/fcc4908fdbb555c09b8431f25211d93… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 debugger: correcting function utilized by KEMI - Since constants are used as arguments on the called function I suppose the parameters are not necessary on the parent function --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fcc4908fdbb555c09b8431f25211d93… Patch: https://github.com/kamailio/kamailio/commit/fcc4908fdbb555c09b8431f25211d93… --- diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index 5c973c57b5..76da385c0d 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -595,16 +595,16 @@ static int w_dbg_sip_msg(struct sip_msg* msg, char *level, char *facility) } /** - * dump pv_cache contents as json + * dump pv_cache contents as json with default parameters */ -static int ki_dbg_pv_dump(sip_msg_t* msg, char* mask, char* level) +static int ki_dbg_pv_dump(sip_msg_t* msg) { - dbg_dump_json(msg, DBG_DP_ALL, DBG_DP_ALL); + dbg_dump_json(msg, DBG_DP_ALL, L_DBG); return 1; } /** - * dump pv_cache contents as json + * dump pv_cache contents as json with explicit parameters */ static int ki_dbg_pv_dump_ex(sip_msg_t* msg, int mask, int level) {

1 0

git:master:74c0dc87: xhttp: updating name of function and parameter type
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: 74c0dc87e1cfc4f25ac5ebae3f4ad9317ed8ca9e URL: https://github.com/kamailio/kamailio/commit/74c0dc87e1cfc4f25ac5ebae3f4ad93… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 xhttp: updating name of function and parameter type - Updating the name to reflect the original name. Mismatch between export and function declaration with regards to the type of parameters. --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/74c0dc87e1cfc4f25ac5ebae3f4ad93… Patch: https://github.com/kamailio/kamailio/commit/74c0dc87e1cfc4f25ac5ebae3f4ad93… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index 8a542bfc8b..f62013cd90 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -551,9 +551,9 @@ int bind_xhttp(xhttp_api_t* api) */ /* clang-format off */ static sr_kemi_t sr_kemi_xhttp_exports[] = { - { str_init("xhttp"), str_init("reply"), + { str_init("xhttp"), str_init("xhttp_reply"), SR_KEMIP_INT, xhttp_send_reply, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:171b7ada: sipcapture: updating the exported expected parameters to match the functions
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: 171b7ada1cc2bd658b8b05efde0c5681ac9c4eed URL: https://github.com/kamailio/kamailio/commit/171b7ada1cc2bd658b8b05efde0c568… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 sipcapture: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/171b7ada1cc2bd658b8b05efde0c568… Patch: https://github.com/kamailio/kamailio/commit/171b7ada1cc2bd658b8b05efde0c568… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index fbb697d18b..171e1d035c 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3114,7 +3114,7 @@ static sr_kemi_t sr_kemi_sipcapture_exports[] = { }, { str_init("sipcapture"), str_init("sip_capture_mode"), SR_KEMIP_INT, ki_sip_capture_mode, - { SR_KEMIP_NONE, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("sipcapture"), str_init("report_capture"),

1 0

git:master:c921556e: textopsx: updating the exported expected parameters to match the functions
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: c921556e77b787d2462d251e7f1fa928bd22467a URL: https://github.com/kamailio/kamailio/commit/c921556e77b787d2462d251e7f1fa92… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 textopsx: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/c921556e77b787d2462d251e7f1fa92… Patch: https://github.com/kamailio/kamailio/commit/c921556e77b787d2462d251e7f1fa92… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index d013308473..a6d7abc65e 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2321,7 +2321,7 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { }, { str_init("textopsx"), str_init("remove_hf_value2"), SR_KEMIP_INT, ki_remove_hf_value2, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textopsx"), str_init("include_hf_value"),

1 0

git:master:ede35768: rtpengine: updating the exported expected parameters to match the functions
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: ede35768d58fcadb484eafc2babc72ec3be42b87 URL: https://github.com/kamailio/kamailio/commit/ede35768d58fcadb484eafc2babc72e… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 rtpengine: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/ede35768d58fcadb484eafc2babc72e… Patch: https://github.com/kamailio/kamailio/commit/ede35768d58fcadb484eafc2babc72e… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c3bc770da9..5b82988229 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3674,7 +3674,7 @@ static sr_kemi_t sr_kemi_rtpengine_exports[] = { }, { str_init("rtpengine"), str_init("set_rtpengine_set2"), SR_KEMIP_INT, ki_set_rtpengine_set2, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:c3990575: permissions: correcting KEMI allow_address
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: c39905759ec8f2d888e17e6e8e6590d2e42504ff URL: https://github.com/kamailio/kamailio/commit/c39905759ec8f2d888e17e6e8e6590d… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 permissions: correcting KEMI allow_address - Updating which function KEMI function allow_address actually calls upon --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/c39905759ec8f2d888e17e6e8e6590d… Patch: https://github.com/kamailio/kamailio/commit/c39905759ec8f2d888e17e6e8e6590d… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index f6715556a3..810874e12b 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1030,7 +1030,7 @@ static sr_kemi_t sr_kemi_permissions_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("permissions"), str_init("allow_address"), - SR_KEMIP_INT, allow_source_address, + SR_KEMIP_INT, allow_address, { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:ed2c9153: dialog: updating the exported expected parameters to match the functions
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: ed2c91533960c2b94a1394a671292c07d94b049b URL: https://github.com/kamailio/kamailio/commit/ed2c91533960c2b94a1394a671292c0… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 dialog: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/ed2c91533960c2b94a1394a671292c0… Patch: https://github.com/kamailio/kamailio/commit/ed2c91533960c2b94a1394a671292c0… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 3fc51f9b9f..e6ff0e9bc3 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1826,7 +1826,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { }, { str_init("dialog"), str_init("set_dlg_profile_static"), SR_KEMIP_INT, ki_set_dlg_profile_static, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("set_dlg_profile"), @@ -1836,7 +1836,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { }, { str_init("dialog"), str_init("unset_dlg_profile_static"), SR_KEMIP_INT, ki_unset_dlg_profile_static, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("unset_dlg_profile"), @@ -1846,7 +1846,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { }, { str_init("dialog"), str_init("is_in_profile_static"), SR_KEMIP_INT, ki_is_in_profile_static, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("is_in_profile"),

1 0

git:master:2fda4db2: path: updating the exported expected parameters to match the functions
by Daniel-Constantin Mierla 27 Nov '17

27 Nov '17

Module: kamailio Branch: master Commit: 2fda4db20ef258ac09c3680b8fab50b988a90f43 URL: https://github.com/kamailio/kamailio/commit/2fda4db20ef258ac09c3680b8fab50b… Author: Samuel <samuel_is_kewl(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-27T08:29:08+01:00 path: updating the exported expected parameters to match the functions - Mismatch between export and function declaration with regards to the quantity of parameters --- Modified: src/modules/path/path_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2fda4db20ef258ac09c3680b8fab50b… Patch: https://github.com/kamailio/kamailio/commit/2fda4db20ef258ac09c3680b8fab50b… --- diff --git a/src/modules/path/path_mod.c b/src/modules/path/path_mod.c index 013e34003a..42c2023964 100644 --- a/src/modules/path/path_mod.c +++ b/src/modules/path/path_mod.c @@ -164,7 +164,7 @@ static int mod_init(void) static sr_kemi_t sr_kemi_path_exports[] = { { str_init("path"), str_init("add_path"), SR_KEMIP_INT, ki_add_path, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("path"), str_init("add_path_user"), @@ -179,7 +179,7 @@ static sr_kemi_t sr_kemi_path_exports[] = { }, { str_init("path"), str_init("add_path_received"), SR_KEMIP_INT, ki_add_path_received, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("path"), str_init("add_path_received_user"),

1 0

[kamailio/kamailio] Patches to the KEMI framework exports (#1338)
by Sam 27 Nov '17

27 Nov '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Updated some issues I found in the KEMI exports while reviewing the implementation. There is some name change there hence the breaking change. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1338 -- Commit Summary -- * dialog: updating the exported expected parameters to match the functions * path: updating the exported expected parameters to match the functions * permissions: correcting KEMI allow_address * rtpengine: updating the exported expected parameters to match the functions * sipcapture: updating the exported expected parameters to match the functions * textops: updating the exported expected parameters to match the functions * textopsx: updating the exported expected parameters to match the functions * xhttp: updating name of function and parameter type * debugger: correcting function utilized by KEMI * kex: updating the exported expected parameters to match the functions * lcr: updating the exported expected parameters to match the functions * maxfwd: Updating code formatting * nathelper: updating the exported expected parameters to match the functions -- File Changes -- M src/modules/debugger/debugger_mod.c (8) M src/modules/dialog/dialog.c (6) M src/modules/kex/kex_mod.c (2) M src/modules/lcr/lcr_mod.c (2) M src/modules/maxfwd/maxfwd.c (9) M src/modules/nathelper/nathelper.c (2) M src/modules/path/path_mod.c (4) M src/modules/permissions/permissions.c (2) M src/modules/rtpengine/rtpengine.c (2) M src/modules/sipcapture/sipcapture.c (2) M src/modules/textops/textops.c (4) M src/modules/textopsx/textopsx.c (2) M src/modules/xhttp/xhttp_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1338.patch https://github.com/kamailio/kamailio/pull/1338.diff -- 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/pull/1338

2 2

.clang-format error on debian stretch
by Juha Heinanen 26 Nov '17

26 Nov '17

clang-format command on debian stretch cannot hand kamailio .clang-format without errors. first one is this: YAML:58:21: error: unknown key 'IncludeIsMainRegex' IncludeIsMainRegex: '$' second is this: YAML:61:19: error: unknown key 'JavaScriptQuotes' JavaScriptQuotes: Leave is it OK if I clean the file? -- Juha

1 0

git:5.0:c9685fa4: xhttp_rpc: fix array printing
by root 26 Nov '17

26 Nov '17

Module: kamailio Branch: 5.0 Commit: c9685fa4705fc5a56bead6ec9a045a329b461efe URL: https://github.com/kamailio/kamailio/commit/c9685fa4705fc5a56bead6ec9a045a3… Author: root <root(a)ProxyC2.localdomain> Committer: root <root(a)ProxyC2.localdomain> Date: 2017-11-26T17:43:36-05:00 xhttp_rpc: fix array printing - manual backport for 41754b645f986175f3385498057bae8bd33646af --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/c9685fa4705fc5a56bead6ec9a045a3… Patch: https://github.com/kamailio/kamailio/commit/c9685fa4705fc5a56bead6ec9a045a3… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 6e27409435..0261be9638 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -562,6 +562,62 @@ static int rpc_struct_add(struct rpc_data_struct* rpc_s, char* fmt, ...) } +/** Adds a new member to array. + */ +static int rpc_array_add(struct rpc_data_struct* rpc_s, char* fmt, ...) +{ + va_list ap; + void **void_ptr; + rpc_ctx_t *ctx = rpc_s->ctx; + struct rpc_data_struct *ds, *s; + + if (!ctx) { + LM_ERR("Invalid context\n"); + return -1; + } + if (!ctx->data_structs) { + LM_ERR("Invalid structs\n"); + return -1; + } + s = ds = ctx->data_structs; + ctx->struc_depth = 0; + while (s) { + if (s == rpc_s) { + if (s->next) { + free_data_struct(s->next); + s->next = NULL; + } + break; + } + ctx->struc_depth++; + ds = s; + s = s->next; + } + if (!s) + s = ds; + va_start(ap, fmt); + while(*fmt) { + if (*fmt == '{' || *fmt == '[') { + void_ptr = va_arg(ap, void**); + ds = new_data_struct(ctx); + if (!ds) goto err; + s->next = ds; + *void_ptr = ds; + if (0!=xhttp_rpc_build_content(ctx, NULL, NULL)) + goto err; + } else { + if (print_value(ctx, *fmt, &ap, NULL) < 0) goto err; + } + fmt++; + } + va_end(ap); + return 0; +err: + va_end(ap); + return -1; +} + + static int rpc_struct_scan(struct rpc_data_struct* rpc_s, char* fmt, ...) { LM_ERR("Not implemented\n"); @@ -668,8 +724,7 @@ static int mod_init(void) func_param.scan = (rpc_scan_f)rpc_scan; func_param.rpl_printf = (rpc_rpl_printf_f)rpc_rpl_printf; func_param.struct_add = (rpc_struct_add_f)rpc_struct_add; - /* use rpc_struct_add for array_add */ - func_param.array_add = (rpc_struct_add_f)rpc_struct_add; + func_param.array_add = (rpc_array_add_f)rpc_array_add; func_param.struct_scan = (rpc_struct_scan_f)rpc_struct_scan; func_param.struct_printf = (rpc_struct_printf_f)rpc_struct_printf; func_param.capabilities = (rpc_capabilities_f)rpc_capabilities;

1 0

[kamailio/kamailio] dialog: updating the quantity of params for certain kemi exports (#1337)
by Sam 26 Nov '17

26 Nov '17

- Updating KEMI exports of certain dialog functions to match the expected quantity of parameters   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1337 -- Commit Summary -- * dialog: updating the quantity of params for certain kemi exports -- File Changes -- M src/modules/dialog/dialog.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1337.patch https://github.com/kamailio/kamailio/pull/1337.diff -- 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/pull/1337

1 2

[kamailio/kamailio] dialog: correcting expectations of parameters (#1336)
by Sam 26 Nov '17

26 Nov '17

- Updating KEMI export of ki_set_dlg_profile_static() since the function only takes one parameter.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1336 -- Commit Summary -- * dialog: correcting expectations of parameters -- File Changes -- M src/modules/dialog/dialog.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1336.patch https://github.com/kamailio/kamailio/pull/1336.diff -- 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/pull/1336

1 2

git:5.1:4b5a889c: xmlrpc: define _XOPEN_SOURCE to 600
by Ovidiu Sas 25 Nov '17

25 Nov '17

Module: kamailio Branch: 5.1 Commit: 4b5a889cf438138d0846ee9adcd8785ea2b94a95 URL: https://github.com/kamailio/kamailio/commit/4b5a889cf438138d0846ee9adcd8785… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-11-25T17:51:33-05:00 xmlrpc: define _XOPEN_SOURCE to 600 - needed for snprintf() and variants - reported by GH #1312 (cherry picked from commit 6e680c71b6a5d1571a38023427335922946a4160) --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4b5a889cf438138d0846ee9adcd8785… Patch: https://github.com/kamailio/kamailio/commit/4b5a889cf438138d0846ee9adcd8785… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 2e7c644279..7b0066d988 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -18,16 +18,28 @@ * with this program; if not, write to the Free Software Foundation, Inc., 59 * Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*This define breaks on Solaris OS */ + +/** + * make strptime available + * use 600 for 'Single UNIX Specification, Version 3' + * _XOPEN_SOURCE creates conflict in header definitions in Solaris + */ #ifndef __OS_solaris -#define _XOPEN_SOURCE 4 /* strptime */ + #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ + #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect + * of the above define on + * features.h/unistd.h syscall() */ + #define _DEFAULT_SOURCE 1 /* _BSD_SOURCE is deprecated */ + #define _DARWIN_C_SOURCE 1 + + #define _SVID_SOURCE 1 /* timegm for old glib */ +#else + #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif -#define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ -#define _SVID_SOURCE 1 /* timegm */ -#define _DEFAULT_SOURCE 1 /* _SVID_SOURCE is deprecated */ -#include <strings.h> #include <time.h> + +#include <strings.h> #include <string.h> #include <stdlib.h> #include <stdio.h>

1 0

Errored: sergey-safarov/kamailio#31 (master - 9826158)
by Travis CI 25 Nov '17

25 Nov '17

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #31 Status: Errored Duration: 38 seconds Commit: 9826158 (master) Author: Sergey Safarov Message: pkg/docker: Updated reference to docker scripts View the changeset: https://github.com/sergey-safarov/kamailio/compare/2980674f86b4...982615820… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/307225932?utm_source=e… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

add_contact_alias(0) is proto differs
by Juha Heinanen 25 Nov '17

25 Nov '17

Currently add_contact_alias() works like this: Adds an “;alias=ip~port~transport” parameter to the contact URI containing either received ip, port, and transport protocol or those given as parameters. If called without parameters, “;alias” parameter is only added if received ip and port differ from those in contact URI. Now I noticed that a broken UA does not add a proper ;transport param to contact uri and therefore received transport does not match contact uri transport. Therefore transport proto does not match, but ip and port do match. It would be useful is add_contact_alias() would add ;alias param also if transports do not match. Is it OK if I make the change? After that README would read: Adds an “;alias=ip~port~transport” parameter to the contact URI containing either received ip, port, and transport protocol or those given as parameters. If called without parameters, “;alias” parameter is only added if received ip, port, and transport protocol differ from those in contact URI. -- Juha

2 4

[kamailio/kamailio] Possible issue with parameters (#1333)
by Sam 25 Nov '17

25 Nov '17

https://github.com/kamailio/kamailio/blob/f95fda89d4532ba333aed835c72f102a7… Hi, it seems that KEMI defines this method to accept one parameter but the ki_search_append seems to expect two arguments. I might have misunderstood how KEMI is implemented but wanted to open this ticket in case it is an issue. The same goes for: search_append_body -- 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/1333

2 3

git:master:991fe9b2: rtpengine: proper check for empty string inside add_rtpengine_socks()
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: 991fe9b28e0e201309048f3b38a135037e40357a URL: https://github.com/kamailio/kamailio/commit/991fe9b28e0e201309048f3b38a1350… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T09:18:23+01:00 rtpengine: proper check for empty string inside add_rtpengine_socks() - reported by GH #1325 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/991fe9b28e0e201309048f3b38a1350… Patch: https://github.com/kamailio/kamailio/commit/991fe9b28e0e201309048f3b38a1350… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 9704693eee..c3bc770da9 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -906,7 +906,7 @@ int add_rtpengine_socks(struct rtpp_set * rtpp_list, char * rtpproxy, p1++; } - if (p1 != NULL && p1 != '\0') { + if (p1 != NULL && p1[0] != '\0') { s1.s = p1; s1.len = strlen(p1); if (str2int(&s1, &port) < 0 || port > 0xFFFF) {

1 0

[kamailio/kamailio] xmlrpc: compiler warnings in trunk and 5.1 (#1312)
by Ovidiu Sas 25 Nov '17

25 Nov '17

CentOS Linux release 7.4.1708 (Core) ``` CC (gcc) [M xmlrpc.so] xmlrpc.o xmlrpc.c: In function 'set_fault': xmlrpc.c:894:2: warning: implicit declaration of function 'vsnprintf' [-Wimplicit-function-declaration] vsnprintf(buf, REASON_BUF_LEN, fmt, ap); ^ xmlrpc.c: In function 'print_value': xmlrpc.c:1024:4: warning: implicit declaration of function 'snprintf' [-Wimplicit-function-declaration] body.len = snprintf(buf, 256, "%f", va_arg(*ap, double)); ^ xmlrpc.c:1024:15: warning: incompatible implicit declaration of built-in function 'snprintf' [enabled by default] body.len = snprintf(buf, 256, "%f", va_arg(*ap, double)); ^ ``` -- 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/1312

2 2

git:master:6e680c71: xmlrpc: define _XOPEN_SOURCE to 600
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: 6e680c71b6a5d1571a38023427335922946a4160 URL: https://github.com/kamailio/kamailio/commit/6e680c71b6a5d1571a3802342733592… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T09:04:54+01:00 xmlrpc: define _XOPEN_SOURCE to 600 - needed for snprintf() and variants - reported by GH #1312 --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/6e680c71b6a5d1571a3802342733592… Patch: https://github.com/kamailio/kamailio/commit/6e680c71b6a5d1571a3802342733592… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 2e7c644279..7b0066d988 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -18,16 +18,28 @@ * with this program; if not, write to the Free Software Foundation, Inc., 59 * Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*This define breaks on Solaris OS */ + +/** + * make strptime available + * use 600 for 'Single UNIX Specification, Version 3' + * _XOPEN_SOURCE creates conflict in header definitions in Solaris + */ #ifndef __OS_solaris -#define _XOPEN_SOURCE 4 /* strptime */ + #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ + #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect + * of the above define on + * features.h/unistd.h syscall() */ + #define _DEFAULT_SOURCE 1 /* _BSD_SOURCE is deprecated */ + #define _DARWIN_C_SOURCE 1 + + #define _SVID_SOURCE 1 /* timegm for old glib */ +#else + #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif -#define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ -#define _SVID_SOURCE 1 /* timegm */ -#define _DEFAULT_SOURCE 1 /* _SVID_SOURCE is deprecated */ -#include <strings.h> #include <time.h> + +#include <strings.h> #include <string.h> #include <stdlib.h> #include <stdio.h>

1 0

git:5.1:0ef5bef4: pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: 5.1 Commit: 0ef5bef4738af52a8a7b173cfd662a04a4d568dd URL: https://github.com/kamailio/kamailio/commit/0ef5bef4738af52a8a7b173cfd662a0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:59+01:00 pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject --- Added: .gitmodules Added: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD Removed: pkg/kamailio/alpine_docker/Dockerfile Removed: pkg/kamailio/alpine_docker/README.md Removed: pkg/kamailio/alpine_docker/build.sh Removed: pkg/kamailio/alpine_docker/hooks/pre_build --- Diff: https://github.com/kamailio/kamailio/commit/0ef5bef4738af52a8a7b173cfd662a0… Patch: https://github.com/kamailio/kamailio/commit/0ef5bef4738af52a8a7b173cfd662a0…

1 0

[kamailio/kamailio] pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject (#1330)
by sergey-safarov 25 Nov '17

25 Nov '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1330 -- Commit Summary -- * pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject -- File Changes -- A .gitmodules (3) A pkg/docker (1) M pkg/kamailio/alpine/APKBUILD (1) D pkg/kamailio/alpine_docker/Dockerfile (5) D pkg/kamailio/alpine_docker/README.md (85) D pkg/kamailio/alpine_docker/build.sh (144) D pkg/kamailio/alpine_docker/hooks/pre_build (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1330.patch https://github.com/kamailio/kamailio/pull/1330.diff -- 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/pull/1330

2 1

[kamailio/kamailio] pkg/kamailio/obs: Fixed lua module build (#1317)
by sergey-safarov 25 Nov '17

25 Nov '17

Reverted commit cb42b9881b3d1f90f3cb54765eef65ce9d773f92 Fixed lua module build You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1317 -- Commit Summary -- * Revert "pkg/obs: enable the same modules for RHEL 7 as for Centos 7" * pkg/kamailio/obs: Fixed build of lua module -- File Changes -- M pkg/kamailio/obs/kamailio.spec (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1317.patch https://github.com/kamailio/kamailio/pull/1317.diff -- 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/pull/1317

2 2

git:5.0:50e1a0d1: Revert "pkg/obs: enable the same modules for RHEL 7 as for Centos 7"
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: 5.0 Commit: 50e1a0d1837ce319abd57c73991b2ec00499da7a URL: https://github.com/kamailio/kamailio/commit/50e1a0d1837ce319abd57c73991b2ec… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:35+01:00 Revert "pkg/obs: enable the same modules for RHEL 7 as for Centos 7" This reverts commit cb42b9881b3d1f90f3cb54765eef65ce9d773f92. --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/50e1a0d1837ce319abd57c73991b2ec… Patch: https://github.com/kamailio/kamailio/commit/50e1a0d1837ce319abd57c73991b2ec… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9f0b2a9f12..4cf0d11441 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -132,18 +132,18 @@ %if 0%{?rhel} == 7 && 0%{?centos_ver} != 7 %define dist_name rhel %define dist_version %{?rhel} -%bcond_without cnxcc +%bcond_with cnxcc %bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without kazoo -%bcond_without memcached +%bcond_with geoip +%bcond_with http_async_client +%bcond_with jansson +%bcond_with json +%bcond_with kazoo +%bcond_with memcached %bcond_without perl %bcond_without redis -%bcond_without sctp -%bcond_without websocket +%bcond_with sctp +%bcond_with websocket %bcond_without xmlrpc %endif

1 0

git:5.0:2043ab77: pkg/kamailio/obs: Fixed build of lua module
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: 5.0 Commit: 2043ab77af5f6e3fe25bd402dc24a2449cffa67e URL: https://github.com/kamailio/kamailio/commit/2043ab77af5f6e3fe25bd402dc24a24… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:35+01:00 pkg/kamailio/obs: Fixed build of lua module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2043ab77af5f6e3fe25bd402dc24a24… Patch: https://github.com/kamailio/kamailio/commit/2043ab77af5f6e3fe25bd402dc24a24… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 4cf0d11441..1d0a01af83 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -11,6 +11,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_without kazoo %bcond_without memcached %bcond_without perl @@ -29,6 +30,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_without kazoo %bcond_without memcached %bcond_without perl @@ -47,6 +49,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_without kazoo %bcond_without memcached %bcond_without perl @@ -65,6 +68,7 @@ %bcond_with http_async_client %bcond_with jansson %bcond_with json +%bcond_without lua %bcond_with kazoo %bcond_without memcached %bcond_without perl @@ -84,6 +88,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_without kazoo %bcond_without memcached %bcond_without perl @@ -102,6 +107,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_with kazoo %bcond_without memcached %bcond_without perl @@ -120,6 +126,7 @@ %bcond_with http_async_client %bcond_with jansson %bcond_with json +%bcond_with lua %bcond_with kazoo %bcond_with memcached %bcond_with perl @@ -138,6 +145,7 @@ %bcond_with http_async_client %bcond_with jansson %bcond_with json +%bcond_with lua %bcond_with kazoo %bcond_with memcached %bcond_without perl

1 0

git:master:6f170d28: pkg/kamailio/rhel: Updated build instructions
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: 6f170d2847aac510cc4f5630c71c733a1bdacbd8 URL: https://github.com/kamailio/kamailio/commit/6f170d2847aac510cc4f5630c71c733… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:03+01:00 pkg/kamailio/rhel: Updated build instructions --- Modified: pkg/kamailio/rhel/README.md --- Diff: https://github.com/kamailio/kamailio/commit/6f170d2847aac510cc4f5630c71c733… Patch: https://github.com/kamailio/kamailio/commit/6f170d2847aac510cc4f5630c71c733… --- diff --git a/pkg/kamailio/rhel/README.md b/pkg/kamailio/rhel/README.md index e1727f7320..8bd5bbeafb 100644 --- a/pkg/kamailio/rhel/README.md +++ b/pkg/kamailio/rhel/README.md @@ -4,3 +4,16 @@ Now supported dists: 1. RHEL 7 SPEC file and other stuff located at `../obs` folder + +IF you wnat build optional packages please use rpmbuild with options "--with". Example + +``` +rpmbbuild -bb --with cnxcc --with geoip --with http_async_client --with jansson \ + --with json --with kazoo --with memcached --with sctp --with websocket kamailio.spec +``` + +or + +``` +mock --rpmbuild-opts '--with cnxcc --with geoip --with http_async_client' --rebuild kamailio.src.rpm +```

1 0

git:master:70021219: pkg/kamailio/obs: Added acc_diameter module files
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: 70021219713d2ab79bcd3282f1073e7a615d27ad URL: https://github.com/kamailio/kamailio/commit/70021219713d2ab79bcd3282f1073e7… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:03+01:00 pkg/kamailio/obs: Added acc_diameter module files --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/70021219713d2ab79bcd3282f1073e7… Patch: https://github.com/kamailio/kamailio/commit/70021219713d2ab79bcd3282f1073e7… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e578ca1d99..c079f02d4b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1145,6 +1145,7 @@ fi %dir %{_docdir}/kamailio/modules %doc %{_docdir}/kamailio/modules/README.acc +%doc %{_docdir}/kamailio/modules/README.acc_diameter %doc %{_docdir}/kamailio/modules/README.alias_db %doc %{_docdir}/kamailio/modules/README.app_jsdt %doc %{_docdir}/kamailio/modules/README.async @@ -1292,6 +1293,7 @@ fi %dir %{_libdir}/kamailio/modules %{_libdir}/kamailio/modules/acc.so +%{_libdir}/kamailio/modules/acc_diameter.so %{_libdir}/kamailio/modules/alias_db.so %{_libdir}/kamailio/modules/app_jsdt.so %{_libdir}/kamailio/modules/async.so

1 0

git:master:e264699b: pkg/kamailio/obs: Fixed build of lua module
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: e264699bdfb63d7fe153d465215fd9cfdaca4993 URL: https://github.com/kamailio/kamailio/commit/e264699bdfb63d7fe153d465215fd9c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:03+01:00 pkg/kamailio/obs: Fixed build of lua module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e264699bdfb63d7fe153d465215fd9c… Patch: https://github.com/kamailio/kamailio/commit/e264699bdfb63d7fe153d465215fd9c… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index c079f02d4b..0f60a0a8a0 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -11,6 +11,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_without kazoo %bcond_without memcached %bcond_without perl @@ -30,6 +31,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_without kazoo %bcond_without memcached %bcond_without perl @@ -49,6 +51,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_without kazoo %bcond_without memcached %bcond_without perl @@ -68,6 +71,7 @@ %bcond_with http_async_client %bcond_with jansson %bcond_with json +%bcond_without lua %bcond_with kazoo %bcond_without memcached %bcond_without perl @@ -88,6 +92,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_without kazoo %bcond_without memcached %bcond_without perl @@ -107,6 +112,7 @@ %bcond_without http_async_client %bcond_without jansson %bcond_without json +%bcond_without lua %bcond_with kazoo %bcond_without memcached %bcond_without perl @@ -126,6 +132,7 @@ %bcond_with http_async_client %bcond_with jansson %bcond_with json +%bcond_with lua %bcond_with kazoo %bcond_with memcached %bcond_with perl @@ -145,6 +152,7 @@ %bcond_with http_async_client %bcond_with jansson %bcond_with json +%bcond_with lua %bcond_with kazoo %bcond_with memcached %bcond_without perl

1 0

git:master:f23c7e34: pkg/kamailio/obs: Added sipdump module
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: f23c7e34061e52aaf7cb79fad22048500f957cbb URL: https://github.com/kamailio/kamailio/commit/f23c7e34061e52aaf7cb79fad220485… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:03+01:00 pkg/kamailio/obs: Added sipdump module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/f23c7e34061e52aaf7cb79fad220485… Patch: https://github.com/kamailio/kamailio/commit/f23c7e34061e52aaf7cb79fad220485… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index bd4dd1c769..e578ca1d99 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -185,6 +185,7 @@ Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver Conflicts: kamailio-radius < % ver, kamailio-redis < %ver Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver +Conflicts: kamailio-sipdump < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver Conflicts: kamailio-tls < %ver, kamailio-unixodbc < %ver Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver @@ -690,6 +691,15 @@ Requires: kamailio-sipcapture = %ver reference config for sipcapture daemon. +%package sipdump +Summary: This module writes SIP traffic and some associated details into local files +Group: System Environment/Daemons +Requires: kamailio = %ver + +%description sipdump +This module writes SIP traffic and some associated details into local files + + %package smsops Summary: Tools for handling SMS packets in SIP messages Group: System Environment/Daemons @@ -1787,6 +1797,12 @@ fi %endif +%files sipdump +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.sipdump +%{_libdir}/kamailio/modules/sipdump.so + + %files snmpstats %defattr(-,root,root) %{_docdir}/kamailio/modules/README.snmpstats

1 0

git:master:531db895: pkg/kamailio/obs: Ported 32c5d9dd9f7a5e02ab428e5c16bf7406e4ff7856 ot OBS spec file
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: 531db895fc517a9d4614d8746e3389626af55805 URL: https://github.com/kamailio/kamailio/commit/531db895fc517a9d4614d8746e33896… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:03+01:00 pkg/kamailio/obs: Ported 32c5d9dd9f7a5e02ab428e5c16bf7406e4ff7856 ot OBS spec file --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/531db895fc517a9d4614d8746e33896… Patch: https://github.com/kamailio/kamailio/commit/531db895fc517a9d4614d8746e33896… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8ad3290f24..bd4dd1c769 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl +%bcond_without rebbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -32,6 +33,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl +%bcond_without rebbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -50,6 +52,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl +%bcond_without rebbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -68,6 +71,7 @@ %bcond_with kazoo %bcond_without memcached %bcond_without perl +%bcond_with rebbitmq %bcond_with redis %bcond_without sctp %bcond_without websocket @@ -87,6 +91,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl +%bcond_without rebbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -105,6 +110,7 @@ %bcond_with kazoo %bcond_without memcached %bcond_without perl +%bcond_with rebbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -123,6 +129,7 @@ %bcond_with kazoo %bcond_with memcached %bcond_with perl +%bcond_with rebbitmq %bcond_with redis %bcond_with sctp %bcond_with websocket @@ -141,6 +148,7 @@ %bcond_with kazoo %bcond_with memcached %bcond_without perl +%bcond_without rebbitmq %bcond_without redis %bcond_with sctp %bcond_with websocket @@ -170,6 +178,7 @@ Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver +Conflicts: kamailio-rabbitmq < %ver Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -601,6 +610,18 @@ BuildRequires: python-devel Python extensions for Kamailio. +%if %{with rabbitmq} +%package rabbitmq +Summary: RabbitMQ related modules +Group: System Environment/Daemons +Requires: libuuid, librabbitmq, kamailio = %ver +BuildRequires: librabbitmq-devel, libuuid-devel + +%description rabbitmq +RabbitMQ module for Kamailio. +%endif + + %package radius Summary: RADIUS modules for Kamailio Group: System Environment/Daemons @@ -920,6 +941,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kjsonrpcs \ %if %{with kazoo} kkazoo \ +%endif +%if %{with rabbitmq} + krabbitmq \ %endif kldap %if %{with lua} @@ -986,6 +1010,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kjsonrpcs \ %if %{with kazoo} kkazoo \ +%endif +%if %{with rabbitmq} + krabbitmq \ %endif kldap \ %if %{with lua} @@ -1696,6 +1723,14 @@ fi %{_libdir}/kamailio/modules/app_python.so +%if %{with rabbitmq} +%files rabbitmq +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.rabbitmq +%{_libdir}/kamailio/modules/rabbitmq.so +%endif + + %files radius %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.acc_radius @@ -1858,6 +1893,8 @@ fi - added packaging for Fedora 26 and openSUSE Leap 42.3 - removed packaging for Fedora 24 and openSUSE Leap 42.1 as End Of Life - rewrited SPEC file to support Fedora, RHEL, CentOS, openSUSE distrs +* Mon Jul 31 2017 Mititelu Stefan <stefan.mititelu92(a)gmail.com> + - added rabbitmq module * Wed Apr 26 2017 Carsten Bock <carsten(a)ng-voice.co,> - added ims_diameter_server module - added topos_redis module

1 0

git:master:d9639951: pkg/kamailio/obs: Added missed directories to packaging (non systemd dists)
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: d9639951cb70ae927f899e6cef19dfde66512918 URL: https://github.com/kamailio/kamailio/commit/d9639951cb70ae927f899e6cef19dfd… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:03+01:00 pkg/kamailio/obs: Added missed directories to packaging (non systemd dists) Added workarround for buggy _sharedstatedir on openSUSE Leap. Fixed build error for RHEL7 dists Some SPEC clenup --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d9639951cb70ae927f899e6cef19dfd… Patch: https://github.com/kamailio/kamailio/commit/d9639951cb70ae927f899e6cef19dfd…

1 0

git:master:88745f4b: pkg/kamailio/obs: Ported ca39ea810c01f6947db70870cc1d786e95cb4bc3 to OBS SPEC
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: 88745f4b0ad51e2b9fb7a1817ee3aea201fd306e URL: https://github.com/kamailio/kamailio/commit/88745f4b0ad51e2b9fb7a1817ee3aea… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:19:03+01:00 pkg/kamailio/obs: Ported ca39ea810c01f6947db70870cc1d786e95cb4bc3 to OBS SPEC --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/88745f4b0ad51e2b9fb7a1817ee3aea… Patch: https://github.com/kamailio/kamailio/commit/88745f4b0ad51e2b9fb7a1817ee3aea… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index a33b7f9315..8ad3290f24 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -176,7 +176,7 @@ Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver Conflicts: kamailio-radius < % ver, kamailio-redis < %ver Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver -Conflicts: kamailio-snmpstats < %ver, kamailio-sqlite < %ver +Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver Conflicts: kamailio-tls < %ver, kamailio-unixodbc < %ver Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver Conflicts: kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver @@ -712,6 +712,16 @@ Requires: kamailio = %ver Send commands to statsd server. +%package sqlang +Summary: Squirrel Language (SQLang) for Kamailio +Group: System Environment/Daemons +Requires: squirrel-libs, kamailio = %version +BuildRequires: squirrel-devel gcc-c++ + +%description sqlang +app_sqlang module for Kamailio. + + %package sqlite Summary: SQLite database connectivity for Kamailio Group: System Environment/Daemons @@ -1206,6 +1216,9 @@ fi %doc %{_docdir}/kamailio/modules/README.jsonrpcs %doc %{_docdir}/kamailio/modules/README.nosip %doc %{_docdir}/kamailio/modules/README.tsilo +%doc %{_docdir}/kamailio/modules/README.call_obj +%doc %{_docdir}/kamailio/modules/README.evrexec +%doc %{_docdir}/kamailio/modules/README.keepalive %dir %attr(-,kamailio,kamailio) %{_sysconfdir}/kamailio @@ -1350,6 +1363,9 @@ fi %{_libdir}/kamailio/modules/jsonrpcs.so %{_libdir}/kamailio/modules/nosip.so %{_libdir}/kamailio/modules/tsilo.so +%{_libdir}/kamailio/modules/call_obj.so +%{_libdir}/kamailio/modules/evrexec.so +%{_libdir}/kamailio/modules/keepalive.so %{_sbindir}/kamailio @@ -1487,6 +1503,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_auth %doc %{_docdir}/kamailio/modules/README.ims_charging %doc %{_docdir}/kamailio/modules/README.ims_dialog +%doc %{_docdir}/kamailio/modules/README.ims_diameter_server %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc %doc %{_docdir}/kamailio/modules/README.ims_qos @@ -1503,6 +1520,7 @@ fi %{_libdir}/kamailio/modules/ims_auth.so %{_libdir}/kamailio/modules/ims_charging.so %{_libdir}/kamailio/modules/ims_dialog.so +%{_libdir}/kamailio/modules/ims_diameter_server.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so %{_libdir}/kamailio/modules/ims_qos.so @@ -1694,7 +1712,9 @@ fi %files redis %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.ndb_redis +%doc %{_docdir}/kamailio/modules/README.topos_redis %{_libdir}/kamailio/modules/ndb_redis.so +%{_libdir}/kamailio/modules/topos_redis.so %endif @@ -1749,6 +1769,12 @@ fi %{_libdir}/kamailio/modules/statsd.so +%files sqlang +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.app_sqlang +%{_libdir}/kamailio/modules/app_sqlang.so + + %files sqlite %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_sqlite @@ -1832,6 +1858,13 @@ fi - added packaging for Fedora 26 and openSUSE Leap 42.3 - removed packaging for Fedora 24 and openSUSE Leap 42.1 as End Of Life - rewrited SPEC file to support Fedora, RHEL, CentOS, openSUSE distrs +* Wed Apr 26 2017 Carsten Bock <carsten(a)ng-voice.co,> + - added ims_diameter_server module + - added topos_redis module + - added call_obj module + - added evrexec module + - added keepalive module + - added app_sqlang module * Thu Mar 09 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com> - added jansson package * Sat Feb 04 2017 Federico Cabiddu <federico.cabiddu(a)gmail.com>

1 0

[kamailio/kamailio] OBS spec update for 5.1.0 relesse (#1316)
by sergey-safarov 25 Nov '17

25 Nov '17

Also need do cherry-pick to 5.1 branch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1316 -- Commit Summary -- * pkg/kamailio/obs: Added missed directories to packaging (non systemd dists) * pkg/kamailio/obs: Ported ca39ea810c01f6947db70870cc1d786e95cb4bc3 to OBS SPEC * pkg/kamailio/obs: Ported 32c5d9dd9f7a5e02ab428e5c16bf7406e4ff7856 ot OBS spec file * pkg/kamailio/obs: Added sipdump module * pkg/kamailio/obs: Added acc_diameter module files -- File Changes -- M pkg/kamailio/obs/kamailio.spec (137) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1316.patch https://github.com/kamailio/kamailio/pull/1316.diff -- 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/pull/1316

3 15

git:master:c10ee13c: pkg/kamailio/rpm: Removed stalled RPM packaging script
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: c10ee13c9a1d3fc6da60c8ee5a34975d818a91e1 URL: https://github.com/kamailio/kamailio/commit/c10ee13c9a1d3fc6da60c8ee5a34975… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:18:44+01:00 pkg/kamailio/rpm: Removed stalled RPM packaging script --- Removed: pkg/kamailio/rpm/kamailio.default Removed: pkg/kamailio/rpm/kamailio.init Removed: pkg/kamailio/rpm/kamailio.init.SuSE Removed: pkg/kamailio/rpm/kamailio.spec-4.1 Removed: pkg/kamailio/rpm/kamailio.spec.CenOS Removed: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/c10ee13c9a1d3fc6da60c8ee5a34975… Patch: https://github.com/kamailio/kamailio/commit/c10ee13c9a1d3fc6da60c8ee5a34975…

1 0

[kamailio/kamailio] pkg/kamailio: Removed stalled RPM packaging scripts (#1286)
by sergey-safarov 25 Nov '17

25 Nov '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1286 -- Commit Summary -- * pkg/kamailio/fedora: Removed unsuported Fedora packaging scripts * pkg/kamailio/rpm: Removed stalled RPM packaging script -- File Changes -- D pkg/kamailio/fedora/17/README (67) D pkg/kamailio/fedora/17/kamailio-build.appl (49) D pkg/kamailio/fedora/17/kamailio.appl (42) D pkg/kamailio/fedora/17/kamailio.service (16) D pkg/kamailio/fedora/17/kamailio.spec (1325) D pkg/kamailio/fedora/17/kamailio.sysconfig (12) D pkg/kamailio/fedora/18/README (1) D pkg/kamailio/fedora/18/kamailio-build.appl (49) D pkg/kamailio/fedora/18/kamailio.appl (42) D pkg/kamailio/fedora/18/kamailio.service (1) D pkg/kamailio/fedora/18/kamailio.spec (1) D pkg/kamailio/fedora/18/kamailio.sysconfig (1) D pkg/kamailio/rpm/kamailio.default (30) D pkg/kamailio/rpm/kamailio.init (128) D pkg/kamailio/rpm/kamailio.init.SuSE (133) D pkg/kamailio/rpm/kamailio.spec-4.1 (409) D pkg/kamailio/rpm/kamailio.spec.CenOS (745) D pkg/kamailio/rpm/kamailio.spec.SuSE (389) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1286.patch https://github.com/kamailio/kamailio/pull/1286.diff -- 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/pull/1286

2 1

git:master:7565fb7a: pkg/kamailio/fedora: Removed unsuported Fedora packaging scripts
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: 7565fb7ae287e8656633c57e2133ad91e2043367 URL: https://github.com/kamailio/kamailio/commit/7565fb7ae287e8656633c57e2133ad9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:18:44+01:00 pkg/kamailio/fedora: Removed unsuported Fedora packaging scripts --- Removed: pkg/kamailio/fedora/17/README Removed: pkg/kamailio/fedora/17/kamailio-build.appl Removed: pkg/kamailio/fedora/17/kamailio.appl Removed: pkg/kamailio/fedora/17/kamailio.service Removed: pkg/kamailio/fedora/17/kamailio.spec Removed: pkg/kamailio/fedora/17/kamailio.sysconfig Removed: pkg/kamailio/fedora/18/README Removed: pkg/kamailio/fedora/18/kamailio-build.appl Removed: pkg/kamailio/fedora/18/kamailio.appl Removed: pkg/kamailio/fedora/18/kamailio.service Removed: pkg/kamailio/fedora/18/kamailio.spec Removed: pkg/kamailio/fedora/18/kamailio.sysconfig --- Diff: https://github.com/kamailio/kamailio/commit/7565fb7ae287e8656633c57e2133ad9… Patch: https://github.com/kamailio/kamailio/commit/7565fb7ae287e8656633c57e2133ad9…

1 0

git:master:65a777f3: http_client: add missed useragent parameter
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: 65a777f3316fb3a3adfa61739a091bb9d61582a8 URL: https://github.com/kamailio/kamailio/commit/65a777f3316fb3a3adfa61739a091bb… Author: Vasiliy Ganchev <vance(a)ukr.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:16:55+01:00 http_client: add missed useragent parameter While preparing query_params, "useragent" was missed - add it. --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/65a777f3316fb3a3adfa61739a091bb… Patch: https://github.com/kamailio/kamailio/commit/65a777f3316fb3a3adfa61739a091bb… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index d19910f90f..3dfe21a8a9 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -552,6 +552,7 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, query_params.cacert = default_tls_cacert; query_params.ciphersuites = conn->ciphersuites; query_params.tlsversion = conn->tlsversion; + query_params.useragent = conn->useragent; query_params.verify_peer = conn->verify_peer; query_params.verify_host = conn->verify_host; query_params.timeout = conn->timeout;

1 0

[kamailio/kamailio] http_client: add missed useragent parameter (#1331)
by Vasiliy Ganchev 25 Nov '17

25 Nov '17

While preparing query_params, "useragent" was missed - add it. As before User-Agent was never present in HTTP requests. #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1331 -- Commit Summary -- * http_client: add missed useragent parameter -- File Changes -- M src/modules/http_client/functions.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1331.patch https://github.com/kamailio/kamailio/pull/1331.diff -- 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/pull/1331

2 2

[kamailio/kamailio] Update textops.c (#1332)
by Sam 25 Nov '17

25 Nov '17

textops: fixed naming convention - The original function is named in_ rather than is_, updating to the same standard You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1332 -- Commit Summary -- * Update textops.c -- File Changes -- M src/modules/textops/textops.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1332.patch https://github.com/kamailio/kamailio/pull/1332.diff -- 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/pull/1332

2 2

git:master:ebd51dae: textops: fixed name of in_list() function export to kemi
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: ebd51daea816a6bab3436e24de22d23d079d7c91 URL: https://github.com/kamailio/kamailio/commit/ebd51daea816a6bab3436e24de22d23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:13:20+01:00 textops: fixed name of in_list() function export to kemi - reported by GH #1332 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/ebd51daea816a6bab3436e24de22d23… Patch: https://github.com/kamailio/kamailio/commit/ebd51daea816a6bab3436e24de22d23… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cafb4520be..b05fdd6b31 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3940,7 +3940,7 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("textops"), str_init("is_list"), + { str_init("textops"), str_init("in_list"), SR_KEMIP_INT, ki_in_list, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

1 0

git:master:b524d25a: textops: kemi search_append() and search_append_body() have two params
by Daniel-Constantin Mierla 25 Nov '17

25 Nov '17

Module: kamailio Branch: master Commit: b524d25a3ba327d7a52544489d847932f1ee1a28 URL: https://github.com/kamailio/kamailio/commit/b524d25a3ba327d7a52544489d84793… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:09:49+01:00 textops: kemi search_append() and search_append_body() have two params - reported by GH #1333 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/b524d25a3ba327d7a52544489d84793… Patch: https://github.com/kamailio/kamailio/commit/b524d25a3ba327d7a52544489d84793… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 7d2f71cf21..cafb4520be 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3832,12 +3832,12 @@ static sr_kemi_t sr_kemi_textops_exports[] = { }, { str_init("textops"), str_init("search_append"), SR_KEMIP_INT, ki_search_append, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textops"), str_init("search_append_body"), SR_KEMIP_INT, ki_search_append_body, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textops"), str_init("is_present_hf"),

1 0

git:master:f95fda89: app_lua: count also the special function when generating the rpc response
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: f95fda89d4532ba333aed835c72f102a7c032980 URL: https://github.com/kamailio/kamailio/commit/f95fda89d4532ba333aed835c72f102… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:50:05+01:00 app_lua: count also the special function when generating the rpc response --- Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f95fda89d4532ba333aed835c72f102… Patch: https://github.com/kamailio/kamailio/commit/f95fda89d4532ba333aed835c72f102… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index b4a44fab70..ac536878c9 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -673,12 +673,17 @@ static void app_lua_rpc_api_list(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error root reply"); return; } + + /* count the number of exported functions */ n = 0; for(i=0; i<SR_KEMI_LUA_EXPORT_SIZE; i++) { ket = sr_kemi_lua_export_get(i); if(ket==NULL) continue; n++; } + for(i=0; sr_kemi_app_lua_rpc_exports[i].fname.s!=NULL; i++) { + n++; + } if(rpc->struct_add(th, "d[", "msize", n,

1 0

git:master:7cbece0e: app_lua: print special kemi functions via rpc
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: 7cbece0e2e60f8c334bea97333b029d51e5b7e33 URL: https://github.com/kamailio/kamailio/commit/7cbece0e2e60f8c334bea97333b029d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:39:27+01:00 app_lua: print special kemi functions via rpc --- Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7cbece0e2e60f8c334bea97333b029d… Patch: https://github.com/kamailio/kamailio/commit/7cbece0e2e60f8c334bea97333b029d… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index 4c431dd3ed..b4a44fab70 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -606,6 +606,54 @@ static void app_lua_rpc_list(rpc_t* rpc, void* ctx) return; } +/** + * only prototypes of special kemi exports in order to list via rpc + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_app_lua_rpc_exports[] = { + { str_init("pv"), str_init("get"), + SR_KEMIP_STR, NULL, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pv"), str_init("seti"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pv"), str_init("sets"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pv"), str_init("unset"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pv"), str_init("is_null"), + SR_KEMIP_BOOL, NULL, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("x"), str_init("modf"), + SR_KEMIP_INT, NULL, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("x"), str_init("exit"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("x"), str_init("drop"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; static const char* app_lua_rpc_api_list_doc[2] = { "list kemi exports to lua", @@ -656,6 +704,22 @@ static void app_lua_rpc_api_list(rpc_t* rpc, void* ctx) return; } } + for(i=0; sr_kemi_app_lua_rpc_exports[i].fname.s!=NULL; i++) { + ket = &sr_kemi_app_lua_rpc_exports[i]; + 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_lua_rpc_cmds[] = {

1 0

git:master:e177266e: app_sqlang: detect if a kemi function was already added in exports list
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: e177266e8f113f1541b31496f9fb0c71ac751f17 URL: https://github.com/kamailio/kamailio/commit/e177266e8f113f1541b31496f9fb0c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:15:42+01:00 app_sqlang: detect if a kemi function was already added in exports list --- Modified: src/modules/app_sqlang/app_sqlang_kemi_export.c Modified: src/modules/app_sqlang/utils/app_sqlang_ctl --- Diff: https://github.com/kamailio/kamailio/commit/e177266e8f113f1541b31496f9fb0c7… Patch: https://github.com/kamailio/kamailio/commit/e177266e8f113f1541b31496f9fb0c7… --- diff --git a/src/modules/app_sqlang/app_sqlang_kemi_export.c b/src/modules/app_sqlang/app_sqlang_kemi_export.c index 52a79df9a3..08d045306c 100644 --- a/src/modules/app_sqlang/app_sqlang_kemi_export.c +++ b/src/modules/app_sqlang/app_sqlang_kemi_export.c @@ -9277,6 +9277,9 @@ SQFUNCTION sr_kemi_sqlang_export_associate(sr_kemi_t *ket) _sr_kemi_sqlang_export_list[i].ket = ket; return _sr_kemi_sqlang_export_list[i].pfunc; } + if(_sr_kemi_sqlang_export_list[i].ket==ket) { + return _sr_kemi_sqlang_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL; diff --git a/src/modules/app_sqlang/utils/app_sqlang_ctl b/src/modules/app_sqlang/utils/app_sqlang_ctl index f5a8375d4a..006dc82321 100755 --- a/src/modules/app_sqlang/utils/app_sqlang_ctl +++ b/src/modules/app_sqlang/utils/app_sqlang_ctl @@ -136,6 +136,9 @@ SQFUNCTION sr_kemi_sqlang_export_associate(sr_kemi_t *ket) _sr_kemi_sqlang_export_list[i].ket = ket; return _sr_kemi_sqlang_export_list[i].pfunc; } + if(_sr_kemi_sqlang_export_list[i].ket==ket) { + return _sr_kemi_sqlang_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

1 0

git:master:48d55652: app_jsdt: detect if a kemi function is already in exported list
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: 48d55652fa36cb2b20540d1ebc7665476dfb1b1e URL: https://github.com/kamailio/kamailio/commit/48d55652fa36cb2b20540d1ebc76654… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:11:44+01:00 app_jsdt: detect if a kemi function is already in exported list --- Modified: src/modules/app_jsdt/app_jsdt_kemi_export.c Modified: src/modules/app_jsdt/utils/app_jsdt_ctl --- Diff: https://github.com/kamailio/kamailio/commit/48d55652fa36cb2b20540d1ebc76654… Patch: https://github.com/kamailio/kamailio/commit/48d55652fa36cb2b20540d1ebc76654… --- diff --git a/src/modules/app_jsdt/app_jsdt_kemi_export.c b/src/modules/app_jsdt/app_jsdt_kemi_export.c index a1f398f022..2150ab3dcc 100644 --- a/src/modules/app_jsdt/app_jsdt_kemi_export.c +++ b/src/modules/app_jsdt/app_jsdt_kemi_export.c @@ -9277,6 +9277,9 @@ duk_c_function sr_kemi_jsdt_export_associate(sr_kemi_t *ket) _sr_kemi_jsdt_export_list[i].ket = ket; return _sr_kemi_jsdt_export_list[i].pfunc; } + if(_sr_kemi_jsdt_export_list[i].ket==ket) { + return _sr_kemi_jsdt_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL; diff --git a/src/modules/app_jsdt/utils/app_jsdt_ctl b/src/modules/app_jsdt/utils/app_jsdt_ctl index eb1bd4c682..26e37aa4ca 100755 --- a/src/modules/app_jsdt/utils/app_jsdt_ctl +++ b/src/modules/app_jsdt/utils/app_jsdt_ctl @@ -136,6 +136,9 @@ duk_c_function sr_kemi_jsdt_export_associate(sr_kemi_t *ket) _sr_kemi_jsdt_export_list[i].ket = ket; return _sr_kemi_jsdt_export_list[i].pfunc; } + if(_sr_kemi_jsdt_export_list[i].ket==ket) { + return _sr_kemi_jsdt_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

1 0

git:master:f4c6365f: app_python: updated the ctl tool to generate the exports
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: f4c6365f2678e5c30d4a1fc287206b82a7eee459 URL: https://github.com/kamailio/kamailio/commit/f4c6365f2678e5c30d4a1fc287206b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:04:13+01:00 app_python: updated the ctl tool to generate the exports --- Modified: src/modules/app_python/apy_kemi_export.c Modified: src/modules/app_python/utils/app_python_ctl --- Diff: https://github.com/kamailio/kamailio/commit/f4c6365f2678e5c30d4a1fc287206b8… Patch: https://github.com/kamailio/kamailio/commit/f4c6365f2678e5c30d4a1fc287206b8… --- diff --git a/src/modules/app_python/apy_kemi_export.c b/src/modules/app_python/apy_kemi_export.c index 07cc901abd..fab078b68e 100644 --- a/src/modules/app_python/apy_kemi_export.c +++ b/src/modules/app_python/apy_kemi_export.c @@ -9279,6 +9279,9 @@ PyCFunction sr_apy_kemi_export_associate(sr_kemi_t *ket) _sr_apy_kemi_export_list[i].ket = ket; return _sr_apy_kemi_export_list[i].pfunc; } + if(_sr_apy_kemi_export_list[i].ket==ket) { + return _sr_apy_kemi_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL; diff --git a/src/modules/app_python/utils/app_python_ctl b/src/modules/app_python/utils/app_python_ctl index 273d5ca2c4..7fff1c7f2d 100755 --- a/src/modules/app_python/utils/app_python_ctl +++ b/src/modules/app_python/utils/app_python_ctl @@ -34,7 +34,7 @@ cat > ../apy_kemi_export.h <<EOF #define __APY_KEMI_FLIB_H__ #include <Python.h> -#include "../../kemi.h" +#include "../../core/kemi.h" #define SR_APY_KEMI_EXPORT_SIZE ${KEMI_MAX_SIZE} @@ -83,7 +83,7 @@ cat > ../apy_kemi_export.c <<EOF #include <Python.h> -#include "../../dprint.h" +#include "../../core/dprint.h" #include "apy_kemi.h" #include "apy_kemi_export.h" @@ -138,6 +138,9 @@ PyCFunction sr_apy_kemi_export_associate(sr_kemi_t *ket) _sr_apy_kemi_export_list[i].ket = ket; return _sr_apy_kemi_export_list[i].pfunc; } + if(_sr_apy_kemi_export_list[i].ket==ket) { + return _sr_apy_kemi_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

1 0

git:master:50a9e2ec: app_lua: updated paths to included files from core in the ctl tool
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: 50a9e2ec1cb86590a067dc23b2298b96a12bc232 URL: https://github.com/kamailio/kamailio/commit/50a9e2ec1cb86590a067dc23b2298b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:05:58+01:00 app_lua: updated paths to included files from core in the ctl tool --- Modified: src/modules/app_lua/utils/app_lua_ctl --- Diff: https://github.com/kamailio/kamailio/commit/50a9e2ec1cb86590a067dc23b2298b9… Patch: https://github.com/kamailio/kamailio/commit/50a9e2ec1cb86590a067dc23b2298b9… --- diff --git a/src/modules/app_lua/utils/app_lua_ctl b/src/modules/app_lua/utils/app_lua_ctl index e4ef9aca8c..a14c160b1d 100755 --- a/src/modules/app_lua/utils/app_lua_ctl +++ b/src/modules/app_lua/utils/app_lua_ctl @@ -36,7 +36,7 @@ cat > ../app_lua_kemi_export.h <<EOF #include <lua.h> #include <lauxlib.h> #include <lualib.h> -#include "../../kemi.h" +#include "../../core/kemi.h" #define SR_KEMI_LUA_EXPORT_SIZE ${KEMI_MAX_SIZE} @@ -87,7 +87,7 @@ cat > ../app_lua_kemi_export.c <<EOF #include <lauxlib.h> #include <lualib.h> -#include "../../dprint.h" +#include "../../core/dprint.h" #include "app_lua_sr.h" #include "app_lua_kemi_export.h"

1 0

git:master:ac8cc0a3: app_lua: updated the utils/app_lua_ctl
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: ac8cc0a3735325ec79a4a634eea6bcdcea4affe7 URL: https://github.com/kamailio/kamailio/commit/ac8cc0a3735325ec79a4a634eea6bcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:00:34+01:00 app_lua: updated the utils/app_lua_ctl --- Modified: src/modules/app_lua/utils/app_lua_ctl --- Diff: https://github.com/kamailio/kamailio/commit/ac8cc0a3735325ec79a4a634eea6bcd… Patch: https://github.com/kamailio/kamailio/commit/ac8cc0a3735325ec79a4a634eea6bcd… --- diff --git a/src/modules/app_lua/utils/app_lua_ctl b/src/modules/app_lua/utils/app_lua_ctl index 6a85943dda..e4ef9aca8c 100755 --- a/src/modules/app_lua/utils/app_lua_ctl +++ b/src/modules/app_lua/utils/app_lua_ctl @@ -142,6 +142,9 @@ lua_CFunction sr_kemi_lua_export_associate(sr_kemi_t *ket) _sr_kemi_lua_export_list[i].ket = ket; return _sr_kemi_lua_export_list[i].pfunc; } + if(_sr_kemi_lua_export_list[i].ket==ket) { + return _sr_kemi_lua_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

1 0

git:master:6c7bc039: drouting: removed unused variable
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: 6c7bc0390fc1d9972ca9fc330c25dd9b29f2476a URL: https://github.com/kamailio/kamailio/commit/6c7bc0390fc1d9972ca9fc330c25dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T18:48:09+01:00 drouting: removed unused variable --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/6c7bc0390fc1d9972ca9fc330c25dd9… Patch: https://github.com/kamailio/kamailio/commit/6c7bc0390fc1d9972ca9fc330c25dd9… --- diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c index 148c991a25..234e3ea1b9 100644 --- a/src/modules/drouting/drouting.c +++ b/src/modules/drouting/drouting.c @@ -729,7 +729,6 @@ static int do_routing(struct sip_msg *msg, int grp_id) struct sip_uri uri; str *ruri; int_str val; - struct usr_avp *avp; #define DR_MAX_GWLIST 32 static int active_gwlist[DR_MAX_GWLIST]; static int local_gwlist[DR_MAX_GWLIST]; @@ -1209,4 +1208,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_drouting_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:d98a005a: app_lua: detect if a kemi function was already added in the exports list
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: d98a005ac57b957231f8bda26c711bf7c7260049 URL: https://github.com/kamailio/kamailio/commit/d98a005ac57b957231f8bda26c711bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T18:42:07+01:00 app_lua: detect if a kemi function was already added in the exports list --- Modified: src/modules/app_lua/app_lua_kemi_export.c --- Diff: https://github.com/kamailio/kamailio/commit/d98a005ac57b957231f8bda26c711bf… Patch: https://github.com/kamailio/kamailio/commit/d98a005ac57b957231f8bda26c711bf… --- diff --git a/src/modules/app_lua/app_lua_kemi_export.c b/src/modules/app_lua/app_lua_kemi_export.c index 0fe6c0d9cb..29aa0e3d2b 100644 --- a/src/modules/app_lua/app_lua_kemi_export.c +++ b/src/modules/app_lua/app_lua_kemi_export.c @@ -9281,6 +9281,9 @@ lua_CFunction sr_kemi_lua_export_associate(sr_kemi_t *ket) _sr_kemi_lua_export_list[i].ket = ket; return _sr_kemi_lua_export_list[i].pfunc; } + if(_sr_kemi_lua_export_list[i].ket==ket) { + return _sr_kemi_lua_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

1 0

git:master:b34a31a6: modules: readme files regenerated - cnxcc ... [skip ci]
by Kamailio Dev 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: b34a31a66442ca6ec566676fcfb7210acbb83201 URL: https://github.com/kamailio/kamailio/commit/b34a31a66442ca6ec566676fcfb7210… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-24T15:16:53+01:00 modules: readme files regenerated - cnxcc ... [skip ci] --- Modified: src/modules/cnxcc/README --- Diff: https://github.com/kamailio/kamailio/commit/b34a31a66442ca6ec566676fcfb7210… Patch: https://github.com/kamailio/kamailio/commit/b34a31a66442ca6ec566676fcfb7210…

1 0

git:master:41953f19: cnxcc: use fixup function helper for core to get string and int params
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: 41953f192185989b5ba3ee7154202b6c390fe84c URL: https://github.com/kamailio/kamailio/commit/41953f192185989b5ba3ee7154202b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T14:48:38+01:00 cnxcc: use fixup function helper for core to get string and int params --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/41953f192185989b5ba3ee7154202b6… Patch: https://github.com/kamailio/kamailio/commit/41953f192185989b5ba3ee7154202b6…

1 0

git:master:b24cae28: cnxcc: docs - added parameters to functions
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: b24cae28dcb8ba3289e0320a1e406e4667371258 URL: https://github.com/kamailio/kamailio/commit/b24cae28dcb8ba3289e0320a1e406e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T15:15:19+01:00 cnxcc: docs - added parameters to functions --- Modified: src/modules/cnxcc/doc/cnxcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b24cae28dcb8ba3289e0320a1e406e4… Patch: https://github.com/kamailio/kamailio/commit/b24cae28dcb8ba3289e0320a1e406e4…

1 0

git:master:3205c597: core: mod_fix - typedefed struct to pvs_fixup_t
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: 3205c5970652bba56e2e3904a565491503fb6206 URL: https://github.com/kamailio/kamailio/commit/3205c5970652bba56e2e3904a565491… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T14:44:12+01:00 core: mod_fix - typedefed struct to pvs_fixup_t --- Modified: src/core/mod_fix.c --- Diff: https://github.com/kamailio/kamailio/commit/3205c5970652bba56e2e3904a565491… Patch: https://github.com/kamailio/kamailio/commit/3205c5970652bba56e2e3904a565491… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 3e8562add6..b07adcfc26 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -259,14 +259,14 @@ FIXUP_F1T(pvar_null, 1, 1, FPARAM_PVS) FIXUP_F1T(pvar_pvar, 1, 2, FPARAM_PVS) */ -struct pvs_fixup { +typedef struct pvs_fixup { pv_spec_t pvs; /* parsed pv spec */ void* orig; /* original pointer */ -}; +} pvs_fixup_t; int fixup_pvar_all(void** param, int param_no) { - struct pvs_fixup* pvs_f; + pvs_fixup_t* pvs_f; str name; pvs_f = 0; @@ -296,14 +296,14 @@ int fixup_pvar_all(void** param, int param_no) int fixup_free_pvar_all(void** param, int param_no) { - struct pvs_fixup* pvs_f; + pvs_fixup_t* pvs_f; if (*param) { pvs_f = *param; *param = pvs_f->orig; /* free only the contents (don't attempt to free &pvs_f->pvs)*/ pv_spec_destroy(&pvs_f->pvs); - /* free the whole pvs_fixup */ + /* free the whole pvs_fixup_t */ pkg_free(pvs_f); } return 0;

1 0

Jenkins build became unstable: kamailio44-nightly-binaries » i386,trusty,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…>

1 1

Jenkins build became unstable: kamailio44-nightly-binaries » i386,jessie,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…>

1 1

Jenkins build became unstable: kamailio44-nightly-binaries » i386,squeeze,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…>

1 1

Jenkins build became unstable: kamailio44-nightly-binaries » i386,precise,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…>

1 1

git:master:db004a73: cnxcc: clang format the code
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: db004a73d21c29a6a375d46eb15a6ba0b58910a7 URL: https://github.com/kamailio/kamailio/commit/db004a73d21c29a6a375d46eb15a6ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T12:37:54+01:00 cnxcc: clang format the code --- Modified: src/modules/cnxcc/cnxcc.c Modified: src/modules/cnxcc/cnxcc.h Modified: src/modules/cnxcc/cnxcc_check.c Modified: src/modules/cnxcc/cnxcc_check.h Modified: src/modules/cnxcc/cnxcc_mod.c Modified: src/modules/cnxcc/cnxcc_mod.h Modified: src/modules/cnxcc/cnxcc_redis.c Modified: src/modules/cnxcc/cnxcc_redis.h Modified: src/modules/cnxcc/cnxcc_rpc.c Modified: src/modules/cnxcc/cnxcc_rpc.h Modified: src/modules/cnxcc/cnxcc_select.c Modified: src/modules/cnxcc/cnxcc_select.h Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.c Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.h --- Diff: https://github.com/kamailio/kamailio/commit/db004a73d21c29a6a375d46eb15a6ba… Patch: https://github.com/kamailio/kamailio/commit/db004a73d21c29a6a375d46eb15a6ba…

1 0

Jenkins build became unstable: kamailio44-nightly-binaries » amd64,wheezy,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…>

1 1

Jenkins build became unstable: kamailio44-nightly-binaries » amd64,squeeze,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…>

1 1

Jenkins build became unstable: kamailio44-nightly-binaries » i386,xenial,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…>

1 1

Jenkins build became unstable: kamailio44-nightly-binaries » amd64,precise,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…>

1 1

Jenkins build became unstable: kamailio44-nightly-binaries » amd64,xenial,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…>

1 1

Jenkins build became unstable: kamailio44-nightly-binaries » amd64,jessie,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…>

1 1

git:master:8fbf7d83: lcr: exported load_gws() variants to kemi framework
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: 8fbf7d83b1dbeedf1ee53895aadbf6e99321432d URL: https://github.com/kamailio/kamailio/commit/8fbf7d83b1dbeedf1ee53895aadbf6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T11:05:21+01:00 lcr: exported load_gws() variants to kemi framework --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8fbf7d83b1dbeedf1ee53895aadbf6e… Patch: https://github.com/kamailio/kamailio/commit/8fbf7d83b1dbeedf1ee53895aadbf6e…

1 0

git:master:a8b4bd94: lcr: exported functions to kemi framework
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: a8b4bd942794c864d8455ca9fb144c1daa76e164 URL: https://github.com/kamailio/kamailio/commit/a8b4bd942794c864d8455ca9fb144c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T11:05:21+01:00 lcr: exported functions to kemi framework --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a8b4bd942794c864d8455ca9fb144c1… Patch: https://github.com/kamailio/kamailio/commit/a8b4bd942794c864d8455ca9fb144c1…

1 0

git:master:e8a79182: lcr: clang format the code
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: e8a79182a76b306fad13c9cb12eb9f2c4c658b14 URL: https://github.com/kamailio/kamailio/commit/e8a79182a76b306fad13c9cb12eb9f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T11:05:21+01:00 lcr: clang format the code --- Modified: src/modules/lcr/hash.c Modified: src/modules/lcr/hash.h Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h Modified: src/modules/lcr/lcr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e8a79182a76b306fad13c9cb12eb9f2… Patch: https://github.com/kamailio/kamailio/commit/e8a79182a76b306fad13c9cb12eb9f2…

1 0

Jenkins build became unstable: kamailio44-nightly-binaries » i386,wheezy,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…>

1 1

Jenkins build became unstable: kamailio44-nightly-binaries » amd64,trusty,slave #122
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…>

1 1

Jenkins build became unstable: kamailio44-nightly-source » wheezy,master #123
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-source/distribution=whe…>

1 1

Jenkins build became unstable: kamailio44-nightly-source » trusty,master #123
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-source/distribution=tru…>

1 1

rfc: clang format the code
by Daniel-Constantin Mierla 24 Nov '17

24 Nov '17

Hello, it was discussed during the last irc devel meeting and everyone there agreed to use clang-format to format the source code: - https://clang.llvm.org/docs/ClangFormat.html Is any developer (maybe not present during the irc devel meeting) opposing this? It is not going to be all at once, because some of the structures and initialization of them may be preferred to be kept with a custom format for being easier to read -- to have a section in the file not formatted, it has to be enclosed in between comments: /* clang-format off */ ... /* clang-format o. */ But for the rest of the code (i.e., functions) I think it will be better to agree on a format and try to use it. The clang-formatting should be done when one needs to update code in some files. Over the years, developers come and go, having each one with a custom formatting style is hard to maintain properly in long term. There are modules that do not indent coherently code inside blocks, using a mixture, more or less no style. This makes it hard for other developers to review in case of reported issues, but also for new comers to get familiar with the code. In the source tree there is already a .clang-format file which defines the options for formatting. It was used by me and other developers already -- I did it mainly in my modules or those components that do not have an active maintainer. But I plan to do it also on the components that have currently a maintainer at the moment I need to work on that code (e.g., fix some issue or export functions to kemi framework). My process of clang-formatting a module is like: - edit the files to add clang-format off/on comments around the parts I want to preserve as they are (typically mod exports -- params, functions, kemi -- and intialization of structures that are aligned to a specific indentation that makes it easier to read). - run: clang-format -i src/modules/modname/*.{c,h} - commit with these changes, no new feature or bug fix must be done in the same commit (can be combined with removing the history comments) If one wants different options inside .clang-format, please propose and let's discuss which one is preferred by the majority of the current developers. If no one shows anything against in a matter of few days, it will be considered accepted (after all, one can re-indent on own style if the rule is not accepted or overturned). Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

3 4

Jenkins build became unstable: kamailio44-nightly-source » squeeze,master #123
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-source/distribution=squ…>

1 1

Jenkins build became unstable: kamailio44-nightly-source » precise,master #123
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-source/distribution=pre…>

1 1

Jenkins build became unstable: kamailio44-nightly-source » xenial,master #123
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-source/distribution=xen…>

1 1

Jenkins build became unstable: kamailio44-nightly-source » jessie,master #123
by jenkins＠sipwise.com 24 Nov '17

24 Nov '17

See <https://kamailio.sipwise.com/job/kamailio44-nightly-source/distribution=jes…>

1 1

git:4.4:6ff438d2: pkg/kamailio/deb: add lsb-base [skip ci]
by Victor Seva 24 Nov '17

24 Nov '17

Module: kamailio Branch: 4.4 Commit: 6ff438d29abf1dbbacc071c995456bd91ee93bf3 URL: https://github.com/kamailio/kamailio/commit/6ff438d29abf1dbbacc071c995456bd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-24T10:01:48+01:00 pkg/kamailio/deb: add lsb-base [skip ci] fixes lintian error: > E: kamailio: init.d-script-needs-depends-on-lsb-base etc/init.d/kamailio (cherry picked from commit 574ad1fc96fa207a5a30fba66977d27e50ea1da1) (cherry picked from commit 253e7884b67349c5042ff721161d974adc8e9bc4) --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/squeeze/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/6ff438d29abf1dbbacc071c995456bd… Patch: https://github.com/kamailio/kamailio/commit/6ff438d29abf1dbbacc071c995456bd… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index aad8454efb..d03fb7b8f7 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -66,6 +66,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index 78140a5be2..72f8280055 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -64,6 +64,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index c14f5f38ec..ad956b19e6 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -61,6 +61,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index f500a50ffc..78e68197c5 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -64,6 +64,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index 3b2e6d7a2e..5000fadd9d 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -54,6 +54,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index f500a50ffc..78e68197c5 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -64,6 +64,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index c444350189..278464023d 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -63,6 +63,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index 7d77b3da16..3cf91a7a8d 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -60,6 +60,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index dd03c6c3ca..dc312d65e9 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -65,6 +65,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends},

1 0

git:4.4:212b33ea: pkg/kamailio/deb: kamailio-nth add less as default [skip ci]
by Victor Seva 24 Nov '17

24 Nov '17

Module: kamailio Branch: 4.4 Commit: 212b33ea0a7c1494cfdca7c06d8425376914cbe9 URL: https://github.com/kamailio/kamailio/commit/212b33ea0a7c1494cfdca7c06d84253… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-24T10:01:48+01:00 pkg/kamailio/deb: kamailio-nth add less as default [skip ci] * most is not available on all distributions (cherry picked from commit c4e5d9bf4438561fe8a87361b462eff38dc88d93) (cherry picked from commit 974a7d54052f4009376d451dcdad7620206cb1ca) --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/squeeze/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/212b33ea0a7c1494cfdca7c06d84253… Patch: https://github.com/kamailio/kamailio/commit/212b33ea0a7c1494cfdca7c06d84253… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index d03fb7b8f7..3bf11e1bc0 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -752,9 +752,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index 72f8280055..eaa3e17f96 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -750,9 +750,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index ad956b19e6..8f753a5fe6 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -699,9 +699,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index 78e68197c5..ac96ff2f42 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -734,9 +734,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index 5000fadd9d..3a5ff22fbc 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -579,9 +579,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index 78e68197c5..ac96ff2f42 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -734,9 +734,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 278464023d..cbbf16e5b8 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -749,9 +749,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index 3cf91a7a8d..a5aa33c3c7 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -681,9 +681,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index dc312d65e9..fba230d851 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -751,9 +751,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen,

1 0

git:4.4:fb66e911: pkg/kamailio/deb: remove lintian errors for old distributions [skip ci]
by Victor Seva 24 Nov '17

24 Nov '17

Module: kamailio Branch: 4.4 Commit: fb66e911b17f5c4e378c4c8c2dd9a776d7d259b4 URL: https://github.com/kamailio/kamailio/commit/fb66e911b17f5c4e378c4c8c2dd9a77… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-24T10:01:15+01:00 pkg/kamailio/deb: remove lintian errors for old distributions [skip ci] * we are using a newer version of lintian, so new errors are detected (cherry picked from commit a56d67d3b7e0d4f5014f91b6b413c5861afc3560) --- Added: pkg/kamailio/deb/jessie/kamailio-mysql-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-mysql-modules.lintian-overrides Added: pkg/kamailio/deb/squeeze/kamailio-mysql-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-mysql-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-mysql-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-mysql-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/squeeze Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/jessie/source.lintian-overrides Modified: pkg/kamailio/deb/precise/source.lintian-overrides Modified: pkg/kamailio/deb/squeeze/source.lintian-overrides Modified: pkg/kamailio/deb/trusty/source.lintian-overrides Modified: pkg/kamailio/deb/wheezy/source.lintian-overrides Modified: pkg/kamailio/deb/xenial/source.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/fb66e911b17f5c4e378c4c8c2dd9a77… Patch: https://github.com/kamailio/kamailio/commit/fb66e911b17f5c4e378c4c8c2dd9a77…

1 0

git:4.4:50414379: pkg/kamailio/deb: wrap-and-sort -sat [skip ci]
by Victor Seva 24 Nov '17

24 Nov '17

Module: kamailio Branch: 4.4 Commit: 50414379518b38b1b7210d19f7d8ad1e7ba65d4c URL: https://github.com/kamailio/kamailio/commit/50414379518b38b1b7210d19f7d8ad1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-24T10:00:55+01:00 pkg/kamailio/deb: wrap-and-sort -sat [skip ci] --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/squeeze/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/50414379518b38b1b7210d19f7d8ad1… Patch: https://github.com/kamailio/kamailio/commit/50414379518b38b1b7210d19f7d8ad1…

1 0

git:5.0:cea3af6d: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Nov '17

24 Nov '17

Module: kamailio Branch: 5.0 Commit: cea3af6dd4c2275df1f0e33a7adf0a29ac711b6c URL: https://github.com/kamailio/kamailio/commit/cea3af6dd4c2275df1f0e33a7adf0a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-24T10:01:16+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/cea3af6dd4c2275df1f0e33a7adf0a2… Patch: https://github.com/kamailio/kamailio/commit/cea3af6dd4c2275df1f0e33a7adf0a2… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index f5e831ae5c..3918f479ba 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -612,7 +612,8 @@ if(is_rfc1918("$rd")) { Adds an “;alias=ip~port~transport” parameter to the contact URI containing either received ip, port, and transport protocol or those given as parameters. If called without parameters, “;alias” parameter - is only added if received ip and port differ from those in contact URI. + is only added if received ip, port, or transport protocol differs from + that in contact URI. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE.

1 0

git:5.0:ae575733: modules/nathelper: check also transport protocol when determining
by Juha Heinanen 24 Nov '17

24 Nov '17

Module: kamailio Branch: 5.0 Commit: ae575733a2761dba1232166f105eeb82781229e6 URL: https://github.com/kamailio/kamailio/commit/ae575733a2761dba1232166f105eeb8… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-11-24T10:58:57+02:00 modules/nathelper: check also transport protocol when determining if ;alias parameter needs to be added by add_contact_alias() call --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ae575733a2761dba1232166f105eeb8… Patch: https://github.com/kamailio/kamailio/commit/ae575733a2761dba1232166f105eeb8… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d08f80c3a5..d7ea668e02 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -707,8 +707,8 @@ if(is_rfc1918("$rd")) { the contact URI containing either received ip, port, and transport protocol or those given as parameters. If called without parameters, <quote>;alias</quote> parameter is - only added if received ip and port differ from those in - contact URI. + only added if received ip, port, or transport protocol differs + from that in contact URI. </para> <para> This function can be used from diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 283e75c89b..642318d52b 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -799,11 +799,12 @@ add_contact_alias_0(struct sip_msg* msg) LM_DBG("contact uri host is not an ip address\n"); } else { if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) && - ((msg->rcv.src_port == uri.port_no) || - ((uri.port.len == 0) && (msg->rcv.src_port == 5060)))) { - LM_DBG("no need to add alias param\n"); - return 2; - } + ((msg->rcv.src_port == uri.port_no) || + ((uri.port.len == 0) && (msg->rcv.src_port == 5060))) && + (uri.proto == msg->rcv.proto)) { + LM_DBG("no need to add alias param\n"); + return 2; + } } /* Check if function has been called already */

1 0

git:5.1:a7049edf: modules/nathelper: check also transport protocol when determining
by Juha Heinanen 24 Nov '17

24 Nov '17

Module: kamailio Branch: 5.1 Commit: a7049edf431b8b8f8c80040b3b005c2e00d44eca URL: https://github.com/kamailio/kamailio/commit/a7049edf431b8b8f8c80040b3b005c2… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-11-24T10:51:04+02:00 modules/nathelper: check also transport protocol when determining if ;alias parameter needs to be added by add_contact_alias() call (cherry picked from commit 93c81f5326acc2aefaca01c347f79c972727d0bf) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/a7049edf431b8b8f8c80040b3b005c2… Patch: https://github.com/kamailio/kamailio/commit/a7049edf431b8b8f8c80040b3b005c2… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 9c3373a9ec..c032fc3a84 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -707,8 +707,8 @@ if(is_rfc1918("$rd")) { the contact URI containing either received ip, port, and transport protocol or those given as parameters. If called without parameters, <quote>;alias</quote> parameter is - only added if received ip and port differ from those in - contact URI. + only added if received ip, port, or transport protocol differs + from that in contact URI. </para> <para> This function can be used from diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index a34d0a19dd..5e7b82b617 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -780,13 +780,13 @@ static int add_contact_alias_0(struct sip_msg *msg) && ((ip = str2ip6(&(uri.host))) == NULL)) { LM_DBG("contact uri host is not an ip address\n"); } else { - if(ip_addr_cmp(ip, &(msg->rcv.src_ip)) - && ((msg->rcv.src_port == uri.port_no) - || ((uri.port.len == 0) - && (msg->rcv.src_port == 5060)))) { - LM_DBG("no need to add alias param\n"); - return 2; - } + if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) && + ((msg->rcv.src_port == uri.port_no) || + ((uri.port.len == 0) && (msg->rcv.src_port == 5060))) && + (uri.proto == msg->rcv.proto)) { + LM_DBG("no need to add alias param\n"); + return 2; + } } /* Check if function has been called already */

1 0

git:master:b79f3e33: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: b79f3e3308786b86864abaddb75e06587722ef6c URL: https://github.com/kamailio/kamailio/commit/b79f3e3308786b86864abaddb75e065… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-24T09:31:56+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/b79f3e3308786b86864abaddb75e065… Patch: https://github.com/kamailio/kamailio/commit/b79f3e3308786b86864abaddb75e065… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 2b12e8c67c..867e7aad88 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -612,7 +612,8 @@ if(is_rfc1918("$rd")) { Adds an “;alias=ip~port~transport” parameter to the contact URI containing either received ip, port, and transport protocol or those given as parameters. If called without parameters, “;alias” parameter - is only added if received ip and port differ from those in contact URI. + is only added if received ip, port, or transport protocol differs from + that in contact URI. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE.

1 0

git:master:93c81f53: modules/nathelper: check also transport protocol when determining
by Juha Heinanen 24 Nov '17

24 Nov '17

Module: kamailio Branch: master Commit: 93c81f5326acc2aefaca01c347f79c972727d0bf URL: https://github.com/kamailio/kamailio/commit/93c81f5326acc2aefaca01c347f79c9… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-11-24T10:18:33+02:00 modules/nathelper: check also transport protocol when determining if ;alias parameter needs to be added by add_contact_alias() call --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/93c81f5326acc2aefaca01c347f79c9… Patch: https://github.com/kamailio/kamailio/commit/93c81f5326acc2aefaca01c347f79c9… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 9c3373a9ec..c032fc3a84 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -707,8 +707,8 @@ if(is_rfc1918("$rd")) { the contact URI containing either received ip, port, and transport protocol or those given as parameters. If called without parameters, <quote>;alias</quote> parameter is - only added if received ip and port differ from those in - contact URI. + only added if received ip, port, or transport protocol differs + from that in contact URI. </para> <para> This function can be used from diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index a34d0a19dd..5e7b82b617 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -780,13 +780,13 @@ static int add_contact_alias_0(struct sip_msg *msg) && ((ip = str2ip6(&(uri.host))) == NULL)) { LM_DBG("contact uri host is not an ip address\n"); } else { - if(ip_addr_cmp(ip, &(msg->rcv.src_ip)) - && ((msg->rcv.src_port == uri.port_no) - || ((uri.port.len == 0) - && (msg->rcv.src_port == 5060)))) { - LM_DBG("no need to add alias param\n"); - return 2; - } + if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) && + ((msg->rcv.src_port == uri.port_no) || + ((uri.port.len == 0) && (msg->rcv.src_port == 5060))) && + (uri.proto == msg->rcv.proto)) { + LM_DBG("no need to add alias param\n"); + return 2; + } } /* Check if function has been called already */

1 0

git:master:a9ef7fe0: ndb_redis: exported redis_cmd() and redis_free() to kemi framework
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: a9ef7fe010492710e0a81a4505337accb5e1fea6 URL: https://github.com/kamailio/kamailio/commit/a9ef7fe010492710e0a81a4505337ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T18:55:07+01:00 ndb_redis: exported redis_cmd() and redis_free() to kemi framework --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a9ef7fe010492710e0a81a4505337ac… Patch: https://github.com/kamailio/kamailio/commit/a9ef7fe010492710e0a81a4505337ac… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index d5462bb1c8..64f2b46897 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -35,6 +35,7 @@ #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/trim.h" +#include "../../core/kemi.h" #include "redis_client.h" #include "api.h" @@ -922,3 +923,88 @@ int bind_ndb_redis(ndb_redis_api_t *api) return 0; } +/** + * + */ +static int ki_redis_cmd(sip_msg_t *msg, str *srv, str *rcmd, str *sres) +{ + return redisc_exec(srv, sres, rcmd); +} + +/** + * + */ +static int ki_redis_cmd_p1(sip_msg_t *msg, str *srv, str *rcmd, str *p1, + str *sres) +{ + return redisc_exec(srv, sres, rcmd, p1->s); +} + +/** + * + */ +static int ki_redis_cmd_p2(sip_msg_t *msg, str *srv, str *rcmd, str *p1, + str *p2, str *sres) +{ + return redisc_exec(srv, sres, rcmd, p1->s, p2->s); +} + +/** + * + */ +static int ki_redis_cmd_p3(sip_msg_t *msg, str *srv, str *rcmd, str *p1, + str *p2, str *p3, str *sres) +{ + return redisc_exec(srv, sres, rcmd, p1->s, p2->s, p3->s); +} + +/** + * + */ +static int ki_redis_free_reply(sip_msg_t *msg, str *name) +{ + if(redisc_free_reply(name)<0) + return -1; + + return 1; +} +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_ndb_redis_exports[] = { + { str_init("ndb_redis"), str_init("redis_cmd"), + SR_KEMIP_INT, ki_redis_cmd, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ndb_redis"), str_init("redis_cmd_p1"), + SR_KEMIP_INT, ki_redis_cmd_p1, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ndb_redis"), str_init("redis_cmd_p2"), + SR_KEMIP_INT, ki_redis_cmd_p2, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE } + }, + { str_init("ndb_redis"), str_init("redis_cmd_p3"), + SR_KEMIP_INT, ki_redis_cmd_p3, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR } + }, + { str_init("ndb_redis"), str_init("redis_free"), + SR_KEMIP_INT, ki_redis_free_reply, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_ndb_redis_exports); + return 0; +} \ No newline at end of file

1 0

git:master:ccbd1176: http_client: print url in log messages if query return code is not ok
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: ccbd1176242632fae2af39a168e4692dcf7ebcf9 URL: https://github.com/kamailio/kamailio/commit/ccbd1176242632fae2af39a168e4692… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T15:58:03+01:00 http_client: print url in log messages if query return code is not ok - safety check for search of end-of-line in a one line result type --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/ccbd1176242632fae2af39a168e4692… Patch: https://github.com/kamailio/kamailio/commit/ccbd1176242632fae2af39a168e4692… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index ca26998606..d19910f90f 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -276,37 +276,39 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, if (res != CURLE_OK) { /* http://curl.haxx.se/libcurl/c/libcurl-errors.html */ if (res == CURLE_COULDNT_CONNECT) { - LM_WARN("failed to connect() to host\n"); + LM_WARN("failed to connect() to host (url: %s)\n", _url); } else if ( res == CURLE_COULDNT_RESOLVE_HOST ) { - LM_WARN("Couldn't resolve host\n"); + LM_WARN("Couldn't resolve host (url: %s)\n", _url); } else if ( res == CURLE_COULDNT_RESOLVE_PROXY ) { - LM_WARN("Couldn't resolve http_proxy host\n"); + LM_WARN("Couldn't resolve http proxy host (url: %s - proxy: %s)\n", + _url, (params && params->http_proxy)?params->http_proxy:""); } else if ( res == CURLE_UNSUPPORTED_PROTOCOL ) { - LM_WARN("URL Schema not supported by curl\n"); + LM_WARN("URL Schema not supported by curl (url: %s)\n", _url); } else if ( res == CURLE_URL_MALFORMAT ) { - LM_WARN("Malformed URL used in http_client\n"); + LM_WARN("Malformed URL used in http client (url: %s)\n", _url); } else if ( res == CURLE_OUT_OF_MEMORY ) { - LM_WARN("Curl library out of memory\n"); + LM_WARN("Curl library out of memory (url: %s)\n", _url); } else if ( res == CURLE_OPERATION_TIMEDOUT ) { - LM_WARN("Curl library timed out on request\n"); + LM_WARN("Curl library timed out on request (url: %s)\n", _url); } else if ( res == CURLE_SSL_CONNECT_ERROR ) { - LM_WARN("TLS error in curl connection\n"); + LM_WARN("TLS error in curl connection (url: %s)\n", _url); } else if ( res == CURLE_SSL_CERTPROBLEM ) { - LM_WARN("TLS local certificate error\n"); + LM_WARN("TLS local certificate error (url: %s)\n", _url); } else if ( res == CURLE_SSL_CIPHER ) { - LM_WARN("TLS cipher error\n"); + LM_WARN("TLS cipher error (url: %s)\n", _url); } else if ( res == CURLE_SSL_CACERT ) { - LM_WARN("TLS server certificate validation error (No valid CA cert)\n"); + LM_WARN("TLS server certificate validation error" + " (No valid CA cert) (url: %s)\n", _url); } else if ( res == CURLE_SSL_CACERT_BADFILE ) { - LM_WARN("TLS CA certificate read error \n"); + LM_WARN("TLS CA certificate read error (url: %s)\n", _url); } else if ( res == CURLE_SSL_ISSUER_ERROR ) { - LM_WARN("TLS issuer certificate check error \n"); + LM_WARN("TLS issuer certificate check error (url: %s)\n", _url); } else if ( res == CURLE_PEER_FAILED_VERIFICATION ) { - LM_WARN("TLS verification error\n"); + LM_WARN("TLS verification error (url: %s)\n", _url); } else if ( res == CURLE_TOO_MANY_REDIRECTS ) { - LM_WARN("Too many redirects\n"); + LM_WARN("Too many redirects (url: %s)\n", _url); } else { - LM_ERR("failed to perform curl (%d)\n", res); + LM_ERR("failed to perform curl (%d) (url: %s)\n", res, _url); } if (params->pconn) { @@ -371,9 +373,13 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, if (params->oneline) { /* search for line feed */ at = memchr(stream.buf, (char)10, download_size); - datasize = (double) (at - stream.buf); - LM_DBG(" -- curl download size cut to first line: %d \n", - (int) datasize); + if(at!=NULL) { + datasize = (double) (at - stream.buf); + LM_DBG(" -- curl download size cut to first line: %d\n", + (int) datasize); + } else { + LM_DBG("no end of line found for one line result type\n"); + } } if (at == NULL) { if (params->maxdatasize

1 0

[kamailio/kamailio] rtpengine: fixed segfault when using read_sdp_pv (#1329)
by Phil Lavin 23 Nov '17

23 Nov '17

Backport of #1326 to 4.4 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1329 -- Commit Summary -- * rtpengine: fixed segfault when using read_sdp_pv -- File Changes -- M modules/rtpengine/rtpengine.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1329.patch https://github.com/kamailio/kamailio/pull/1329.diff -- 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/pull/1329

2 1

git:4.4:3037665c: rtpengine: fixed segfault when using read_sdp_pv
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: 4.4 Commit: 3037665c0794c5e00f074a7e389793a29ba9b960 URL: https://github.com/kamailio/kamailio/commit/3037665c0794c5e00f074a7e389793a… Author: Phil Lavin <phil.lavin(a)cloudcall.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T14:23:15+01:00 rtpengine: fixed segfault when using read_sdp_pv - Obtain body pointer fresh from the SIP message as when using read_sdp_pv the body pointer is overwritten --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3037665c0794c5e00f074a7e389793a… Patch: https://github.com/kamailio/kamailio/commit/3037665c0794c5e00f074a7e389793a… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 01f1606bf2..b63fb33497 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -3185,6 +3185,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) str body, newbody; struct lump *anchor; pv_value_t pv_val; + str cur_body = {0, 0}; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -3214,7 +3215,12 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + /* get the body from the message as body ptr may have changed */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

git:5.0:bae64449: rtpengine: fixed segfault when using read_sdp_pv
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: 5.0 Commit: bae644494e3ad1a1384def016a9343c073cfe1a6 URL: https://github.com/kamailio/kamailio/commit/bae644494e3ad1a1384def016a9343c… Author: Phil Lavin <phil.lavin(a)cloudcall.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T12:55:00+01:00 rtpengine: fixed segfault when using read_sdp_pv - Obtain body pointer fresh from the SIP message as when using read_sdp_pv the body pointer is overwritten --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/bae644494e3ad1a1384def016a9343c… Patch: https://github.com/kamailio/kamailio/commit/bae644494e3ad1a1384def016a9343c… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 82717f8e59..ee3b5f1671 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2853,6 +2853,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) str body, newbody; struct lump *anchor; pv_value_t pv_val; + str cur_body = {0, 0}; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -2882,7 +2883,12 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + /* get the body from the message as body ptr may have changed */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

[kamailio/kamailio] rtpengine: fixed segfault when using read_sdp_pv (#1327)
by Phil Lavin 23 Nov '17

23 Nov '17

Backport of #1326 to 5.0 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1327 -- Commit Summary -- * rtpengine: fixed segfault when using read_sdp_pv -- File Changes -- M src/modules/rtpengine/rtpengine.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1327.patch https://github.com/kamailio/kamailio/pull/1327.diff -- 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/pull/1327

2 1

[kamailio/kamailio] rtpengine: fixed segfault when using read_sdp_pv (#1328)
by Phil Lavin 23 Nov '17

23 Nov '17

Backport of #1326 to 5.1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1328 -- Commit Summary -- * rtpengine: fixed segfault when using read_sdp_pv -- File Changes -- M src/modules/rtpengine/rtpengine.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1328.patch https://github.com/kamailio/kamailio/pull/1328.diff -- 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/pull/1328

2 1

git:5.1:096de8d0: rtpengine: fixed segfault when using read_sdp_pv
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: 5.1 Commit: 096de8d0979a71005e3f52146252365b53ab6197 URL: https://github.com/kamailio/kamailio/commit/096de8d0979a71005e3f52146252365… Author: Phil Lavin <phil.lavin(a)cloudcall.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T12:54:42+01:00 rtpengine: fixed segfault when using read_sdp_pv - Obtain body pointer fresh from the SIP message as when using read_sdp_pv the body pointer is overwritten --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/096de8d0979a71005e3f52146252365… Patch: https://github.com/kamailio/kamailio/commit/096de8d0979a71005e3f52146252365… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index e3468d04a8..9704693eee 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3328,6 +3328,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) str body, newbody; struct lump *anchor; pv_value_t pv_val; + str cur_body = {0, 0}; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -3357,7 +3358,12 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + /* get the body from the message as body ptr may have changed */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

git:master:873ffcad: modules: readme files regenerated - app_python ... [skip ci]
by Kamailio Dev 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 873ffcad3a609d1372eed8e8b4e6a3ff033bc524 URL: https://github.com/kamailio/kamailio/commit/873ffcad3a609d1372eed8e8b4e6a3f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-23T12:46:55+01:00 modules: readme files regenerated - app_python ... [skip ci] --- Modified: src/modules/app_python/README --- Diff: https://github.com/kamailio/kamailio/commit/873ffcad3a609d1372eed8e8b4e6a3f… Patch: https://github.com/kamailio/kamailio/commit/873ffcad3a609d1372eed8e8b4e6a3f… --- diff --git a/src/modules/app_python/README b/src/modules/app_python/README index 2f05fc1d91..8fcad886e9 100644 --- a/src/modules/app_python/README +++ b/src/modules/app_python/README @@ -30,6 +30,11 @@ Maxim Sobolev 4.1. python_exec(method [, args]) + 5. RPC Commands + + 5.1. app_python.reload + 5.2. app_python.api_list + List of Examples 1.1. Set load parameter @@ -58,6 +63,11 @@ Chapter 1. Admin Guide 4.1. python_exec(method [, args]) + 5. RPC Commands + + 5.1. app_python.reload + 5.2. app_python.api_list + 1. Overview This module allows executing Python scripts from config file, exporting @@ -149,3 +159,37 @@ python_exec("my_python_function"); python_exec("my_python_function", "my_params"); python_exec("my_python_function", "$rU"); ... + +5. RPC Commands + + 5.1. app_python.reload + 5.2. app_python.api_list + +5.1. app_python.reload + + IMPORTANT: not implemented yet. + + Marks the need to reload the js script. The actual reload is done by + every working process when the next call to KEMI config is executed. + + Name: app_python.reload + + Parameters: none + + Example: +... +kamcmd app_python.reload +... + +5.2. app_python.api_list + + List the functions available via Kemi framework. + + Name: app_python.api_list + + Parameters: none + + Example: +... +kamcmd app_python.api_list +...

1 0

git:master:cbaceaf8: app_python: documented rpc commands
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: cbaceaf891e16e9b0a1ef4883b8fec5e33698a86 URL: https://github.com/kamailio/kamailio/commit/cbaceaf891e16e9b0a1ef4883b8fec5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T12:45:25+01:00 app_python: documented rpc commands --- Modified: src/modules/app_python/doc/app_python_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cbaceaf891e16e9b0a1ef4883b8fec5… Patch: https://github.com/kamailio/kamailio/commit/cbaceaf891e16e9b0a1ef4883b8fec5… --- diff --git a/src/modules/app_python/doc/app_python_admin.xml b/src/modules/app_python/doc/app_python_admin.xml index 8a2fba4fb3..9afeffb03f 100644 --- a/src/modules/app_python/doc/app_python_admin.xml +++ b/src/modules/app_python/doc/app_python_admin.xml @@ -158,6 +158,54 @@ python_exec("my_python_function", "$rU"); </section> </section> + <section> + <title>RPC Commands</title> + <section id="app_python.r.reload"> + <title> + <function moreinfo="none">app_python.reload</function> + </title> + <para> + IMPORTANT: not implemented yet. + </para> + <para> + Marks the need to reload the js script. + The actual reload is done by every working process when the next + call to KEMI config is executed. + </para> + <para> + Name: <emphasis>app_python.reload</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + Example: + </para> + <programlisting format="linespecific"> +... +&kamcmd; app_python.reload +... + </programlisting> + </section> + <section id="app_python.r.api_list"> + <title> + <function moreinfo="none">app_python.api_list</function> + </title> + <para> + List the functions available via Kemi framework. + </para> + <para> + Name: <emphasis>app_python.api_list</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + Example: + </para> + <programlisting format="linespecific"> +... +&kamcmd; app_python.api_list +... + </programlisting> + </section> + </section> </chapter>

1 0

git:master:bea0b53c: app_python: implemented rpc command to list kemi functions
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: bea0b53ce57f08ab9fc019c19f616b3b67795d64 URL: https://github.com/kamailio/kamailio/commit/bea0b53ce57f08ab9fc019c19f616b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T12:45:25+01:00 app_python: implemented rpc command to list kemi functions - kamctl rpc app_python.api_list --- Modified: src/modules/app_python/app_python_mod.c Modified: src/modules/app_python/apy_kemi.c Modified: src/modules/app_python/apy_kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/bea0b53ce57f08ab9fc019c19f616b3… Patch: https://github.com/kamailio/kamailio/commit/bea0b53ce57f08ab9fc019c19f616b3…

1 0

[kamailio/kamailio] rtpengine: fixed segfault when using read_sdp_pv (#1326)
by Phil Lavin 23 Nov '17

23 Nov '17

#### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This was an odd one. I can't see how `read_sdp_pv` ever worked. When the old SDP is deleted with `del_lump` from the SIP `msg`, the lump pointer is calculated assuming that `body` is a pointer relative to `msg`. When `read_sdp_pv` is set, `body` pointer is set to something entirely different and doing pointer maths relative to `msg` causes integer overflows and results in a segfault on `del_lump`. This change explicitly gets the body pointer (`cur_body`) relative to `msg` before trying to `del_lump`. If it's preferable, I can have it only do this if `read_sdp_pv` is set but I figured it's not a heavy operation and it's safer to always do it. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1326 -- Commit Summary -- * rtpengine: fixed segfault when using read_sdp_pv -- File Changes -- M src/modules/rtpengine/rtpengine.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1326.patch https://github.com/kamailio/kamailio/pull/1326.diff -- 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/pull/1326

2 5

git:master:76085672: Merge pull request #1326 from phil-lavin/bugfix-rtpengine-read-sdp
by GitHub 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 76085672c0f00d8539ab16652d4404266ad8184c URL: https://github.com/kamailio/kamailio/commit/76085672c0f00d8539ab16652d44042… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-11-23T11:59:23+01:00 Merge pull request #1326 from phil-lavin/bugfix-rtpengine-read-sdp rtpengine: fixed segfault when using read_sdp_pv --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/76085672c0f00d8539ab16652d44042… Patch: https://github.com/kamailio/kamailio/commit/76085672c0f00d8539ab16652d44042… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index e3468d04a8..9704693eee 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3328,6 +3328,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) str body, newbody; struct lump *anchor; pv_value_t pv_val; + str cur_body = {0, 0}; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -3357,7 +3358,12 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + /* get the body from the message as body ptr may have changed */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

git:master:36cb7534: rtpengine: fixed segfault when using read_sdp_pv
by Phil Lavin 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 36cb753441a78bd13ded119cd468f32623f09fbf URL: https://github.com/kamailio/kamailio/commit/36cb753441a78bd13ded119cd468f32… Author: Phil Lavin <phil.lavin(a)cloudcall.com> Committer: Phil Lavin <phil.lavin(a)cloudcall.com> Date: 2017-11-23T10:22:42Z rtpengine: fixed segfault when using read_sdp_pv - Obtain body pointer fresh from the SIP message as when using read_sdp_pv the body pointer is overwritten --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/36cb753441a78bd13ded119cd468f32… Patch: https://github.com/kamailio/kamailio/commit/36cb753441a78bd13ded119cd468f32… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index e3468d04a8..9704693eee 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3328,6 +3328,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) str body, newbody; struct lump *anchor; pv_value_t pv_val; + str cur_body = {0, 0}; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -3357,7 +3358,12 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + /* get the body from the message as body ptr may have changed */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

git:master:4bd1d70c: tm: fixed condition in via_matching()
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 4bd1d70c2804ee2a1d29bd911275aa241577cfc1 URL: https://github.com/kamailio/kamailio/commit/4bd1d70c2804ee2a1d29bd911275aa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T11:49:36+01:00 tm: fixed condition in via_matching() - introduced in previous commit --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/4bd1d70c2804ee2a1d29bd911275aa2… Patch: https://github.com/kamailio/kamailio/commit/4bd1d70c2804ee2a1d29bd911275aa2… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 98a7bf97b9..49d02111f1 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -264,11 +264,11 @@ static inline int via_matching( struct via_body *inv_via, ack_via->host.len)!=0) return 0; if (inv_via->port!=ack_via->port) { - if(!(inv_via->port==0 - && (ack_via->port==SIP_PORT || ack_via->port==SIPS_PORT))) + if(inv_via->port==0 + && ack_via->port!=SIP_PORT && ack_via->port!=SIPS_PORT) return 0; - if(!(ack_via->port==0 - && (inv_via->port==SIP_PORT || inv_via->port==SIPS_PORT))) + if(ack_via->port==0 + && inv_via->port!=SIP_PORT && inv_via->port!=SIPS_PORT) return 0; } if (inv_via->transport.len!=ack_via->transport.len) @@ -279,9 +279,9 @@ static inline int via_matching( struct via_body *inv_via, if (inv_via->port!=ack_via->port && (inv_via->port==0 || ack_via->port==0)) { - /* test SIPS_PORT (5061) is used with TLS transport*/ + /* test SIPS_PORT (5061) is used with TLS transport */ if(inv_via->port==SIPS_PORT || ack_via->port==SIPS_PORT) { - if(ack_via->transport.len!=3 + if(inv_via->transport.len!=3 || memcmp(inv_via->transport.s, "TLS", 3)!=0) { return 0; }

1 0

Jenkins build became unstable: kamailio50-nightly-binaries » amd64,xenial,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=a…>

1 2

Jenkins build became unstable: kamailio50-nightly-binaries » i386,trusty,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=i…>

1 2

Jenkins build became unstable: kamailio50-nightly-binaries » amd64,trusty,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=a…>

1 2

[kamailio/kamailio] pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject (#1323)
by sergey-safarov 23 Nov '17

23 Nov '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1323 -- Commit Summary -- * pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject -- File Changes -- A .gitmodules (3) A pkg/docker (1) M pkg/kamailio/alpine/APKBUILD (1) D pkg/kamailio/alpine_docker/Dockerfile (5) D pkg/kamailio/alpine_docker/README.md (85) D pkg/kamailio/alpine_docker/build.sh (144) D pkg/kamailio/alpine_docker/hooks/pre_build (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1323.patch https://github.com/kamailio/kamailio/pull/1323.diff -- 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/pull/1323

2 4

git:master:137e2896: Merge pull request #1323 from sergey-safarov/docker
by GitHub 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 137e2896a5aa3be3f7a881354e476018db8802b4 URL: https://github.com/kamailio/kamailio/commit/137e2896a5aa3be3f7a881354e47601… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-11-23T10:34:20+01:00 Merge pull request #1323 from sergey-safarov/docker pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject --- Added: .gitmodules Added: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD Removed: pkg/kamailio/alpine_docker/Dockerfile Removed: pkg/kamailio/alpine_docker/README.md Removed: pkg/kamailio/alpine_docker/build.sh Removed: pkg/kamailio/alpine_docker/hooks/pre_build --- Diff: https://github.com/kamailio/kamailio/commit/137e2896a5aa3be3f7a881354e47601… Patch: https://github.com/kamailio/kamailio/commit/137e2896a5aa3be3f7a881354e47601…

1 0

git:master:b0929e75: pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject
by Sergey Safarov 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: b0929e757030f1d93f41ad439755b1908c9ac486 URL: https://github.com/kamailio/kamailio/commit/b0929e757030f1d93f41ad439755b19… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-11-22T08:45:31-05:00 pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject --- Added: .gitmodules Added: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD Removed: pkg/kamailio/alpine_docker/Dockerfile Removed: pkg/kamailio/alpine_docker/README.md Removed: pkg/kamailio/alpine_docker/build.sh Removed: pkg/kamailio/alpine_docker/hooks/pre_build --- Diff: https://github.com/kamailio/kamailio/commit/b0929e757030f1d93f41ad439755b19… Patch: https://github.com/kamailio/kamailio/commit/b0929e757030f1d93f41ad439755b19…

1 0

Jenkins build became unstable: kamailio50-nightly-binaries » i386,precise,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=i…>

1 2

Jenkins build became unstable: kamailio50-nightly-binaries » amd64,precise,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=a…>

1 2

Jenkins build became unstable: kamailio50-nightly-binaries » amd64,stretch,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=a…>

1 2

Jenkins build became unstable: kamailio50-nightly-binaries » i386,stretch,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=i…>

1 2

git:master:7b61c725: modules: readme files regenerated - drouting ... [skip ci]
by Kamailio Dev 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 7b61c725bd867540197e695cad1f61e494d0a869 URL: https://github.com/kamailio/kamailio/commit/7b61c725bd867540197e695cad1f61e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-23T10:01:37+01:00 modules: readme files regenerated - drouting ... [skip ci] --- Modified: src/modules/drouting/README --- Diff: https://github.com/kamailio/kamailio/commit/7b61c725bd867540197e695cad1f61e… Patch: https://github.com/kamailio/kamailio/commit/7b61c725bd867540197e695cad1f61e…

1 0

Jenkins build became unstable: kamailio50-nightly-binaries » i386,xenial,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=i…>

1 2

Jenkins build became unstable: kamailio50-nightly-binaries » i386,jessie,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=i…>

1 2

git:master:57c14e65: drouting: exported next_routing() to kemi framework
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 57c14e65d3cea754c88374b8dd1d67cb5be3f295 URL: https://github.com/kamailio/kamailio/commit/57c14e65d3cea754c88374b8dd1d67c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T09:51:10+01:00 drouting: exported next_routing() to kemi framework --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/57c14e65d3cea754c88374b8dd1d67c… Patch: https://github.com/kamailio/kamailio/commit/57c14e65d3cea754c88374b8dd1d67c… --- diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c index f3e59991c0..148c991a25 100644 --- a/src/modules/drouting/drouting.c +++ b/src/modules/drouting/drouting.c @@ -115,7 +115,7 @@ static int dr_exit(void); static int do_routing(struct sip_msg *msg, int grp_id); static int do_routing_0(struct sip_msg *msg, char *str1, char *str2); static int do_routing_1(struct sip_msg *msg, char *str1, char *str2); -static int use_next_gw(struct sip_msg *msg); +static int use_next_gw(struct sip_msg *msg, char *p1, char *p2); static int is_from_gw_0(struct sip_msg *msg, char *str1, char *str2); static int is_from_gw_1(struct sip_msg *msg, char *str1, char *str2); static int is_from_gw_2(struct sip_msg *msg, char *str1, char *str2); @@ -666,7 +666,7 @@ static int do_routing_1(struct sip_msg *msg, char *str1, char *str2) } -static int use_next_gw(struct sip_msg *msg) +static int ki_next_routing(sip_msg_t *msg) { struct usr_avp *avp; int_str val; @@ -699,6 +699,11 @@ static int use_next_gw(struct sip_msg *msg) return 1; } +static int use_next_gw(struct sip_msg *msg, char *p1, char *p2) +{ + return ki_next_routing(msg); +} + int dr_already_choosen(rt_info_t *rt_info, int *active_gwlist, int *local_gwlist, int lgw_size, int check) { @@ -1160,6 +1165,16 @@ static sr_kemi_t sr_kemi_drouting_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("drouting"), str_init("next_routing"), + SR_KEMIP_INT, ki_next_routing, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("drouting"), str_init("use_next_gw"), + SR_KEMIP_INT, ki_next_routing, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("drouting"), str_init("is_from_gw"), SR_KEMIP_INT, ki_is_from_gw, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:5fabdea4: tm: default port checking in via_matching()
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 5fabdea4d86c527a2e38caaae7a54884367d6a7c URL: https://github.com/kamailio/kamailio/commit/5fabdea4d86c527a2e38caaae7a5488… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T09:51:10+01:00 tm: default port checking in via_matching() --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/5fabdea4d86c527a2e38caaae7a5488… Patch: https://github.com/kamailio/kamailio/commit/5fabdea4d86c527a2e38caaae7a5488… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 1fff011dee..98a7bf97b9 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -259,17 +259,35 @@ static inline int via_matching( struct via_body *inv_via, * different senders generating the same tid */ if (inv_via->host.len!=ack_via->host.len) - return 0;; + return 0; if (memcmp(inv_via->host.s, ack_via->host.s, ack_via->host.len)!=0) return 0; - if (inv_via->port!=ack_via->port) - return 0; + if (inv_via->port!=ack_via->port) { + if(!(inv_via->port==0 + && (ack_via->port==SIP_PORT || ack_via->port==SIPS_PORT))) + return 0; + if(!(ack_via->port==0 + && (inv_via->port==SIP_PORT || inv_via->port==SIPS_PORT))) + return 0; + } if (inv_via->transport.len!=ack_via->transport.len) return 0; if (memcmp(inv_via->transport.s, ack_via->transport.s, ack_via->transport.len)!=0) return 0; + + if (inv_via->port!=ack_via->port + && (inv_via->port==0 || ack_via->port==0)) { + /* test SIPS_PORT (5061) is used with TLS transport*/ + if(inv_via->port==SIPS_PORT || ack_via->port==SIPS_PORT) { + if(ack_via->transport.len!=3 + || memcmp(inv_via->transport.s, "TLS", 3)!=0) { + return 0; + } + } + } + /* everything matched -- we found it */ return 1; }

1 0

git:master:ce969665: drouting: updates to documentation
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: ce96966593c9f7e12595b74c2a6bf50b248e64c8 URL: https://github.com/kamailio/kamailio/commit/ce96966593c9f7e12595b74c2a6bf50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T09:51:10+01:00 drouting: updates to documentation --- Modified: src/modules/drouting/doc/drouting_admin.xml Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/ce96966593c9f7e12595b74c2a6bf50… Patch: https://github.com/kamailio/kamailio/commit/ce96966593c9f7e12595b74c2a6bf50…

1 0

git:master:51837d8d: drouting: exported functions to kemi interface
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: 51837d8dd4bb42d4ad59da39ab9be9f5db58231e URL: https://github.com/kamailio/kamailio/commit/51837d8dd4bb42d4ad59da39ab9be9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T09:51:10+01:00 drouting: exported functions to kemi interface --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/51837d8dd4bb42d4ad59da39ab9be9f… Patch: https://github.com/kamailio/kamailio/commit/51837d8dd4bb42d4ad59da39ab9be9f…

1 0

git:master:db6eae95: drouting: use core fixup helper functions
by Daniel-Constantin Mierla 23 Nov '17

23 Nov '17

Module: kamailio Branch: master Commit: db6eae95e2c9a17eef8f823c30a39812429158d3 URL: https://github.com/kamailio/kamailio/commit/db6eae95e2c9a17eef8f823c30a3981… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-23T09:51:10+01:00 drouting: use core fixup helper functions --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/db6eae95e2c9a17eef8f823c30a3981… Patch: https://github.com/kamailio/kamailio/commit/db6eae95e2c9a17eef8f823c30a3981…

1 0

Jenkins build became unstable: kamailio50-nightly-binaries » amd64,jessie,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=a…>

1 2

Jenkins build became unstable: kamailio50-nightly-binaries » i386,wheezy,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=i…>

1 2

Jenkins build became unstable: kamailio50-nightly-binaries » amd64,wheezy,slave #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-binaries/architecture=a…>

1 2

git:5.0:974a7d54: pkg/kamailio/deb: kamailio-nth add less as default [skip ci]
by Victor Seva 23 Nov '17

23 Nov '17

Module: kamailio Branch: 5.0 Commit: 974a7d54052f4009376d451dcdad7620206cb1ca URL: https://github.com/kamailio/kamailio/commit/974a7d54052f4009376d451dcdad762… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-23T08:46:49+01:00 pkg/kamailio/deb: kamailio-nth add less as default [skip ci] * most is not available on all distributions (cherry picked from commit c4e5d9bf4438561fe8a87361b462eff38dc88d93) --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/974a7d54052f4009376d451dcdad762… Patch: https://github.com/kamailio/kamailio/commit/974a7d54052f4009376d451dcdad762… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 0928750577..dc2bb283cd 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -789,9 +789,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index 0869281ea9..98fd92382a 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -787,9 +787,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index f8b476f21a..82000864d7 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -700,9 +700,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index a560dd2097..e396ab32e0 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -771,9 +771,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index a560dd2097..e396ab32e0 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -771,9 +771,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 7e4e3ae12c..1f95baf7e7 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -768,9 +768,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index f8b476f21a..82000864d7 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -700,9 +700,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen, diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index a551d1640e..e51d873825 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -788,9 +788,9 @@ Depends: gcc, gdb, iftop, + less | most, lsof, mc, - most, ngrep, psmisc, screen,

1 0

git:5.0:253e7884: pkg/kamailio/deb: add lsb-base [skip ci]
by Victor Seva 23 Nov '17

23 Nov '17

Module: kamailio Branch: 5.0 Commit: 253e7884b67349c5042ff721161d974adc8e9bc4 URL: https://github.com/kamailio/kamailio/commit/253e7884b67349c5042ff721161d974… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-23T08:46:39+01:00 pkg/kamailio/deb: add lsb-base [skip ci] fixes lintian error: > E: kamailio: init.d-script-needs-depends-on-lsb-base etc/init.d/kamailio (cherry picked from commit 574ad1fc96fa207a5a30fba66977d27e50ea1da1) --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/253e7884b67349c5042ff721161d974… Patch: https://github.com/kamailio/kamailio/commit/253e7884b67349c5042ff721161d974… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index fc5bb0d96a..0928750577 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -66,6 +66,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index 79708a8d93..0869281ea9 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -64,6 +64,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index c65ba6a196..f8b476f21a 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -60,6 +60,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index ec5b823d8d..a560dd2097 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -64,6 +64,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index ec5b823d8d..a560dd2097 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -64,6 +64,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index c701a61550..7e4e3ae12c 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -62,6 +62,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index c65ba6a196..f8b476f21a 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -60,6 +60,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index 052851f108..a551d1640e 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -65,6 +65,7 @@ Pre-Depends: ${misc:Pre-Depends}, Depends: adduser, + lsb-base, python, ${misc:Depends}, ${shlibs:Depends},

1 0

git:5.0:796003bb: pkg/kamailio/deb: wrap-and-sort -sat [skip ci]
by Victor Seva 23 Nov '17

23 Nov '17

Module: kamailio Branch: 5.0 Commit: 796003bbe4578ae85edb26047f7f5d9ddd6f24a9 URL: https://github.com/kamailio/kamailio/commit/796003bbe4578ae85edb26047f7f5d9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-23T08:46:27+01:00 pkg/kamailio/deb: wrap-and-sort -sat [skip ci] --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/796003bbe4578ae85edb26047f7f5d9… Patch: https://github.com/kamailio/kamailio/commit/796003bbe4578ae85edb26047f7f5d9…

1 0

Re: [sr-dev] [kamailio/kamailio] usrloc: more docs for db_insert_null parameter (03d0a93)
by Anthony Messina 23 Nov '17

23 Nov '17

fiels -> fields -- 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/commit/03d0a93acb9cbb212292f32a7913dcf…

1 0

Jenkins build became unstable: kamailio50-nightly-source » xenial,master #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-source/distribution=xen…>

1 1

Jenkins build became unstable: kamailio50-nightly-source » wheezy,master #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-source/distribution=whe…>

1 1

Jenkins build became unstable: kamailio50-nightly-source » precise,master #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-source/distribution=pre…>

1 1

Jenkins build became unstable: kamailio50-nightly-source » trusty,master #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-source/distribution=tru…>

1 1

Jenkins build became unstable: kamailio50-nightly-source » jessie,master #99
by jenkins＠sipwise.com 23 Nov '17

23 Nov '17

See <https://kamailio.sipwise.com/job/kamailio50-nightly-source/distribution=jes…>

1 1

git:master:35985c78: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 22 Nov '17

22 Nov '17

Module: kamailio Branch: master Commit: 35985c78a502731bc8005688a1cc50af348aec71 URL: https://github.com/kamailio/kamailio/commit/35985c78a502731bc8005688a1cc50a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-22T19:31:36+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/35985c78a502731bc8005688a1cc50a… Patch: https://github.com/kamailio/kamailio/commit/35985c78a502731bc8005688a1cc50a… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 0b4e3c1acb..03d531fb3c 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1386,16 +1386,16 @@ unset_dlg_profile("caller","$fu"); 7.3. is_in_profile(profile,[value]) - Checks if the current dialog belongs to a profile. If the profile - supports values, the check can be reinforced to take into account a - specific value, if the dialog was inserted into the profile for a - specific value. If no value is passed, only the membership of the - dialog in the profile per se is checked. Note that if the profile does - not support values, the value parameter will be silently discarded. + Checks if the current dialog belongs to a profile. If the profile is + defined with values, then the check is also matching with the specific + value provided as parameter. + + Note that if the profile is not defined with support for values, the + value parameter will be silently discarded. Meaning of the parameters is as follows: * profile - name of the profile to be checked against; - * value (optional) - string value to further restrict the check. + * value (optional) - string value to be matched during the check. Pseudo-variables are supported. This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE

1 0

[kamailio/kamailio] dialog doc does not match code (#1320)
by dryvoip 22 Nov '17

22 Nov '17

Documentation: 7.3. is_in_profile(profile,[value]) Checks if the current dialog belongs to a profile. If the profile supports values, the check can be reinforced to take into account a specific value, if the dialog was inserted into the profile for a specific value. **If no value is passed, only the membership of the dialog in the profile per se is checked.** Note that if the profile does not support values, the value parameter will be silently discarded. Code: ``` static int w_is_in_profile_helper(sip_msg_t *msg, struct dlg_profile_table *profile, str *value) { if (profile->has_value) { if (value==NULL || value->len<=0) { LM_ERR("invalid value parameter\n"); return -1; } return is_dlg_in_profile( msg, profile, value); } else { return is_dlg_in_profile( msg, profile, NULL); } } ``` Expected result: Documentation should be corrected, or even better, code should be updated to perform as documented. -- 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/1320

2 2

git:master:d319c449: dialog: proper description of is_in_profile() to match the code
by Daniel-Constantin Mierla 22 Nov '17

22 Nov '17

Module: kamailio Branch: master Commit: d319c449c8c15334ed913633cfece869a7d955aa URL: https://github.com/kamailio/kamailio/commit/d319c449c8c15334ed913633cfece86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-22T19:15:16+01:00 dialog: proper description of is_in_profile() to match the code - reported by GH #1320 --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d319c449c8c15334ed913633cfece86… Patch: https://github.com/kamailio/kamailio/commit/d319c449c8c15334ed913633cfece86… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index e0041f75ed..4e7a654b2f 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1608,11 +1608,12 @@ unset_dlg_profile("caller","$fu"); </title> <para> Checks if the current dialog belongs to a profile. If the profile - supports values, the check can be reinforced to take into account a - specific value, if the dialog was inserted into the profile for a - specific value. If no value is passed, only the membership of - the dialog in the profile per se is checked. Note that if the profile does - not support values, the value parameter will be silently discarded. + is defined with values, then the check is also matching with the + specific value provided as parameter. + </para> + <para> + Note that if the profile is not defined with support for values, the + value parameter will be silently discarded. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -1623,13 +1624,13 @@ unset_dlg_profile("caller","$fu"); </listitem> <listitem> <para><emphasis>value</emphasis> (optional) - string value to - further restrict the check. Pseudo-variables are supported. + be matched during the check. Pseudo-variables are supported. </para> </listitem> </itemizedlist> <para> This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, - REPLY_ROUTE and FAILURE_ROUTE. + REPLY_ROUTE and FAILURE_ROUTE. </para> <example> <title><function>is_in_profile</function> usage</title>

1 0

[kamailio/kamailio] fix typo in function ksr_branch_manage (#1324)
by Karsten Horsmann 22 Nov '17

22 Nov '17

Typo of "$T_branch_idx]" returns always nil - Error then "attempt to concatenate a nil value" from lua. Reorder the ] into a string.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1324 -- Commit Summary -- * fix typo in function ksr_branch_manage -- File Changes -- M misc/examples/kemi/kamailio-basic-kemi-lua.lua (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1324.patch https://github.com/kamailio/kamailio/pull/1324.diff -- 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/pull/1324

2 3

[kamailio/kamailio] core: removing the condition for second record_route ipv6 header (#1315)
by Surendra Tiwari 22 Nov '17

22 Nov '17

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1315 -- Commit Summary -- * core: removing the condition for second record_route ipv6 header -- File Changes -- M src/core/msg_translator.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1315.patch https://github.com/kamailio/kamailio/pull/1315.diff -- 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/pull/1315

2 10

[kamailio/kamailio] error in adding another record route while forwarding call from tls client to tcp gateway (#1313)
by Surendra Tiwari 22 Nov '17

22 Nov '17

wrong record-route while adding another record route . `` Record-Route: <sip:2600:1F1C:74E:E100:E89F:BEB1:10AF:1CB1:5060;transport=tcp;r2=on;lr=on;ftag=V4Zw5Cjy7MeoxT-YKzAqq0bejH2jMVbe;did=8a9.3ae2> ### Possible Solutions ``  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-172-31-0-35:/usr/local/src/kamailio/src/modules# kamailio -version version: kamailio 5.0.4 (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 05:47:18 Oct 31 2017 with unknown ``` * **Operating System**:  ``` ------------------------------------------------------------------------ INVITE sip:+919967609476ipv6-phone.voice.plivodev.com@ms.voice.plivodev.com:5060 SIP/2.0 Record-Route: <sip:2600:1F1C:74E:E100:E89F:BEB1:10AF:1CB1:5060;transport=tcp;r2=on;lr=on;ftag=V4Zw5Cjy7MeoxT-YKzAqq0bejH2jMVbe;did=8a9.3ae2> Record-Route: <sip:[2600:1F1C:74E:E100:E89F:BEB1:10AF:1CB1]:5061;transport=tls;r2=on;lr=on;ftag=V4Zw5Cjy7MeoxT-YKzAqq0bejH2jMVbe;did=8a9.3ae2> Via: SIP/2.0/TCP [2600:1F1C:74E:E100:E89F:BEB1:10AF:1CB1]:5060;branch=z9hG4bKf213.7fbb49d8d95b8d23065d4f15e2cc852e.0;i=1 Via: SIP/2.0/TLS [2001:FD0:3200:174:A590:5860:61F5:384B]:50085;received=2001:FD0:3200:174:A590:5860:61F5:384B;rport=50085;branch=z9hG4bKPjhuMfZXOwOBBco.KIFMjJGDEKUlNL6H5l;alias Max-Forwards: 69 From: sip:snsone170720062259@ipv6-phone.voice.plivodev.com;tag=V4Zw5Cjy7MeoxT-YKzAqq0bejH2jMVbe To: sip:+919967609476ipv6-phone.voice.plivodev.com@ipv6-phone.voice.plivodev.com Contact: <sip:snsone170720062259@[2001:fd0:3200:174:a590:5860:61f5:384b]:50085;transport=TLS;app_id=30eb1c5ce0951e0a3cbb9d1b6ecf5c03a51b8a9f5eaf78c905edfa239a769471;ob> Call-ID: fI3AeG7mpYKJ9cxL-bIAnEkcBjh9I.gz CSeq: 2732 INVITE Route: <sip:ipv6-phone.voice.plivodev.com;transport=tls;lr> Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS Supported: replaces, 100rel, timer, norefersub Session-Expires: 1800 ``` -- 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/1313

2 3

git:master:d9ca0f6f: misc/examples: fixed position of ] in log message from kemi examples
by Daniel-Constantin Mierla 22 Nov '17

22 Nov '17

Module: kamailio Branch: master Commit: d9ca0f6fcbd479dc82f75d301e43e45daf36a658 URL: https://github.com/kamailio/kamailio/commit/d9ca0f6fcbd479dc82f75d301e43e45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-22T17:52:34+01:00 misc/examples: fixed position of ] in log message from kemi examples - based on a reporte by GH #1324 --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-python.py Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/d9ca0f6fcbd479dc82f75d301e43e45… Patch: https://github.com/kamailio/kamailio/commit/d9ca0f6fcbd479dc82f75d301e43e45… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 5a051ad19f..9d6cbdc82b 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -342,8 +342,8 @@ function ksr_route_sipout() // equivalent of branch_route[...]{} function ksr_branch_manage() { - KSR.dbg("new branch [" + KSR.pv.get("$T_branch_idx]") - + " to " + KSR.pv.get("$ru") + "\n"); + KSR.dbg("new branch [" + KSR.pv.get("$T_branch_idx") + + "] to " + KSR.pv.get("$ru") + "\n"); ksr_route_natmanage(); return; } diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index e92f4ec995..ed973f171b 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -333,8 +333,8 @@ end -- Manage outgoing branches -- equivalent of branch_route[...]{} function ksr_branch_manage() - KSR.dbg("new branch [".. KSR.pv.get("$T_branch_idx]") - .. " to ".. KSR.pv.get("$ru") .. "\n"); + KSR.dbg("new branch [".. KSR.pv.get("$T_branch_idx") + .. "] to ".. KSR.pv.get("$ru") .. "\n"); ksr_route_natmanage(); return 1; end diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index fa3c4707d6..f692280959 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -343,7 +343,7 @@ def ksr_route_sipout(self, msg): # -- equivalent of branch_route[...]{} def ksr_branch_manage(self, msg): KSR.dbg("new branch ["+ str(KSR.pv.get("$T_branch_idx")) - + " to "+ KSR.pv.get("$ru") + "\n"); + + "] to "+ KSR.pv.get("$ru") + "\n"); self.ksr_route_natmanage(msg); return 1; diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index 9bf6c81f7a..41146ab51d 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -347,7 +347,7 @@ function ksr_route_sipout() function ksr_branch_manage() { KSR.dbg("new branch [" + KSR.pv.get("$T_branch_idx") - + " to " + KSR.pv.get("$ru") + "\n"); + + "] to " + KSR.pv.get("$ru") + "\n"); ksr_route_natmanage(); return; }

1 0

git:5.0:be39fa8a: pkg/kamailio/deb: remove lintian errors for old distributions
by Victor Seva 22 Nov '17

22 Nov '17

Module: kamailio Branch: 5.0 Commit: be39fa8abb6f4f0b30c75da1150ec6a188be55d0 URL: https://github.com/kamailio/kamailio/commit/be39fa8abb6f4f0b30c75da1150ec6a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-22T12:24:34+01:00 pkg/kamailio/deb: remove lintian errors for old distributions * we are using a newer version of lintian, so new errors are detected (cherry picked from commit a56d67d3b7e0d4f5014f91b6b413c5861afc3560) (cherry picked from commit fc3842545afee3c62005f9845600b75b8c48bba9) --- Added: pkg/kamailio/deb/jessie/kamailio-mysql-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-mysql-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-mysql-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-mysql-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-mysql-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/jessie/source.lintian-overrides Modified: pkg/kamailio/deb/precise/source.lintian-overrides Modified: pkg/kamailio/deb/trusty/source.lintian-overrides Modified: pkg/kamailio/deb/wheezy/source.lintian-overrides Modified: pkg/kamailio/deb/xenial/source.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/be39fa8abb6f4f0b30c75da1150ec6a… Patch: https://github.com/kamailio/kamailio/commit/be39fa8abb6f4f0b30c75da1150ec6a…

1 0

git:master:19f7d568: tsilo: exported functions to kemi framework
by Daniel-Constantin Mierla 22 Nov '17

22 Nov '17

Module: kamailio Branch: master Commit: 19f7d568a7bb17a88dd06f0b78775a559a1ca683 URL: https://github.com/kamailio/kamailio/commit/19f7d568a7bb17a88dd06f0b78775a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-22T10:25:14+01:00 tsilo: exported functions to kemi framework --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/19f7d568a7bb17a88dd06f0b78775a5… Patch: https://github.com/kamailio/kamailio/commit/19f7d568a7bb17a88dd06f0b78775a5… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index f5b1732e89..1bc50c2930 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -32,6 +32,7 @@ #include "../../modules/registrar/api.h" #include "../../core/dset.h" #include "../../core/rpc_lookup.h" +#include "../../core/kemi.h" #include "ts_hash.h" #include "ts_handlers.h" @@ -245,6 +246,7 @@ static int fixup_ts_append(void** param, int param_no) return 0; } + /** * */ @@ -270,6 +272,28 @@ static int w_ts_append(struct sip_msg* _msg, char *_table, char *_ruri) return rc; } + +/** + * + */ +static int ki_ts_append(sip_msg_t* _msg, str *_table, str *_ruri) +{ + str ruri = STR_NULL; + int rc; + + if(ts_check_uri(_ruri)<0) + return -1; + + if (pkg_str_dup(&ruri, _ruri) < 0) + return -1; + + rc = ts_append(_msg, &ruri, _table->s); + + pkg_free(ruri.s); + + return rc; +} + /** * */ @@ -291,6 +315,15 @@ static int w_ts_append_to(struct sip_msg* msg, char *idx, char *lbl, char *table return ts_append_to(msg, tindex, tlabel, table, 0); } +/** + * + */ +static int ki_ts_append_to(sip_msg_t* _msg, int tindex, int tlabel, str *_table) +{ + return ts_append_to(_msg, (unsigned int)tindex, (unsigned int)tlabel, + _table->s, 0); +} + /** * */ @@ -320,6 +353,16 @@ static int w_ts_append_to2(struct sip_msg* msg, char *idx, char *lbl, char *tabl return ts_append_to(msg, tindex, tlabel, table, &suri); } +/** + * + */ +static int ki_ts_append_to_uri(sip_msg_t* _msg, int tindex, int tlabel, + str *_table, str *_uri) +{ + return ts_append_to(_msg, (unsigned int)tindex, (unsigned int)tlabel, + _table->s, _uri); +} + /** * */ @@ -328,6 +371,13 @@ static int w_ts_store(struct sip_msg* msg, char *p1, char *p2) return ts_store(msg, 0); } +/** + * + */ +static int ki_ts_store(sip_msg_t* msg) +{ + return ts_store(msg, 0); +} /** * @@ -342,3 +392,44 @@ static int w_ts_store1(struct sip_msg* msg, char *_ruri, char *p2) } return ts_store(msg, &suri); } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_tsilo_exports[] = { + { str_init("tsilo"), str_init("ts_store"), + SR_KEMIP_INT, ki_ts_store, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tsilo"), str_init("ts_store_uri"), + SR_KEMIP_INT, ts_store, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tsilo"), str_init("ts_append"), + SR_KEMIP_INT, ki_ts_append, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tsilo"), str_init("ts_append_to"), + SR_KEMIP_INT, ki_ts_append_to, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tsilo"), str_init("ts_append_to_uri"), + SR_KEMIP_INT, ki_ts_append_to_uri, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_STR, + SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_tsilo_exports); + return 0; +} \ No newline at end of file

1 0

git:master:80bed453: textopsx: exported header management functions to kemi framework
by Daniel-Constantin Mierla 22 Nov '17

22 Nov '17

Module: kamailio Branch: master Commit: 80bed453cfcc5ec8753e4bb823097e711b1b5385 URL: https://github.com/kamailio/kamailio/commit/80bed453cfcc5ec8753e4bb823097e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-22T09:05:14+01:00 textopsx: exported header management functions to kemi framework --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/80bed453cfcc5ec8753e4bb823097e7… Patch: https://github.com/kamailio/kamailio/commit/80bed453cfcc5ec8753e4bb823097e7…

1 0

git:master:18ebd5fe: textops: more functions exported to kemi
by Daniel-Constantin Mierla 22 Nov '17

22 Nov '17

Module: kamailio Branch: master Commit: 18ebd5fe71baee236c8b2ee720028c5c90f622c5 URL: https://github.com/kamailio/kamailio/commit/18ebd5fe71baee236c8b2ee720028c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-22T09:05:14+01:00 textops: more functions exported to kemi --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/18ebd5fe71baee236c8b2ee720028c5… Patch: https://github.com/kamailio/kamailio/commit/18ebd5fe71baee236c8b2ee720028c5…

1 0

git:master:0a626a25: textops: split the code for msg_apply_changes()
by Daniel-Constantin Mierla 22 Nov '17

22 Nov '17

Module: kamailio Branch: master Commit: 0a626a257dceb0c7cee13bf4ed173b644a5e5fd7 URL: https://github.com/kamailio/kamailio/commit/0a626a257dceb0c7cee13bf4ed173b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-22T09:05:14+01:00 textops: split the code for msg_apply_changes() - exported msg_set_buffer(...) to kemi framework --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/0a626a257dceb0c7cee13bf4ed173b6… Patch: https://github.com/kamailio/kamailio/commit/0a626a257dceb0c7cee13bf4ed173b6… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index d7a948c8ea..6d188e8622 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -143,39 +143,17 @@ static int mod_init(void) /** * */ -static int ki_msg_apply_changes(sip_msg_t *msg) +static int ki_msg_update_buffer(sip_msg_t *msg, str *obuf) { - struct dest_info dst; - str obuf; sip_msg_t tmp; - if(msg->first_line.type != SIP_REPLY && get_route_type() != REQUEST_ROUTE) { - LM_ERR("invalid usage - not in request route\n"); + if(obuf==NULL || obuf->s==NULL || obuf->len<=0) { + LM_ERR("invalid buffer parameter\n"); return -1; } - init_dest_info(&dst); - dst.proto = PROTO_UDP; - if(msg->first_line.type == SIP_REPLY) { - obuf.s = generate_res_buf_from_sip_res( - msg, (unsigned int *)&obuf.len, BUILD_NO_VIA1_UPDATE); - } else { - if(msg->msg_flags & FL_RR_ADDED) { - LM_ERR("cannot apply msg changes after adding record-route" - " header - it breaks conditional 2nd header\n"); - return -1; - } - obuf.s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf.len, - &dst, - BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); - } - if(obuf.s == NULL) { - LM_ERR("couldn't update msg buffer content\n"); - return -1; - } - if(obuf.len >= BUF_SIZE) { - LM_ERR("new buffer overflow (%d)\n", obuf.len); - pkg_free(obuf.s); + if(obuf->len >= BUF_SIZE) { + LM_ERR("new buffer is too large (%d)\n", obuf->len); return -1; } /* temporary copy */ @@ -210,13 +188,10 @@ static int ki_msg_apply_changes(sip_msg_t *msg) msg->dst_uri = tmp.dst_uri; msg->path_vec = tmp.path_vec; - memcpy(msg->buf, obuf.s, obuf.len); - msg->len = obuf.len; + memcpy(msg->buf, obuf->s, obuf->len); + msg->len = obuf->len; msg->buf[msg->len] = '\0'; - /* free new buffer - copied in the static buffer from old sip_msg_t */ - pkg_free(obuf.s); - /* reparse the message */ LM_DBG("SIP message content updated - reparsing\n"); if(parse_msg(msg->buf, msg->len, msg) != 0) { @@ -229,6 +204,59 @@ static int ki_msg_apply_changes(sip_msg_t *msg) return 1; } +/** + * + */ +static int ki_msg_set_buffer(sip_msg_t *msg, str *obuf) +{ + if(msg->first_line.type != SIP_REPLY && get_route_type() != REQUEST_ROUTE) { + LM_ERR("invalid usage - not in request route or a reply\n"); + return -1; + } + + return ki_msg_update_buffer(msg, obuf); +} + +/** + * + */ +static int ki_msg_apply_changes(sip_msg_t *msg) +{ + int ret; + dest_info_t dst; + str obuf; + + if(msg->first_line.type != SIP_REPLY && get_route_type() != REQUEST_ROUTE) { + LM_ERR("invalid usage - not in request route or a reply\n"); + return -1; + } + + init_dest_info(&dst); + dst.proto = PROTO_UDP; + if(msg->first_line.type == SIP_REPLY) { + obuf.s = generate_res_buf_from_sip_res( + msg, (unsigned int *)&obuf.len, BUILD_NO_VIA1_UPDATE); + } else { + if(msg->msg_flags & FL_RR_ADDED) { + LM_ERR("cannot apply msg changes after adding record-route" + " header - it breaks conditional 2nd header\n"); + return -1; + } + obuf.s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf.len, + &dst, + BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); + } + if(obuf.s == NULL) { + LM_ERR("couldn't update msg buffer content\n"); + return -1; + } + ret = ki_msg_update_buffer(msg, &obuf); + /* free new buffer - copied in the static buffer from old sip_msg_t */ + pkg_free(obuf.s); + + return ret; +} + /** * */ @@ -2124,6 +2152,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("msg_set_buffer"), + SR_KEMIP_INT, ki_msg_set_buffer, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textopsx"), str_init("change_reply_status"), SR_KEMIP_INT, ki_change_reply_status, { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:5.0:fb15fdb9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 21 Nov '17

21 Nov '17

Module: kamailio Branch: 5.0 Commit: fb15fdb912b420bcddec6cb37e717b11449ca4da URL: https://github.com/kamailio/kamailio/commit/fb15fdb912b420bcddec6cb37e717b1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-21T13:31:31+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_python/README Modified: src/modules/auth/README Modified: src/modules/corex/README Modified: src/modules/db_mongodb/README Modified: src/modules/dialog/README Modified: src/modules/mtree/README Modified: src/modules/pua_reginfo/README Modified: src/modules/rtimer/README Modified: src/modules/sl/README Modified: src/modules/textops/README Modified: src/modules/textopsx/README Modified: src/modules/timer/README Modified: src/modules/tm/README Modified: src/modules/usrloc/README Modified: src/modules/xcap_client/README Modified: src/modules/xcap_server/README --- Diff: https://github.com/kamailio/kamailio/commit/fb15fdb912b420bcddec6cb37e717b1… Patch: https://github.com/kamailio/kamailio/commit/fb15fdb912b420bcddec6cb37e717b1…

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 21 Nov '17

21 Nov '17

- URL: https://github.com/kamailio/kamailio/commit/82f84da093c917d111fa3c0706c8e23… Author: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-11-21T12:24:50+01:00 Support gcc 7+. (cherry picked from commit c110c6b2741739ff5f45953bfd0d46b9f3b888dc) - URL: https://github.com/kamailio/kamailio/commit/aa36dab490f76d3de46564f3b59a2c3… Author: Rick <dunst0(a)users.noreply.github.com> Date: 2017-11-21T12:25:09+01:00 dispatcher: undeclared UINT32_MAX on FreeBSD missing header - on FreeBSD is for UINT32_MAX the <stdint.h> header needed (cherry picked from commit ed4757c5886f0fc93d3eeec9f01885b63c6dc9c8) - URL: https://github.com/kamailio/kamailio/commit/cc6882384a2c6679455a266ff2d7be1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:25:33+01:00 app_python: safety checks for self var pointer (cherry picked from commit a6efe6d7e1a205a9d0c2d5c6c165fe337c4de814) - URL: https://github.com/kamailio/kamailio/commit/b7fee7c2733ce5ffd6e3f29a6d86c56… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-11-21T12:25:58+01:00 mtree: doc typo (cherry picked from commit dee1dc349a5aad9c84a22701d88e2eafa6a22b5c) - URL: https://github.com/kamailio/kamailio/commit/77f4f6e2fb0acc2bb3ead15e524d2c5… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-11-21T12:26:08+01:00 dialog: documentation text format (cherry picked from commit 41aa50ae4ee31657f8eb61fcb949d188cda8cff4) - URL: https://github.com/kamailio/kamailio/commit/52ad0deba97bea5186811c3e7ae1a09… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-11-21T12:26:39+01:00 sl: fix typos and format in documentation and code (cherry picked from commit fab551a87b40b35ca99845df52071980458cdd51) - URL: https://github.com/kamailio/kamailio/commit/407f7f8ace43f40ff067b70af0a19da… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-11-21T12:27:04+01:00 sl: use documentation entities (cherry picked from commit 7ee62dfa4c2290e657a55b609053755f91faa4ee) - URL: https://github.com/kamailio/kamailio/commit/92e776c6e1ebe7ad00ad7de51569d1f… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-11-21T12:27:18+01:00 sl: document event routes (cherry picked from commit 2a157d6f0951124ca8a3aba7171dfb91c68625b7) - URL: https://github.com/kamailio/kamailio/commit/86dc029f9f12580af31f72bb2e46a37… Author: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-11-21T12:27:39+01:00 dialog: remove replicated dialog from profile as soon as gets to terminated state - matches local (non-replicated) behaviour introduced in edf61ac (cherry picked from commit 22e4031cdcc7ba7c90553bd569e289043c0c64cf) - URL: https://github.com/kamailio/kamailio/commit/b34e9da246325e80dc3b388579d41c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:27:56+01:00 timer: code formatting (cherry picked from commit 3386e34593da78fcbf6f72f45ad2e6e8d3a72525) - URL: https://github.com/kamailio/kamailio/commit/27a319ba7fe93bbd52acb63e347efbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:28:06+01:00 timer: use typedefs, updated log macros (cherry picked from commit e9d0e799309b807b2376fd3eb30bd74a36997168) - URL: https://github.com/kamailio/kamailio/commit/28fd5caad5fda5c51fc14747db15763… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:28:17+01:00 timer: docs - split selects from functions section (cherry picked from commit 25a775cf44bc9c88ce8b6afc906968e2677dbf37) - URL: https://github.com/kamailio/kamailio/commit/82ae72199d4073a26b7130aa813f1be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:28:39+01:00 timer: use route_lookup() instead of route_get() to find a route block - avoids creating an empty route block structure - split code for dedicated cfg function wrapper (cherry picked from commit e4800a83439cb04eb3a5d4e106ad767a3d6776a5) - URL: https://github.com/kamailio/kamailio/commit/7765d6b79c165c8329f6aa19eef7f76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:28:49+01:00 timer: save route name inside timer action structure (cherry picked from commit 4ccfc2b6845cccb04a2814c1d71c18de1e0efdff) - URL: https://github.com/kamailio/kamailio/commit/9539723a4f125aedfca174560d253a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:29:00+01:00 timer: removed svn id (cherry picked from commit a69e47ce762108e0399bdfb6784649ebf3a34394) - URL: https://github.com/kamailio/kamailio/commit/720b0f3c6f35ff9f8ea8d46b0d06ec7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:29:50+01:00 timer: allow execution of kemi callbacks on timer - route block name is used as kemi function name (cherry picked from commit 570112934d693029229d9809cd2de98a1ce4cc7a) - URL: https://github.com/kamailio/kamailio/commit/49629af1cc63cd38b58d2c974f5bf91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:30:00+01:00 timer: doc - example using the module via kemi (cherry picked from commit 7b8d3389338e7194201eeff18399822cc2188bc2) - URL: https://github.com/kamailio/kamailio/commit/1bbcdd8f21b464992ec223e7523ad7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:30:10+01:00 timer: revert to use of route_get() - route block is searched prior of being declared due to modparam callback (cherry picked from commit 37cf1433af55a8744dfccee873699e17b06b8ac4) - URL: https://github.com/kamailio/kamailio/commit/cc1b2c99b854b684910837ac49e9902… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:30:24+01:00 rtimer: save the route name in the internal structure (cherry picked from commit 8a0de1b9f29b0bcd3c13166911c24c01ef9c72ba) - URL: https://github.com/kamailio/kamailio/commit/26de610e5c09b21bde52337ad79ac64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:30:38+01:00 rtimer: support for execution of kemi callback functions (cherry picked from commit 1b14fdee7414d84b2c7181958bf29df3256299a7) - URL: https://github.com/kamailio/kamailio/commit/50a2085649d00952e3fc7bbb036d6ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:30:52+01:00 rtimer: doc - updated examples, enhancements for use with kemi (cherry picked from commit 666656c27b8d01d490523f0a7e15de57ff42bad5) - URL: https://github.com/kamailio/kamailio/commit/bf650e63a1ad6f42d3fb1021ca77bda… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-11-21T12:31:45+01:00 tm: fix documentation typos and changed or obsolete paths (cherry picked from commit e5b77a64f47dd103eebfe3dfe1208c050dd50a9d) - URL: https://github.com/kamailio/kamailio/commit/ad595e4a8f1ec74cbf5974303063959… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-11-21T12:32:05+01:00 auth|pua_reginfo: fix common documentation typo (cherry picked from commit 9ed210ad397d0ad36c020b960a799e918482765f) - URL: https://github.com/kamailio/kamailio/commit/9d91bee54012b8b21236d3c2015bb70… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-11-21T12:33:12+01:00 textops: documentaton updated for is_audio_on_hold() - reported by Julia Boudniatsky <juliabo(a)gmail.com> (cherry picked from commit be51e338830f960cc27845136feaee4f101ed2c1) - URL: https://github.com/kamailio/kamailio/commit/5c709d7cc8e016e9354d34fc4002c1a… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2017-11-21T12:33:35+01:00 core: remove condition for ipv6 outbound socket to build via header (cherry picked from commit e6abb9302c8b127b7ac15cd7e24075845e271bf1) - URL: https://github.com/kamailio/kamailio/commit/a3448fc11a8be943263693c2b7a6322… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:33:54+01:00 core: safety checks to catch enclosed ipv6 addresses or hostnames in via build (cherry picked from commit 1de15c06b982b4b4a0d9860b51c2178745cd9af0) - URL: https://github.com/kamailio/kamailio/commit/4bd4c8b8278176b1ab0c97a0b7b94bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:36:15+01:00 pua_usrloc: no publish requests at shutdown time - operations are useless, being related to db operations - safer for races between modules during cleanup, reported by GH #1287 (cherry picked from commit db8f664aa72a4fabc9a5f5c4b06d629fd4c8946a) - URL: https://github.com/kamailio/kamailio/commit/03d0a93acb9cbb212292f32a7913dcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:36:27+01:00 usrloc: more docs for db_insert_null parameter (cherry picked from commit 7c52ffb920ec0552a8720833223a54813affe8ee) - URL: https://github.com/kamailio/kamailio/commit/9ef7083974ec290d54820a07126a3fe… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2017-11-21T12:37:22+01:00 cfg: fix spelling error in load module statement related to jsonrpcs (cherry picked from commit 422f9ea87029716674972e4c387dfd362058ad49) - URL: https://github.com/kamailio/kamailio/commit/ce7546fae9ac982a3cfa73fa16b88b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:37:52+01:00 db_mongodb: added Remarks section to collect details about specific requirements (cherry picked from commit 2d74f9854239442b7bf63b701f40bbc2013c2ba7) - URL: https://github.com/kamailio/kamailio/commit/0a3c7fea521e156291a6b57cb747972… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-11-21T12:39:40+01:00 textopsx: fix documentation typo (cherry picked from commit 8443b3e28a3f44a127ab8de6b8ee329f2f796e12) - URL: https://github.com/kamailio/kamailio/commit/16a61e2faec14757495f00974e0fabe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:40:36+01:00 core: warning when a task is pushed but no workers - helper functions to get the number of workers (cherry picked from commit 60db119bf8388f047cb7f7e2ce9f2e740b5abb8d) - URL: https://github.com/kamailio/kamailio/commit/a01346437211d689152b65adf67711a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:40:52+01:00 db_mysql: coherent indentation and whitespacing (cherry picked from commit 4b19cda766732adc7788b7a5ebcf256c58a35c32) - URL: https://github.com/kamailio/kamailio/commit/00874323603e757761f7f37df772067… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:41:31+01:00 tm: use define for unset flags of run_trans_callbacks_with_buf() (cherry picked from commit 33302f87cb2bd8b94a1e338d8a3171a41a055bf2) - URL: https://github.com/kamailio/kamailio/commit/07cc81aa4180a40217dc6d7c4dcd3d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:41:42+01:00 tm: run TMCB_RESPONSE_OUT callback only if the response code is still the active one (cherry picked from commit 785a3ccc743f429107c3dfae78d43705918aa4e6) - URL: https://github.com/kamailio/kamailio/commit/89681537b9e646b6e30c5356bdf9c7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:42:18+01:00 tm: use relayed_code for active type check in TMCB RESPONSE OUT - relayed_msg can be a fake reply and accessing the status field causes a crash (issue introduced by previous patch) (cherry picked from commit 2a80ed8030419ca15c4a954ea83531bb131e66b0) - URL: https://github.com/kamailio/kamailio/commit/d22f0f5418e4a021a874656cec27ed7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:42:34+01:00 corex: rpc command to control debug level - corex.debug - get the equivalent for former mi command (cherry picked from commit 05f388adf04060978b995bdc83605d2faf2359f5) - URL: https://github.com/kamailio/kamailio/commit/1bdc7fa1bae3fef096a76803bf527f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:42:44+01:00 corex: documentation for corex.debug rpc command (cherry picked from commit dfbffd71ed01fe72022babd3836966299283994b) - URL: https://github.com/kamailio/kamailio/commit/bfc8b49637c02d68708000197815570… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:43:05+01:00 acc: check if async task workers are active before doing async insert (cherry picked from commit d4edeb823290e47cafa7952d4a029d7cfae9723a) - URL: https://github.com/kamailio/kamailio/commit/d9ee182f8147fc4d62e3fc4bf8dbf4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:44:23+01:00 xcap_server: added section ids in docs (cherry picked from commit ba3f64ec28da4b7bcaf9cbd07b74575034bb950a) (cherry picked from commit 8ff9cdc48effc50bbe3b6642276cbcce9ccd7bfe) - URL: https://github.com/kamailio/kamailio/commit/502b4ee9ed9445c053f6ea8fc32cd74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:44:35+01:00 xcap_client: removed empty section for functions in docs (cherry picked from commit 86cbc43788b140dbbd3f35c7245a81dcbfa2d291) (cherry picked from commit 41d17a914c0364e044ca336c613a702fc5b08426) - URL: https://github.com/kamailio/kamailio/commit/987c184a44ead43f5e7adea9988dc68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:44:47+01:00 drouting: removed svn ids and history (cherry picked from commit 2dd28a6285b688606b69691d33000d30f877c9a4) (cherry picked from commit 13f8a6a3f8ff61fc2da119e4587fa80de4e91a95) - URL: https://github.com/kamailio/kamailio/commit/ba59314ef8d4cb6466d15791eeec190… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2017-11-21T12:45:33+01:00 nat_traversal: correcting the ipv6 contact in fix_contact - fix_contact for ipv6 addres,add the [] to the host part of contact header (cherry picked from commit 4838bca79d5eb82d133b295d6e601c1924d7ac11) (cherry picked from commit 705fc77c076f6f7431295992d117db3e59c5c9fb) - URL: https://github.com/kamailio/kamailio/commit/e23a4d18cad2ef6cade13d34a86a232… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:45:43+01:00 core: test if ipv6 address starts with [ for subst snd lumps - safer than the test against cached socket address known to be without [], allowing to pass any address value to be used - reported by GH #1315 (cherry picked from commit 2cb94f28d7d214d22ccdb6a5b993b391f61ea15b) (cherry picked from commit 69fb3b9b274b618ce4bf03c61ae03e11db8d0593) - URL: https://github.com/kamailio/kamailio/commit/5406ca7df5acce2741474d89a6ce893… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:46:31+01:00 app_python: aliased load to script_name parameter - load is used to specify what scripts needs to be loaded among the modules implementing kemi (cherry picked from commit 4ca055ab34e4dfcf244491257906563b571fb748) (cherry picked from commit 24eb13ded637958e7380085a540137e937fab574) - URL: https://github.com/kamailio/kamailio/commit/bf1906d9a4e5aec6d29575d87853d95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:46:45+01:00 utils/kamctl: updated man pages (cherry picked from commit cb58fc376d3ed2d4c075282f2efe6721bf19d94e) (cherry picked from commit 2d459560451bcc850a44cd93899891b079efcd8a) - URL: https://github.com/kamailio/kamailio/commit/9e8dbcf4ed1370dffdc9958d0ecd5b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T12:47:08+01:00 http_client: fixed the name of exported function http_client_query() with 4 params (cherry picked from commit 4b3e7c4a988afdc93a3c337ea97e1f8c13730a79) (cherry picked from commit d60dd300e6e0444e984f62a18ffbbe63f8ba0fdf) - URL: https://github.com/kamailio/kamailio/commit/71acb20450eaa9ad75d221398a9234b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T13:23:45+01:00 timer: set back rcv_info structure after backport conflict

1 0

git:master:b1fbf47d: pkg/kamailio/deb: version set to 5.2.0~dev1 [skip ci]
by Victor Seva 21 Nov '17

21 Nov '17

Module: kamailio Branch: master Commit: b1fbf47d9cf0680fb892e255d3f22ec6401bc590 URL: https://github.com/kamailio/kamailio/commit/b1fbf47d9cf0680fb892e255d3f22ec… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-21T12:28:47+01:00 pkg/kamailio/deb: version set to 5.2.0~dev1 [skip ci] --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b1fbf47d9cf0680fb892e255d3f22ec… Patch: https://github.com/kamailio/kamailio/commit/b1fbf47d9cf0680fb892e255d3f22ec… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 5b56ca1022..ee14ead055 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev1) unstable; urgency=medium + + * version set to 5.2.0-dev1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:28:02 +0100 + kamailio (5.2.0~dev0) unstable; urgency=medium * version set to 5.2.0-dev0 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 5b56ca1022..ee14ead055 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev1) unstable; urgency=medium + + * version set to 5.2.0-dev1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:28:02 +0100 + kamailio (5.2.0~dev0) unstable; urgency=medium * version set to 5.2.0-dev0 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 5b56ca1022..ee14ead055 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev1) unstable; urgency=medium + + * version set to 5.2.0-dev1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:28:02 +0100 + kamailio (5.2.0~dev0) unstable; urgency=medium * version set to 5.2.0-dev0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 5b56ca1022..ee14ead055 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev1) unstable; urgency=medium + + * version set to 5.2.0-dev1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:28:02 +0100 + kamailio (5.2.0~dev0) unstable; urgency=medium * version set to 5.2.0-dev0 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 5b56ca1022..ee14ead055 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev1) unstable; urgency=medium + + * version set to 5.2.0-dev1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:28:02 +0100 + kamailio (5.2.0~dev0) unstable; urgency=medium * version set to 5.2.0-dev0 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 5b56ca1022..ee14ead055 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev1) unstable; urgency=medium + + * version set to 5.2.0-dev1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:28:02 +0100 + kamailio (5.2.0~dev0) unstable; urgency=medium * version set to 5.2.0-dev0 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 5b56ca1022..ee14ead055 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev1) unstable; urgency=medium + + * version set to 5.2.0-dev1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:28:02 +0100 + kamailio (5.2.0~dev0) unstable; urgency=medium * version set to 5.2.0-dev0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 5b56ca1022..ee14ead055 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev1) unstable; urgency=medium + + * version set to 5.2.0-dev1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:28:02 +0100 + kamailio (5.2.0~dev0) unstable; urgency=medium * version set to 5.2.0-dev0 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 5b56ca1022..ee14ead055 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev1) unstable; urgency=medium + + * version set to 5.2.0-dev1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:28:02 +0100 + kamailio (5.2.0~dev0) unstable; urgency=medium * version set to 5.2.0-dev0

1 0

git:5.1:ae981250: pkg/kamailio/deb: version set to 5.1.0~rc1
by Victor Seva 21 Nov '17

21 Nov '17

Module: kamailio Branch: 5.1 Commit: ae981250ab3b03a4163aa89e62161a9ec9db6e3c URL: https://github.com/kamailio/kamailio/commit/ae981250ab3b03a4163aa89e62161a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-21T12:25:40+01:00 pkg/kamailio/deb: version set to 5.1.0~rc1 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/ae981250ab3b03a4163aa89e62161a9… Patch: https://github.com/kamailio/kamailio/commit/ae981250ab3b03a4163aa89e62161a9… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 0ed5a0fac2..ad1f4be0f2 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc1) unstable; urgency=medium + + * version set to 5.1.0~rc1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:23:47 +0100 + kamailio (5.1.0~rc0) unstable; urgency=medium * version set to 5.1.0~rc0 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 0ed5a0fac2..ad1f4be0f2 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc1) unstable; urgency=medium + + * version set to 5.1.0~rc1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:23:47 +0100 + kamailio (5.1.0~rc0) unstable; urgency=medium * version set to 5.1.0~rc0 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 0ed5a0fac2..ad1f4be0f2 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc1) unstable; urgency=medium + + * version set to 5.1.0~rc1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:23:47 +0100 + kamailio (5.1.0~rc0) unstable; urgency=medium * version set to 5.1.0~rc0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 0ed5a0fac2..ad1f4be0f2 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc1) unstable; urgency=medium + + * version set to 5.1.0~rc1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:23:47 +0100 + kamailio (5.1.0~rc0) unstable; urgency=medium * version set to 5.1.0~rc0 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 0ed5a0fac2..ad1f4be0f2 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc1) unstable; urgency=medium + + * version set to 5.1.0~rc1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:23:47 +0100 + kamailio (5.1.0~rc0) unstable; urgency=medium * version set to 5.1.0~rc0 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 0ed5a0fac2..ad1f4be0f2 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc1) unstable; urgency=medium + + * version set to 5.1.0~rc1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:23:47 +0100 + kamailio (5.1.0~rc0) unstable; urgency=medium * version set to 5.1.0~rc0 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 0ed5a0fac2..ad1f4be0f2 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc1) unstable; urgency=medium + + * version set to 5.1.0~rc1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:23:47 +0100 + kamailio (5.1.0~rc0) unstable; urgency=medium * version set to 5.1.0~rc0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 0ed5a0fac2..ad1f4be0f2 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc1) unstable; urgency=medium + + * version set to 5.1.0~rc1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:23:47 +0100 + kamailio (5.1.0~rc0) unstable; urgency=medium * version set to 5.1.0~rc0 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 0ed5a0fac2..ad1f4be0f2 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~rc1) unstable; urgency=medium + + * version set to 5.1.0~rc1 + + -- Victor Seva <vseva(a)debian.org> Tue, 21 Nov 2017 12:23:47 +0100 + kamailio (5.1.0~rc0) unstable; urgency=medium * version set to 5.1.0~rc0

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 21 Nov '17

21 Nov '17

- URL: https://github.com/kamailio/kamailio/commit/dff21f989f134cc35a32002d865611c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:39:43+01:00 etc/kamailio.cfg: added log_prefix - removed commented port example (cherry picked from commit 387e2a805a58d3a44e80331575d4a072f5a541fd) - URL: https://github.com/kamailio/kamailio/commit/8ff9cdc48effc50bbe3b6642276cbcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:39:53+01:00 xcap_server: added section ids in docs (cherry picked from commit ba3f64ec28da4b7bcaf9cbd07b74575034bb950a) - URL: https://github.com/kamailio/kamailio/commit/fcf13e1694ee29a758053be21cdce67… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-11-21T11:40:07+01:00 app_sqlang: allow select compiler using CC (cherry picked from commit 6efcf9afa764b264dc6b8fe3b8a478942bde7e6e) - URL: https://github.com/kamailio/kamailio/commit/41d17a914c0364e044ca336c613a702… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:40:19+01:00 xcap_client: removed empty section for functions in docs (cherry picked from commit 86cbc43788b140dbbd3f35c7245a81dcbfa2d291) - URL: https://github.com/kamailio/kamailio/commit/13f8a6a3f8ff61fc2da119e4587fa80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:40:32+01:00 drouting: removed svn ids and history (cherry picked from commit 2dd28a6285b688606b69691d33000d30f877c9a4) - URL: https://github.com/kamailio/kamailio/commit/678abb0c5049d56c21bfc88f70873ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:40:42+01:00 drouting: clang format the source code (cherry picked from commit e76a0acfccdd2a76252f220a2b530b19c5dfa1ba) - URL: https://github.com/kamailio/kamailio/commit/055f6d29bb9becc1e15155fa7701080… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:40:52+01:00 drouting: note in docs about supported characters in prefix values - these are the digits (0..9), +, * and # (cherry picked from commit 8a40437e54d9a5f2e3141c3434fd672a9f2d0e13) - URL: https://github.com/kamailio/kamailio/commit/9f8c93ea28255a197c21bccbc6801ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:41:29+01:00 core: udp - print up to first 100 chars from received packet (cherry picked from commit 83c370414cb288b113ad4f075a2261e7d701d6d3) - URL: https://github.com/kamailio/kamailio/commit/804adb80204fc862d7a6cbb8007aa02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:41:45+01:00 nathelper: allow variable for flags parameter of fix_nated_sdp() (cherry picked from commit 4d93fb69805deea8c23ae2aa8b8743cc24ff2925) - URL: https://github.com/kamailio/kamailio/commit/705fc77c076f6f7431295992d117db3… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2017-11-21T11:41:57+01:00 nat_traversal: correcting the ipv6 contact in fix_contact - fix_contact for ipv6 addres,add the [] to the host part of contact header (cherry picked from commit 4838bca79d5eb82d133b295d6e601c1924d7ac11) - URL: https://github.com/kamailio/kamailio/commit/69fb3b9b274b618ce4bf03c61ae03e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:42:15+01:00 core: test if ipv6 address starts with [ for subst snd lumps - safer than the test against cached socket address known to be without [], allowing to pass any address value to be used - reported by GH #1315 (cherry picked from commit 2cb94f28d7d214d22ccdb6a5b993b391f61ea15b) - URL: https://github.com/kamailio/kamailio/commit/626573483e3184313cd54712f35ec05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:42:24+01:00 nathelper: clang format the code (cherry picked from commit bcc5a66815ea21a762c22a8222afc621b42bb94d) - URL: https://github.com/kamailio/kamailio/commit/1d54d51664b1f10d2afbfd20c143dda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:42:36+01:00 nathelper: support to use variable for flags param of add_rcv_param() (cherry picked from commit d2120dae8bb76dfaa7057883c1f10950d35d4e48) - URL: https://github.com/kamailio/kamailio/commit/6a3e11240be8e34614cf604897778a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:42:46+01:00 nathelper: allow variable for nat_uac_test() parameter (cherry picked from commit 2815150bf74cdda26c12d05f25d6b67adf033dc1) - URL: https://github.com/kamailio/kamailio/commit/f2116e24670e8bcd169c0d9ae846b91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:42:57+01:00 nathelper: export add_rcv_param(flags) to kemi interface (cherry picked from commit 6b65ff70d505680fa3904f659c47d466e77b38c6) - URL: https://github.com/kamailio/kamailio/commit/3f10b021d6f60eeb2cf19056a93f55a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:43:08+01:00 test/unit: print same messages when running all or individual unit tests - some explanatory comments in Makefile (cherry picked from commit 52c766bf3c54402cf403a58188952968a8520b68) - URL: https://github.com/kamailio/kamailio/commit/8318c3504018f39b7ec145197a663b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:43:19+01:00 test/unit: 19.sh - remove usrloc record by ruid (cherry picked from commit d848d133301bead7a6e3d9b3e6f3ffa2329fd825) - URL: https://github.com/kamailio/kamailio/commit/a430ff9555d0d412d364666e468cc78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:43:33+01:00 core: kemi - exported hdr.append_after() and hdr.insert_before() - kemi functions to add a header after another one and insert a header before another one (cherry picked from commit 0df40557879bc8c64c917d54b61fd106147be7b1) - URL: https://github.com/kamailio/kamailio/commit/72078c4281f316d7728f54b3219a713… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:43:43+01:00 core: kemi - simplified anchor location for hdr append and insert functions (cherry picked from commit 7ab180c8ed3976148a23a0d0a727d1dcab1d9e72) - URL: https://github.com/kamailio/kamailio/commit/3cacf80402be3c1bf3fae9db6a05ab7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:43:53+01:00 textops: several functions exported to kemi framework (cherry picked from commit a1508e63ff59665701b8901a79b14a3aa88eab9c) - URL: https://github.com/kamailio/kamailio/commit/920aa01cf590aba7fafb81633b498a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:44:03+01:00 core: kemi - function for branch flags with index have two int params (cherry picked from commit e4b7cd2a3e362917ff28f2f532d8d39ef9e53a4f) - URL: https://github.com/kamailio/kamailio/commit/7f6764d3dd7abaf5ed190b44d22f213… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:44:14+01:00 core: kemi - support for short header name in hdr remove and search - KSR.hdr.is_present("hname") - function to search if a header is present (cherry picked from commit 97f975fa5c2d2186f860e0deada4b5412c529ee5) - URL: https://github.com/kamailio/kamailio/commit/77b00c2ae89414f9864e7384483466f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:44:25+01:00 core: kemi - more core functions exported to kemi framework (cherry picked from commit aec6c31b5acb43a5123fe29cccba623ffebe0b2b) - URL: https://github.com/kamailio/kamailio/commit/24eb13ded637958e7380085a540137e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:44:35+01:00 app_python: aliased load to script_name parameter - load is used to specify what scripts needs to be loaded among the modules implementing kemi (cherry picked from commit 4ca055ab34e4dfcf244491257906563b571fb748) - URL: https://github.com/kamailio/kamailio/commit/2d459560451bcc850a44cd93899891b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:44:48+01:00 utils/kamctl: updated man pages (cherry picked from commit cb58fc376d3ed2d4c075282f2efe6721bf19d94e) - URL: https://github.com/kamailio/kamailio/commit/f66bd3bf2a143ce2a1b3f88b8aa0c5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:45:01+01:00 core: pv - increased the size for pv and transformation hash tables (cherry picked from commit 877b2c8fc40cd2e385fae7da713ef63dbd9bbabd) - URL: https://github.com/kamailio/kamailio/commit/b26e95db1ab7d40999009225cc55b9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:45:12+01:00 htable: added function to free $sht(...) pv name (cherry picked from commit 507c3c6f44467546d9441c0989610171f50f7edc) - URL: https://github.com/kamailio/kamailio/commit/efe85046528b89e4068c02e3fe74b62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:45:35+01:00 core: pv - new parameters to control the size of pv cache - pv_cache_limit - the limit how many pv declarations in the cache after which an action is taken. Default value is 2048 - pv_cache_action - specify what action to be done when the size of pv cache is exceeded. If 0, print an warning log message when the limit is exceeded. If 1, warning log messages is printed and the cache systems tries to drop a $sht(...) declaration. Default is 0 This tries to cope better with the situation of declaring too many variables when using kemi scripts (cherry picked from commit 6dc9ee1701019c8db994710c11f7e05447cbae92) - URL: https://github.com/kamailio/kamailio/commit/d60dd300e6e0444e984f62a18ffbbe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:46:13+01:00 http_client: fixed the name of exported function http_client_query() with 4 params (cherry picked from commit 4b3e7c4a988afdc93a3c337ea97e1f8c13730a79) - URL: https://github.com/kamailio/kamailio/commit/bf5d692c062da250813e5faa41ee481… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:47:49+01:00 Makefile.defs: version set to 5.1.0-rc1

1 0

git:master:94a7beae: Makefile.defs: version set to 5.2.0-dev1
by Daniel-Constantin Mierla 21 Nov '17

21 Nov '17

Module: kamailio Branch: master Commit: 94a7beaee82d4dd29e903c4de03e069fb549c608 URL: https://github.com/kamailio/kamailio/commit/94a7beaee82d4dd29e903c4de03e069… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:47:21+01:00 Makefile.defs: version set to 5.2.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/94a7beaee82d4dd29e903c4de03e069… Patch: https://github.com/kamailio/kamailio/commit/94a7beaee82d4dd29e903c4de03e069… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 75fa1567ff..0ffaa291db 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:4b3e7c4a: http_client: fixed the name of exported function http_client_query() with 4 params
by Daniel-Constantin Mierla 21 Nov '17

21 Nov '17

Module: kamailio Branch: master Commit: 4b3e7c4a988afdc93a3c337ea97e1f8c13730a79 URL: https://github.com/kamailio/kamailio/commit/4b3e7c4a988afdc93a3c337ea97e1f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:37:23+01:00 http_client: fixed the name of exported function http_client_query() with 4 params --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/4b3e7c4a988afdc93a3c337ea97e1f8… Patch: https://github.com/kamailio/kamailio/commit/4b3e7c4a988afdc93a3c337ea97e1f8… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index d822c5019b..2a31ff97bd 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -138,7 +138,7 @@ static cmd_export_t cmds[] = { {"http_client_query", (cmd_function)w_http_query_post, 3, fixup_http_query_post, fixup_free_http_query_post, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, - {"http_query", (cmd_function)w_http_query_post_hdr, 4, fixup_http_query_post_hdr, + {"http_client_query", (cmd_function)w_http_query_post_hdr, 4, fixup_http_query_post_hdr, fixup_free_http_query_post_hdr, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {"http_connect", (cmd_function)w_curl_connect, 3, fixup_curl_connect,

1 0

git:master:6dc9ee17: core: pv - new parameters to control the size of pv cache
by Daniel-Constantin Mierla 21 Nov '17

21 Nov '17

Module: kamailio Branch: master Commit: 6dc9ee1701019c8db994710c11f7e05447cbae92 URL: https://github.com/kamailio/kamailio/commit/6dc9ee1701019c8db994710c11f7e05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:02:38+01:00 core: pv - new parameters to control the size of pv cache - pv_cache_limit - the limit how many pv declarations in the cache after which an action is taken. Default value is 2048 - pv_cache_action - specify what action to be done when the size of pv cache is exceeded. If 0, print an warning log message when the limit is exceeded. If 1, warning log messages is printed and the cache systems tries to drop a $sht(...) declaration. Default is 0 This tries to cope better with the situation of declaring too many variables when using kemi scripts --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/6dc9ee1701019c8db994710c11f7e05… Patch: https://github.com/kamailio/kamailio/commit/6dc9ee1701019c8db994710c11f7e05…

1 0

git:master:507c3c6f: htable: added function to free $sht(...) pv name
by Daniel-Constantin Mierla 21 Nov '17

21 Nov '17

Module: kamailio Branch: master Commit: 507c3c6f44467546d9441c0989610171f50f7edc URL: https://github.com/kamailio/kamailio/commit/507c3c6f44467546d9441c098961017… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T11:02:11+01:00 htable: added function to free $sht(...) pv name --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/507c3c6f44467546d9441c098961017… Patch: https://github.com/kamailio/kamailio/commit/507c3c6f44467546d9441c098961017… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 9ef26a9e7e..0d07b92f19 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -129,6 +129,23 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, return 0; } +void pv_ht_free_name(void *p) +{ + pv_name_t *pn; + ht_pv_t *hpv=NULL; + + if(p==NULL) + return; + + pn = (pv_name_t*)p; + hpv = (ht_pv_t*)pn->u.dname; + if(hpv==NULL) + return; + if(hpv->pve) + pv_elem_free_all(hpv->pve); + pkg_free(hpv); +} + int pv_parse_ht_name(pv_spec_p sp, str *in) { ht_pv_t *hpv=NULL; @@ -184,6 +201,7 @@ int pv_parse_ht_name(pv_spec_p sp, str *in) hpv->ht = ht_get_table(&hpv->htname); sp->pvp.pvn.u.dname = (void*)hpv; sp->pvp.pvn.type = PV_NAME_OTHER; + sp->pvp.pvn.nfree = pv_ht_free_name; return 0; error:

1 0

git:master:877b2c8f: core: pv - increased the size for pv and transformation hash tables
by Daniel-Constantin Mierla 21 Nov '17

21 Nov '17

Module: kamailio Branch: master Commit: 877b2c8fc40cd2e385fae7da713ef63dbd9bbabd URL: https://github.com/kamailio/kamailio/commit/877b2c8fc40cd2e385fae7da713ef63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-21T10:12:07+01:00 core: pv - increased the size for pv and transformation hash tables --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/877b2c8fc40cd2e385fae7da713ef63… Patch: https://github.com/kamailio/kamailio/commit/877b2c8fc40cd2e385fae7da713ef63… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 7e3d7b9b4b..931d35715a 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -40,8 +40,8 @@ #include "pvapi.h" #include "pvar.h" -#define PV_TABLE_SIZE 32 /*!< pseudo-variables table size */ -#define TR_TABLE_SIZE 16 /*!< transformations table size */ +#define PV_TABLE_SIZE 64 /*!< pseudo-variables table size */ +#define TR_TABLE_SIZE 32 /*!< transformations table size */ void tr_destroy(trans_t *t); diff --git a/src/core/pvar.h b/src/core/pvar.h index 62ab78267f..3e838e20f8 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -240,7 +240,7 @@ typedef struct _pv_cache struct _pv_cache *next; } pv_cache_t; -#define PV_CACHE_SIZE 32 /*!< pseudo-variables cache table size */ +#define PV_CACHE_SIZE 64 /*!< pseudo-variables cache table size */ pv_cache_t **pv_cache_get_table(void);

1 0

git:master:cb58fc37: utils/kamctl: updated man pages
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: cb58fc376d3ed2d4c075282f2efe6721bf19d94e URL: https://github.com/kamailio/kamailio/commit/cb58fc376d3ed2d4c075282f2efe672… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-20T18:23:48+01:00 utils/kamctl: updated man pages --- Modified: utils/kamctl/kamctl.8 Modified: utils/kamctl/kamdbctl.8 --- Diff: https://github.com/kamailio/kamailio/commit/cb58fc376d3ed2d4c075282f2efe672… Patch: https://github.com/kamailio/kamailio/commit/cb58fc376d3ed2d4c075282f2efe672…

1 0

git:master:6ab88720: modules: readme files regenerated - app_python ... [skip ci]
by Kamailio Dev 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: 6ab88720bf4a55cce50294c598f8f3f4a1cf2354 URL: https://github.com/kamailio/kamailio/commit/6ab88720bf4a55cce50294c598f8f3f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-11-20T17:31:38+01:00 modules: readme files regenerated - app_python ... [skip ci] --- Modified: src/modules/app_python/README --- Diff: https://github.com/kamailio/kamailio/commit/6ab88720bf4a55cce50294c598f8f3f… Patch: https://github.com/kamailio/kamailio/commit/6ab88720bf4a55cce50294c598f8f3f… --- diff --git a/src/modules/app_python/README b/src/modules/app_python/README index c24477c35f..2f05fc1d91 100644 --- a/src/modules/app_python/README +++ b/src/modules/app_python/README @@ -21,9 +21,10 @@ Maxim Sobolev 3. Parameters - 3.1. script_name (string) - 3.2. mod_init_function (string) - 3.3. child_init_method (string) + 3.1. load (string) + 3.2. script_name (string) + 3.3. mod_init_function (string) + 3.4. child_init_method (string) 4. Functions @@ -31,7 +32,7 @@ Maxim Sobolev List of Examples - 1.1. Set script_name parameter + 1.1. Set load parameter 1.2. Set mod_init_function parameter 1.3. Set child_init_method parameter 1.4. python_exec usage @@ -48,9 +49,10 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. script_name (string) - 3.2. mod_init_function (string) - 3.3. child_init_method (string) + 3.1. load (string) + 3.2. script_name (string) + 3.3. mod_init_function (string) + 3.4. child_init_method (string) 4. Functions @@ -83,23 +85,29 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. script_name (string) - 3.2. mod_init_function (string) - 3.3. child_init_method (string) + 3.1. load (string) + 3.2. script_name (string) + 3.3. mod_init_function (string) + 3.4. child_init_method (string) -3.1. script_name (string) +3.1. load (string) - The path to the fiel with Python code to be executed from configuration + The path to the file with Python code to be executed from configuration file. Default value is “/usr/local/etc/kamailio/handler.py”. - Example 1.1. Set script_name parameter + Example 1.1. Set load parameter ... -modparam("app_python", "script_name", "/usr/local/etc/kamailio/myscript.py") +modparam("app_python", "load", "/usr/local/etc/kamailio/myscript.py") ... -3.2. mod_init_function (string) +3.2. script_name (string) + + This is same as "load" parameter, kept for backward compatibility with + the older versions of the module. + +3.3. mod_init_function (string) The Python function to be executed by this module when it is initialied by Kamailio. @@ -111,7 +119,7 @@ modparam("app_python", "script_name", "/usr/local/etc/kamailio/myscript.py") modparam("app_python", "mod_init_function", "my_mod_init") ... -3.3. child_init_method (string) +3.4. child_init_method (string) The Python function to be executed by this module when a new worker process (child) is initialied by Kamailio.

1 0

git:master:4ca055ab: app_python: aliased load to script_name parameter
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: 4ca055ab34e4dfcf244491257906563b571fb748 URL: https://github.com/kamailio/kamailio/commit/4ca055ab34e4dfcf244491257906563… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-20T17:21:50+01:00 app_python: aliased load to script_name parameter - load is used to specify what scripts needs to be loaded among the modules implementing kemi --- Modified: src/modules/app_python/app_python_mod.c Modified: src/modules/app_python/doc/app_python_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ca055ab34e4dfcf244491257906563… Patch: https://github.com/kamailio/kamailio/commit/4ca055ab34e4dfcf244491257906563… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 64f59fcc07..64ca55ff40 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -60,6 +60,7 @@ PyThreadState *myThreadState; /** module parameters */ static param_export_t params[]={ {"script_name", PARAM_STR, &script_name }, + {"load", PARAM_STR, &script_name }, {"mod_init_function", PARAM_STR, &mod_init_fname }, {"child_init_method", PARAM_STR, &child_init_mname }, {0,0,0} diff --git a/src/modules/app_python/doc/app_python_admin.xml b/src/modules/app_python/doc/app_python_admin.xml index 9eab795662..8a2fba4fb3 100644 --- a/src/modules/app_python/doc/app_python_admin.xml +++ b/src/modules/app_python/doc/app_python_admin.xml @@ -58,10 +58,10 @@ </section> <section> <title>Parameters</title> - <section id="app_python.p.script_name"> - <title><varname>script_name</varname> (string)</title> + <section id="app_python.p.load"> + <title><varname>load</varname> (string)</title> <para> - The path to the fiel with Python code to be executed + The path to the file with Python code to be executed from configuration file. </para> <para> @@ -70,15 +70,23 @@ </emphasis> </para> <example> - <title>Set <varname>script_name</varname> parameter</title> + <title>Set <varname>load</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("app_python", "script_name", "/usr/local/etc/kamailio/myscript.py") +modparam("app_python", "load", "/usr/local/etc/kamailio/myscript.py") ... </programlisting> </example> </section> + <section id="app_python.p.script_name"> + <title><varname>script_name</varname> (string)</title> + <para> + This is same as "load" parameter, kept for backward compatibility + with the older versions of the module. + </para> + </section> + <section id="app_python.p.mod_init_function"> <title><varname>mod_init_function</varname> (string)</title> <para>

1 0

Kamailio KEMI Framework Tutorial
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Hello, I started a tutorial for Kamailio KEMI Framework written in markdown format targeting use of mkdocs. It is published on github as part of kamailio-docs repository: * https://github.com/kamailio/kamailio-docs/tree/master/kamailio-kemi-framewo… The mkdocs build (to browse and read) is online at: * http://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/ It is work in progress and contributions from the community are more than welcome -- doing push requests on github project is the recommended way for contributions: * https://github.com/kamailio/kamailio-docs/ The main goal is document the role of KEMI, its benefits and how it can be used. It addition it should cover the list of functions exported to KEMI by core as well as special KEMI functions. Regarding the functions exported by kamailio modules to KEMI I added as an skeleton the ones exported by acc module. However, I am not sure if we should do it there or add them to the existing docs of the modules. Opinions on this?!? Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

git:master:97f975fa: core: kemi - support for short header name in hdr remove and search
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: 97f975fa5c2d2186f860e0deada4b5412c529ee5 URL: https://github.com/kamailio/kamailio/commit/97f975fa5c2d2186f860e0deada4b54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T22:14:40+01:00 core: kemi - support for short header name in hdr remove and search - KSR.hdr.is_present("hname") - function to search if a header is present --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/97f975fa5c2d2186f860e0deada4b54… Patch: https://github.com/kamailio/kamailio/commit/97f975fa5c2d2186f860e0deada4b54…

1 0

git:master:aec6c31b: core: kemi - more core functions exported to kemi framework
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: aec6c31b5acb43a5123fe29cccba623ffebe0b2b URL: https://github.com/kamailio/kamailio/commit/aec6c31b5acb43a5123fe29cccba623… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-20T09:54:43+01:00 core: kemi - more core functions exported to kemi framework --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/aec6c31b5acb43a5123fe29cccba623… Patch: https://github.com/kamailio/kamailio/commit/aec6c31b5acb43a5123fe29cccba623…

1 0

git:master:e4b7cd2a: core: kemi - function for branch flags with index have two int params
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: e4b7cd2a3e362917ff28f2f532d8d39ef9e53a4f URL: https://github.com/kamailio/kamailio/commit/e4b7cd2a3e362917ff28f2f532d8d39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T21:50:25+01:00 core: kemi - function for branch flags with index have two int params --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e4b7cd2a3e362917ff28f2f532d8d39… Patch: https://github.com/kamailio/kamailio/commit/e4b7cd2a3e362917ff28f2f532d8d39… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 0462c5dd8a..093fd4441f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -561,17 +561,17 @@ static sr_kemi_t _sr_kemi_core[] = { }, { str_init(""), str_init("setbiflag"), SR_KEMIP_BOOL, sr_kemi_core_setbiflag, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("resetbiflag"), SR_KEMIP_BOOL, sr_kemi_core_resetbiflag, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("isbiflagset"), SR_KEMIP_BOOL, sr_kemi_core_isbiflagset, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("setsflag"), @@ -1309,4 +1309,4 @@ str *sr_kemi_param_map_get_params(int *ptypes) sret.s = pbuf; sret.len = strlen(sret.s); return &sret; -} \ No newline at end of file +}

1 0

git:master:a1508e63: textops: several functions exported to kemi framework
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: a1508e63ff59665701b8901a79b14a3aa88eab9c URL: https://github.com/kamailio/kamailio/commit/a1508e63ff59665701b8901a79b14a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T12:07:16+01:00 textops: several functions exported to kemi framework --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/a1508e63ff59665701b8901a79b14a3… Patch: https://github.com/kamailio/kamailio/commit/a1508e63ff59665701b8901a79b14a3…

1 0

git:master:0df40557: core: kemi - exported hdr.append_after() and hdr.insert_before()
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: 0df40557879bc8c64c917d54b61fd106147be7b1 URL: https://github.com/kamailio/kamailio/commit/0df40557879bc8c64c917d54b61fd10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T11:10:04+01:00 core: kemi - exported hdr.append_after() and hdr.insert_before() - kemi functions to add a header after another one and insert a header before another one --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/0df40557879bc8c64c917d54b61fd10… Patch: https://github.com/kamailio/kamailio/commit/0df40557879bc8c64c917d54b61fd10…

1 0

git:master:7ab180c8: core: kemi - simplified anchor location for hdr append and insert functions
by Daniel-Constantin Mierla 20 Nov '17

20 Nov '17

Module: kamailio Branch: master Commit: 7ab180c8ed3976148a23a0d0a727d1dcab1d9e72 URL: https://github.com/kamailio/kamailio/commit/7ab180c8ed3976148a23a0d0a727d1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T11:15:41+01:00 core: kemi - simplified anchor location for hdr append and insert functions --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7ab180c8ed3976148a23a0d0a727d1d… Patch: https://github.com/kamailio/kamailio/commit/7ab180c8ed3976148a23a0d0a727d1d… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 603ae1ea35..0462c5dd8a 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -634,7 +634,6 @@ static sr_kemi_t _sr_kemi_core[] = { static int sr_kemi_hdr_append(sip_msg_t *msg, str *txt) { struct lump* anchor; - struct hdr_field *hf; char *hdr; if(txt==NULL || txt->s==NULL || msg==NULL) @@ -646,14 +645,14 @@ static int sr_kemi_hdr_append(sip_msg_t *msg, str *txt) return -1; } - hf = msg->last_header; hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); return -1; } memcpy(hdr, txt->s, txt->len); - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + /* anchor after last header */ + anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { LM_ERR("can't insert lump\n"); pkg_free(hdr); @@ -766,21 +765,20 @@ static int sr_kemi_hdr_remove(sip_msg_t *msg, str *txt) static int sr_kemi_hdr_insert(sip_msg_t *msg, str *txt) { struct lump* anchor; - struct hdr_field *hf; char *hdr; if(txt==NULL || txt->s==NULL || msg==NULL) return -1; LM_DBG("insert hf: %.*s\n", txt->len, txt->s); - hf = msg->headers; hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { LM_ERR("no pkg memory left\n"); return -1; } memcpy(hdr, txt->s, txt->len); - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + /* anchor before first header */ + anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); if(insert_new_lump_before(anchor, hdr, txt->len, 0) == 0) { LM_ERR("can't insert lump\n"); pkg_free(hdr);

1 0

git:master:d848d133: test/unit: 19.sh - remove usrloc record by ruid
by Daniel-Constantin Mierla 19 Nov '17

19 Nov '17

Module: kamailio Branch: master Commit: d848d133301bead7a6e3d9b3e6f3ffa2329fd825 URL: https://github.com/kamailio/kamailio/commit/d848d133301bead7a6e3d9b3e6f3ffa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T08:55:43+01:00 test/unit: 19.sh - remove usrloc record by ruid --- Modified: test/unit/19.sh --- Diff: https://github.com/kamailio/kamailio/commit/d848d133301bead7a6e3d9b3e6f3ffa… Patch: https://github.com/kamailio/kamailio/commit/d848d133301bead7a6e3d9b3e6f3ffa… --- diff --git a/test/unit/19.sh b/test/unit/19.sh index 8815aa07f5..f9bd07b09b 100755 --- a/test/unit/19.sh +++ b/test/unit/19.sh @@ -34,6 +34,7 @@ UAC=5080 # add an registrar entry to the db; +$MYSQL "DELETE FROM location WHERE ruid=\"kamailio-unit-uid\"" $MYSQL "INSERT INTO location (ruid,username,contact,socket,user_agent,cseq,q) VALUES (\"kamailio-unit-uid\", \"foo\",\"sip:foo@localhost:$UAS\",\"udp:127.0.0.1:$UAS\",\"kamailio_test\",1,-1);" $BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null @@ -46,5 +47,5 @@ ret=$? killall -9 sipp > /dev/null 2>&1 kill_kamailio -$MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@localhost:$UAS\") and (user_agent = \"kamailio_test\"));" +$MYSQL "DELETE FROM location WHERE ruid=\"kamailio-unit-uid\"" exit $ret;

1 0

git:master:52c766bf: test/unit: print same messages when running all or individual unit tests
by Daniel-Constantin Mierla 19 Nov '17

19 Nov '17

Module: kamailio Branch: master Commit: 52c766bf3c54402cf403a58188952968a8520b68 URL: https://github.com/kamailio/kamailio/commit/52c766bf3c54402cf403a5818895296… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-19T08:54:25+01:00 test/unit: print same messages when running all or individual unit tests - some explanatory comments in Makefile --- Modified: test/unit/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/52c766bf3c54402cf403a5818895296… Patch: https://github.com/kamailio/kamailio/commit/52c766bf3c54402cf403a5818895296… --- diff --git a/test/unit/Makefile b/test/unit/Makefile index 83b3dba999..00c2a47c2e 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -4,32 +4,37 @@ TESTS_FILES ?= $(wildcard *.sh) TESTS_EXCLUDE ?= TESTS ?= $(filter-out $(patsubst %,%.sh,$(TESTS_EXCLUDE)), $(TESTS_FILES)) +# run all tests all: @for FILE in $(TESTS) ; do \ if [ -f $$FILE ] ; then \ if [ -x $$FILE ] ; then \ - echo "run test `basename $$FILE .sh`:" `head -n 2 "$$FILE" | tail -n 1 | cut -c 3-` ; \ + echo "Run test `basename $$FILE .sh`:" `head -n 2 "$$FILE" | tail -n 1 | cut -c 3-` ; \ ./$$FILE ; \ ret=$$? ; \ - if [ ! "$$ret" -eq 0 ] ; then \ - echo "failed" ; RES=1;\ - fi ; \ + if [ ! "$$ret" -eq 0 ] ; then \ + echo "Test unit file $$FILE: failed" ; \ + else \ + echo "Test unit file $$FILE: ok" ; \ + fi ; \ fi ; \ fi ; \ done ; \ exit $$RES; +# run one test specified in variable UNIT +# example: make UNIT=1.sh run run: -@if [ -f $(UNIT) ] ; then \ if [ -x $(UNIT) ] ; then \ echo "Run test `basename $(UNIT) .sh`:" `head -n 2 "$(UNIT)" | tail -n 1 | cut -c 3-` ; \ ./$(UNIT) ; \ ret=$$? ; \ - if [ ! "$$ret" -eq 0 ] ; then \ - echo "Test unit file $(UNIT): failed" ; \ - else \ - echo "Test unit file $(UNIT): ok" ; \ - fi ; \ + if [ ! "$$ret" -eq 0 ] ; then \ + echo "Test unit file $(UNIT): failed" ; \ + else \ + echo "Test unit file $(UNIT): ok" ; \ + fi ; \ fi ; \ else \ echo "Test unit file $(UNIT): not found" ; \

1 0

git:master:2815150b: nathelper: allow variable for nat_uac_test() parameter
by Daniel-Constantin Mierla 18 Nov '17

18 Nov '17

Module: kamailio Branch: master Commit: 2815150bf74cdda26c12d05f25d6b67adf033dc1 URL: https://github.com/kamailio/kamailio/commit/2815150bf74cdda26c12d05f25d6b67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-18T16:19:55+01:00 nathelper: allow variable for nat_uac_test() parameter --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/2815150bf74cdda26c12d05f25d6b67… Patch: https://github.com/kamailio/kamailio/commit/2815150bf74cdda26c12d05f25d6b67… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index d34d807408..d6878e3176 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -207,7 +207,7 @@ static cmd_export_t cmds[] = { fixup_fix_sdp, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"nat_uac_test", (cmd_function)nat_uac_test_f, 1, - fixup_uint_null, 0, + fixup_igp_null, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"fix_nated_register", (cmd_function)fix_nated_register_f, 0, fixup_fix_nated_register, 0, @@ -1441,7 +1441,12 @@ static int nat_uac_test(struct sip_msg *msg, int tests) static int nat_uac_test_f(struct sip_msg *msg, char *str1, char *str2) { - return nat_uac_test(msg, (int)(long)str1); + int tflags = 0; + if(fixup_get_ivalue(msg, (gparam_t*)str1, &tflags)<0) { + LM_ERR("failed to get the value for flags parameter\n"); + return -1; + } + return nat_uac_test(msg, tflags); } static int is_rfc1918(struct sip_msg *msg, str *address) @@ -2101,7 +2106,7 @@ static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) int hdr_param = 0; if(str1) { - if(fixup_get_ivalue(msg, (gparam_t*))str1, &hdr_param)<0) { + if(fixup_get_ivalue(msg, (gparam_t*)str1, &hdr_param)<0) { LM_ERR("failed to get falgs parameter\n"); return -1; }

1 0

git:master:6b65ff70: nathelper: export add_rcv_param(flags) to kemi interface
by Daniel-Constantin Mierla 18 Nov '17

18 Nov '17

Module: kamailio Branch: master Commit: 6b65ff70d505680fa3904f659c47d466e77b38c6 URL: https://github.com/kamailio/kamailio/commit/6b65ff70d505680fa3904f659c47d46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-18T16:26:29+01:00 nathelper: export add_rcv_param(flags) to kemi interface --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/6b65ff70d505680fa3904f659c47d46… Patch: https://github.com/kamailio/kamailio/commit/6b65ff70d505680fa3904f659c47d46… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index d6878e3176..a34d0a19dd 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2097,20 +2097,12 @@ static int create_rcv_uri(str *uri, struct sip_msg *m) * Add received parameter to Contacts for further * forwarding of the REGISTER requuest */ -static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) +static int ki_add_rcv_param(sip_msg_t *msg, int hdr_param) { contact_t *c; struct lump *anchor; char *param; str uri; - int hdr_param = 0; - - if(str1) { - if(fixup_get_ivalue(msg, (gparam_t*)str1, &hdr_param)<0) { - LM_ERR("failed to get falgs parameter\n"); - return -1; - } - } if(create_rcv_uri(&uri, msg) < 0) { return -1; @@ -2160,6 +2152,22 @@ static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) return 1; } +/* + * Add received parameter to Contacts for further + * forwarding of the REGISTER requuest + */ +static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) +{ + int hdr_param = 0; + + if(str1) { + if(fixup_get_ivalue(msg, (gparam_t*)str1, &hdr_param)<0) { + LM_ERR("failed to get falgs parameter\n"); + return -1; + } + } + return ki_add_rcv_param(msg, hdr_param); +} /* * Create an AVP to be used by registrar with the source IP and port @@ -2399,6 +2407,11 @@ static sr_kemi_t sr_kemi_nathelper_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("nathelper"), str_init("add_rcv_param"), + SR_KEMIP_INT, ki_add_rcv_param, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:d2120dae: nathelper: support to use variable for flags param of add_rcv_param()
by Daniel-Constantin Mierla 18 Nov '17

18 Nov '17

Module: kamailio Branch: master Commit: d2120dae8bb76dfaa7057883c1f10950d35d4e48 URL: https://github.com/kamailio/kamailio/commit/d2120dae8bb76dfaa7057883c1f1095… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-18T16:07:19+01:00 nathelper: support to use variable for flags param of add_rcv_param() --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/d2120dae8bb76dfaa7057883c1f1095… Patch: https://github.com/kamailio/kamailio/commit/d2120dae8bb76dfaa7057883c1f1095… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index b333d8d7ef..d34d807408 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -216,7 +216,7 @@ static cmd_export_t cmds[] = { 0, 0, REQUEST_ROUTE }, {"add_rcv_param", (cmd_function)add_rcv_param_f, 1, - fixup_uint_null, 0, + fixup_igp_null, 0, REQUEST_ROUTE }, {"is_rfc1918", (cmd_function)is_rfc1918_f, 1, fixup_spve_null, 0, @@ -2098,9 +2098,14 @@ static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) struct lump *anchor; char *param; str uri; - int hdr_param; + int hdr_param = 0; - hdr_param = str1 ? 0 : 1; + if(str1) { + if(fixup_get_ivalue(msg, (gparam_t*))str1, &hdr_param)<0) { + LM_ERR("failed to get falgs parameter\n"); + return -1; + } + } if(create_rcv_uri(&uri, msg) < 0) { return -1;

1 0

git:master:bcc5a668: nathelper: clang format the code
by Daniel-Constantin Mierla 18 Nov '17

18 Nov '17

Module: kamailio Branch: master Commit: bcc5a66815ea21a762c22a8222afc621b42bb94d URL: https://github.com/kamailio/kamailio/commit/bcc5a66815ea21a762c22a8222afc62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-18T15:56:18+01:00 nathelper: clang format the code --- Modified: src/modules/nathelper/nathelper.c Modified: src/modules/nathelper/nathelper.h Modified: src/modules/nathelper/nhelpr_funcs.c Modified: src/modules/nathelper/nhelpr_funcs.h Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/bcc5a66815ea21a762c22a8222afc62… Patch: https://github.com/kamailio/kamailio/commit/bcc5a66815ea21a762c22a8222afc62…

1 0

git:master:2cb94f28: core: test if ipv6 address starts with [ for subst snd lumps
by Daniel-Constantin Mierla 17 Nov '17

17 Nov '17

Module: kamailio Branch: master Commit: 2cb94f28d7d214d22ccdb6a5b993b391f61ea15b URL: https://github.com/kamailio/kamailio/commit/2cb94f28d7d214d22ccdb6a5b993b39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-17T14:33:46+01:00 core: test if ipv6 address starts with [ for subst snd lumps - safer than the test against cached socket address known to be without [], allowing to pass any address value to be used - reported by GH #1315 --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/2cb94f28d7d214d22ccdb6a5b993b39… Patch: https://github.com/kamailio/kamailio/commit/2cb94f28d7d214d22ccdb6a5b993b39… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 725d6290c9..ca0f9fa521 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -678,8 +678,8 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, case SUBST_SND_IP: \ if (send_sock){ \ new_len+=send_address_str->len; \ - if (send_sock->address.af!=AF_INET && \ - send_address_str==&(send_sock->address_str)) \ + if (send_sock->address.af==AF_INET6 && \ + send_address_str->s[0]!='[') \ new_len+=2; \ }else{ \ LM_CRIT("FIXME: null send_sock\n"); \ @@ -724,8 +724,8 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, case SUBST_SND_ALL: \ if (send_sock){ \ new_len+=send_address_str->len; \ - if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))) \ + if ((send_sock->address.af==AF_INET6) && \ + (send_address_str->s[0]!='[')) \ new_len+=2; \ if ((send_sock->port_no!=SIP_PORT) || \ (send_port_str!=&(send_sock->port_no_str))){ \ @@ -766,7 +766,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, default: \ LM_CRIT("unknown subst type %d\n", (subst_l)->u.subst); \ } - + if (send_info){ send_sock=send_info->send_sock; }else{ @@ -935,7 +935,7 @@ void process_lumps( struct sip_msg* msg, default:\ LM_CRIT("unknown comp %d\n", msg->rcv.comp); \ } - + #define SENDCOMP_PARAM_ADD \ /* add ;comp=xxxx */ \ switch(send_info->comp){ \ @@ -956,7 +956,7 @@ void process_lumps( struct sip_msg* msg, break;\ default:\ LM_CRIT("unknown comp %d\n", msg->rcv.comp); \ - } + } #else #define RCVCOMP_PARAM_ADD #define SENDCOMP_PARAM_ADD @@ -1057,14 +1057,14 @@ void process_lumps( struct sip_msg* msg, case SUBST_SND_IP: \ if (send_sock){ \ if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))){\ + (send_address_str->s[0]!='[')){\ new_buf[offset]='['; offset++; \ }\ memcpy(new_buf+offset, send_address_str->s, \ send_address_str->len); \ offset+=send_address_str->len; \ if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))){\ + (send_address_str->s[0]!='[')){\ new_buf[offset]=']'; offset++; \ }\ }else{ \ @@ -1086,14 +1086,14 @@ void process_lumps( struct sip_msg* msg, if (send_sock){ \ /* address */ \ if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))){\ + (send_address_str->s[0]!='[')){\ new_buf[offset]='['; offset++; \ }\ memcpy(new_buf+offset, send_address_str->s, \ send_address_str->len); \ offset+=send_address_str->len; \ if ((send_sock->address.af!=AF_INET) && \ - (send_address_str==&(send_sock->address_str))){\ + (send_address_str->s[0]!='[')){\ new_buf[offset]=']'; offset++; \ }\ /* :port */ \

1 0

[kamailio/kamailio] nat_traversal: fixing ipv6 contact for fix_contact function in cfg. (#1319)
by Surendra Tiwari 17 Nov '17

17 Nov '17

- fix_contact for ipv6 addres,add the [] to the host part of contact header   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description when we detect the nat, we are using fix_contact to fix the contact header according to nat.but for ipv6, fix_contact doesn't add the [] to ip part of contact header.because of this we are getting bad contact header.we resolved this by adding [] to ipv6 address. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1319 -- Commit Summary -- * nat_traversal: correcting the ipv6 contact in fix_contact -- File Changes -- M src/modules/nat_traversal/nat_traversal.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1319.patch https://github.com/kamailio/kamailio/pull/1319.diff -- 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/pull/1319

2 3

git:master:6fc84ad9: Merge pull request #1319 from surendratiwari3/nat_traversal_ipv6_contact
by GitHub 17 Nov '17

17 Nov '17

Module: kamailio Branch: master Commit: 6fc84ad9efe4962cc7668851f7ca61cfcc25675f URL: https://github.com/kamailio/kamailio/commit/6fc84ad9efe4962cc7668851f7ca61c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-11-17T13:07:56+01:00 Merge pull request #1319 from surendratiwari3/nat_traversal_ipv6_contact nat_traversal: fixing ipv6 contact for fix_contact function in cfg. --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/6fc84ad9efe4962cc7668851f7ca61c… Patch: https://github.com/kamailio/kamailio/commit/6fc84ad9efe4962cc7668851f7ca61c… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d3c6c95057..ae38d7653b 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1478,8 +1478,16 @@ FixContact(struct sip_msg *msg) return -1; } - len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, - newip.s, newport, after.len, after.s); + if (msg->rcv.src_ip.af==AF_INET6) + { + len = sprintf(buf, "%.*s[%s]:%d%.*s", before_host.len, before_host.s, + newip.s, newport, after.len, after.s); + } + else + { + len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, + newip.s, newport, after.len, after.s); + } if (insert_new_lump_after(anchor, buf, len, (enum _hdr_types_t)HDR_CONTACT_F) == 0) { pkg_free(buf);

1 0

git:master:4838bca7: nat_traversal: correcting the ipv6 contact in fix_contact
by Surendra Tiwari 17 Nov '17

17 Nov '17

Module: kamailio Branch: master Commit: 4838bca79d5eb82d133b295d6e601c1924d7ac11 URL: https://github.com/kamailio/kamailio/commit/4838bca79d5eb82d133b295d6e601c1… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2017-11-17T11:39:55Z nat_traversal: correcting the ipv6 contact in fix_contact - fix_contact for ipv6 addres,add the [] to the host part of contact header --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/4838bca79d5eb82d133b295d6e601c1… Patch: https://github.com/kamailio/kamailio/commit/4838bca79d5eb82d133b295d6e601c1… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index d3c6c95057..ae38d7653b 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1478,8 +1478,16 @@ FixContact(struct sip_msg *msg) return -1; } - len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, - newip.s, newport, after.len, after.s); + if (msg->rcv.src_ip.af==AF_INET6) + { + len = sprintf(buf, "%.*s[%s]:%d%.*s", before_host.len, before_host.s, + newip.s, newport, after.len, after.s); + } + else + { + len = sprintf(buf, "%.*s%s:%d%.*s", before_host.len, before_host.s, + newip.s, newport, after.len, after.s); + } if (insert_new_lump_after(anchor, buf, len, (enum _hdr_types_t)HDR_CONTACT_F) == 0) { pkg_free(buf);

1 0

[kamailio/kamailio] nat_traversal: fixing ipv6 contact for fix_contact function in cfg . (#1318)
by Surendra Tiwari 17 Nov '17

17 Nov '17

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1318 -- Commit Summary -- * nat_traversal: fixing ipv6 contact for fix_contact function in cfg -- File Changes -- M src/modules/nat_traversal/nat_traversal.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1318.patch https://github.com/kamailio/kamailio/pull/1318.diff -- 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/pull/1318

2 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev