sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

[kamailio/kamailio] sipcapture: add new capture_bad_msgs modparam (#2245)

by Stefan Mititelu

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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  Enable the parsing of broken SIP messages. @lbalaceanu is the original developer of this patch. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2245 -- Commit Summary -- * sipcapture: add new capture_bad_msgs modparam -- File Changes -- M src/modules/sipcapture/doc/sipcapture_admin.xml (18) M src/modules/sipcapture/sipcapture.c (182) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2245.patch https://github.com/kamailio/kamailio/pull/2245.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/2245

4 years, 9 months

git:master:51bbc555: sipcapture: add new capture_bad_msgs modparam

by Henning Westerholt

Module: kamailio Branch: master Commit: 51bbc5557edf4d4c1cdcb268f70d00ef406b53fc URL: https://github.com/kamailio/kamailio/commit/51bbc5557edf4d4c1cdcb268f70d00e… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:17:18+01:00 sipcapture: add new capture_bad_msgs modparam In order to enable the parsing of broken SIP messages. By default this behavior is disabled. Updated doc. --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/51bbc5557edf4d4c1cdcb268f70d00e… Patch: https://github.com/kamailio/kamailio/commit/51bbc5557edf4d4c1cdcb268f70d00e…

4 years, 9 months

git:master:9d0ea2b4: seas: use ip_addr2sbuf instead of (redundant) buf_print_ip

by Henning Westerholt

Module: kamailio Branch: master Commit: 9d0ea2b4323bcafd73322cc2b234231273013bcd URL: https://github.com/kamailio/kamailio/commit/9d0ea2b4323bcafd73322cc2b234231… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:07:42+01:00 seas: use ip_addr2sbuf instead of (redundant) buf_print_ip --- Modified: src/modules/seas/event_dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/9d0ea2b4323bcafd73322cc2b234231… Patch: https://github.com/kamailio/kamailio/commit/9d0ea2b4323bcafd73322cc2b234231… --- diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 6031310aa1..e1c7047beb 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -850,7 +850,7 @@ int process_bind_action(as_p as,unsigned char processor_id,unsigned int flags,ch memcpy(&port,payload+k,2); k+=2; port=ntohs(port); - buf_print_ip(buffer, &my_addr,300); + ip_addr2sbuf(&my_addr,buffer,300); switch(proto){ case PROTO_UDP: proto_s="UDP";

4 years, 9 months

git:master:279848dd: tls: use ip_addr2sbuf instead of (redundant) buf_print_ip

by Henning Westerholt

Module: kamailio Branch: master Commit: 279848dda1fc24428ad3662f6890b6f51fef3518 URL: https://github.com/kamailio/kamailio/commit/279848dda1fc24428ad3662f6890b6f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:06:33+01:00 tls: use ip_addr2sbuf instead of (redundant) buf_print_ip --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/279848dda1fc24428ad3662f6890b6f… Patch: https://github.com/kamailio/kamailio/commit/279848dda1fc24428ad3662f6890b6f… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index d084aaecd3..c8e5852556 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -885,10 +885,10 @@ int tls_encode_f(struct tcp_connection *c, ERR("protocol level error\n"); TLS_ERR(err_src); memset(ip_buf, 0, sizeof(buf)); - buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("source IP: %s\n", ip_buf); memset(ip_buf, 0, sizeof(buf)); - buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); ERR("destination IP: %s\n", ip_buf); goto error; @@ -1283,10 +1283,10 @@ int tls_read_f(struct tcp_connection* c, int* flags) ERR("protocol level error\n"); TLS_ERR(err_src); memset(ip_buf, 0, sizeof(ip_buf)); - buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("source IP: %s\n", ip_buf); memset(ip_buf, 0, sizeof(ip_buf)); - buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); ERR("destination IP: %s\n", ip_buf); goto error;

4 years, 9 months

git:master:3708022d: Revert "core: add new function buf_print_ip(..) to print an IP address to an buffer"

by Henning Westerholt

Module: kamailio Branch: master Commit: 3708022dfa24cf250cb34f0d5e5f990711f91d1b URL: https://github.com/kamailio/kamailio/commit/3708022dfa24cf250cb34f0d5e5f990… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:05:51+01:00 Revert "core: add new function buf_print_ip(..) to print an IP address to an buffer" This reverts commit 4acca8ad2f31f465b08f15d98cc4780236e2beb0. --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/3708022dfa24cf250cb34f0d5e5f990… Patch: https://github.com/kamailio/kamailio/commit/3708022dfa24cf250cb34f0d5e5f990… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 82f746e0d6..9989063fff 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -274,35 +274,6 @@ void stdout_print_ip(struct ip_addr* ip) } -void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len) -{ - if (len < INET6_ADDRSTRLEN) { - LM_ERR("insufficent buffer length\n"); - return; - } - switch(ip->af){ - case AF_INET: - snprintf(buf, len, "%d.%d.%d.%d", ip->u.addr[0], - ip->u.addr[1], - ip->u.addr[2], - ip->u.addr[3]); - break; - case AF_INET6: - snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", htons(ip->u.addr16[0]), - htons(ip->u.addr16[1]), - htons(ip->u.addr16[2]), - htons(ip->u.addr16[3]), - htons(ip->u.addr16[4]), - htons(ip->u.addr16[5]), - htons(ip->u.addr16[6]), - htons(ip->u.addr16[7]) - ); - break; - default: - snprintf(buf, len, "warning unknown address family %d\n", ip->af); - } -} - void print_net(struct net* net) { diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 896d4b757e..9a7b67ac5d 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -265,8 +265,6 @@ int mk_net_str(struct net* dst, str* s); void print_ip(char* prefix, struct ip_addr* ip, char* suffix); void stdout_print_ip(struct ip_addr* ip); -void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len); - void print_net(struct net* net); char* get_proto_name(unsigned int proto);

4 years, 9 months

git:master:4acca8ad: core: add new function buf_print_ip(..) to print an IP address to an buffer

by Henning Westerholt

Module: kamailio Branch: master Commit: 4acca8ad2f31f465b08f15d98cc4780236e2beb0 URL: https://github.com/kamailio/kamailio/commit/4acca8ad2f31f465b08f15d98cc4780… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T12:04:54+01:00 core: add new function buf_print_ip(..) to print an IP address to an buffer --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/4acca8ad2f31f465b08f15d98cc4780… Patch: https://github.com/kamailio/kamailio/commit/4acca8ad2f31f465b08f15d98cc4780… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 9989063fff..82f746e0d6 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -274,6 +274,35 @@ void stdout_print_ip(struct ip_addr* ip) } +void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len) +{ + if (len < INET6_ADDRSTRLEN) { + LM_ERR("insufficent buffer length\n"); + return; + } + switch(ip->af){ + case AF_INET: + snprintf(buf, len, "%d.%d.%d.%d", ip->u.addr[0], + ip->u.addr[1], + ip->u.addr[2], + ip->u.addr[3]); + break; + case AF_INET6: + snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", htons(ip->u.addr16[0]), + htons(ip->u.addr16[1]), + htons(ip->u.addr16[2]), + htons(ip->u.addr16[3]), + htons(ip->u.addr16[4]), + htons(ip->u.addr16[5]), + htons(ip->u.addr16[6]), + htons(ip->u.addr16[7]) + ); + break; + default: + snprintf(buf, len, "warning unknown address family %d\n", ip->af); + } +} + void print_net(struct net* net) { diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 9a7b67ac5d..896d4b757e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -265,6 +265,8 @@ int mk_net_str(struct net* dst, str* s); void print_ip(char* prefix, struct ip_addr* ip, char* suffix); void stdout_print_ip(struct ip_addr* ip); +void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len); + void print_net(struct net* net); char* get_proto_name(unsigned int proto);

4 years, 9 months

Re: [sr-dev] error_readline_pkg-config with latest Makefile

by Ovidiu Sas

Take a look at this makefile: https://github.com/Optware/Optware-ng/blob/master/make/kamailio.mk It was used to cross compile kamailio for several platforms. Through CC_EXTRA_OPTS you can pass extra compiler flags and paths for the target platform. Also, please keep the list in cc, otherwise e-mails will go unanswered, Regards, Ovidiu Sas On Thu, Mar 19, 2020 at 11:53 PM subhra giri <subhraprakash79(a)gmail.com> wrote: > > Dear ovidiu > I am not able to fix the issue in makefile. > Please help me what i should update in makefile for cross-compiling readline for mips. > readline.h is located at > /home/subhra/SDK3.1.2/linux/embedded_rootfs/build/readline-5.1/readline.h > > And libreadline*.so* are present at > > /home/subhra/SDK3.1.2/linux/embedded_rootfs/build/readline-5.1/shlib/libreadline.so.5.1 > /home/subhra/SDK3.1.2/linux/embedded_rootfs/build/readline-5.1/shlib/readline.so > Thanks and Regards > Subhra Prakash -- VoIP Embedded, Inc. http://www.voipembedded.com

4 years, 9 months

git:master:cc34d05b: seas: use new introduced buf_print_ip to print IP addresses instead of own implemenation

by Henning Westerholt

Module: kamailio Branch: master Commit: cc34d05b8371c57cdcfe468fdba036d2b710dbb5 URL: https://github.com/kamailio/kamailio/commit/cc34d05b8371c57cdcfe468fdba036d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T12:06:58+01:00 seas: use new introduced buf_print_ip to print IP addresses instead of own implemenation --- Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/seas/seas.h --- Diff: https://github.com/kamailio/kamailio/commit/cc34d05b8371c57cdcfe468fdba036d… Patch: https://github.com/kamailio/kamailio/commit/cc34d05b8371c57cdcfe468fdba036d… --- diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 86f1b0d722..6031310aa1 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -850,7 +850,7 @@ int process_bind_action(as_p as,unsigned char processor_id,unsigned int flags,ch memcpy(&port,payload+k,2); k+=2; port=ntohs(port); - print_ip_buf(&my_addr,buffer,300); + buf_print_ip(buffer, &my_addr,300); switch(proto){ case PROTO_UDP: proto_s="UDP"; diff --git a/src/modules/seas/seas.h b/src/modules/seas/seas.h index 9f525f48c4..3244cc9692 100644 --- a/src/modules/seas/seas.h +++ b/src/modules/seas/seas.h @@ -159,19 +159,4 @@ void seas_sighandler(int signo); char* create_as_event_t(struct cell *t,struct sip_msg *msg,char processor_id,int *evt_len,int flags); char* create_as_event_sl(struct sip_msg *msg,char processor_id,int *evt_len,int flags); -static inline void print_ip_buf(struct ip_addr* ip, char *where,int len) -{ - switch(ip->af){ - case AF_INET: - snprintf(where,len,"%d.%d.%d.%d", ip->u.addr[0], ip->u.addr[1], ip->u.addr[2], ip->u.addr[3]); - break; - case AF_INET6: - snprintf(where,len,"%x:%x:%x:%x:%x:%x:%x:%x",htons(ip->u.addr16[0]),htons(ip->u.addr16[1]),htons(ip->u.addr16[2]), - htons(ip->u.addr16[3]), htons(ip->u.addr16[4]), htons(ip->u.addr16[5]), htons(ip->u.addr16[6]), - htons(ip->u.addr16[7])); - break; - default: - break; - } -} #endif

4 years, 9 months

git:master:328d4521: tls: log src and dst IPs in case of protocol level errors in send/receive

by Henning Westerholt

Module: kamailio Branch: master Commit: 328d45215514f03d2fcfd88d49e56027f2002b86 URL: https://github.com/kamailio/kamailio/commit/328d45215514f03d2fcfd88d49e5602… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T12:06:26+01:00 tls: log src and dst IPs in case of protocol level errors in send/receive - log src and dst IPs in case of protocol level errors in send/receive - to help debugging TLS errors in multi-domain/multi-dispatching scenarios --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/328d45215514f03d2fcfd88d49e5602… Patch: https://github.com/kamailio/kamailio/commit/328d45215514f03d2fcfd88d49e5602… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 9ce1b5e2f3..d084aaecd3 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -752,6 +752,7 @@ int tls_encode_f(struct tcp_connection *c, struct tls_mbuf rd, wr; int ssl_error; char* err_src; + char ip_buf[64]; const char* buf; unsigned int len; int x; @@ -881,7 +882,15 @@ int tls_encode_f(struct tcp_connection *c, break; /* or goto end */ case SSL_ERROR_SSL: /* protocol level error */ + ERR("protocol level error\n"); TLS_ERR(err_src); + memset(ip_buf, 0, sizeof(buf)); + buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ERR("source IP: %s\n", ip_buf); + memset(ip_buf, 0, sizeof(buf)); + buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ERR("destination IP: %s\n", ip_buf); + goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ case SSL_ERROR_WANT_CONNECT: @@ -994,6 +1003,7 @@ int tls_read_f(struct tcp_connection* c, int* flags) struct tls_rd_buf* enc_rd_buf; int n, flush_flags; char* err_src; + char ip_buf[64]; int x; int tls_dbg; @@ -1270,7 +1280,15 @@ int tls_read_f(struct tcp_connection* c, int* flags) goto bug; case SSL_ERROR_SSL: /* protocol level error */ + ERR("protocol level error\n"); TLS_ERR(err_src); + memset(ip_buf, 0, sizeof(ip_buf)); + buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ERR("source IP: %s\n", ip_buf); + memset(ip_buf, 0, sizeof(ip_buf)); + buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ERR("destination IP: %s\n", ip_buf); + goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ case SSL_ERROR_WANT_CONNECT:

4 years, 9 months

git:master:ae95a6a2: ims_usrloc_pcscf: fix warning: this âifâ clause does not guard...

by --list

Module: kamailio Branch: master Commit: ae95a6a2f73e6a4153a415c70d9e21562c651c1a URL: https://github.com/kamailio/kamailio/commit/ae95a6a2f73e6a4153a415c70d9e215… Author: --list <hw(a)skalatan.de> Committer: --list <hw(a)skalatan.de> Date: 2020-03-23T11:14:38+01:00 ims_usrloc_pcscf: fix warning: this âifâ clause does not guard... --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/ae95a6a2f73e6a4153a415c70d9e215… Patch: https://github.com/kamailio/kamailio/commit/ae95a6a2f73e6a4153a415c70d9e215… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 0d156d39c4..1ac55734d7 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -119,11 +119,12 @@ void free_ppublic(ppublic_t* _p) // Keep them in sync! void free_security(security_t* _p) { - if (!_p) + if (!_p) { return; + } - if(_p->sec_header.s) - shm_free(_p->sec_header.s); + if(_p->sec_header.s) + shm_free(_p->sec_header.s); switch (_p->type) {

4 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020