sr-dev May 2020

sr-dev@lists.kamailio.org

24 participants
393 discussions

git:master:0fff35bd: usrloc: fix define name typo for the new keepalive management

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0fff35bd8368bc0a2a2236a6ee01456db1807911 URL: https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T21:48:29+02:00 usrloc: fix define name typo for the new keepalive management - user right db value index for null checking - ensure ending 0 doesn't overflow on aor building --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456… Patch: https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index a78f0aff54..cba8ec425c 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -101,8 +101,8 @@ int ul_ka_db_records(int partidx) int proto = 0; str host = STR_NULL; char *p = NULL; -#define ULKA_AURBUF_SIZE 1024 - char aorbuf[ULKA_AURBUF_SIZE]; +#define ULKA_AORBUF_SIZE 1024 + char aorbuf[ULKA_AORBUF_SIZE]; int i = 0; /* select fields */ @@ -231,12 +231,12 @@ int ul_ka_db_records(int partidx) /* user */ p = (char*)VAL_STRING(ROW_VALUES(row) + 6); - if (VAL_NULL(ROW_VALUES(row)+1) || p==0 || p[0]==0) { + if (VAL_NULL(ROW_VALUES(row)+6) || p==0 || p[0]==0) { LM_ERR("empty username -> skipping\n"); continue; } ur.aor.len = strlen(p); - if(ur.aor.len >= ULKA_AURBUF_SIZE) { + if(ur.aor.len >= ULKA_AORBUF_SIZE) { LM_DBG("long username ->skipping\n"); continue; } @@ -244,8 +244,8 @@ int ul_ka_db_records(int partidx) /* domain */ p = (char*)VAL_STRING(ROW_VALUES(row) + 7); - if (!(VAL_NULL(ROW_VALUES(row)+1) || p==0 || p[0]==0)) { - if(ur.aor.len + strlen(p) >= ULKA_AURBUF_SIZE - 1) { + if (!(VAL_NULL(ROW_VALUES(row)+7) || p==0 || p[0]==0)) { + if(ur.aor.len + strlen(p) >= ULKA_AORBUF_SIZE - 2) { LM_DBG("long aor ->skipping\n"); continue; }

4 years, 6 months

git:master:375d0146: presence: check for null head when reordering returned presentity list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 375d01466dffcef9e7064f4100a5afef48dbde39 URL: https://github.com/kamailio/kamailio/commit/375d01466dffcef9e7064f4100a5afe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T21:37:52+02:00 presence: check for null head when reordering returned presentity list --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/375d01466dffcef9e7064f4100a5afe… Patch: https://github.com/kamailio/kamailio/commit/375d01466dffcef9e7064f4100a5afe… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index 9c81b7bd8e..c313b01cf0 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -1296,7 +1296,9 @@ ps_presentity_t *ps_ptable_search(ps_presentity_t *ptm, int mmode, int rmode) ptl->prev = NULL; } ptd->next = pte; - pte->prev = ptd; + if(pte) { + pte->prev = ptd; + } pte = ptd; } else { if(ptd->prev) { @@ -1307,7 +1309,9 @@ ps_presentity_t *ps_ptable_search(ps_presentity_t *ptm, int mmode, int rmode) } ptd->next = pte; ptd->prev = NULL; - pte->prev = ptd; + if(pte) { + pte->prev = ptd; + } pte = ptd; } } @@ -1394,4 +1398,4 @@ ps_presentity_t *ps_ptable_get_expired(int eval) } return ptl; -} \ No newline at end of file +}

4 years, 6 months

git:master:aac577a4: core: safer truncation of hostname using memcpy

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aac577a4655ebf09d5cbef3e1a49f72d25ea57d7 URL: https://github.com/kamailio/kamailio/commit/aac577a4655ebf09d5cbef3e1a49f72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T21:28:01+02:00 core: safer truncation of hostname using memcpy --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/aac577a4655ebf09d5cbef3e1a49f72… Patch: https://github.com/kamailio/kamailio/commit/aac577a4655ebf09d5cbef3e1a49f72… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 6fba6bf147..d96cc99d0e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -800,11 +800,14 @@ static inline struct hostent* ip_addr2he(str* name, struct ip_addr* ip) static char* p_aliases[1]; static char* p_addr[2]; static char address[16]; + int len; p_aliases[0]=0; /* no aliases*/ p_addr[1]=0; /* only one address*/ p_addr[0]=address; - strncpy(hostname, name->s, (name->len<256)?(name->len)+1:256); + len = (name->len<255)?name->len:255; + memcpy(hostname, name->s, len); + hostname[len] = '\0'; if (ip->len>16) return 0; memcpy(address, ip->u.addr, ip->len);

