sr-dev

sr-dev@lists.kamailio.org

21 participants
45185 discussions

git:master:c09ede1b: core: different logging for IPv4 and IPv6 for socket option setting
by Henning Westerholt 14 Aug '22

14 Aug '22

Module: kamailio Branch: master Commit: c09ede1ba7d600da37e7c0007f128a72b34250a4 URL: https://github.com/kamailio/kamailio/commit/c09ede1ba7d600da37e7c0007f128a7… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-14T09:01:57Z core: different logging for IPv4 and IPv6 for socket option setting --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/c09ede1ba7d600da37e7c0007f128a7… Patch: https://github.com/kamailio/kamailio/commit/c09ede1ba7d600da37e7c0007f128a7… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 1eefb13c42..7c501f0dab 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -336,13 +336,13 @@ int udp_init(struct socket_info* sock_info) if (addr->s.sa_family==AF_INET){ if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPV4 setsockopt: %s\n", strerror(errno)); goto error; } } else if (addr->s.sa_family==AF_INET6){ if(setsockopt(sock_info->socket, SOL_IPV6, IPV6_RECVERR, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPv6 setsockopt: %s\n", strerror(errno)); goto error; } } @@ -354,7 +354,7 @@ int udp_init(struct socket_info* sock_info) optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPv4 setsockopt: %s\n", strerror(errno)); goto error; } } else if (addr->s.sa_family==AF_INET6){ @@ -365,7 +365,7 @@ int udp_init(struct socket_info* sock_info) if(setsockopt(sock_info->socket, IPPROTO_IPV6, IPV6_MTU_DISCOVER, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); + LM_ERR("IPv6 setsockopt: %s\n", strerror(errno)); goto error; } }

1 0

git:master:990bdfe5: core: also set pmtu_discovery core parameter for IPv6, GH #3141
by Henning Westerholt 14 Aug '22

14 Aug '22

Module: kamailio Branch: master Commit: 990bdfe56b9d8e2d2d297b87998065e137d4e203 URL: https://github.com/kamailio/kamailio/commit/990bdfe56b9d8e2d2d297b87998065e… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-14T08:56:12Z core: also set pmtu_discovery core parameter for IPv6, GH #3141 - also set pmtu_discovery core parameter for IPv6 - based on a patch from Rick van Rein <rick(a)openfortress.nl> - probably to be extended further --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/990bdfe56b9d8e2d2d297b87998065e… Patch: https://github.com/kamailio/kamailio/commit/990bdfe56b9d8e2d2d297b87998065e… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index bffdda1b01..1eefb13c42 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -329,22 +329,45 @@ int udp_init(struct socket_info* sock_info) } #if defined (__OS_linux) && defined(UDP_ERRORS) + /* Ask for the ability to recvmsg (...,MSG_ERRQUEUE) for immediate + * resend when hitting Path MTU limits. */ optval=1; /* enable error receiving on unconnected sockets */ - if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR, + if (addr->s.sa_family==AF_INET){ + if(setsockopt(sock_info->socket, SOL_IP, IP_RECVERR, (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); - goto error; + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } + } else if (addr->s.sa_family==AF_INET6){ + if(setsockopt(sock_info->socket, SOL_IPV6, IPV6_RECVERR, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } } #endif #if defined (__OS_linux) - /* if pmtu_discovery=1 then set DF bit and do Path MTU discovery - * disabled by default */ - optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; - if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER, - (void*)&optval, sizeof(optval)) ==-1){ - LM_ERR("setsockopt: %s\n", strerror(errno)); - goto error; + if (addr->s.sa_family==AF_INET){ + /* If pmtu_discovery=1 then set DF bit and do Path MTU discovery + * disabled by default. Specific to IPv4. */ + optval= (pmtu_discovery) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; + if(setsockopt(sock_info->socket, IPPROTO_IP, IP_MTU_DISCOVER, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } + } else if (addr->s.sa_family==AF_INET6){ + /* IPv6 never fragments but sends ICMPv6 Packet too Big, + * If pmtu_discovery=1 then set DF bit and do Path MTU discovery + * disabled by default. Specific to IPv6. */ + optval= (pmtu_discovery) ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; + if(setsockopt(sock_info->socket, IPPROTO_IPV6, + IPV6_MTU_DISCOVER, + (void*)&optval, sizeof(optval)) ==-1){ + LM_ERR("setsockopt: %s\n", strerror(errno)); + goto error; + } } #endif

