sr-dev January 2019

sr-dev@lists.kamailio.org

27 participants
301 discussions

git:master:c47c759e: cnxcc: updated the export signature of set_max_credit() to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c47c759e6f59ec674c9c83a9e38d2620c36323c8 URL: https://github.com/kamailio/kamailio/commit/c47c759e6f59ec674c9c83a9e38d262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-12T18:15:28+01:00 cnxcc: updated the export signature of set_max_credit() to kemi - affected by last addition with connection cost --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c47c759e6f59ec674c9c83a9e38d262… Patch: https://github.com/kamailio/kamailio/commit/c47c759e6f59ec674c9c83a9e38d262… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index d1a7c17076..55d9bf00a1 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -2127,7 +2127,7 @@ static sr_kemi_t sr_kemi_cnxcc_exports[] = { { str_init("cnxcc"), str_init("set_max_credit"), SR_KEMIP_INT, ki_set_max_credit, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, - SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE } + SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT } }, { str_init("cnxcc"), str_init("set_max_time"), SR_KEMIP_INT, ki_set_max_time,

5 years, 4 months

git:5.0:3dcde884: cdp: fix three coverity errors (ressource leaks and error checks)

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 3dcde88477e243131acd6f06f945ec367e9d5f27 URL: https://github.com/kamailio/kamailio/commit/3dcde88477e243131acd6f06f945ec3… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:11:24+01:00 cdp: fix three coverity errors (ressource leaks and error checks) - fix an ressource leak related to library call getaddrinfo - add missing error checks for setsockopts and fcntl calls (cherry picked from commit 967a71687aa63a253d495ba49351ae916713a452) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/3dcde88477e243131acd6f06f945ec3… Patch: https://github.com/kamailio/kamailio/commit/3dcde88477e243131acd6f06f945ec3… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 4162501f6c..2710387d29 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -844,6 +844,7 @@ int receive_loop(peer *original_peer) int peer_connect(peer *p) { int sock; + int tmp = 0; unsigned int option = 1; struct addrinfo *ainfo=0,*res=0,*sainfo=0,hints; @@ -935,10 +936,21 @@ int peer_connect(peer *p) } x=fcntl(sock,F_GETFL,0); - fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (x == -1) { + LM_ERR("error during first fcntl operation\n"); + goto error; + } + tmp = fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (tmp == -1) { + LM_ERR("error during second fcntl operation\n"); + goto error; + } + } + tmp = setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); + if (tmp == -1) { + LM_ERR("could not set socket options\n"); + goto error; } - setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); - LM_INFO("peer_connect(): Peer %.*s:%d connected\n",p->fqdn.len,p->fqdn.s,p->port); if (!send_fd(p->fd_exchange_pipe,sock,p)){ @@ -948,10 +960,12 @@ int peer_connect(peer *p) } if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return sock; } error: if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return -1; }

5 years, 4 months

git:5.0:3f0d4174: core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 3f0d41742e41f117dc9426afd148cf906c271e46 URL: https://github.com/kamailio/kamailio/commit/3f0d41742e41f117dc9426afd148cf9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:11:53+01:00 core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - use the same logic for IPv4 string comparison as for IPv6 - the old comparison could return true for e.g. via="192.168.1.1", src="192.1.1.100" - the new logic is also faster for the trivial case with different string length (cherry picked from commit 98ee014a88ca951d82a0389f0be119078ba525f7) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/3f0d41742e41f117dc9426afd148cf9… Patch: https://github.com/kamailio/kamailio/commit/3f0d41742e41f117dc9426afd148cf9… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 54ed42b903..aa286788aa 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -176,7 +176,7 @@ static int check_via_address(struct ip_addr* ip, str *name, LM_CRIT("invalid Via host name\n"); return -1; } - if (strncmp(name->s, s, name->len)==0) + if (len==name->len&&(strncmp(name->s, s, name->len)==0)) return 0; } }else{

5 years, 4 months

