sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
475 discussions

git:master:c0bc3861: presence: extra columns updated for dbmode 2

by lazedo

Module: kamailio Branch: master Commit: c0bc38616cb9a2923e35545fa86a663686bc6746 URL: https://github.com/kamailio/kamailio/commit/c0bc38616cb9a2923e35545fa86a663… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-12-08T08:50:44Z presence: extra columns updated for dbmode 2 we noticed some phones and upstream clusters sending diferent route / contact after initial subscription. this commit adds contact and record_route to updated columns for dbmode = 2 also adds user_agent to initial save and a simple fix for getting the correct message in debug --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/c0bc38616cb9a2923e35545fa86a663… Patch: https://github.com/kamailio/kamailio/commit/c0bc38616cb9a2923e35545fa86a663…

7 years

git:master:cae249d5: tm: restore backup char inside ki_t_check_status()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cae249d58c1155c2f13c56e8f1251fcadb5483c0 URL: https://github.com/kamailio/kamailio/commit/cae249d58c1155c2f13c56e8f1251fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:47:38+01:00 tm: restore backup char inside ki_t_check_status() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/cae249d58c1155c2f13c56e8f1251fc… Patch: https://github.com/kamailio/kamailio/commit/cae249d58c1155c2f13c56e8f1251fc… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 7d7145393b..90f9a989ea 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -995,6 +995,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) /* first get the transaction */ if (t_check(msg, 0 ) == -1) return -1; + backup = 0; if ((t = get_t()) == 0) { LM_ERR("cannot check status for a reply" " which has no T-state established\n"); @@ -1010,7 +1011,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) switch(get_route_type()) { case REQUEST_ROUTE: /* use the status of the last sent reply */ - status = int2str( t->uas.status, 0); + status = int2str(t->uas.status, 0); break; case TM_ONREPLY_ROUTE: @@ -1037,7 +1038,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) " a final response in FAILURE_ROUTE\n"); goto error; } - status = int2str( lowest_status , 0); + status = int2str(lowest_status, 0); break; case BRANCH_FAILURE_ROUTE: status = int2str(t->uac[get_t_branch()].last_received, 0); @@ -1052,6 +1053,7 @@ static int ki_t_check_status(sip_msg_t* msg, str *sexp) /* do the checking */ n = regexec(&re, status, 1, &pmatch, 0); + if (backup) status[msg->first_line.u.reply.status.len] = backup; regfree(&re); if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ @@ -2979,4 +2981,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(tm_kemi_exports); return 0; -} \ No newline at end of file +}

7 years