1 0

git:master:43d92797: tls_wolfssl: wolfSSL â update to v5.4.0-stable
by S-P Chan 13 Aug '22

13 Aug '22

Module: kamailio Branch: master Commit: 43d927970f4be565284f53e986171eb3512c6b63 URL: https://github.com/kamailio/kamailio/commit/43d927970f4be565284f53e986171eb… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2022-08-13T21:52:30+08:00 tls_wolfssl: wolfSSL â update to v5.4.0-stable - the upstream commit also fixes GCC warnings so we don't have to workaround with -Wno-xxxxxx --- Modified: misc/external/wolfssl/wolfssl Modified: src/modules/tls_wolfssl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/43d927970f4be565284f53e986171eb… Patch: https://github.com/kamailio/kamailio/commit/43d927970f4be565284f53e986171eb… --- diff --git a/misc/external/wolfssl/wolfssl b/misc/external/wolfssl/wolfssl index e722c15be86..57aac1c50b4 160000 --- a/misc/external/wolfssl/wolfssl +++ b/misc/external/wolfssl/wolfssl @@ -1 +1 @@ -Subproject commit e722c15be860794179082a05d09e6a90dc77ccf0 +Subproject commit 57aac1c50b45275c7a99eca32ad985998b292dc8 diff --git a/src/modules/tls_wolfssl/Makefile b/src/modules/tls_wolfssl/Makefile index f6a27f7f34e..a04edc40b4d 100644 --- a/src/modules/tls_wolfssl/Makefile +++ b/src/modules/tls_wolfssl/Makefile @@ -23,7 +23,7 @@ $(WOLFSSL_PREFIX)/include/wolfssl/options.h $(WOLFSSL_PREFIX)/lib/libwolfssl.a: ./autogen.sh; \ fi; \ if [ ! -f "Makefile" ]; then \ - env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC -Wno-error=array-bounds -Wno-error=stringop-overflow" ./configure \ + env -u DEFS -u CFLAGS -u LDFLAGS -u LIBS EXTRA_CFLAGS="-g -fPIC" ./configure \ --enable-all --enable-pkcs11 --enable-static --enable-aligndata=no \ --disable-shared --disable-examples \ --prefix=$(CURDIR)/$(WOLFSSL_PREFIX) \

1 0

git:master:9a35ce57: modules: readme files regenerated - secfilter ... [skip ci]
by Kamailio Dev 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: 9a35ce57270d259f60a116322d17a411c58bcb4f URL: https://github.com/kamailio/kamailio/commit/9a35ce57270d259f60a116322d17a41… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-12T16:31:16+02:00 modules: readme files regenerated - secfilter ... [skip ci] --- Modified: src/modules/secfilter/README --- Diff: https://github.com/kamailio/kamailio/commit/9a35ce57270d259f60a116322d17a41… Patch: https://github.com/kamailio/kamailio/commit/9a35ce57270d259f60a116322d17a41… --- diff --git a/src/modules/secfilter/README b/src/modules/secfilter/README index 7cbabac6c8..435db783fa 100644 --- a/src/modules/secfilter/README +++ b/src/modules/secfilter/README @@ -663,67 +663,72 @@ d in the user-agent header ($ua)"); ... User-agent ========== -[+] Blacklisted - ----------- - 0001 -> friendly-scanner - 0002 -> pplsip - 0003 -> sipcli - 0004 -> sundayddr - 0005 -> iWar - 0006 -> sipsak - 0007 -> VaxSIPUserAgent - 0008 -> SimpleSIP - 0009 -> SIP Call - 0010 -> Ozeki - 0011 -> VoIPSec - 0012 -> SIPScan - 0013 -> Conaito - 0014 -> UsaAirport - 0015 -> PortSIP VoIP SDK - 0016 -> zxcvfdf11 - 0017 -> fdgddfg546df4g8d5f - -[+] Whitelisted - ----------- - 0001 -> my custom ua +{ + User-Agent: { + Blacklisted: { + Value: friendly-scanner + Value: pplsip + Value: sipcli + Value: sundayddr + Value: iWar + Value: sipsak + Value: VaxSIPUserAgent + Value: SimpleSIP + Value: SIP Call + Value: Ozeki + Value: VoIPSec + Value: SIPScan + Value: Conaito + Value: UsaAirport + Value: PortSIP VoIP SDK + Value: zxcvfdf11 + Value: fdgddfg546df4g8d5f + Value: siptest + Value: Nmap NSE + } + Whitelisted: { + Value: my custom ua + } + } +} ... 7.2. Statistics Example 1.25. kamcmd secfilter.stats ... -Blocked messages (blacklist) -============================ -[+] By user-agent : 1256 -[+] By country : 45 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 1 -[+] By IP address : 2552 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 316 -[+] By to user : 134 -[+] By contact user : 0 - -Allowed messages (whitelist) -============================ -[+] By user-agent : 0 -[+] By country : 478 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 0 -[+] By IP address : 0 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 0 -[+] By to user : 0 -[+] By contact user : 0 - -Other blocked messages -====================== -[+] Destinations : 0 -[+] SQL injection : 213 +{ + Blacklist: { + User-Agent: 1256 + Country: 45 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 1 + IP-Address: 2552 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 316 + To-User: 0134 + Contact-User: 0 + } + Whitelist: { + User-Agent: 0 + Country: 478 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 0 + IP-Address: 0 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 0 + To-User: 0 + Contact-User: 0 + } + Other: { + Destination: 0 + SQL-Injection: 213 + } +} ...

