sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
391 discussions

git:master:4b11820c: rtpproxy: print the ip address directly to local buffer
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 4b11820cb4337718854f1b80963e204764bc23b1 URL: https://github.com/kamailio/kamailio/commit/4b11820cb4337718854f1b80963e204… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T13:27:33+01:00 rtpproxy: print the ip address directly to local buffer - avoid extra copy --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/4b11820cb4337718854f1b80963e204… Patch: https://github.com/kamailio/kamailio/commit/4b11820cb4337718854f1b80963e204… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 74da691e705..f6ea6b1b12d 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1815,11 +1815,11 @@ static int rtpproxy_manage2(struct sip_msg *msg, char *flags, char *ip) static int rtpproxy_offer1_helper_f(struct sip_msg *msg, char *flags) { - char *cp; char newip[IP_ADDR_MAX_STR_SIZE]; + int len; - cp = ip_addr2a(&msg->rcv.dst_ip); - strcpy(newip, cp); + len = ip_addr2sbuf(&msg->rcv.dst_ip, newip, IP_ADDR_MAX_STR_SIZE - 1); + newip[len] = 0; return force_rtp_proxy(msg, flags, newip, 1, 0); }

1 0

Route $hfl negative index strange behaviour:
by Xenofon Karamanos 20 Nov '23

20 Nov '23

Hello, I am working on extending $hfl and $hflc supporting some more headers. During some experimentation, i stumbled in some weird behavior regarding $(hfl(Route)[-1]) and negative indexing of $hfl pseudo-variable. Here is a breakdown of what's happening: in kamailio.cfg: request_route { xlog("L_INFO", "Route headers hdr: $hdr(Route)\n"); xlog("L_INFO", "Route headers hfl: $hfl(Route)\n"); xlog("L_INFO", "Route headers count: $hflc(Route)\n"); xlog("L_INFO", "Route headers 0: $(hfl(Route)[0])\n"); xlog("L_INFO", "Route headers 1: $(hfl(Route)[1])\n"); xlog("L_INFO", "Route headers 4: $(hfl(Route)[4])\n"); xlog("L_INFO", "Route headers -1: $(hfl(Route)[-1])\n"); xlog("L_INFO", "Route headers -2: $(hfl(Route)[-2])\n"); xlog("L_INFO", "Route headers -3: $(hfl(Route)[-3])\n"); ... } Now when sending a SIP message containing multiple headers that have comma separated values ie: OPTIONS_MSG_2CONTACTS="OPTIONS sip:example.com SIP/2.0 Via: SIP/2.0/UDP 192.168.1.100:5060;branch=z9hG4bK123456789 Max-Forwards: 70 From: <sip:bob@example.com>;tag=123456789 To: <sip:alice@example.com> Call-ID: 987654321(a)192.168.1.100 CSeq: 1 OPTIONS Contact: <sip:bob@example.com>;expires=3600,<sip:bob2@example.com>;expires=3600,<sip:bob3@example.com>;expires=3600 Route: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> Route: <sip:server4.example.com;lr;ftag=1234>, <sip:server5.example.com;lr;ftag=5678> Content-Length: 0 " the logs show the weird behavior: Negative -1 should print the last header found and so on (as stated by https://www.kamailio.org/wikidocs/cookbooks/devel/pseudovariables/#hflname-… $hdr $hfl doc). Currently, -1 prints null and -2 prints the last one, -3 second to last and so on. This is probably a bug and not the expected behavior, or am i missing something? INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hdr: <sip:server1.example.com;lr;ftag=1234>, <sip:server2.example.com;lr;ftag=5678>, <sip:server3.example.com;lr;ftag=9012> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers hfl: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers count: 5 INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 0: <sip:server1.example.com;lr;ftag=1234> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 1: <sip:server2.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers 4: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -1: <null> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -2: <sip:server5.example.com;lr;ftag=5678> INFO: {1 1 OPTIONS 987654321(a)192.168.1.100} <script>: Route headers -3: <sip:server4.example.com;lr;ftag=1234> Thanks, Xenofon

1 0