git:5.0:ccf6bfe1: core: check for optarg before passing it to external library (coverity report)

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: ccf6bfe19e9402e616633c9b18fef0a08c27d304 URL: https://github.com/kamailio/kamailio/commit/ccf6bfe19e9402e616633c9b18fef0a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:11:43+01:00 core: check for optarg before passing it to external library (coverity report) (cherry picked from commit 7eb1eae615a4c3ef710e9931b101ddc4db07aff2) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/ccf6bfe19e9402e616633c9b18fef0a… Patch: https://github.com/kamailio/kamailio/commit/ccf6bfe19e9402e616633c9b18fef0a… --- diff --git a/src/main.c b/src/main.c index 8982c31c8e..1e8859ab65 100644 --- a/src/main.c +++ b/src/main.c @@ -1891,6 +1891,10 @@ int main(int argc, char** argv) log_color=1; break; case 'M': + if (optarg == NULL) { + fprintf(stderr, "bad private mem size\n"); + goto error; + } pkg_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; if (tmp &&(*tmp)){ fprintf(stderr, "bad private mem size number: -M %s\n",

5 years, 4 months

git:5.0:85e45ced: cdp: fix two errors from coverty scan (missing check, var initialization)

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 85e45cede3c463fbe8186d19a8d7d024dd42cb76 URL: https://github.com/kamailio/kamailio/commit/85e45cede3c463fbe8186d19a8d7d02… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:10:57+01:00 cdp: fix two errors from coverty scan (missing check, var initialization) - remove library call can fail, test for the error and log it - initialize the msghdr variable with a memset (cherry picked from commit 7d52bf6ce7188eaa57690766c231e55b5509db4f) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/85e45cede3c463fbe8186d19a8d7d02… Patch: https://github.com/kamailio/kamailio/commit/85e45cede3c463fbe8186d19a8d7d02… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0ff2fe15ae..4162501f6c 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -157,10 +157,14 @@ static int make_send_pipe(serviced_peer_t *sp) */ static void close_send_pipe(serviced_peer_t *sp) { + int tmp; if (sp->send_pipe_name.s) { close(sp->send_pipe_fd); close(sp->send_pipe_fd_out); - remove(sp->send_pipe_name.s); + tmp = remove(sp->send_pipe_name.s); + if (tmp == -1) { + LM_ERR("could not remove send pipe\n"); + } shm_free(sp->send_pipe_name.s); sp->send_pipe_name.s=0; sp->send_pipe_name.len=0; @@ -269,6 +273,7 @@ static int send_fd(int pipe_fd,int fd, peer *p) struct iovec iov[1]; int ret; int *tmp = NULL; + memset(&msg, 0, sizeof(struct msghdr)); #ifdef HAVE_MSGHDR_MSG_CONTROL struct cmsghdr* cmsg;

5 years, 4 months

git:5.2:1e56e4df: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.2 Commit: 1e56e4df35865f7138565213e35da8fd32096332 URL: https://github.com/kamailio/kamailio/commit/1e56e4df35865f7138565213e35da8f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-11T16:16:32+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/1e56e4df35865f7138565213e35da8f… Patch: https://github.com/kamailio/kamailio/commit/1e56e4df35865f7138565213e35da8f… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index fe7cf03ec7..842e2cfcc7 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -30,7 +30,7 @@ Daniel-Constantin Mierla 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 5. Pseudo Variables @@ -57,7 +57,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 5. Pseudo Variables @@ -110,7 +110,7 @@ modparam("phonenum", "smode", 0) 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 4.1. phonenum_match(num, pvc) @@ -133,7 +133,7 @@ if(phonenum_match("1-484-555-8888", "src")) { } ... -4.2. phonenum_match(num, cnc, pvc) +4.2. phonenum_match_cn(num, cnc, pvc) Match num against the libphonenumber and set the attributes inside the pvc container, restricting the rules with a country name code (two

5 years, 4 months

git:5.2:0d25cb4e: phonenum: fixing documentation typo (#1807)

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 0d25cb4e9d4f4cc6d3e4a864ef2fa3aaca746511 URL: https://github.com/kamailio/kamailio/commit/0d25cb4e9d4f4cc6d3e4a864ef2fa3a… Author: Rick <dunst0(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-01-11T16:03:59+01:00 phonenum: fixing documentation typo (#1807) (cherry picked from commit 77316f7567e0bbabcc7897969b68fdf64432d645) --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0d25cb4e9d4f4cc6d3e4a864ef2fa3a… Patch: https://github.com/kamailio/kamailio/commit/0d25cb4e9d4f4cc6d3e4a864ef2fa3a… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index ab62660ccf..402edfdb60 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -124,7 +124,7 @@ if(phonenum_match("1-484-555-8888", "src")) { </section> <section id="phonenum.f.phonenum_match_cn"> <title> - <function moreinfo="none">phonenum_match(num, cnc, pvc)</function> + <function moreinfo="none">phonenum_match_cn(num, cnc, pvc)</function> </title> <para> Match num against the libphonenumber and set the attributes inside

5 years, 4 months

git:master:b98e0558: modules: readme files regenerated - phonenum ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b98e0558c9f94a314e802baa7b50345a3f0d1270 URL: https://github.com/kamailio/kamailio/commit/b98e0558c9f94a314e802baa7b50345… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-11T16:01:46+01:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/b98e0558c9f94a314e802baa7b50345… Patch: https://github.com/kamailio/kamailio/commit/b98e0558c9f94a314e802baa7b50345… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index fe7cf03ec7..842e2cfcc7 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -30,7 +30,7 @@ Daniel-Constantin Mierla 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 5. Pseudo Variables @@ -57,7 +57,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 5. Pseudo Variables @@ -110,7 +110,7 @@ modparam("phonenum", "smode", 0) 4. Functions 4.1. phonenum_match(num, pvc) - 4.2. phonenum_match(num, cnc, pvc) + 4.2. phonenum_match_cn(num, cnc, pvc) 4.1. phonenum_match(num, pvc) @@ -133,7 +133,7 @@ if(phonenum_match("1-484-555-8888", "src")) { } ... -4.2. phonenum_match(num, cnc, pvc) +4.2. phonenum_match_cn(num, cnc, pvc) Match num against the libphonenumber and set the attributes inside the pvc container, restricting the rules with a country name code (two

5 years, 4 months

[kamailio/kamailio] phonenum: fixing documentation typo (#1807)

by Rick

#### 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 - [ ] 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/1807 -- Commit Summary -- * phonenum: fixing documentation typo -- File Changes -- M src/modules/phonenum/doc/phonenum_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1807.patch https://github.com/kamailio/kamailio/pull/1807.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/1807

5 years, 4 months

git:master:77316f75: phonenum: fixing documentation typo (#1807)

by Henning Westerholt

Module: kamailio Branch: master Commit: 77316f7567e0bbabcc7897969b68fdf64432d645 URL: https://github.com/kamailio/kamailio/commit/77316f7567e0bbabcc7897969b68fdf… Author: Rick <dunst0(a)users.noreply.github.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-01-11T16:00:55+01:00 phonenum: fixing documentation typo (#1807) --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/77316f7567e0bbabcc7897969b68fdf… Patch: https://github.com/kamailio/kamailio/commit/77316f7567e0bbabcc7897969b68fdf… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index ab62660ccf..402edfdb60 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -124,7 +124,7 @@ if(phonenum_match("1-484-555-8888", "src")) { </section> <section id="phonenum.f.phonenum_match_cn"> <title> - <function moreinfo="none">phonenum_match(num, cnc, pvc)</function> + <function moreinfo="none">phonenum_match_cn(num, cnc, pvc)</function> </title> <para> Match num against the libphonenumber and set the attributes inside

5 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2019