sr-dev September 2024

sr-dev@lists.kamailio.org

15 participants
173 discussions

git:master:8a13a1d8: utils/kamctl: regenerate db table definitions
by Daniel-Constantin Mierla 06 Sep '24

06 Sep '24

Module: kamailio Branch: master Commit: 8a13a1d8301aa22baa9b3a52b891fd04a04c3768 URL: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-06T10:16:50+02:00 utils/kamctl: regenerate db table definitions --- Modified: utils/kamctl/db_sqlite/htable-create.sql Modified: utils/kamctl/mysql/htable-create.sql Modified: utils/kamctl/oracle/htable-create.sql Modified: utils/kamctl/postgres/htable-create.sql Modified: utils/kamctl/xhttp_pi/acc-mod Modified: utils/kamctl/xhttp_pi/alias_db-mod Modified: utils/kamctl/xhttp_pi/auth_db-mod Modified: utils/kamctl/xhttp_pi/avpops-mod Modified: utils/kamctl/xhttp_pi/carrierroute-mod Modified: utils/kamctl/xhttp_pi/cpl-mod Modified: utils/kamctl/xhttp_pi/dialog-mod Modified: utils/kamctl/xhttp_pi/dialplan-mod Modified: utils/kamctl/xhttp_pi/dispatcher-mod Modified: utils/kamctl/xhttp_pi/domain-mod Modified: utils/kamctl/xhttp_pi/domainpolicy-mod Modified: utils/kamctl/xhttp_pi/drouting-mod Modified: utils/kamctl/xhttp_pi/group-mod Modified: utils/kamctl/xhttp_pi/htable-mod Modified: utils/kamctl/xhttp_pi/imc-mod Modified: utils/kamctl/xhttp_pi/lcr-mod Modified: utils/kamctl/xhttp_pi/matrix-mod Modified: utils/kamctl/xhttp_pi/mohqueue-mod Modified: utils/kamctl/xhttp_pi/msilo-mod Modified: utils/kamctl/xhttp_pi/mtree-mod Modified: utils/kamctl/xhttp_pi/pdt-mod Modified: utils/kamctl/xhttp_pi/permissions-mod Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/pipelimit-mod Modified: utils/kamctl/xhttp_pi/presence-mod Modified: utils/kamctl/xhttp_pi/purple-mod Modified: utils/kamctl/xhttp_pi/registrar-mod Modified: utils/kamctl/xhttp_pi/rls-mod Modified: utils/kamctl/xhttp_pi/rtpengine-mod Modified: utils/kamctl/xhttp_pi/rtpproxy-mod Modified: utils/kamctl/xhttp_pi/sca-mod Modified: utils/kamctl/xhttp_pi/secfilter-mod Modified: utils/kamctl/xhttp_pi/siptrace-mod Modified: utils/kamctl/xhttp_pi/speeddial-mod Modified: utils/kamctl/xhttp_pi/standard-mod Modified: utils/kamctl/xhttp_pi/topos-mod Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uid_auth_db-mod Modified: utils/kamctl/xhttp_pi/uid_avp_db-mod Modified: utils/kamctl/xhttp_pi/uid_domain-mod Modified: utils/kamctl/xhttp_pi/uid_gflags-mod Modified: utils/kamctl/xhttp_pi/uid_uri_db-mod Modified: utils/kamctl/xhttp_pi/uri_db-mod Modified: utils/kamctl/xhttp_pi/userblocklist-mod Modified: utils/kamctl/xhttp_pi/usrloc-mod --- Diff: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0… Patch: https://github.com/kamailio/kamailio/commit/8a13a1d8301aa22baa9b3a52b891fd0…

1 0

git:master:12cdb896: lib/srdb1/schema: increase default size of columns for htable
by Daniel-Constantin Mierla 06 Sep '24

06 Sep '24

Module: kamailio Branch: master Commit: 12cdb896fed98a38bfd9b77e1ace1dd346901cc3 URL: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-06T10:07:41+02:00 lib/srdb1/schema: increase default size of columns for htable - same type, version kept, code nca work with different size already --- Modified: src/lib/srdb1/schema/htable.xml --- Diff: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… Patch: https://github.com/kamailio/kamailio/commit/12cdb896fed98a38bfd9b77e1ace1dd… --- diff --git a/src/lib/srdb1/schema/htable.xml b/src/lib/srdb1/schema/htable.xml index 9ee35d2fe71..ab60cc7fd3c 100644 --- a/src/lib/srdb1/schema/htable.xml +++ b/src/lib/srdb1/schema/htable.xml @@ -36,7 +36,7 @@ <column id="key_name"> <name>key_name</name> <type>string</type> - <size>64</size> + <size>256</size> <default/> <description>Name of the hash key</description> </column> @@ -58,7 +58,7 @@ <column id="attribute"> <name>key_value</name> <type>string</type> - <size>128</size> + <size>512</size> <default/> <description>The value of the key</description> </column>

1 0

[kamailio/kamailio] [htable] db_sql "key_value" length = 128 too small, what if change to 1024 ? (Issue #3944)
by gao114882 06 Sep '24

06 Sep '24

### Description  ### Expected behavior large "key_value" can store to db_sql。 #### Actual observed behavior the key_value = "{\"id\":1,\"in_port\":\"5263\",\"in_ptl\":\"udp\",\"rate_limit\":\"\",\"out_port\":\"5262\",\"out_ptl\":\"udp\",\"mode\":2,\"proxied_ip\":\"172.16.4.114\",\"proxied_port\":\"5080\",\"in_gateway_ip\":\"116.198.229.196\",\"in_gateway_port\":\"5080\",\"black_list\":{\"ip\":[\"127.0.0.1\"],\"user\":[]},\"white_list\":{\"ip\":[\"127.0.0.1\"],\"user\":[]},\"called_prefix\":[{\"match_num\":\"\",\"caller_rule\":{\"start_pos\":0,\"length\":2,\"new_num\":\"\",\"type\":2},\"called_rule\":{\"start_pos\":0,\"length\":0,\"new_num\":\"\",\"type\":0}}],\"caller_prefix\":[{\"match_num\":\"\",\"caller_rule\":{\"start_pos\":0,\"length\":2,\"new_num\":\"\",\"type\":1},\"called_rule\":{\"start_pos\":0,\"length\":0,\"new_num\":\"\",\"type\":0}}]}" <img width="913" alt="企业微信截图_17234562508919" src="https://github.com/user-attachments/assets/ab0acd4b-980a-4dc5-95b3-8e8afb7a…"> #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: compiled on 11:50:37 Aug 9 2024 with gcc 4.8.5 ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3944 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3944(a)github.com>

2 2

git:master:60165196: registrar: safety check for uri and remove duplicated aor extract
by Daniel-Constantin Mierla 05 Sep '24

05 Sep '24

Module: kamailio Branch: master Commit: 60165196ad3144597c24eb9f7bb7fb0cd56f8c25 URL: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T11:28:08+02:00 registrar: safety check for uri and remove duplicated aor extract - follow up of changes from previous commit --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… Patch: https://github.com/kamailio/kamailio/commit/60165196ad3144597c24eb9f7bb7fb0… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 4bd4a1505a1..1f5b7e0acbd 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -936,7 +936,7 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) int novariation = 0; - if(_uri->len > 0) { + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, &turi) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1043,11 +1043,6 @@ int save(struct sip_msg *_m, udomain_t *_d, int _cflags, str *_uri) get_act_time(); c = get_first_contact(_m); - if(extract_aor((_uri) ? _uri : &get_to(_m)->uri, &aor, NULL) < 0) { - LM_ERR("failed to extract Address Of Record\n"); - goto error; - } - mem_only = is_cflag_set(REG_SAVE_MEM_FL) ? FL_MEM : FL_NONE; novariation = is_cflag_set(REG_SAVE_NOVARIATION_FL) ? 1 : 0; @@ -1118,7 +1113,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) if(_ruid == NULL || _ruid->len <= 0) { /* No ruid provided - remove all contacts for aor */ - if(_uri->len > 0) { + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, &turi) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1142,9 +1137,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) } } else { /* ruid provided - remove a specific contact */ - - if(_uri->len > 0) { - + if(_uri != NULL && _uri->len > 0) { if(extract_aor(_uri, &aor, NULL) < 0) { LM_ERR("failed to extract Address Of Record\n"); return -1; @@ -1162,9 +1155,7 @@ int unregister(struct sip_msg *_m, udomain_t *_d, str *_uri, str *_ruid) return -2; } _reg_ul.unlock_udomain(_d, &aor); - } else { - res = _reg_ul.delete_urecord_by_ruid(_d, _ruid); switch(res) { case -1:

1 0

[kamailio/kamailio] Kamailio 5.8.3 breaks IPv6 endpoints (Issue #3968)
by Sebastian Damm 05 Sep '24

05 Sep '24

### Description  We are running Kamailio in front of a backend farm, REGISTERs go directly to the backend. After registration, the backend sends out OPTIONS requests periodically. This worked with 5.8.2. Now when running a 5.8.3 server (taken from your apt repository), I get the following errors in the log: ``` Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [ut.h:235]: uri2dst2(): bad_uri: [sip:[[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]]:59580;transport=tls] Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [t_fwd.c:1764]: t_forward_nonack(): failure to add branches ``` There are extra square brackets in the URI. I compared the REGISTERs from old and new Kamailio to the backend, and also the OPTIONS packets sent by the backend, the are identical except for the obvious differences. ### Troubleshooting #### Reproduction  * Have a Kamailio with nathelper enabled. * Do something like this for nat detection: ``` def ksr_route_natdetect(self, msg): KSR.force_rport() # Checks if request goes to backend or not if not msg.is_internal_message(): KSR.setbflag(FLB_NATB) KSR.setflag(FLT_NATS) if KSR.textops.is_present_hf("Contact") > 0: if KSR.nathelper.set_contact_alias() < 0: msg.log("Error in aliasing contact") KSR.sl.sl_send_reply(400,"Bad request") return False else: if msg.is_request(): KSR.nathelper.handle_ruri_alias() return 1 ``` * register a phone to the backend (e.g. an Asterisk server) * send an OPTIONS packet from the backend to the registered device. #### SIP The REGISTER from Kamailio to the backend looks like this: ``` REGISTER sip:domain;transport=tcp SIP/2.0 Via: SIP/2.0/TCP 100.74.11.1:5063;branch=z9hG4bK6c3e.2cedb59e7724d263255c1996d9d2d4fa.0;i=6 Via: SIP/2.0/TLS [2001:16e0:affe:affe:24a2:55a2:15bf:23d1]:61391;received=2001:16e0:affe:affe:24a2:55a2:15bf:23d1;rport=61391;branch=z9hG4bKPjAB7F905A-A6A2-491D-A456-89C8FD4C5183;alias Max-Forwards: 69 From: <sip:dZmIQyb70tzt2J9@sdammone>;tag=AAA80708-4968-4B49-95B8-7DBCEFCC5E62 To: <sip:dZmIQyb70tzt2J9@sdammone> Call-ID: 4922AA11-F4BA-49D0-AE64-EECF49735684 CSeq: 44208 REGISTER User-Agent: foobar Supported: outbound, path Contact: <sip:dZmIQyb70tzt2J9@[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]:61391;transport=TLS;p-xs=6eb17056fba34ce6bc7d458a1a7a80ba;ob;alias=[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]~61391~3>;reg-id=1;+sip.instance="<urn:uuid:00000000-0000-0000-0000-00000c73bfc6>" Expires: 300 Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS Content-Length: 0 Path: <sip:100.74.11.1:5063;transport=tcp;lr;xep=true> ``` The OPTIONS packet from backend to the client looks like this: ``` OPTIONS sip:dZmIQyb70tzt2J9@[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]:61391;transport=TLS;p-xs=6eb17056fba34ce6bc7d458a1a7a80ba;ob;alias=[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]~61391~3 SIP/2.0 Via: SIP/2.0/TCP 100.74.130.66:5060;rport;branch=z9hG4bKPj3e558221-2506-4a2b-9daa-ff7e73d05e8c;alias From: <sip:dZmIQyb70tzt2J9@sdammone>;tag=18c9809a-4775-4c35-8e88-5c5a7bdcf1fe To: <sip:dZmIQyb70tzt2J9@[2001:16e0:affe:affe:24a2:55a2:15bf:23d1];p-xs=6eb17056fba34ce6bc7d458a1a7a80ba;ob;alias=[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]~61391~3> Contact: <sip:dZmIQyb70tzt2J9@100.74.130.66:5060;transport=TCP> Call-ID: 2e1efbd3-9366-4542-b909-83429266b6ef CSeq: 2989 OPTIONS Supported: path Route: <sip:100.74.11.1:5063;transport=tcp;lr;xep=true> Max-Forwards: 70 User-Agent: barfoo Content-Length: 0 ``` #### Log Messages ``` Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [ut.h:235]: uri2dst2(): bad_uri: [sip:[[2001:16e0:affe:affe:24a2:55a2:15bf:23d1]]:59580;transport=tls] Sep 04 14:41:36 sipproxy /usr/sbin/kamailio[124]: ERROR: tm [t_fwd.c:1764]: t_forward_nonack(): failure to add branches ``` ### Possible Solutions Downgrading to 5.8.2 again works. I suppose, the problem comes from this commit by @vingarzan: https://github.com/kamailio/kamailio/commit/52ab6f3dcf5ad8d967be8bdecaa64ef… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 11.4.0 ``` * **Operating System**:  ``` Ubuntu Jammy ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3968 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3968(a)github.com>

3 6

git:5.8:be1fe948: nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets
by Daniel-Constantin Mierla 05 Sep '24

05 Sep '24

Module: kamailio Branch: 5.8 Commit: be1fe948b188ba84ec542e5622377d3772463e5b URL: https://github.com/kamailio/kamailio/commit/be1fe948b188ba84ec542e5622377d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T09:44:37+02:00 nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets - the add_contact_alias() without parameters was doing it already - discovered while investigating GH #3968 (cherry picked from commit 744e5ac9678c0c9ef07bfb0de44c7c478a2debdc) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/be1fe948b188ba84ec542e5622377d3… Patch: https://github.com/kamailio/kamailio/commit/be1fe948b188ba84ec542e5622377d3… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9ee73e62a21..99904557847 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -998,6 +998,8 @@ static int add_contact_alias_3( struct lump *anchor; struct sip_uri uri; char *bracket, *lt, *param, *at, *start; + int is_ipv6 = 0; + int i; /* Do nothing if Contact header does not exist */ if(!msg->contact) { @@ -1058,8 +1060,8 @@ static int add_contact_alias_3( } /* Create ;alias param */ - param_len = _ksr_contact_salias.len + IP6_MAX_STR_SIZE - + 1 /* ~ */ + 5 /* port */ + param_len = _ksr_contact_salias.len + 1 /* [ */ + IP6_MAX_STR_SIZE + + 1 /* ] */ + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */ + 1 /* closing > */; param = (char *)pkg_malloc(param_len); if(!param) { @@ -1068,8 +1070,20 @@ static int add_contact_alias_3( } at = param; /* ip address */ + for(i = 0; i < ip_str->len; i++) { + if(ip_str->s[i] == ':') { + is_ipv6 = 1; + break; + } + } + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, '['); + } append_str(at, _ksr_contact_salias.s, _ksr_contact_salias.len); append_str(at, ip_str->s, ip_str->len); + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, ']'); + } /* port */ append_chr(at, '~'); append_str(at, port_str->s, port_str->len);

1 0

git:master:aa794581: core: try to lookup connection for WSS when TCPCONN_MATCH_STRICT is set
by Daniel-Constantin Mierla 05 Sep '24

05 Sep '24

Module: kamailio Branch: master Commit: aa794581ecf105b5313d2f5b8bcfe516ab337936 URL: https://github.com/kamailio/kamailio/commit/aa794581ecf105b5313d2f5b8bcfe51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-05T09:01:52+02:00 core: try to lookup connection for WSS when TCPCONN_MATCH_STRICT is set - URIs have always transport ws, but most likely the connection is wss - GH #3969 --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/aa794581ecf105b5313d2f5b8bcfe51… Patch: https://github.com/kamailio/kamailio/commit/aa794581ecf105b5313d2f5b8bcfe51… --- diff --git a/src/core/forward.h b/src/core/forward.h index 31086c6512b..8d96e4df5cb 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -137,6 +137,7 @@ static inline int msg_send_buffer( union sockaddr_union local_addr; struct tcp_connection *con = NULL; struct ws_event_info wsev; + int dproto; int ret; #endif @@ -192,9 +193,21 @@ static inline int msg_send_buffer( if(likely(port)) { su2ip_addr(&ip, &dst->to); if(tcp_connection_match == TCPCONN_MATCH_STRICT) { + /* lookup first for WSS, because transport=ws is in URI, + * but WS is less likely */ + if(dst->proto == PROTO_WSS || dst->proto == PROTO_WS) { + dproto = PROTO_WSS; + } else { + dproto = dst->proto; + } con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - dst->proto); + dproto); + if(con == NULL && dst->proto == PROTO_WS) { + con = tcpconn_lookup(dst->id, &ip, port, from, + (dst->send_sock) ? dst->send_sock->port_no : 0, 0, + PROTO_WS); + } } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:744e5ac9: nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 744e5ac9678c0c9ef07bfb0de44c7c478a2debdc URL: https://github.com/kamailio/kamailio/commit/744e5ac9678c0c9ef07bfb0de44c7c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T19:36:34+02:00 nathelper: add_contact_alias() with parameters to enclose ipv6 in square brackets - the add_contact_alias() without parameters was doing it already - discovered while investigating GH #3968 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/744e5ac9678c0c9ef07bfb0de44c7c4… Patch: https://github.com/kamailio/kamailio/commit/744e5ac9678c0c9ef07bfb0de44c7c4… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 1188dbeb04b..bf4b3b21893 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -998,6 +998,8 @@ static int add_contact_alias_3( struct lump *anchor; struct sip_uri uri; char *bracket, *lt, *param, *at, *start; + int is_ipv6 = 0; + int i; /* Do nothing if Contact header does not exist */ if(!msg->contact) { @@ -1058,8 +1060,8 @@ static int add_contact_alias_3( } /* Create ;alias param */ - param_len = _ksr_contact_salias.len + IP6_MAX_STR_SIZE - + 1 /* ~ */ + 5 /* port */ + param_len = _ksr_contact_salias.len + 1 /* [ */ + IP6_MAX_STR_SIZE + + 1 /* ] */ + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */ + 1 /* closing > */; param = (char *)pkg_malloc(param_len); if(!param) { @@ -1068,8 +1070,20 @@ static int add_contact_alias_3( } at = param; /* ip address */ + for(i = 0; i < ip_str->len; i++) { + if(ip_str->s[i] == ':') { + is_ipv6 = 1; + break; + } + } + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, '['); + } append_str(at, _ksr_contact_salias.s, _ksr_contact_salias.len); append_str(at, ip_str->s, ip_str->len); + if(is_ipv6 && ip_str->s[0] != '[') { + append_chr(at, ']'); + } /* port */ append_chr(at, '~'); append_str(at, port_str->s, port_str->len);

1 0

git:5.8:3c89405e: nathelper: check if alias ipv6 has already square brackets
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: 5.8 Commit: 3c89405ed74152fd59365ad7dacb144092f5516a URL: https://github.com/kamailio/kamailio/commit/3c89405ed74152fd59365ad7dacb144… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T18:58:00+02:00 nathelper: check if alias ipv6 has already square brackets - GH #3968 (cherry picked from commit 6e01172a138d395fa3f7c3f25238647934137dba) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/3c89405ed74152fd59365ad7dacb144… Patch: https://github.com/kamailio/kamailio/commit/3c89405ed74152fd59365ad7dacb144… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9c0bebad3a7..9ee73e62a21 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1140,6 +1140,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) *trans, *start; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_len, ip_port_len, port_len, i; + int is_ipv6 = 0; if(parse_sip_msg_uri(msg) < 0) { LM_ERR("while parsing Request-URI\n"); @@ -1188,7 +1189,6 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) // IPv6 needs some [] added when composing a SIP URI, which further // complicates this code. ip_len = port - val; - int is_ipv6 = 0; for(i = 0; i < ip_len; i++) { if(val[i] == ':') { is_ipv6 = 1; @@ -1206,7 +1206,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) append_str(at, "sip:", 4); ip_port_len = trans - val; alias_len = _ksr_contact_salias.len + ip_port_len + 2 /* ~n */; - if(is_ipv6) { + if(is_ipv6 && val[0] != '[') { // IPv6 - add '[' ']' around IP // then append ':' and copy the port append_chr(at, '[');

1 0

git:master:6e01172a: nathelper: check if alias ipv6 has already square brackets
by Daniel-Constantin Mierla 04 Sep '24

04 Sep '24

Module: kamailio Branch: master Commit: 6e01172a138d395fa3f7c3f25238647934137dba URL: https://github.com/kamailio/kamailio/commit/6e01172a138d395fa3f7c3f25238647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-09-04T18:54:22+02:00 nathelper: check if alias ipv6 has already square brackets - GH #3968 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/6e01172a138d395fa3f7c3f25238647… Patch: https://github.com/kamailio/kamailio/commit/6e01172a138d395fa3f7c3f25238647… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 3c829709c0f..1188dbeb04b 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1140,6 +1140,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) *trans, *start; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_len, ip_port_len, port_len, i; + int is_ipv6 = 0; if(parse_sip_msg_uri(msg) < 0) { LM_ERR("while parsing Request-URI\n"); @@ -1188,7 +1189,6 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) // IPv6 needs some [] added when composing a SIP URI, which further // complicates this code. ip_len = port - val; - int is_ipv6 = 0; for(i = 0; i < ip_len; i++) { if(val[i] == ':') { is_ipv6 = 1; @@ -1206,7 +1206,7 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) append_str(at, "sip:", 4); ip_port_len = trans - val; alias_len = _ksr_contact_salias.len + ip_port_len + 2 /* ~n */; - if(is_ipv6) { + if(is_ipv6 && val[0] != '[') { // IPv6 - add '[' ']' around IP // then append ':' and copy the port append_chr(at, '[');

1 0

← Newer
1
...
11
12
13
14
15
16
17
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2024