git:master:71969c61: mohqueue: switch to use snprintf() for a couple of string formatting cases
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 71969c6126e6885f2ba312c692c9c646d8f870ef URL: https://github.com/kamailio/kamailio/commit/71969c6126e6885f2ba312c692c9c64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T13:03:52+01:00 mohqueue: switch to use snprintf() for a couple of string formatting cases --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/71969c6126e6885f2ba312c692c9c64… Patch: https://github.com/kamailio/kamailio/commit/71969c6126e6885f2ba312c692c9c64… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index 530137a2afb..75130381746 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -183,7 +183,7 @@ void ack_msg(sip_msg_t *pmsg, call_lst *pcall) **********/ pcall->call_hash = pcall->call_label = 0; - sprintf(pcall->call_addr, "%s %s", + snprintf(pcall->call_addr, IP_ADDR_MAX_STR_SIZE + 4, "%s %s", pmsg->rcv.dst_ip.af == AF_INET ? "IP4" : "IP6", ip_addr2a(&pmsg->rcv.dst_ip)); pcall->call_state = CLSTA_INQUEUE; @@ -412,12 +412,12 @@ void close_call(sip_msg_t *pmsg, call_lst *pcall) + strlen(pcall->call_via) // Via + strlen(pcall->call_route) // Route + strlen(pquri); // Contact - phdr = pkg_malloc(npos1); + phdr = pkg_malloc(npos1 + 1); if(!phdr) { LM_ERR("%sNo more memory!\n", pfncname); goto bye_err; } - sprintf(phdr, pbyemsg, + snprintf(phdr, npos1 + 1, pbyemsg, pcall->call_via, // Via pcall->call_route, // Route pquri); // Contact @@ -1097,15 +1097,16 @@ void first_invite_msg(sip_msg_t *pmsg, call_lst *pcall) str pcontact[1]; char *pcontacthdr = "Contact: <%s>" SIPEOL; - pcontact->s = - pkg_malloc(strlen(pcall->pmohq->mohq_uri) + strlen(pcontacthdr)); + int tblen; + tblen = strlen(pcall->pmohq->mohq_uri) + strlen(pcontacthdr); + pcontact->s = pkg_malloc(tblen + 1); if(!pcontact->s) { LM_ERR("%sNo more memory!\n", pfncname); end_RTP(pmsg, pcall); delete_call(pcall); return; } - sprintf(pcontact->s, pcontacthdr, pcall->pmohq->mohq_uri); + snprintf(pcontact->s, tblen + 1, pcontacthdr, pcall->pmohq->mohq_uri); pcontact->len = strlen(pcontact->s); if(!add_lump_rpl2(pmsg, pcontact->s, pcontact->len, LUMP_RPL_HDR)) { LM_ERR("%sUnable to add contact (%s) to call (%s)!\n", pfncname, @@ -1557,12 +1558,12 @@ int refer_call(call_lst *pcall, mohq_lock *plock) + strlen(pcall->pmohq->mohq_uri) // Contact + puri->len // Refer-To + strlen(pcall->pmohq->mohq_uri); // Referred-By - char *pbuf = pkg_malloc(npos1); + char *pbuf = pkg_malloc(npos1 + 1); if(!pbuf) { LM_ERR("%sNo more memory!\n", pfncname); goto refererr; } - sprintf(pbuf, prefermsg, + snprintf(pbuf, npos1 + 1, prefermsg, pcall->call_via, // Via pcall->call_route, // Route pcall->pmohq->mohq_uri, // Contact @@ -1863,7 +1864,7 @@ int send_prov_rsp(sip_msg_t *pmsg, call_lst *pcall) char phdrtmp[200]; char *phdrtmplt = "Accept-Language: en" SIPEOL "Require: 100rel" SIPEOL "RSeq: %d" SIPEOL; - sprintf(phdrtmp, phdrtmplt, pcall->call_cseq); + snprintf(phdrtmp, 200, phdrtmplt, pcall->call_cseq); struct lump_rpl **phdrlump = add_lump_rpl2(pmsg, phdrtmp, strlen(phdrtmp), LUMP_RPL_HDR); if(!phdrlump) { @@ -2006,7 +2007,7 @@ int send_rtp_answer(sip_msg_t *pmsg, call_lst *pcall) npos1 += pparse[npos2].len; } char pbodylen[30]; - sprintf(pbodylen, "%s: %d\r\n\r\n", pclenhdr, pSDP->len); + snprintf(pbodylen, 30, "%s: %d\r\n\r\n", pclenhdr, pSDP->len); npos1 += pextrahdr->len + strlen(pbodylen) + pSDP->len + 1; char *pnewbuf = pkg_malloc(npos1); if(!pnewbuf) { @@ -2858,4 +2859,4 @@ int mohq_send(sip_msg_t *pmsg, char *pqueue) return -1; } return 1; -} \ No newline at end of file +}

1 0

git:master:1eb94377: core: review and update/remove old comments
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 1eb943773f52ea659c8dd812226ad07bcd15caaa URL: https://github.com/kamailio/kamailio/commit/1eb943773f52ea659c8dd812226ad07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T10:43:19+01:00 core: review and update/remove old comments --- Modified: src/core/dns_cache.c Modified: src/core/fix_lumps.h Modified: src/core/forward.c Modified: src/core/globals.h Modified: src/core/local_timer.c Modified: src/core/mem/q_malloc.c Modified: src/core/msg_translator.c Modified: src/core/proxy.c Modified: src/core/pv_core.c Modified: src/core/raw_sock.c Modified: src/core/tcp_read.c Modified: src/core/tcp_stats.h Modified: src/core/timer.c Modified: src/core/usr_avp.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1eb943773f52ea659c8dd812226ad07… Patch: https://github.com/kamailio/kamailio/commit/1eb943773f52ea659c8dd812226ad07…

1 0

git:master:34edbfa0: core: tcp_main - remove old comments
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 34edbfa0194ba29e0e671551d44df3710beb93b6 URL: https://github.com/kamailio/kamailio/commit/34edbfa0194ba29e0e671551d44df37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T10:18:58+01:00 core: tcp_main - remove old comments --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/34edbfa0194ba29e0e671551d44df37… Patch: https://github.com/kamailio/kamailio/commit/34edbfa0194ba29e0e671551d44df37… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 00a1796ec5a..855b2d80617 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -4373,7 +4373,6 @@ inline static int send2child(struct tcp_connection *tcpconn) tcpconn->s) <= 0)) { if((errno == EAGAIN) || (errno == EWOULDBLOCK)) { - /* FIXME: remove after debugging */ LM_CRIT("tcp child %d, socket %d: queue full, %d requests queued " "(total handled %d)\n", idx, tcp_children[idx].unix_sock, min_busy, @@ -4556,23 +4555,7 @@ inline static int handle_tcpconn_ev( int empty_q; int bytes; #endif /* TCP_ASYNC */ - /* is refcnt!=0 really necessary? - * No, in fact it's a bug: I can have the following situation: a send only - * tcp connection used by n processes simultaneously => refcnt = n. In - * the same time I can have a read event and this situation is perfectly - * valid. -- andrei - */ -#if 0 - if ((tcpconn->refcnt!=0)){ - /* FIXME: might be valid for sigio_rt iff fd flags are not cleared - * (there is a short window in which it could generate a sig - * that would be caught by tcp_main) */ - LM_CRIT("handle_tcpconn_ev: io event on referenced" - " tcpconn (%p), refcnt=%d, fd=%d\n", - tcpconn, tcpconn->refcnt, tcpconn->s); - return -1; - } -#endif + /* pass it to child, so remove it from the io watch list and the local * timer */ #ifdef TCP_ASYNC @@ -4627,7 +4610,7 @@ inline static int handle_tcpconn_ev( (void)dst_blocklist_su(BLST_ERR_SEND, tcpconn->rcv.proto, &tcpconn->rcv.src_su, &tcpconn->send_flags, 0); #endif /* USE_DST_BLOCKLIST */ - TCP_STATS_CON_RESET(); /* FIXME: it could != RST */ + TCP_STATS_CON_RESET(); /* note: it could != RST */ } } if(unlikely(!tcpconn_try_unhash(tcpconn))) {

1 0

git:master:e51ccd11: core: set proto on fixing forward actions
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: e51ccd11fe51f2d53dd7719b8fdec561a6ba7494 URL: https://github.com/kamailio/kamailio/commit/e51ccd11fe51f2d53dd7719b8fdec56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T10:07:50+01:00 core: set proto on fixing forward actions --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/e51ccd11fe51f2d53dd7719b8fdec56… Patch: https://github.com/kamailio/kamailio/commit/e51ccd11fe51f2d53dd7719b8fdec56… --- diff --git a/src/core/route.c b/src/core/route.c index f6c8c681d29..a03330b6c04 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -619,6 +619,7 @@ int fix_actions(struct action *a) enum rval_type rve_type, err_type, expected_type; struct rvalue *rv; int rve_param_no; + int proto; if(a == 0) { LM_CRIT("null pointer\n"); @@ -646,8 +647,23 @@ int fix_actions(struct action *a) case STRING_ST: s.s = t->val[0].u.string; s.len = strlen(s.s); - p = add_proxy( - &s, t->val[1].u.number, 0); /* FIXME proto*/ + switch(t->type) { + case FORWARD_TCP_T: + proto = PROTO_TCP; + break; + case FORWARD_TLS_T: + proto = PROTO_TCP; + break; + case FORWARD_SCTP_T: + proto = PROTO_TCP; + break; + case FORWARD_UDP_T: + proto = PROTO_TCP; + break; + default: + proto = 0; + } + p = add_proxy(&s, t->val[1].u.number, proto); if(p == 0) { ret = E_BAD_ADDRESS; goto error;

1 0

git:master:c9fbf264: xcap: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: c9fbf2640ad74e9f42b43bded80877f8c4ce3f5d URL: https://github.com/kamailio/kamailio/commit/c9fbf2640ad74e9f42b43bded80877f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 xcap: clang format --- Modified: src/lib/xcap/common_policy.c Modified: src/lib/xcap/common_policy.h Modified: src/lib/xcap/msg_rules.c Modified: src/lib/xcap/msg_rules.h Modified: src/lib/xcap/parse_common_rules.c Modified: src/lib/xcap/parse_common_rules.h Modified: src/lib/xcap/parse_msg_rules.c Modified: src/lib/xcap/parse_pres_rules.c Modified: src/lib/xcap/pres_rules.c Modified: src/lib/xcap/pres_rules.h Modified: src/lib/xcap/resource_list.c Modified: src/lib/xcap/resource_list.h Modified: src/lib/xcap/resource_lists_parser.c Modified: src/lib/xcap/resource_lists_parser.h Modified: src/lib/xcap/rls_services_parser.c Modified: src/lib/xcap/rls_services_parser.h Modified: src/lib/xcap/xcap_client.c Modified: src/lib/xcap/xcap_client.h Modified: src/lib/xcap/xcap_result_codes.h Modified: src/lib/xcap/xml_utils.c Modified: src/lib/xcap/xml_utils.h --- Diff: https://github.com/kamailio/kamailio/commit/c9fbf2640ad74e9f42b43bded80877f… Patch: https://github.com/kamailio/kamailio/commit/c9fbf2640ad74e9f42b43bded80877f…

1 0

git:master:a84e8bf0: srdb2: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: a84e8bf031994d1b8d71e7b778204df0cbd7475b URL: https://github.com/kamailio/kamailio/commit/a84e8bf031994d1b8d71e7b778204df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 srdb2: clang format --- Modified: src/lib/srdb2/db.h Modified: src/lib/srdb2/db_cmd.c Modified: src/lib/srdb2/db_cmd.h Modified: src/lib/srdb2/db_con.c Modified: src/lib/srdb2/db_con.h Modified: src/lib/srdb2/db_ctx.c Modified: src/lib/srdb2/db_ctx.h Modified: src/lib/srdb2/db_drv.c Modified: src/lib/srdb2/db_drv.h Modified: src/lib/srdb2/db_fld.c Modified: src/lib/srdb2/db_fld.h Modified: src/lib/srdb2/db_gen.c Modified: src/lib/srdb2/db_gen.h Modified: src/lib/srdb2/db_pool.c Modified: src/lib/srdb2/db_pool.h Modified: src/lib/srdb2/db_rec.c Modified: src/lib/srdb2/db_rec.h Modified: src/lib/srdb2/db_res.c Modified: src/lib/srdb2/db_res.h Modified: src/lib/srdb2/db_uri.c Modified: src/lib/srdb2/db_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/a84e8bf031994d1b8d71e7b778204df… Patch: https://github.com/kamailio/kamailio/commit/a84e8bf031994d1b8d71e7b778204df…

1 0

git:master:4d4311b3: srdb1: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 4d4311b355b111ec4b22c748f8d9dd0960ae4c4f URL: https://github.com/kamailio/kamailio/commit/4d4311b355b111ec4b22c748f8d9dd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 srdb1: clang format --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db.h Modified: src/lib/srdb1/db_cap.h Modified: src/lib/srdb1/db_con.h Modified: src/lib/srdb1/db_id.c Modified: src/lib/srdb1/db_id.h Modified: src/lib/srdb1/db_key.h Modified: src/lib/srdb1/db_locking.h Modified: src/lib/srdb1/db_op.h Modified: src/lib/srdb1/db_pool.c Modified: src/lib/srdb1/db_pool.h Modified: src/lib/srdb1/db_pooling.h Modified: src/lib/srdb1/db_query.c Modified: src/lib/srdb1/db_query.h Modified: src/lib/srdb1/db_res.c Modified: src/lib/srdb1/db_res.h Modified: src/lib/srdb1/db_row.c Modified: src/lib/srdb1/db_row.h Modified: src/lib/srdb1/db_ut.c Modified: src/lib/srdb1/db_ut.h Modified: src/lib/srdb1/db_val.c Modified: src/lib/srdb1/db_val.h --- Diff: https://github.com/kamailio/kamailio/commit/4d4311b355b111ec4b22c748f8d9dd0… Patch: https://github.com/kamailio/kamailio/commit/4d4311b355b111ec4b22c748f8d9dd0…

1 0

git:master:3893cea9: shm_regex: clang format
by Daniel-Constantin Mierla 20 Nov '23

20 Nov '23

Module: kamailio Branch: master Commit: 3893cea9ebf83513ed68d2064113dd4fa67900bc URL: https://github.com/kamailio/kamailio/commit/3893cea9ebf83513ed68d2064113dd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-20T09:43:15+01:00 shm_regex: clang format --- Modified: src/lib/shm_regex/shm_regex.c Modified: src/lib/shm_regex/shm_regex.h --- Diff: https://github.com/kamailio/kamailio/commit/3893cea9ebf83513ed68d2064113dd4… Patch: https://github.com/kamailio/kamailio/commit/3893cea9ebf83513ed68d2064113dd4…

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023