sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
287 discussions

git:master:316c8060: mtree: Fix some typos, adjust some formatting

by Olle E. Johansson

Module: kamailio Branch: master Commit: 316c80607243387015e35ac423238c5a32401a44 URL: https://github.com/kamailio/kamailio/commit/316c80607243387015e35ac423238c5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2021-05-28T09:38:31+02:00 mtree: Fix some typos, adjust some formatting --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/316c80607243387015e35ac423238c5… Patch: https://github.com/kamailio/kamailio/commit/316c80607243387015e35ac423238c5… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index badbd09dc8..c04f031cfd 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -175,37 +175,37 @@ static int mod_init(void) return -1; } - if(pv_parse_spec(&value_param, &pv_value)<00 + if(pv_parse_spec(&value_param, &pv_value) < 0 || !(pv_is_w(&pv_value))) { - LM_ERR("cannot parse value pv or is read only\n"); + LM_ERR("cannot parse value pv or pv is read-only\n"); return -1; } - if (pv_parse_spec(&values_param, &pv_values) <0 + if (pv_parse_spec(&values_param, &pv_values) < 0 || pv_values.type != PVT_AVP) { LM_ERR("cannot parse values avp\n"); return -1; } - if(pv_parse_spec(&dstid_param, &pv_dstid)<0 + if(pv_parse_spec(&dstid_param, &pv_dstid) < 0 || pv_dstid.type!=PVT_AVP) { LM_ERR("cannot parse dstid avp\n"); return -1; } - if(pv_parse_spec(&weight_param, &pv_weight)<0 + if(pv_parse_spec(&weight_param, &pv_weight) < 0 || pv_weight.type!=PVT_AVP) { - LM_ERR("cannot parse dstid avp\n"); + LM_ERR("cannot parse weight avp\n"); return -1; } - if(pv_parse_spec(&count_param, &pv_count)<0 + if(pv_parse_spec(&count_param, &pv_count) < 0 || !(pv_is_w(&pv_weight))) { - LM_ERR("cannot parse count pv or is read-only\n"); + LM_ERR("cannot parse count pv or pv is read-only\n"); return -1; } @@ -220,7 +220,7 @@ static int mod_init(void) LM_DBG("mt_char_list=%s \n", mt_char_list.s); mt_char_table_init(); - /* binding to mysql module */ + /* binding to database module */ if(db_bind_mod(&db_url, &mt_dbf)) { LM_ERR("database module not found\n"); @@ -614,7 +614,7 @@ static int mt_load_db(m_tree_t *pt) if(RES_ROWS(db_res)[0].values[0].type != DB1_STRING || RES_ROWS(db_res)[0].values[1].type != DB1_STRING) { - LM_ERR("wrond column types in db table (%d / %d)\n", + LM_ERR("wrong column types in db table (%d / %d)\n", RES_ROWS(db_res)[0].values[0].type, RES_ROWS(db_res)[0].values[1].type); goto error; @@ -1029,7 +1029,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) if(tr==NULL) { /* no tree with such name*/ - rpc->fault(ctx, 404, "Not found tree"); + rpc->fault(ctx, 404, "Tree not found"); goto error; } @@ -1038,7 +1038,7 @@ void rpc_mtree_match(rpc_t* rpc, void* ctx) LM_DBG("no prefix found in [%.*s] for [%.*s]\n", tname.len, tname.s, tomatch.len, tomatch.s); - rpc->fault(ctx, 404, "Not found"); + rpc->fault(ctx, 404, "Prefix not found"); } error:

3 years, 6 months

[kamailio/kamailio] IPV6 Contact Parsed as V4 notation (#2742)

by chappo

### Description Saving contact location details for IPV6 client via UDP results in a IPv4 notation. Changing to TCP correctly saves the IPV6 notation and functions correctly. ### Troubleshooting Tested on 4.4 / 4.5 & Devel. Default and custom configuration #### Reproduction Using default configuration the contact location for a IPv6 UDP client is saved as a shortened v4 style address. Using TCP with exact same configuration the client is correctly saved in IPV6 notation. #### Debugging Data May 23 03:29:50 localhost /usr/local/sbin/kamailio[32104]: DEBUG: <core> [core/udp_server.c:493]: udp_rcv_loop(): received on udp socket: (106/100/528) [[REGISTER sip:voip.domain.com SIP/2.0 0D 0A Via: SIP/2.0/UDP 32.1.128.4:52692;rport;branch=z9hG4bKPj]] May 23 03:29:50 localhost /usr/local/sbin/kamailio[32104]: DEBUG: {1 8093 REGISTER nTrprYhDHmupMBiLT6fuYVwvy31d0YPB} <core> [core/socket_info.c:641]: grep_sock_info(): checking if host==us: 39==33 && [2001:8004:13C1:7751:7999:6FB5:216D:A4A8] == [2400:8907:0:0:F03C:92FF:FE22:XXXX] #### Log Messages [syslog.log](https://github.com/kamailio/kamailio/files/6527523/syslog.log) #### SIP Traffic ![IPV6TCP-Issue](https://user-images.githubusercontent.com/1019075/119247055-466fad80-bbb9-11eb-90b7-1a42f4a0cc6c.png) ![IPV6UDP-Issue](https://user-images.githubusercontent.com/1019075/119247057-496a9e00-bbb9-11eb-92d3-fed71109d009.png) ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.5.0 (x86_64/linux) ef765d flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: ef765d compiled on 03:53:39 May 23 2021 with gcc 8.3.0 version: kamailio 5.5.0 (x86_64/linux) ef765d flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: ef765d compiled on 04:15:07 May 23 2021 with gcc 8.3.0 * **Operating System**: 4.19.0-16-amd64 #1 SMP Debian 4.19.181-1 (2021-03-19) x86_64 GNU/Linux -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2742

3 years, 6 months

git:master:5a987e89: pv: new variables $hfl(name)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5a987e89fddd0574eeaf5580d3b1f8b078cbfa3d URL: https://github.com/kamailio/kamailio/commit/5a987e89fddd0574eeaf5580d3b1f8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-27T15:22:32+02:00 pv: new variables $hfl(name) - similar to $hdr(name), but for some of the standard headers that can have many bodies serialized in the same header field is able to return the individual body values - so far implemented for Via - for the rest of the headers works like $hdr(name) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/5a987e89fddd0574eeaf5580d3b1f8b… Patch: https://github.com/kamailio/kamailio/commit/5a987e89fddd0574eeaf5580d3b1f8b…

3 years, 7 months

git:5.5:c20487a4: pkg/kamailio/deb: missing lwsc module files [skip ci]

by Victor Seva

Module: kamailio Branch: 5.5 Commit: c20487a44aac003414378202935586b746bc2f4e URL: https://github.com/kamailio/kamailio/commit/c20487a44aac003414378202935586b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-05-27T14:08:32+02:00 pkg/kamailio/deb: missing lwsc module files [skip ci] fixes #2749 (cherry picked from commit f49d97fc92d3dbfa11c11ca453b9639aa7f81221) --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch 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/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/c20487a44aac003414378202935586b… Patch: https://github.com/kamailio/kamailio/commit/c20487a44aac003414378202935586b…

3 years, 7 months

git:master:f49d97fc: pkg/kamailio/deb: missing lwsc module files [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: f49d97fc92d3dbfa11c11ca453b9639aa7f81221 URL: https://github.com/kamailio/kamailio/commit/f49d97fc92d3dbfa11c11ca453b9639… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-05-27T14:06:39+02:00 pkg/kamailio/deb: missing lwsc module files [skip ci] fixes #2749 --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch 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/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/f49d97fc92d3dbfa11c11ca453b9639… Patch: https://github.com/kamailio/kamailio/commit/f49d97fc92d3dbfa11c11ca453b9639…

3 years, 7 months

git:master:3f2c61a9: modules: readme files regenerated - textops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3f2c61a9834fba9c57bb73af640612aaaf4ec524 URL: https://github.com/kamailio/kamailio/commit/3f2c61a9834fba9c57bb73af640612a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-26T15:46:17+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/3f2c61a9834fba9c57bb73af640612a… Patch: https://github.com/kamailio/kamailio/commit/3f2c61a9834fba9c57bb73af640612a…

3 years, 7 months

git:master:c6ce384e: textops: docs for remove_hf_idx() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c6ce384e479ed21aae803a78fc5835e774fe521d URL: https://github.com/kamailio/kamailio/commit/c6ce384e479ed21aae803a78fc5835e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T15:43:50+02:00 textops: docs for remove_hf_idx() function --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c6ce384e479ed21aae803a78fc5835e… Patch: https://github.com/kamailio/kamailio/commit/c6ce384e479ed21aae803a78fc5835e… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 6f3ab09f9a..4427ee1e00 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1497,6 +1497,44 @@ if(remove_hf_exp_pv("^$var(match)", "^$var(keep)")) </example> </section> + <section id="textops.f.remove_hf_idx"> + <title> + <function moreinfo="none">remove_hf_idx(hname, idx)</function> + </title> + <para> + Remove from message the headers matching by name 'hname' with + the index 'idx'. + </para> + <para> + Returns true if the header is removed. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hname</emphasis> - header name.</para> + </listitem> + <listitem> + <para><emphasis>idx</emphasis> - index of the header, starting + from 0 with first header; negative values count from the end of + the headers, -1 being the last header matching the name.</para> + </listitem> + </itemizedlist> + <para> + The parameters can be config variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>remove_hf_idx</function> usage</title> + <programlisting format="linespecific"> +... +remove_hf_idx("X-My-Header", "-1"); +... +</programlisting> + </example> + </section> + <section id="textops.f.has_body"> <title> <function moreinfo="none">has_body()</function>,

3 years, 7 months

git:master:91a873df: textops: added remove_hf_idx(hname, idx)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 91a873dfe070f8041743ea93fafdac438763a2d1 URL: https://github.com/kamailio/kamailio/commit/91a873dfe070f8041743ea93fafdac4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T15:29:11+02:00 textops: added remove_hf_idx(hname, idx) - function to remove a header by name and index --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/91a873dfe070f8041743ea93fafdac4… Patch: https://github.com/kamailio/kamailio/commit/91a873dfe070f8041743ea93fafdac4… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 2998906051..b192c1306c 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -143,6 +143,7 @@ static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int remove_hf_exp_f(sip_msg_t* msg, char* ematch, char* eskip); static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int remove_hf_pv_f(sip_msg_t* msg, char* phf, char* foo); +static int remove_hf_idx_f(sip_msg_t* msg, char* phname, char* pidx); static int remove_hf_re_pv_f(sip_msg_t* msg, char* key, char* foo); static int remove_hf_exp_pv_f(sip_msg_t* msg, char* ematch, char* eskip); static int is_present_hf_pv_f(sip_msg_t* msg, char* key, char* foo); @@ -239,6 +240,9 @@ static cmd_export_t cmds[]={ {"remove_hf", (cmd_function)remove_hf_f, 1, hname_fixup, free_hname_fixup, ANY_ROUTE}, + {"remove_hf_idx", (cmd_function)remove_hf_idx_f, 2, + fixup_spve_igp, fixup_free_spve_igp, + ANY_ROUTE}, {"remove_hf_re", (cmd_function)remove_hf_re_f, 1, fixup_regexp_null, fixup_free_regexp_null, ANY_ROUTE}, @@ -1747,6 +1751,84 @@ int remove_hf_f(struct sip_msg* msg, char* str_hf, char* foo) return cnt==0 ? -1 : 1; } +static int ki_remove_hf_idx(sip_msg_t* msg, str* hname, int idx) +{ + hdr_field_t hfm = {0}; + hdr_field_t *hfi = NULL; + sr_lump_t *anchor = NULL; + int i = 0; + int rm = 0; + int pos = 0; + + /* ensure all headers are parsed */ + if(parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_ERR("error parsing headers\n"); + return -1; + } + + if(parse_hname2_str(hname, &hfm)==NULL) { + LM_ERR("failed to parse header name [%.*s]\n", hname->len, hname->s); + return -1; + } + + LM_DBG("trying to remove hf: %.*s - index: %d\n", hname->len, hname->s, idx); + if(idx>=0) { + rm = 1; + } + pos = idx; + +again: + for (hfi=msg->headers; hfi; hfi=hfi->next) { + if (hfm.type!=HDR_OTHER_T && hfm.type!=HDR_ERROR_T) { + if (hfm.type!=hfi->type) { + continue; + } + } else { + if (hfi->name.len!=hname->len) { + continue; + } + if(strncasecmp(hfi->name.s, hname->s, hname->len)!=0) { + continue; + } + } + if(rm==1 && i==pos) { + anchor=del_lump(msg, hfi->name.s - msg->buf, hfi->len, 0); + if (anchor==0) { + LM_ERR("cannot remove hdr %.*s\n", hname->len, hname->s); + return -1; + } + return 1; + } + i++; + } + if(rm==1) { + /* header not found */ + return 2; + } + pos = i + idx; + if(pos>=0) { + rm = 1; + goto again; + } + return 1; +} + +static int remove_hf_idx_f(sip_msg_t* msg, char* phname, char* pidx) +{ + str hname = STR_NULL; + int idx = 0; + + if(fixup_get_svalue(msg, (gparam_t*)phname, &hname)<0) { + LM_ERR("failed to get header name\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t*)pidx, &idx)<0) { + LM_ERR("failed to get header index\n"); + return -1; + } + return ki_remove_hf_idx(msg, &hname, idx); +} + static int remove_hf_re(sip_msg_t* msg, regex_t *re) { struct hdr_field *hf; @@ -4984,6 +5066,11 @@ 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("remove_hf_idx"), + SR_KEMIP_INT, ki_remove_hf_idx, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textops"), str_init("remove_hf_exp"), SR_KEMIP_INT, ki_remove_hf_exp, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

3 years, 7 months

git:5.4:dd09c233: core: xavp - safety checks for name len

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: dd09c233417129694ffb7481b03d465defae447d URL: https://github.com/kamailio/kamailio/commit/dd09c233417129694ffb7481b03d465… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:29:04+02:00 core: xavp - safety checks for name len (cherry picked from commit d22d812da1c3b2a2f65f142ef5ed5fa07e8ab072) (cherry picked from commit 6a5a61bfab80116338f6a9c91ed7ec5f7b98923b) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/dd09c233417129694ffb7481b03d465… Patch: https://github.com/kamailio/kamailio/commit/dd09c233417129694ffb7481b03d465… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e27c07bd6f..5f160a1ceb 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -106,7 +106,7 @@ static sr_xavp_t *xavp_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_raw(name->s, name->len); @@ -427,7 +427,7 @@ static int xavp_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_raw(name->s, name->len); @@ -498,7 +498,7 @@ int xavp_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_raw(name->s, name->len); @@ -865,7 +865,7 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avp = *list; if(avp!=NULL) { @@ -1157,7 +1157,7 @@ static sr_xavp_t *xavu_get_internal(str *name, sr_xavp_t **list, sr_xavp_t **prv sr_xavp_t *avu; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return NULL; } @@ -1235,7 +1235,7 @@ int xavu_rm_by_name(str *name, sr_xavp_t **head) unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { return -1; } @@ -1466,7 +1466,7 @@ static sr_xavp_t *xavi_new_value(str *name, sr_xval_t *val) int size; unsigned int id; - if(name==NULL || name->s==NULL || val==NULL) + if(name==NULL || name->s==NULL || name->len<=0 || val==NULL) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1699,7 +1699,7 @@ static sr_xavp_t *xavi_get_internal(str *name, sr_xavp_t **list, int idx, sr_xav unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return NULL; id = get_hash1_case_raw(name->s, name->len); @@ -1826,7 +1826,7 @@ static int xavi_rm_internal(str *name, sr_xavp_t **head, int idx) int n=0; int count=0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return 0; id = get_hash1_case_raw(name->s, name->len); @@ -1909,7 +1909,7 @@ int xavi_count(str *name, sr_xavp_t **start) unsigned int id; int n = 0; - if(name==NULL || name->s==NULL) + if(name==NULL || name->s==NULL || name->len<=0) return -1; id = get_hash1_case_raw(name->s, name->len); @@ -2202,7 +2202,7 @@ sr_xavp_t *xavi_extract(str *name, sr_xavp_t **list) sr_xavp_t *prv = 0; unsigned int id; - if(name==NULL || name->s==NULL) { + if(name==NULL || name->s==NULL || name->len<=0) { if(list!=NULL) { avi = *list; if(avi!=NULL) {

3 years, 7 months

git:5.4:0675c3eb: presence: set correct type for local_log_facility modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 0675c3eb0fa95e19532cf812585f1eb021829dbc URL: https://github.com/kamailio/kamailio/commit/0675c3eb0fa95e19532cf812585f1eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-26T08:28:43+02:00 presence: set correct type for local_log_facility modparam (cherry picked from commit 5f4662a95a97d5224bf03745a9a354a41925706c) (cherry picked from commit 5bc7e1d636b617839f697838e326347b19cb0fcc) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/0675c3eb0fa95e19532cf812585f1eb… Patch: https://github.com/kamailio/kamailio/commit/0675c3eb0fa95e19532cf812585f1eb… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 301113aa03..09751bbc15 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -232,7 +232,7 @@ static param_export_t params[]={ { "fetch_rows", INT_PARAM, &pres_fetch_rows}, { "db_table_lock_type", INT_PARAM, &pres_db_table_lock_type}, { "local_log_level", PARAM_INT, &pres_local_log_level}, - { "local_log_facility", PARAM_STR, &pres_log_facility_str}, + { "local_log_facility", PARAM_STRING, &pres_log_facility_str}, { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order},

3 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021