4 years, 6 months

git:master:3e969a5b: sipdump: safety check for local socket pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3e969a5b4d9a75d082f7d59b0fa1dc6362391675 URL: https://github.com/kamailio/kamailio/commit/3e969a5b4d9a75d082f7d59b0fa1dc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T18:01:13+02:00 sipdump: safety check for local socket pointer - use generic address is not set --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e969a5b4d9a75d082f7d59b0fa1dc6… Patch: https://github.com/kamailio/kamailio/commit/3e969a5b4d9a75d082f7d59b0fa1dc6… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index ad867ff0ce..e61fea014d 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -433,8 +433,14 @@ int sipdump_msg_sent(sr_event_param_t *evp) sdi.tag.s = "snd"; sdi.tag.len = 3; - sdi.src_ip = evp->dst->send_sock->address_str; - sdi.src_port = (int)evp->dst->send_sock->port_no; + if(evp->dst->send_sock==NULL || evp->dst->send_sock->address_str.s==NULL) { + sdi.src_ip.len = 7; + sdi.src_ip.s = "0.0.0.0"; + sdi.src_port = 0; + } else { + sdi.src_ip = evp->dst->send_sock->address_str; + sdi.src_port = (int)evp->dst->send_sock->port_no; + } su2ip_addr(&ip, &evp->dst->to); sdi.dst_ip.len = ip_addr2sbufz(&ip, dstip_buf, IP_ADDR_MAX_STRZ_SIZE); sdi.dst_ip.s = dstip_buf;

4 years, 6 months

git:master:fc7b0d65: core: events - increased SREV_CB_LIST_SIZE

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fc7b0d65a227a176f79459c86844668bcd519148 URL: https://github.com/kamailio/kamailio/commit/fc7b0d65a227a176f79459c86844668… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T13:54:49+02:00 core: events - increased SREV_CB_LIST_SIZE - there can be several modules registering for these core callbacks --- Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/fc7b0d65a227a176f79459c86844668… Patch: https://github.com/kamailio/kamailio/commit/fc7b0d65a227a176f79459c86844668… --- diff --git a/src/core/events.h b/src/core/events.h index 6282e65a5a..df8a313055 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -38,7 +38,7 @@ #define SREV_NET_DATA_RECV 14 #define SREV_NET_DATA_SEND 15 -#define SREV_CB_LIST_SIZE 3 +#define SREV_CB_LIST_SIZE 8 typedef struct sr_event_param { void *data;

4 years, 6 months

git:master:e996aec3: modules: readme files regenerated - siptrace ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e996aec353972e7f0a4cb5e2a6156e2eee478954 URL: https://github.com/kamailio/kamailio/commit/e996aec353972e7f0a4cb5e2a6156e2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-07T20:46:12+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/e996aec353972e7f0a4cb5e2a6156e2… Patch: https://github.com/kamailio/kamailio/commit/e996aec353972e7f0a4cb5e2a6156e2… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 89a26c5948..9006415a23 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -444,8 +444,8 @@ modparam("siptrace", "trace_db_mode", 1) Kept for backward compatibily, use trace_db_mode instead. - If set to non-zero, ot sets trace_db_mode paremter to 1 when the module - is initialized. + If set to non-zero, ot sets trace_db_mode parameter to 1 when the + module is initialized. Default value is 0.

4 years, 6 months

git:master:5429a0ed: modules: readme files regenerated - keepalive ... [skip ci]

by The Root

Module: kamailio Branch: master Commit: 5429a0ed51a04c484e1def93887b344b2d90379f URL: https://github.com/kamailio/kamailio/commit/5429a0ed51a04c484e1def93887b344… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2020-05-07T20:46:04+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/5429a0ed51a04c484e1def93887b344… Patch: https://github.com/kamailio/kamailio/commit/5429a0ed51a04c484e1def93887b344… --- diff --git a/src/modules/keepalive/README b/src/modules/keepalive/README index 150da0acdc..4437803128 100644 --- a/src/modules/keepalive/README +++ b/src/modules/keepalive/README @@ -55,8 +55,8 @@ Yasin CANER 1. Available Functions - 1.1. add_destination(uri, owner, flags, [callback, - [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, + [callback, [user_attr]]) 1.2. Examples @@ -324,7 +324,9 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, [callback, [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, [callback, + [user_attr]]) + 1.2. Examples The KeepAlive module provides an internal API to be used by other @@ -336,10 +338,13 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, [callback, [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, [callback, + [user_attr]]) + 1.2. Examples -1.1. add_destination(uri, owner, flags, [callback, [user_attr]]) +1.1. add_destination(uri, owner, flags, ping_interval, [callback, +[user_attr]]) This function registers a new destination to monitor. Monitoring of the destination starts as soon as it returns with success (0 value). @@ -354,6 +359,8 @@ Chapter 2. Developer Guide * owner (string) - module name “owning” the destination (for information purpose) * flags (integer) - destination flags (unused for now, use 0 value) + * ping_interval (integer) - Pinging interval in seconds for this + destination * callback (ka_statechanged_f, optional) - callback function, executed on destination's state change. The callback function is of type void (*ka_statechanged_f)(str @@ -398,7 +405,7 @@ void my_callback(str uri, int state, void *user_attr) { str dest = str_init("sip:192.168.10.21:5060"); str owner = str_init("mymodule"); -if (ka_api.add_destination(dest, owner, 0, my_callback, NULL) != 0) { +if (ka_api.add_destination(dest, owner, 0, 60, my_callback, NULL) != 0) { LM_ERR("can't add destination\n"); goto error; }

4 years, 6 months

git:master:9137f924: siptrace: small spelling fix in docs

by Henning Westerholt

Module: kamailio Branch: master Commit: 9137f924956920d660d9f9353d5117aa6eafe8a3 URL: https://github.com/kamailio/kamailio/commit/9137f924956920d660d9f9353d5117a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-07T18:45:22Z siptrace: small spelling fix in docs --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9137f924956920d660d9f9353d5117a… Patch: https://github.com/kamailio/kamailio/commit/9137f924956920d660d9f9353d5117a… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 56d69cb95b..5bd274a2f0 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -461,7 +461,7 @@ modparam("siptrace", "trace_db_mode", 1) Kept for backward compatibily, use trace_db_mode instead. </para> <para> - If set to non-zero, ot sets trace_db_mode paremter to 1 + If set to non-zero, ot sets trace_db_mode parameter to 1 when the module is initialized. </para> <para>

4 years, 6 months

git:master:1d555161: tm: small spelling fix in comments

by Henning Westerholt

Module: kamailio Branch: master Commit: 1d555161195ebccd35534f8533eacdcbba7020fc URL: https://github.com/kamailio/kamailio/commit/1d555161195ebccd35534f8533eacdc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-07T18:45:04Z tm: small spelling fix in comments --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/1d555161195ebccd35534f8533eacdc… Patch: https://github.com/kamailio/kamailio/commit/1d555161195ebccd35534f8533eacdc… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index 7600237398..c76fbb887a 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -408,7 +408,7 @@ static void rpc_uac_callback(struct cell* t, int type, struct tmcb_params* ps) * If all the parameters are ok it will call t_uac() using them. * Note: this version will wait for the transaction final reply * only if reply_wait is set to 1. Otherwise the rpc reply will be sent - * immediately and it will be success if the paremters were ok and t_uac did + * immediately and it will be success if the parameters were ok and t_uac did * not report any error. * Note: reply waiting (reply_wait==1) is not yet supported. * @param rpc - rpc handle

4 years, 6 months

[kamailio/kamailio] ims_usrloc_scscf: extend and fix log messages (#2316)

by alexyosifov

#### 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/2316 -- Commit Summary -- * ims_usrloc_scscf: extend and fix log messages -- File Changes -- M src/modules/ims_usrloc_scscf/impurecord.c (22) M src/modules/ims_usrloc_scscf/subscribe.c (4) M src/modules/ims_usrloc_scscf/udomain.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2316.patch https://github.com/kamailio/kamailio/pull/2316.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/2316

4 years, 6 months

← Newer
1
...
25
26
27
28
29
30
31
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2020