1 0

[kamailio/kamailio] secfilter: Wrong format on RPC response data (Issue #2992)
by Olle E. Johansson 12 Aug '22

12 Aug '22

secfilter RPC functions to get statistics use a console format to printing data, suitable for **kamcmd** but not for any RPC method. This should be converted to a machine-parsable data structure (much like dispatcher, usrloc and htable data dumps). -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2992 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2992(a)github.com>

2 3

[kamailio/kamailio] secfilter: machine-parsable data structure for RPC printing data (PR #3213)
by Jose Luis Verdeguer 12 Aug '22

12 Aug '22

#### 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/3213 -- Commit Summary -- * secfilter: machine-parsable data structure for RPC printing data -- File Changes -- M src/modules/secfilter/secfilter_rpc.c (383) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3213.patch https://github.com/kamailio/kamailio/pull/3213.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3213 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3213(a)github.com>

3 8

git:master:d5ef682e: secfilter: updated samples [skip ci]
by Jose Luis Verdeguer 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: d5ef682ebe98ca87021a8e2344bb94c75747f53e URL: https://github.com/kamailio/kamailio/commit/d5ef682ebe98ca87021a8e2344bb94c… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-08-12T16:18:48+02:00 secfilter: updated samples [skip ci] --- Modified: src/modules/secfilter/doc/secfilter_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d5ef682ebe98ca87021a8e2344bb94c… Patch: https://github.com/kamailio/kamailio/commit/d5ef682ebe98ca87021a8e2344bb94c… --- diff --git a/src/modules/secfilter/doc/secfilter_admin.xml b/src/modules/secfilter/doc/secfilter_admin.xml index ce7b6cea27a..9daa67d9523 100644 --- a/src/modules/secfilter/doc/secfilter_admin.xml +++ b/src/modules/secfilter/doc/secfilter_admin.xml @@ -814,29 +814,34 @@ ... User-agent ========== -[+] Blacklisted - ----------- - 0001 -> friendly-scanner - 0002 -> pplsip - 0003 -> sipcli - 0004 -> sundayddr - 0005 -> iWar - 0006 -> sipsak - 0007 -> VaxSIPUserAgent - 0008 -> SimpleSIP - 0009 -> SIP Call - 0010 -> Ozeki - 0011 -> VoIPSec - 0012 -> SIPScan - 0013 -> Conaito - 0014 -> UsaAirport - 0015 -> PortSIP VoIP SDK - 0016 -> zxcvfdf11 - 0017 -> fdgddfg546df4g8d5f - -[+] Whitelisted - ----------- - 0001 -> my custom ua +{ + User-Agent: { + Blacklisted: { + Value: friendly-scanner + Value: pplsip + Value: sipcli + Value: sundayddr + Value: iWar + Value: sipsak + Value: VaxSIPUserAgent + Value: SimpleSIP + Value: SIP Call + Value: Ozeki + Value: VoIPSec + Value: SIPScan + Value: Conaito + Value: UsaAirport + Value: PortSIP VoIP SDK + Value: zxcvfdf11 + Value: fdgddfg546df4g8d5f + Value: siptest + Value: Nmap NSE + } + Whitelisted: { + Value: my custom ua + } + } +} ... </programlisting> </example> @@ -850,40 +855,40 @@ User-agent <programlisting format="linespecific"> ... -Blocked messages (blacklist) -============================ -[+] By user-agent : 1256 -[+] By country : 45 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 1 -[+] By IP address : 2552 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 316 -[+] By to user : 134 -[+] By contact user : 0 - -Allowed messages (whitelist) -============================ -[+] By user-agent : 0 -[+] By country : 478 -[+] By from domain : 0 -[+] By to domain : 0 -[+] By contact domain: 0 -[+] By IP address : 0 -[+] By from name : 0 -[+] By to name : 0 -[+] By contact name : 0 -[+] By from user : 0 -[+] By to user : 0 -[+] By contact user : 0 - -Other blocked messages -====================== -[+] Destinations : 0 -[+] SQL injection : 213 +{ + Blacklist: { + User-Agent: 1256 + Country: 45 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 1 + IP-Address: 2552 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 316 + To-User: 0134 + Contact-User: 0 + } + Whitelist: { + User-Agent: 0 + Country: 478 + From-Domain: 0 + To-Domain: 0 + Contact-Domain: 0 + IP-Address: 0 + From-Name: 0 + To-Name: 0 + Contact-Name: 0 + From-User: 0 + To-User: 0 + Contact-User: 0 + } + Other: { + Destination: 0 + SQL-Injection: 213 + } +} ... </programlisting> </example>

1 0

git:master:fe20e16b: secfilter: machine-parsable data structure for RPC printing data
by Jose Luis Verdeguer 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: fe20e16bf1e1656ef794699db345eefd3d1b8ac8 URL: https://github.com/kamailio/kamailio/commit/fe20e16bf1e1656ef794699db345eef… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-08-12T16:18:48+02:00 secfilter: machine-parsable data structure for RPC printing data --- Modified: src/modules/secfilter/secfilter_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/fe20e16bf1e1656ef794699db345eef… Patch: https://github.com/kamailio/kamailio/commit/fe20e16bf1e1656ef794699db345eef…

1 0

[kamailio/kamailio] build warnings (Issue #3208)
by sergey-safarov 12 Aug '22

12 Aug '22

``` CC (gcc) [kamailio] core/crypto/shautils.o CC (gcc) [kamailio] core/cfg/cfg.o CC (gcc) [kamailio] core/cfg/cfg_ctx.o core/cfg/cfg_ctx.c: In function 'cfg_update_defaults': core/cfg/cfg_ctx.c:287:28: warning: the comparison will always evaluate as 'true' for the pointer operand in '(unsigned char *)&ginst->vars + (sizetype)var->offset' must not be NULL [-Waddress] 287 | if(ginst->vars + var->offset) { | ^~~~~ CC (gcc) [kamailio] core/cfg/cfg_script.o CC (gcc) [kamailio] core/cfg/cfg_select.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3208 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3208(a)github.com>

2 2

git:master:26785f86: core/cfg: cast pointer to long to silent compiler warning
by Daniel-Constantin Mierla 12 Aug '22

12 Aug '22

Module: kamailio Branch: master Commit: 26785f866eeadc6944af83ae1a57e8ff100f60f5 URL: https://github.com/kamailio/kamailio/commit/26785f866eeadc6944af83ae1a57e8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-12T14:32:20+02:00 core/cfg: cast pointer to long to silent compiler warning - GH #3208 --- Modified: src/core/cfg/cfg_ctx.c --- Diff: https://github.com/kamailio/kamailio/commit/26785f866eeadc6944af83ae1a57e8f… Patch: https://github.com/kamailio/kamailio/commit/26785f866eeadc6944af83ae1a57e8f… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index a1e761f3a21..a9f19464bec 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -284,7 +284,7 @@ static int cfg_update_defaults(cfg_group_meta_t *meta, meta->array = array; clone_done = 1; } - if(ginst->vars + var->offset) { + if((unsigned long)ginst->vars + var->offset) { memcpy(ginst->vars + var->offset, new_val, cfg_var_size(var)); } else { LM_ERR("invalid variable offset\n");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev