sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

git:master:cd6d509d: core: compare parsed ipv6 addresses in ipv6_get_netif_scope()
by Daniel-Constantin Mierla 24 Apr '19

24 Apr '19

Module: kamailio Branch: master Commit: cd6d509d4030143364a50971870d02ffdc83c175 URL: https://github.com/kamailio/kamailio/commit/cd6d509d4030143364a50971870d02f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-24T11:33:53+02:00 core: compare parsed ipv6 addresses in ipv6_get_netif_scope() --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/cd6d509d4030143364a50971870d02f… Patch: https://github.com/kamailio/kamailio/commit/cd6d509d4030143364a50971870d02f… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index c77e4b8227..4ed7b56487 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -105,7 +105,7 @@ * return the scope for IPv6 interface matching the ipval parameter * - needed for binding to link local IPv6 addresses */ -unsigned int ipv6_get_netif_scope(const char *ipval) +unsigned int ipv6_get_netif_scope(char *ipval) { struct ifaddrs *netiflist = NULL; struct ifaddrs *netif = NULL; @@ -113,6 +113,20 @@ unsigned int ipv6_get_netif_scope(const char *ipval) unsigned int iscope = 0; int i = 0; int r = 0; + ip_addr_t *ipa = NULL; + ip_addr_t vaddr; + str ips; + + ips.s = ipval; + ips.len = strlen(ipval); + + ipa = str2ip6(&ips); + if(ipa==NULL) { + LM_ERR("could not parse ipv6 address: %s\n", ipval); + return 0; + } + memcpy(&vaddr, ipa, sizeof(ip_addr_t)); + ipa = NULL; /* walk over the list of all network interface addresses */ if(getifaddrs(&netiflist)!=0) { @@ -136,10 +150,15 @@ unsigned int ipv6_get_netif_scope(const char *ipval) break; } } - /* if the ips matche, get scope index from interface name */ - if(strcmp(ipaddr, ipval)==0){ - iscope=if_nametoindex(netif->ifa_name); - goto done; + ips.s = ipaddr; + ips.len = strlen(ipaddr); + ipa = str2ip6(&ips); + if(ipa!=NULL) { + /* if the ips match, get scope index from interface name */ + if(ip_addr_cmp(&vaddr, ipa)) { + iscope=if_nametoindex(netif->ifa_name); + goto done; + } } } } diff --git a/src/core/socket_info.h b/src/core/socket_info.h index e8c684407c..37bfd897f1 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -151,6 +151,6 @@ typedef struct _sr_phostp { struct socket_info* lookup_local_socket(str *phostp); int parse_protohostport(str* ins, sr_phostp_t *r); -unsigned int ipv6_get_netif_scope(const char *ipval); +unsigned int ipv6_get_netif_scope(char *ipval); #endif

1 0

git:master:b02b8e82: dialog: handle case of null contact->s value
by Daniel-Constantin Mierla 24 Apr '19

24 Apr '19

Module: kamailio Branch: master Commit: b02b8e82a3afec2c0f7f954b5a996476808ee3c6 URL: https://github.com/kamailio/kamailio/commit/b02b8e82a3afec2c0f7f954b5a99647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-23T20:51:10+02:00 dialog: handle case of null contact->s value - get over static analyzer report --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/b02b8e82a3afec2c0f7f954b5a99647… Patch: https://github.com/kamailio/kamailio/commit/b02b8e82a3afec2c0f7f954b5a99647… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 5c11bada52..6035a74f6e 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -584,7 +584,13 @@ int dlg_set_leg_info(struct dlg_cell *dlg, str* tag, str *rr, str *contact, /* contact */ dlg->contact[leg].len = contact->len; - memcpy(dlg->contact[leg].s, contact->s, contact->len); + if(contact->s) { + memcpy(dlg->contact[leg].s, contact->s, contact->len); + } else { + if(contact->len>0) { + memset(dlg->contact[leg].s, 0, contact->len); + } + } /* cseq */ dlg->cseq[leg].len = cs.len; memcpy( dlg->cseq[leg].s, cs.s, cs.len);

1 0

[kamailio/kamailio] core: fix compilation error (#1934)
by Mikko Lehto 23 Apr '19

23 Apr '19

#### Pre-Submission Checklist - [✓] Commit message has the format required by CONTRIBUTING guide - [✓] Commits are split per component - [✓] Each component has a single commit - [✓] No commits to README files for modules #### 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 #1765 #### Description Macro constant UINT32_MAX is defined in <stdint.h>. GCC and Clang does not complain on Ubuntu 16 GCC and Clang complains on FreeBSD 11. Backporting not needed, PROXY feature only in development branch 5.3. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1934 -- Commit Summary -- * core: fix compilation error -- File Changes -- M src/core/tcp_main.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1934.patch https://github.com/kamailio/kamailio/pull/1934.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/1934

2 1

git:master:285a6710: Merge pull request #1934 from mslehto/UINT32_MAX
by GitHub 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: 285a67101c4b412fcac0b1a6a7f28ab8f25216e0 URL: https://github.com/kamailio/kamailio/commit/285a67101c4b412fcac0b1a6a7f28ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-23T14:05:27+02:00 Merge pull request #1934 from mslehto/UINT32_MAX core: fix compilation error --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/285a67101c4b412fcac0b1a6a7f28ab… Patch: https://github.com/kamailio/kamailio/commit/285a67101c4b412fcac0b1a6a7f28ab… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 20e16606c0..85e06e9513 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -50,6 +50,7 @@ #include <sys/uio.h> /* writev*/ #include <netdb.h> #include <stdlib.h> /*exit() */ +#include <stdint.h> /* UINT32_MAX */ #include <unistd.h>

1 0

git:master:3fd0cea8: core: fix compilation error
by Mikko Lehto 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: 3fd0cea891b13c4ba831a2e6d8d5620dc4106efb URL: https://github.com/kamailio/kamailio/commit/3fd0cea891b13c4ba831a2e6d8d5620… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2019-04-23T11:26:14+03:00 core: fix compilation error - UINT32_MAX is defined in <stdint.h> > CC (clang) [kamailio] core/tcp_main.o > core/tcp_main.c:1134:16: error: use of undeclared identifier 'UINT32_MAX' > if (port == UINT32_MAX || port == 0 || port >= (1 << 16)) { > ^ --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/3fd0cea891b13c4ba831a2e6d8d5620… Patch: https://github.com/kamailio/kamailio/commit/3fd0cea891b13c4ba831a2e6d8d5620… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 20e16606c0..85e06e9513 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -50,6 +50,7 @@ #include <sys/uio.h> /* writev*/ #include <netdb.h> #include <stdlib.h> /*exit() */ +#include <stdint.h> /* UINT32_MAX */ #include <unistd.h>

1 0

[kamailio/kamailio] ndb_mongodb: fix initialization crash (#1932)
by Nuno Ferreira 23 Apr '19

23 Apr '19

#### 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 - Initialize mongodb c driver before any other mongo api call. Without this, kamailio would crash with a segmentation fault. This probably won't happen if a module was also already being used with a db_mongodb setup. This issue was initially reported here: https://lists.kamailio.org/pipermail/sr-users/2019-April/105382.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1932 -- Commit Summary -- * ndb_mongodb: fix initialization crash -- File Changes -- M src/modules/ndb_mongodb/mongodb_client.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1932.patch https://github.com/kamailio/kamailio/pull/1932.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/1932

2 3

[kamailio/kamailio] modules:sipcapture Fixed wrong pointer for payload buffer. (#1928)
by Alexandr Dubovikov 23 Apr '19

23 Apr '19

#### 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/1928 -- Commit Summary -- * modules:sipcapture Fixed wrong pointer for payload buffer. -- File Changes -- M src/modules/sipcapture/hep.c (4) M src/modules/sipcapture/sipcapture.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1928.patch https://github.com/kamailio/kamailio/pull/1928.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/1928

2 3

git:master:7c9b5c8a: ndb_mongodb: fix initialization crash
by Nuno Ferreira 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: 7c9b5c8ada2933086a7665bca4aaea016a394b1f URL: https://github.com/kamailio/kamailio/commit/7c9b5c8ada2933086a7665bca4aaea0… Author: Nuno Ferreira <nferreira(a)fuze.com> Committer: Nuno Ferreira <nferreira(a)fuze.com> Date: 2019-04-22T19:36:25+01:00 ndb_mongodb: fix initialization crash - Initialize mongodb c driver before any other mongo api call. Without this, kamailio would crash with a segmentation fault. This probably won't happen if a module was also already being used with a db_mongodb setup. --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/7c9b5c8ada2933086a7665bca4aaea0… Patch: https://github.com/kamailio/kamailio/commit/7c9b5c8ada2933086a7665bca4aaea0… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index 746c5876fd..b49f111998 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -53,6 +53,7 @@ int mongodbc_init(void) return -1; } + mongoc_init(); for(rsrv=_mongodbc_srv_list; rsrv; rsrv=rsrv->next) { if(rsrv->uri==NULL || rsrv->uri->len<=0) {

1 0

git:master:e8ea999b: Merge pull request #1932 from nferreyra/ndb_mongodb_mongoc_init
by GitHub 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: e8ea999b3f208d71fb8bdaa282c5f1d31296860b URL: https://github.com/kamailio/kamailio/commit/e8ea999b3f208d71fb8bdaa282c5f1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-23T08:56:20+02:00 Merge pull request #1932 from nferreyra/ndb_mongodb_mongoc_init ndb_mongodb: fix initialization crash --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/e8ea999b3f208d71fb8bdaa282c5f1d… Patch: https://github.com/kamailio/kamailio/commit/e8ea999b3f208d71fb8bdaa282c5f1d… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index 746c5876fd..b49f111998 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -53,6 +53,7 @@ int mongodbc_init(void) return -1; } + mongoc_init(); for(rsrv=_mongodbc_srv_list; rsrv; rsrv=rsrv->next) { if(rsrv->uri==NULL || rsrv->uri->len<=0) {

1 0

git:master:8df2a65a: Merge pull request #1928 from adubovikov/master
by GitHub 23 Apr '19

23 Apr '19

Module: kamailio Branch: master Commit: 8df2a65a9d39cd929e7e2554d0ff7fa6b176458f URL: https://github.com/kamailio/kamailio/commit/8df2a65a9d39cd929e7e2554d0ff7fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-04-23T08:55:08+02:00 Merge pull request #1928 from adubovikov/master modules:sipcapture Fixed wrong pointer for payload buffer. --- Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/8df2a65a9d39cd929e7e2554d0ff7fa… Patch: https://github.com/kamailio/kamailio/commit/8df2a65a9d39cd929e7e2554d0ff7fa… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 0430b96969..f435477a09 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -739,7 +739,11 @@ int hepv3_message_parse(char *buf, unsigned int len, sip_msg_t *msg) msg->rcv.proto = PROTO_UDP; if(payload != NULL) + { ret = len - payload_len; + msg->buf = payload; + msg->len = payload_len; + } done: diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index dbb53c0537..a7a7564608 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2969,11 +2969,8 @@ static int nosip_hep_msg(sr_event_param_t *evp) return 0; } - buf = msg->buf + len; - len = msg->len - len; - - msg->buf = buf; - msg->len = len; + buf = msg->buf; + len = msg->len; } else { LOG(L_ERR, "ERROR: sipcapture:hep_msg_received: not supported version " "or bad length: v:[%d] l:[%d]\n",

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019