[kamailio/kamailio] GeoIP2 not available into deb package (#1352)

by Surendra Tiwari

### Description I am trying to install geoip2 using apt-get but found its not available into debian repo. apt-get kamailio-geoip2-modules  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1352

7 years

git:master:f4f2b7b2: pkg/kamailio/deb: geoip2 module [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: f4f2b7b201d1cc5bbb0cc915835873a1e03270ac URL: https://github.com/kamailio/kamailio/commit/f4f2b7b201d1cc5bbb0cc915835873a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-08T09:46:29+01:00 pkg/kamailio/deb: geoip2 module [skip ci] fix #1352 --- Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules 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/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/f4f2b7b201d1cc5bbb0cc915835873a… Patch: https://github.com/kamailio/kamailio/commit/f4f2b7b201d1cc5bbb0cc915835873a…

7 years

git:master:5d813bb3: textopsx: proper check for null value inside ki_modify_hf()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5d813bb3abd1a9a0ee080bf67db2f5502772a3be URL: https://github.com/kamailio/kamailio/commit/5d813bb3abd1a9a0ee080bf67db2f55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:31:21+01:00 textopsx: proper check for null value inside ki_modify_hf() --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/5d813bb3abd1a9a0ee080bf67db2f55… Patch: https://github.com/kamailio/kamailio/commit/5d813bb3abd1a9a0ee080bf67db2f55… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index a6d7abc65e..24bdf0c84f 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -1183,7 +1183,7 @@ static int ki_modify_hf(sip_msg_t *msg, str *hexp, str *val, p1 = NULL; goto error; } - if(val && val->s>=0) { + if(val && val->s!=0 && val->len>0) { s2 = as_asciiz(val); p2 = s2; if(fixf(&p2, 2)!=0) { @@ -1202,7 +1202,6 @@ static int ki_modify_hf(sip_msg_t *msg, str *hexp, str *val, return ret; error: - if(p2!=NULL) fixup_free_hname_str(&p2, 2); if(p1!=NULL) fixup_free_hname_str(&p1, 1); if(s2!=NULL) pkg_free(s2); if(s1!=NULL) pkg_free(s1);

7 years

git:master:de4a32b0: rabbitmq: proper test of pv cache lookup return

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: de4a32b02ddaf94b0ad4ed06a0b4fa5bb9c1a10e URL: https://github.com/kamailio/kamailio/commit/de4a32b02ddaf94b0ad4ed06a0b4fa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:27:11+01:00 rabbitmq: proper test of pv cache lookup return --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/de4a32b02ddaf94b0ad4ed06a0b4fa5… Patch: https://github.com/kamailio/kamailio/commit/de4a32b02ddaf94b0ad4ed06a0b4fa5… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 4e6e390d18..1e5ae7f351 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -507,7 +507,7 @@ static int ki_rabbitmq_publish_consume(sip_msg_t *msg, str *exchange, dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed getting pv: %.*s\n", dpv->len, dpv->s); return -1; } @@ -669,4 +669,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_rabbitmq_exports); return 0; -} \ No newline at end of file +}

7 years

git:master:816d2cd4: presence: increased the size of db update arrays in update_subs_db()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 816d2cd44d96245b5a5b53505d6fbc350bda378c URL: https://github.com/kamailio/kamailio/commit/816d2cd44d96245b5a5b53505d6fbc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:25:12+01:00 presence: increased the size of db update arrays in update_subs_db() --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/816d2cd44d96245b5a5b53505d6fbc3… Patch: https://github.com/kamailio/kamailio/commit/816d2cd44d96245b5a5b53505d6fbc3… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index f199f95c58..fb0fa719ad 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -372,8 +372,8 @@ int insert_subs_db(subs_t* s, int type) int update_subs_db(subs_t* subs, int type) { - db_key_t query_cols[3], update_keys[8]; - db_val_t query_vals[3], update_vals[8]; + db_key_t query_cols[3], update_keys[10]; + db_val_t query_vals[3], update_vals[10]; int n_update_cols= 0; int n_query_cols = 0;

7 years

git:master:9e0fbfd9: peering: check return code when parsing all headers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9e0fbfd9a79764fb283b6a6864e6519e167fff82 URL: https://github.com/kamailio/kamailio/commit/9e0fbfd9a79764fb283b6a6864e6519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:22:20+01:00 peering: check return code when parsing all headers --- Modified: src/modules/peering/verify.c --- Diff: https://github.com/kamailio/kamailio/commit/9e0fbfd9a79764fb283b6a6864e6519… Patch: https://github.com/kamailio/kamailio/commit/9e0fbfd9a79764fb283b6a6864e6519… --- diff --git a/src/modules/peering/verify.c b/src/modules/peering/verify.c index b3138c6fde..6865cf1b41 100644 --- a/src/modules/peering/verify.c +++ b/src/modules/peering/verify.c @@ -328,7 +328,10 @@ int verify_source(struct sip_msg* _msg, char* s1, char* s2) } /* Add P-Request-Hash header body */ - parse_headers(_msg, HDR_EOH_F, 0); + if(parse_headers(_msg, HDR_EOH_F, 0)<0) { + LM_ERR("failed to parse headers\n"); + return -1; + } for (hf = _msg->headers; hf; hf = hf->next) { if(cmp_hdrname_strzn(&hf->name, "P-Request-Hash", sizeof("P-Request-Hash") - 1) == 0)

7 years

git:master:c0c374ef: lcr: safety checks for parms of kemi functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c0c374ef15a99eef745570dd78926f6248187493 URL: https://github.com/kamailio/kamailio/commit/c0c374ef15a99eef745570dd78926f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:20:02+01:00 lcr: safety checks for parms of kemi functions --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c0c374ef15a99eef745570dd78926f6… Patch: https://github.com/kamailio/kamailio/commit/c0c374ef15a99eef745570dd78926f6… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index eecab748f6..beeeec0e23 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2201,8 +2201,9 @@ static int ki_load_gws_furi(sip_msg_t *_m, int lcr_id, str *ruri_user, struct usr_avp *avp; struct search_state st; - LM_DBG("load_gws(%u, %.*s, %.*s)\n", lcr_id, ruri_user->len, ruri_user->s, - from_uri->len, from_uri->s); + LM_DBG("load_gws(%u, %.*s, %.*s)\n", lcr_id, + ruri_user->len, ZSW(ruri_user->s), + from_uri->len, ZSW(from_uri->s)); request_uri = GET_RURI(_m); @@ -2363,6 +2364,10 @@ static int ki_load_gws_ruser(sip_msg_t *_m, int lcr_id, str *ruri_user) { str from_uri = STR_NULL; + if(ruri_user==NULL || ruri_user->s==NULL) { + LM_ERR("invalid parameter\n"); + return -1; + } return ki_load_gws_furi(_m, lcr_id, ruri_user, &from_uri); } @@ -2371,9 +2376,15 @@ static int ki_load_gws_ruser(sip_msg_t *_m, int lcr_id, str *ruri_user) */ static int ki_load_gws(sip_msg_t *_m, int lcr_id) { - str ruri_user = STR_NULL; + str ruri_user; str from_uri = STR_NULL; + if ((parse_sip_msg_uri(_m) < 0) || (!_m->parsed_uri.user.s)) { + LM_ERR("error while parsing R-URI\n"); + return -1; + } + ruri_user = _m->parsed_uri.user; + return ki_load_gws_furi(_m, lcr_id, &ruri_user, &from_uri); } @@ -3444,4 +3455,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_lcr_exports); return 0; -} \ No newline at end of file +}

7 years

git:master:74215ac1: http_client: fixed safety check looking up var names

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 74215ac16878cc00cf29ae0fc89dfc9aa9ed9399 URL: https://github.com/kamailio/kamailio/commit/74215ac16878cc00cf29ae0fc89dfc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-08T09:07:40+01:00 http_client: fixed safety check looking up var names --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/74215ac16878cc00cf29ae0fc89dfc9… Patch: https://github.com/kamailio/kamailio/commit/74215ac16878cc00cf29ae0fc89dfc9… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index 4a19be6b18..9b8abc984d 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -561,7 +561,7 @@ static int ki_curl_connect(sip_msg_t *_m, str *con, str *url, str *dpv) pv_spec_t *dst; dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s); return -1; } @@ -635,7 +635,7 @@ static int ki_curl_connect_post(sip_msg_t *_m, str *con, str *url, pv_spec_t *dst; dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s); return -1; } @@ -810,7 +810,7 @@ static int ki_http_query_post_hdrs(sip_msg_t *_m, str *url, str *post, str *hdrs pv_spec_t *dst; dst = pv_cache_get(dpv); - if(dpv==NULL) { + if(dst==NULL) { LM_ERR("failed to get pv spec for: %.*s\n", dpv->len, dpv->s); return -1; }

7 years

← Newer
1
...
35
36
37
38
39
40
41
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017