- sr-dev - kamailio.org

git:5.4:5d30b911: core: set MAX_WARNING_LEN to 1024
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 5d30b9111e1e80553ba260767521b9132b82d6a7 URL: https://github.com/kamailio/kamailio/commit/5d30b9111e1e80553ba260767521b91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:49:37+02:00 core: set MAX_WARNING_LEN to 1024 - 256 can be too short - close GH #2799 (cherry picked from commit 0d06e164efa720d91d49995585e80c9082ce3b21) (cherry picked from commit 1f9f6fff6e0ab21e460538ffd1e54b6c60f54f7e) --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/5d30b9111e1e80553ba260767521b91… Patch: https://github.com/kamailio/kamailio/commit/5d30b9111e1e80553ba260767521b91… --- diff --git a/src/core/config.h b/src/core/config.h index 81fe101fe1..d8a85e9e6e 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -90,7 +90,7 @@ #define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) -#define MAX_WARNING_LEN 256 +#define MAX_WARNING_LEN 1024 #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1)

1 0

git:5.4:e9e19030: http_client: docs - fixed small typo
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: e9e190302f397b4d133fc5ca3a20168e93e51cd0 URL: https://github.com/kamailio/kamailio/commit/e9e190302f397b4d133fc5ca3a20168… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:48:05+02:00 http_client: docs - fixed small typo (cherry picked from commit 1f67ac5a62b58b35df52aedbd1a3d2234a72817e) (cherry picked from commit 6a527503a653d554ffb38f8bd7a40fd75441ff4d) --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e9e190302f397b4d133fc5ca3a20168… Patch: https://github.com/kamailio/kamailio/commit/e9e190302f397b4d133fc5ca3a20168… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 6f1c897690..906ec2eb25 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -446,7 +446,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: <itemizedlist> <listitem><para>0 - Return the entire HTTP result body</para></listitem> - <listitem><para>1 - Return the first oine from HTTP result body</para></listitem> + <listitem><para>1 - Return the first line from HTTP result body</para></listitem> </itemizedlist> </para> <para>

1 0

git:5.4:2ab8cb38: http_client: check if shm is initialized in curl_parse_param()
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 2ab8cb38f9ddf01e174c3525ebdec35d6c83406e URL: https://github.com/kamailio/kamailio/commit/2ab8cb38f9ddf01e174c3525ebdec35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:48:41+02:00 http_client: check if shm is initialized in curl_parse_param() (cherry picked from commit 7741ad7979d54fb4ee1247760d8d5c3666353a96) (cherry picked from commit b27dc141ccddfb3e0f77399ead8b2b158942de69) --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/2ab8cb38f9ddf01e174c3525ebdec35… Patch: https://github.com/kamailio/kamailio/commit/2ab8cb38f9ddf01e174c3525ebdec35… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index c71df5cd75..7df146493f 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -32,6 +32,7 @@ #include "../../core/dprint.h" #include "../../core/parser/parse_param.h" #include "../../core/usr_avp.h" +#include "../../core/shm_init.h" #include "../../core/cfg_parser.h" #include "http_client.h" #include "curlcon.h" @@ -237,6 +238,11 @@ int curl_parse_param(char *val) LM_DBG("modparam httpcon: %s\n", val); LM_DBG(" *** Default httproxy: %s\n", http_proxy.s); + if(!shm_initialized()) { + LM_ERR("shared memory was not initialized\n"); + return -1; + } + /* parse: name=>http_url*/ in.s = val; in.len = strlen(in.s);

1 0

git:5.4:810ea55b: http_client: clone name in http connection structures
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 810ea55bcbd557f4544dd1a1ee21bcff558ae553 URL: https://github.com/kamailio/kamailio/commit/810ea55bcbd557f4544dd1a1ee21bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:48:56+02:00 http_client: clone name in http connection structures - use name to lookup private memory structure, hash id is not unique, can be collisions for different names (cherry picked from commit 9429083c87b1323e31983cc71551676c199bf640) (cherry picked from commit 459f40b52a8a6f8b2ef70a6986c686448ea572a8) --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/810ea55bcbd557f4544dd1a1ee21bcf… Patch: https://github.com/kamailio/kamailio/commit/810ea55bcbd557f4544dd1a1ee21bcf… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 7df146493f..b1bfa3bd48 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -172,7 +172,8 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) ccp = _curl_con_pkg_root; while(ccp) { - if(ccp->conid == con->conid) { + if(ccp->conid == con->conid && ccp->name.len == con->name.len + && strncmp(ccp->name.s, con->name.s, con->name.len) == 0) { return ccp; } ccp = ccp->next; @@ -814,8 +815,9 @@ curl_con_t *curl_init_con(str *name) cc = cc->next; } - cc = (curl_con_t *)shm_malloc(sizeof( - curl_con_t)); /* Connection structures are shared by all children processes */ + /* Connection structures are shared by all children processes */ + cc = (curl_con_t *)shm_malloc(sizeof(curl_con_t) + + (name->len + 1)*sizeof(char)); if(cc == NULL) { LM_ERR("no shm memory\n"); return NULL; @@ -823,7 +825,8 @@ curl_con_t *curl_init_con(str *name) /* Each structure is allocated in package memory so each process can write into it without any locks or such stuff */ - ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t)); + ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t) + + (name->len + 1)*sizeof(char)); if(ccp == NULL) { /* We failed to allocate ccp, so let's free cc and quit */ shm_free(cc); @@ -831,17 +834,21 @@ curl_con_t *curl_init_con(str *name) return NULL; } - memset(cc, 0, sizeof(curl_con_t)); + memset(cc, 0, sizeof(curl_con_t) + (name->len + 1)*sizeof(char)); cc->next = _curl_con_root; cc->conid = conid; + cc->name.s = (char*)cc + sizeof(curl_con_t); + memcpy(cc->name.s, name->s, name->len); + cc->name.len = name->len; _curl_con_root = cc; - cc->name = *name; /* Put the new ccp first in line */ - memset(ccp, 0, sizeof(curl_con_pkg_t)); + memset(ccp, 0, sizeof(curl_con_pkg_t) + (name->len + 1)*sizeof(char)); ccp->next = _curl_con_pkg_root; ccp->conid = conid; - ccp->curl = NULL; + ccp->name.s = (char*)ccp + sizeof(curl_con_pkg_t); + memcpy(ccp->name.s, name->s, name->len); + ccp->name.len = name->len; _curl_con_pkg_root = ccp; LM_DBG("CURL: Added connection [%.*s]\n", name->len, name->s); diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index 29b451ba4d..a37bdbe4a5 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -93,7 +93,7 @@ enum connection_status typedef struct _curl_con { str name; /*!< Connection name */ - unsigned int conid; /*!< Connection ID */ + unsigned int conid; /*!< Connection hash ID */ enum connection_status connstate; /*!< Connection status */ str url; /*!< The URL without schema (host + base URL)*/ str schema; /*!< The URL schema */ @@ -125,7 +125,8 @@ typedef struct _curl_con /*! Per-process copy of connection object -stored in pkg memory */ typedef struct _curl_con_pkg { - unsigned int conid; /*!< Connection ID (referring to core connection id */ + str name; /*!< Connection name */ + unsigned int conid; /*!< Connection hash ID */ char redirecturl [512]; /*!< Last redirect URL - to use for $curlredirect(curlcon) pv */ unsigned int last_result; /*!< Last result of accessing this connection */

1 0

git:5.4:ca97ee94: websocket: docs - added tcp_accept_no_cl=yes to example
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: ca97ee946df51fe8b2ceff5ea0ec890ebbdfac0c URL: https://github.com/kamailio/kamailio/commit/ca97ee946df51fe8b2ceff5ea0ec890… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:47:39+02:00 websocket: docs - added tcp_accept_no_cl=yes to example (cherry picked from commit a05b4d7c2e413032b1a63f3d017243446a0bc6ec) (cherry picked from commit 9d7301652ca7f051df4a23b6be3a83d3f21baa5d) --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ca97ee946df51fe8b2ceff5ea0ec890… Patch: https://github.com/kamailio/kamailio/commit/ca97ee946df51fe8b2ceff5ea0ec890… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 7cc6e09069..b4b5e2c8ce 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -43,6 +43,8 @@ <title>event_route[xhttp:request]</title> <programlisting><![CDATA[ ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets

1 0

git:5.4:9979ae48: xhttp: warning log if tcp_accept_no_cl is not set
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 9979ae4889ccb2c18b3f10f45625679bb8c2c4b2 URL: https://github.com/kamailio/kamailio/commit/9979ae4889ccb2c18b3f10f45625679… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:47:51+02:00 xhttp: warning log if tcp_accept_no_cl is not set (cherry picked from commit b8fbf5e8c199b8277053f9c15231695a16058d6e) (cherry picked from commit cf6c70f00fda196ac9eba4a2ccd24b382d41b240) --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9979ae4889ccb2c18b3f10f45625679… Patch: https://github.com/kamailio/kamailio/commit/9979ae4889ccb2c18b3f10f45625679… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index ba57066849..440577bde2 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -41,6 +41,7 @@ #include "../../core/sip_msg_clone.h" #include "../../core/mod_fix.h" #include "../../core/pvar.h" +#include "../../core/tcp_options.h" #include "../../core/kemi.h" #include "api.h" @@ -142,6 +143,11 @@ static int mod_init(void) xhttp_route_no = route_no; } + if(cfg_get(tcp, tcp_cfg, accept_no_cl)==0) { + LM_WARN("tcp_accept_no_cl not set - usually required" + " to handle HTTP requests with no Content-Lenght\n"); + } + /* bind the SL API */ if(sl_load_api(&slb) != 0) { LM_ERR("cannot bind to SL API\n");

1 0

git:5.4:4f02ec38: siptrace: fixed IPv6 without brackets
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 4f02ec387cf9f46cc83ec6fea0df0a17ab7f08a5 URL: https://github.com/kamailio/kamailio/commit/4f02ec387cf9f46cc83ec6fea0df0a1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:46:07+02:00 siptrace: fixed IPv6 without brackets more details GH #2775 (cherry picked from commit 417eb2a7052a9354712663cca9e3bc075a3f69c0) (cherry picked from commit 903e41468a00edeff52cbf1e3c0053c82860c92c) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/4f02ec387cf9f46cc83ec6fea0df0a1… Patch: https://github.com/kamailio/kamailio/commit/4f02ec387cf9f46cc83ec6fea0df0a1… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fbeb3fb764..afd8bfef24 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2061,7 +2061,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", siptrace_proto_name(nd->rcv->proto), - ip_addr2a(&nd->rcv->src_ip), (int)nd->rcv->src_port); + ip_addr2strz(&nd->rcv->src_ip), (int)nd->rcv->src_port); if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); sto.fromip.s = SIPTRACE_ANYADDR; @@ -2071,7 +2071,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) } sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(nd->rcv->proto), ip_addr2a(&nd->rcv->dst_ip), + siptrace_proto_name(nd->rcv->proto), ip_addr2strz(&nd->rcv->dst_ip), (int)nd->rcv->dst_port); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len);

1 0

git:5.4:2dc8fa86: secsipid: explicit STIR/SHAKEN reference
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 2dc8fa863c48465051bde2383acbad753583a2b2 URL: https://github.com/kamailio/kamailio/commit/2dc8fa863c48465051bde2383acbad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:46:27+02:00 secsipid: explicit STIR/SHAKEN reference - help matching on search terms (cherry picked from commit a59ea8920c17aca29ffa734ca0babb107a415fde) (cherry picked from commit 3e0f634c1dd11702a97cc2fe2c3f70f1f933a4f3) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2dc8fa863c48465051bde2383acbad7… Patch: https://github.com/kamailio/kamailio/commit/2dc8fa863c48465051bde2383acbad7… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1b057696f6..e22d8f9aff 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -19,7 +19,7 @@ The module implements secure SIP identity specifications - STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) - IETF extensions for SIP (RFC8224, RFC8588). + IETF extensions for SIP (RFC8224, RFC8588), known together as STIR/SHAKEN. </para> <para> It exports the functions to check and generate SIP Identity header.

1 0

git:5.4:198753a4: xhttp: extended example for event_route[xhttp:request]
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 198753a49da7ff81965d4eeac1d96e53dbe901a6 URL: https://github.com/kamailio/kamailio/commit/198753a49da7ff81965d4eeac1d96e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:47:28+02:00 xhttp: extended example for event_route[xhttp:request] (cherry picked from commit 195de260f102f1a016ad7bd1021571c1dd8a983f) (cherry picked from commit 42df0f0b58a2b5780a9bf613a5a29d4af27b4f67) --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/198753a49da7ff81965d4eeac1d96e5… Patch: https://github.com/kamailio/kamailio/commit/198753a49da7ff81965d4eeac1d96e5… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index c2a18f9d44..507283b90f 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -222,6 +222,11 @@ event_route[xhttp:request] { </para> <programlisting format="linespecific"> ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

1 0

git:5.4:5e390618: pv: test for HDR_ERROR_T after header name parsing
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 5e39061818a0d52ac3a692c6357a497a09207e87 URL: https://github.com/kamailio/kamailio/commit/5e39061818a0d52ac3a692c6357a497… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:44:42+02:00 pv: test for HDR_ERROR_T after header name parsing (cherry picked from commit c264fbc66a4690b073c72ffa8fc095227ce0ae8b) (cherry picked from commit 18e85c98bb6eebf9afe83aaa0a832d1c4af46e62) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/5e39061818a0d52ac3a692c6357a497… Patch: https://github.com/kamailio/kamailio/commit/5e39061818a0d52ac3a692c6357a497… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 6d793185dc..c07096c240 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3248,8 +3248,8 @@ int pv_parse_hdr_name(pv_spec_p sp, str *in) s.s = p; s.len = in->len+1; - if (parse_hname2_short(s.s, s.s + s.len, &hdr)==0) - { + parse_hname2_short(s.s, s.s + s.len, &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", s.len, s.s); goto error; }

1 0

git:5.4:5b849659: app_perl change to ignore "die" signals from eval blocks
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 5b849659b23c1fad9161d51c1e7aac5a96d8850c URL: https://github.com/kamailio/kamailio/commit/5b849659b23c1fad9161d51c1e7aac5… Author: rodolfojcj <458749+rodolfojcj(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:45:02+02:00 app_perl change to ignore "die" signals from eval blocks (cherry picked from commit 50557b8433e137a9095b4d48df8ac9b8c3fd8807) (cherry picked from commit 7192139d77f844cd927c326ce16cadfc63378b35) --- Modified: src/modules/app_perl/lib/perl/Kamailio.pm --- Diff: https://github.com/kamailio/kamailio/commit/5b849659b23c1fad9161d51c1e7aac5… Patch: https://github.com/kamailio/kamailio/commit/5b849659b23c1fad9161d51c1e7aac5… --- diff --git a/src/modules/app_perl/lib/perl/Kamailio.pm b/src/modules/app_perl/lib/perl/Kamailio.pm index eda5ede8b7..aa587424e1 100644 --- a/src/modules/app_perl/lib/perl/Kamailio.pm +++ b/src/modules/app_perl/lib/perl/Kamailio.pm @@ -40,6 +40,7 @@ bootstrap Kamailio; BEGIN { $SIG{'__DIE__'} = sub { + die @_ if( $^S or not defined $^S ); Kamailio::Message::log(undef, L_ERR, "perl error: $_[0]\n"); }; $SIG{'__WARN__'} = sub {

1 0

git:5.4:e1fb94f5: pv: added missing WS and WSS to $K(key) variable
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: e1fb94f5c258038527f8f8df90135d6a4c2a4391 URL: https://github.com/kamailio/kamailio/commit/e1fb94f5c258038527f8f8df90135d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:45:28+02:00 pv: added missing WS and WSS to $K(key) variable (cherry picked from commit a8c9d0ae4fbafba89ef12737419037d141eed1d3) (cherry picked from commit 7b89c5e6abe5f4ae3ee55d9c938c865806f29dec) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e1fb94f5c258038527f8f8df90135d6… Patch: https://github.com/kamailio/kamailio/commit/e1fb94f5c258038527f8f8df90135d6… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index c07096c240..9bbce87c26 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3303,6 +3303,10 @@ int pv_parse_K_name(pv_spec_p sp, str *in) switch(in->len) { + case 2: + if(strncmp(in->s, "WS", 2)==0) + sp->pvp.pvn.u.isname.name.n = 6; + else goto error; case 3: if(strncmp(in->s, "UDP", 3)==0) sp->pvp.pvn.u.isname.name.n = 2; @@ -3310,6 +3314,8 @@ int pv_parse_K_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 3; else if(strncmp(in->s, "TLS", 3)==0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "WSS", 3)==0) + sp->pvp.pvn.u.isname.name.n = 7; else goto error; break; case 4: @@ -3381,6 +3387,10 @@ int pv_get_K(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_uintval(msg, param, res, PROTO_TLS); case 5: return pv_get_uintval(msg, param, res, PROTO_SCTP); + case 6: + return pv_get_uintval(msg, param, res, PROTO_WS); + case 7: + return pv_get_uintval(msg, param, res, PROTO_WSS); default: return pv_get_uintval(msg, param, res, AF_INET); }

1 0

git:5.4:465fbace: dialog: safety checks for bind addr fields
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 465fbace1586874b60b98ab04caddd1c76b2810c URL: https://github.com/kamailio/kamailio/commit/465fbace1586874b60b98ab04caddd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:44:19+02:00 dialog: safety checks for bind addr fields - they can be null on non-local sockets - GH #2757 (cherry picked from commit 490ae559d2b77b13b3f3831e7ff1aa58980e4086) (cherry picked from commit b6428ca86c821ddf74fd4ea8a17aecdce39934f4) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/465fbace1586874b60b98ab04caddd1… Patch: https://github.com/kamailio/kamailio/commit/465fbace1586874b60b98ab04caddd1… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1bfcb2cad7..b6a49da2a4 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -802,6 +802,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) int i; struct dlg_var *var; srjson_doc_t jdoc; + str sempty = str_init(""); db_val_t values[DIALOG_TABLE_COL_NO]; @@ -870,14 +871,25 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) SET_STR_VALUE(values+6, cell->tag[DLG_CALLEE_LEG]); SET_PROPER_NULL_FLAG(cell->tag[DLG_CALLEE_LEG], values, 6); - LM_DBG("caller sock_info is %.*s, callee sock_info is %.*s\n", - cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLER_LEG]->sock_str.s, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); - SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); - SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + if(cell->bind_addr[DLG_CALLER_LEG]) { + LM_DBG("caller sock_info is %.*s\n", + cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLER_LEG]->sock_str.s); + SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); + } else { + LM_DBG("no caller sock_info\n"); + SET_STR_VALUE(values+7, sempty); + } + if(cell->bind_addr[DLG_CALLEE_LEG]) { + LM_DBG("callee sock_info is %.*s\n", + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); + SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + } else { + LM_DBG("no callee sock_info\n"); + SET_STR_VALUE(values+8, sempty); + } SET_STR_VALUE(values+12, cell->cseq[DLG_CALLER_LEG]); SET_STR_VALUE(values+13, cell->cseq[DLG_CALLEE_LEG]);

1 0

git:5.5:044a2e66: sworker: docs - fixed small typo
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.5 Commit: 044a2e665ce5612980b203c705f75ee786be5316 URL: https://github.com/kamailio/kamailio/commit/044a2e665ce5612980b203c705f75ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:40:06+02:00 sworker: docs - fixed small typo (cherry picked from commit fc62ceeb6d625acda6952486031efa1fe2945768) --- Modified: src/modules/sworker/doc/sworker_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/044a2e665ce5612980b203c705f75ee… Patch: https://github.com/kamailio/kamailio/commit/044a2e665ce5612980b203c705f75ee… --- diff --git a/src/modules/sworker/doc/sworker_admin.xml b/src/modules/sworker/doc/sworker_admin.xml index 9656ff1071..2110998f2f 100644 --- a/src/modules/sworker/doc/sworker_admin.xml +++ b/src/modules/sworker/doc/sworker_admin.xml @@ -109,7 +109,7 @@ request_route { 'drop' must be used so processing of the message does not continue to request_route or reply_route in the same process, it is going to be done by the delegated group of workers. It returns -1 (false) in case there - was a proble delegating the processing. + was a problem delegating the processing. </para> <para> This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.

1 0

git:5.5:75571e17: core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.5 Commit: 75571e1739470877365e7c25548ef282e81283a1 URL: https://github.com/kamailio/kamailio/commit/75571e1739470877365e7c25548ef28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:40:38+02:00 core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots - GH #2798 (cherry picked from commit 61cbb5e861aeb9b7f69ebb8d284e3ded0ede9cd8) --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/75571e1739470877365e7c25548ef28… Patch: https://github.com/kamailio/kamailio/commit/75571e1739470877365e7c25548ef28… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 5fc2952ed9..a87c91756c 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2147,6 +2147,7 @@ int pv_init_buffer(void) _pv_print_buffer_slots, _pv_print_buffer_size); _pv_print_buffer_slots_active = _pv_print_buffer_slots; _pv_print_buffer_size_active = _pv_print_buffer_size; + _pv_print_buffer_index = 0; return 0; } @@ -2168,6 +2169,7 @@ void pv_destroy_buffer(void) pkg_free(_pv_print_buffer); _pv_print_buffer_slots_active = 0; _pv_print_buffer_size_active = 0; + _pv_print_buffer_index = 0; _pv_print_buffer = NULL; } @@ -2177,8 +2179,9 @@ void pv_destroy_buffer(void) int pv_reinit_buffer(void) { if(_pv_print_buffer_size==_pv_print_buffer_size_active - && _pv_print_buffer_slots==_pv_print_buffer_slots_active) + && _pv_print_buffer_slots==_pv_print_buffer_slots_active) { return 0; + } pv_destroy_buffer(); return pv_init_buffer(); }

1 0

git:master:b4e94080: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: b4e94080987a4f8e2b04ac5c8ef7ce89ad4246ee URL: https://github.com/kamailio/kamailio/commit/b4e94080987a4f8e2b04ac5c8ef7ce8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-29T09:16:28+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/b4e94080987a4f8e2b04ac5c8ef7ce8… Patch: https://github.com/kamailio/kamailio/commit/b4e94080987a4f8e2b04ac5c8ef7ce8… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 3824577860..ad9277ce37 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -39,6 +39,7 @@ Daniel-Constantin Mierla 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) 2.20. hf_iterator_append(iname, htext) + 2.21. hf_iterator_insert(iname, htext) 3. Selects @@ -68,7 +69,8 @@ Daniel-Constantin Mierla 1.18. hf_iterator_next usage 1.19. hf_iterator_rm usage 1.20. hf_iterator_append usage - 1.21. @hf_value select usage + 1.21. hf_iterator_insert usage + 1.22. @hf_value select usage Chapter 1. Admin Guide @@ -97,6 +99,7 @@ Chapter 1. Admin Guide 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) 2.20. hf_iterator_append(iname, htext) + 2.21. hf_iterator_insert(iname, htext) 3. Selects @@ -136,6 +139,7 @@ Chapter 1. Admin Guide 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) 2.20. hf_iterator_append(iname, htext) + 2.21. hf_iterator_insert(iname, htext) 2.1. msg_apply_changes() @@ -517,6 +521,26 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... +2.21. hf_iterator_insert(iname, htext) + + Add headers before the one at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.21. hf_iterator_insert usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_insert("i1", "My-New-Header: abc\r\n"); + break; + } + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -552,7 +576,7 @@ hf_iterator_end("i1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.21. @hf_value select usage + Example 1.22. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

git:master:d65adfb7: textopsx: added hf_iterator_insert() function
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: d65adfb7531d8032cb4839341f7787d7877e572e URL: https://github.com/kamailio/kamailio/commit/d65adfb7531d8032cb4839341f7787d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T09:01:25+02:00 textopsx: added hf_iterator_insert() function --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/d65adfb7531d8032cb4839341f7787d… Patch: https://github.com/kamailio/kamailio/commit/d65adfb7531d8032cb4839341f7787d…

1 0

[kamailio/kamailio] make ruxc build optional (#2808)
by sergey-safarov 28 Jul '21

28 Jul '21

### Description I during master compilation I see an error ``` [root@safarov-dell kamailio]# make -C src/modules/ruxc/ make: Entering directory '/tmp/kamailio/src/modules/ruxc' CC (gcc) [M ruxc.so] ruxc_mod.o ruxc_mod.c:28:10: fatal error: ruxc.h: No such file or directory 28 | #include <ruxc.h> | ^~~~~~~~ compilation terminated. ``` I was not able to figure out how to install the required dependency on CentOS dist and Fedora. Could you make build this module build optional -- 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/issues/2808

2 3

git:master:61cbb5e8: core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots
by Daniel-Constantin Mierla 27 Jul '21

27 Jul '21

Module: kamailio Branch: master Commit: 61cbb5e861aeb9b7f69ebb8d284e3ded0ede9cd8 URL: https://github.com/kamailio/kamailio/commit/61cbb5e861aeb9b7f69ebb8d284e3de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-27T16:52:12+02:00 core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots - GH #2798 --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/61cbb5e861aeb9b7f69ebb8d284e3de… Patch: https://github.com/kamailio/kamailio/commit/61cbb5e861aeb9b7f69ebb8d284e3de… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 5fc2952ed9..a87c91756c 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2147,6 +2147,7 @@ int pv_init_buffer(void) _pv_print_buffer_slots, _pv_print_buffer_size); _pv_print_buffer_slots_active = _pv_print_buffer_slots; _pv_print_buffer_size_active = _pv_print_buffer_size; + _pv_print_buffer_index = 0; return 0; } @@ -2168,6 +2169,7 @@ void pv_destroy_buffer(void) pkg_free(_pv_print_buffer); _pv_print_buffer_slots_active = 0; _pv_print_buffer_size_active = 0; + _pv_print_buffer_index = 0; _pv_print_buffer = NULL; } @@ -2177,8 +2179,9 @@ void pv_destroy_buffer(void) int pv_reinit_buffer(void) { if(_pv_print_buffer_size==_pv_print_buffer_size_active - && _pv_print_buffer_slots==_pv_print_buffer_slots_active) + && _pv_print_buffer_slots==_pv_print_buffer_slots_active) { return 0; + } pv_destroy_buffer(); return pv_init_buffer(); }

1 0

git:master:4e239991: modules: readme files regenerated - outbound ... [skip ci]
by Kamailio Dev 27 Jul '21

27 Jul '21

Module: kamailio Branch: master Commit: 4e2399916ce7f00d4c141004194a73f786a40b12 URL: https://github.com/kamailio/kamailio/commit/4e2399916ce7f00d4c141004194a73f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-27T16:01:15+02:00 modules: readme files regenerated - outbound ... [skip ci] --- Modified: src/modules/outbound/README --- Diff: https://github.com/kamailio/kamailio/commit/4e2399916ce7f00d4c141004194a73f… Patch: https://github.com/kamailio/kamailio/commit/4e2399916ce7f00d4c141004194a73f… --- diff --git a/src/modules/outbound/README b/src/modules/outbound/README index 163e5e2b27..8e65a606dc 100644 --- a/src/modules/outbound/README +++ b/src/modules/outbound/README @@ -25,6 +25,7 @@ Peter Dunkley 3.1. force_outbound_flag (integer) 3.2. force_no_outbound_flag (integer) + 3.3. flow_token_secret (string) List of Examples @@ -32,6 +33,7 @@ Peter Dunkley 1.2. Registrar Configuration 1.3. Set force_outbound_flag parameter 1.4. Set force_no_outbound_flag parameter + 1.5. Set flow_token_secret parameter Chapter 1. Admin Guide @@ -51,6 +53,7 @@ Chapter 1. Admin Guide 3.1. force_outbound_flag (integer) 3.2. force_no_outbound_flag (integer) + 3.3. flow_token_secret (string) 1. Overview @@ -480,6 +483,7 @@ event_route[tm:branch-failure:FAIL-BRANCH] { 3.1. force_outbound_flag (integer) 3.2. force_no_outbound_flag (integer) + 3.3. flow_token_secret (string) 3.1. force_outbound_flag (integer) @@ -506,3 +510,15 @@ modparam("outbound", "force_outbound_flag", 1) ... modparam("outbound", "force_no_outbound_flag", 2) ... + +3.3. flow_token_secret (string) + + Secret phrase used to calculate the outbound key value used for flow + tokens validation. Allows to set persistent outbound key. + + If not specified, outbound will use randomly generated outbound key + + Example 1.5. Set flow_token_secret parameter +... +modparam("outbound", "flow_token_secret", "johndoessecretphrase") +...

1 0

[kamailio/kamailio] outbound: add flow_token_secret param (#2801)
by Michael Furmur 27 Jul '21

27 Jul '21

- calculate ob_key as SHA1(flow_token_secret) if specified - keep old behavior with randomly generated ob_key if not specified   #### 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  Adds ``flow_token_secret``(string) parameter for **outbound** module to give the ability to use persistent ob_key which is used for flow tokens validation. Useful for cluster configurations with floating IP and ensures successful validation of the previously generated flow tokens after the **kamailio** restart. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2801 -- Commit Summary -- * outbound: add flow_token_secret param -- File Changes -- M src/modules/outbound/doc/outbound_admin.xml (22) M src/modules/outbound/outbound_mod.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2801.patch https://github.com/kamailio/kamailio/pull/2801.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/2801

3 3

git:master:cc32abd9: outbound: add flow_token_secret param
by Daniel-Constantin Mierla 27 Jul '21

27 Jul '21

Module: kamailio Branch: master Commit: cc32abd91888f3978708eddc88c4409ef5a6b122 URL: https://github.com/kamailio/kamailio/commit/cc32abd91888f3978708eddc88c4409… Author: Michael Furmur <m.furmur(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-27T15:54:34+02:00 outbound: add flow_token_secret param - calculate ob_key as SHA1(flow_token_secret) if specified - keep old behavior with randomly generated ob_key if not specified --- Modified: src/modules/outbound/doc/outbound_admin.xml Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cc32abd91888f3978708eddc88c4409… Patch: https://github.com/kamailio/kamailio/commit/cc32abd91888f3978708eddc88c4409… --- diff --git a/src/modules/outbound/doc/outbound_admin.xml b/src/modules/outbound/doc/outbound_admin.xml index 7418cecfd9..0fe4e278b2 100644 --- a/src/modules/outbound/doc/outbound_admin.xml +++ b/src/modules/outbound/doc/outbound_admin.xml @@ -499,6 +499,28 @@ modparam("outbound", "force_no_outbound_flag", 2) </example> </section> + <section> + <title><varname>flow_token_secret</varname> (string)</title> + <para> + Secret phrase used to calculate the outbound key value + used for flow tokens validation. + Allows to set persistent outbound key. + </para> + <para> + If not specified, <emphasis>outbound</emphasis> will use randomly generated outbound key + </para> + <example> + <title> + Set <varname>flow_token_secret</varname> parameter + </title> + <programlisting format="linespecific"> +... +modparam("outbound", "flow_token_secret", "johndoessecretphrase") +... + </programlisting> + </example> + </section> + </section> </chapter> diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 82d18a3eca..ada7062454 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -25,6 +25,7 @@ */ #include <openssl/hmac.h> #include <openssl/rand.h> +#include <openssl/sha.h> #include "../../core/basex.h" #include "../../core/dprint.h" @@ -52,6 +53,7 @@ static void destroy(void); static unsigned int ob_force_flag = (unsigned int) -1; static unsigned int ob_force_no_flag = (unsigned int) -1; static str ob_key = {0, 0}; +static str flow_token_secret = {0, 0}; static cmd_export_t cmds[]= { @@ -63,8 +65,9 @@ static cmd_export_t cmds[]= static param_export_t params[]= { - { "force_outbound_flag", INT_PARAM, &ob_force_flag }, - { "force_no_outbound_flag", INT_PARAM, &ob_force_no_flag }, + { "force_outbound_flag", PARAM_INT, &ob_force_flag }, + { "force_no_outbound_flag", PARAM_INT, &ob_force_no_flag }, + { "flow_token_secret", PARAM_STRING, &flow_token_secret}, { 0, 0, 0 } }; @@ -102,10 +105,17 @@ static int mod_init(void) return -1; } ob_key.len = OB_KEY_LEN; - if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) - { - LM_ERR("unable to get %d cryptographically strong pseudo-" - "random bytes\n", ob_key.len); + + if(flow_token_secret.s) { + assert(ob_key.len == SHA_DIGEST_LENGTH); + LM_DBG("flow_token_secret mod param set. use persistent ob_key"); + SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); + } else { + if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) + { + LM_ERR("unable to get %d cryptographically strong pseudo-" + "random bytes\n", ob_key.len); + } } if (cfg_declare("outbound", outbound_cfg_def, &default_outbound_cfg,

1 0

git:master:3c9037e9: pv: added variable $msgbuf(index)
by Daniel-Constantin Mierla 27 Jul '21

27 Jul '21

Module: kamailio Branch: master Commit: 3c9037e94a33396487ddd72ade607756ea1a91bc URL: https://github.com/kamailio/kamailio/commit/3c9037e94a33396487ddd72ade60775… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-27T15:45:21+02:00 pv: added variable $msgbuf(index) - get/set the character at the position index in the message buffer --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/3c9037e94a33396487ddd72ade60775… Patch: https://github.com/kamailio/kamailio/commit/3c9037e94a33396487ddd72ade60775… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index cc976c86c0..c4e33b4d31 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -552,6 +552,8 @@ static pv_export_t mod_pvs[] = { pv_parse_via_name, 0, 0, 0}, {{"viaZ", (sizeof("viaZ")-1)}, PVT_OTHER, pv_get_viaZ, 0, pv_parse_via_name, 0, 0, 0}, + {{"msgbuf", (sizeof("msgbuf")-1)}, PVT_OTHER, pv_get_msgbuf, pv_set_msgbuf, + pv_parse_msgbuf_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 292c96758c..44cc551212 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4633,3 +4633,115 @@ int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_via_attr(msg, vbZ, param, res); } + +/** + * + */ +int pv_parse_msgbuf_name(pv_spec_t *sp, str *in) +{ + int n; + char *p; + pv_spec_t *nsp = 0; + + if(in==NULL || in->s==NULL || in->len<=0 || sp==NULL) { + return -1; + } + + p = in->s; + if(*p==PV_MARKER) { + nsp = (pv_spec_p)pkg_malloc(sizeof(pv_spec_t)); + if(nsp==NULL) { + LM_ERR("no more memory\n"); + return -1; + } + p = pv_parse_spec(in, nsp); + if(p==NULL) { + LM_ERR("invalid variable [%.*s]\n", in->len, in->s); + pv_spec_free(nsp); + return -1; + } + //LM_ERR("dynamic name [%.*s]\n", in->len, in->s); + //pv_print_spec(nsp); + sp->pvp.pvn.type = PV_NAME_PVAR; + sp->pvp.pvn.u.dname = (void*)nsp; + return 0; + } + + if (str2sint(in, &n) != 0) { + LM_ERR("bad index value: [%.*s]\n", in->len, in->s); + return -1; + } + + sp->pvp.pvn.u.isname.name.n = n; + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; +} + +/** + * + */ +int pv_get_vparam_ival(sip_msg_t *msg, pv_param_t *param) +{ + pv_value_t vval; + + if(param->pvn.type==PV_NAME_PVAR) { + /* pvar */ + if(pv_get_spec_value(msg, (pv_spec_t*)(param->pvn.u.dname), &vval)!=0) { + LM_ERR("cannot get name value\n"); + return -1; + } + return vval.ri; + } else { + return param->pvn.u.isname.name.n; + } +} + +/** + * + */ +int pv_get_msgbuf(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + int n; + static char outmsgbuf[4]; + + n = pv_get_vparam_ival(msg, param); + + if(n<0 || n>=msg->len) { + LM_ERR("index out of range\n"); + return pv_get_null(msg, param, res); + } + outmsgbuf[0] = msg->buf[n]; + outmsgbuf[1] = '\0'; + return pv_get_strlval(msg, param, res, outmsgbuf, 2); +} + +/** + * + */ +int pv_set_msgbuf(sip_msg_t *msg, pv_param_t *param, + int op, pv_value_t *val) +{ + int n; + + n = pv_get_vparam_ival(msg, param); + + if(n<0 || n>=msg->len) { + LM_ERR("index out of range\n"); + return -1; + } + + if((val==NULL) || (val->flags&PV_VAL_NULL)) { + LM_ERR("null value - skipping\n"); + return 1; + } + if(!(val->flags&PV_VAL_STR) || val->rs.len<=0) { + LM_ERR("error - str value required\n"); + return -1; + } + + msg->buf[n] = val->rs.s[0]; + + return 0; +} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 14c79ce86c..6406d9054a 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -416,5 +416,11 @@ int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_get_via1(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_msgbuf_name(pv_spec_t *sp, str *in); +int pv_get_msgbuf(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_set_msgbuf(sip_msg_t *msg, pv_param_t *param, + int op, pv_value_t *val); + + #endif

1 0

git:5.4:17fab5e2: pv_headers: pvh_set_header, remove values to set null when necessary
by Victor Seva 27 Jul '21

27 Jul '21

Module: kamailio Branch: 5.4 Commit: 17fab5e2cf3dad61816dbd76977c72f88a345bdc URL: https://github.com/kamailio/kamailio/commit/17fab5e2cf3dad61816dbd76977c72f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-27T11:33:34+02:00 pv_headers: pvh_set_header, remove values to set null when necessary * fix pvh_set_xavi for SR_XTYPE_NULL (cherry picked from commit af926514ac3e70dff51408baf326b29bce4eecfc) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/17fab5e2cf3dad61816dbd76977c72f… Patch: https://github.com/kamailio/kamailio/commit/17fab5e2cf3dad61816dbd76977c72f… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 96fdc292b0..b8e4f92e61 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -375,7 +375,7 @@ int pvh_set_xavi(struct sip_msg *msg, str *xname, str *name, void *data, LM_DBG("br_xname: %.*s name: %.*s append:%d\n", br_xname.len, br_xname.s, name->len, name->s, append); memset(&xval, 0, sizeof(sr_xval_t)); - if(data == NULL || SR_XTYPE_NULL) { + if(data == NULL || type == SR_XTYPE_NULL) { xval.type = SR_XTYPE_NULL; } else if(type == SR_XTYPE_STR) { xval.type = SR_XTYPE_STR; @@ -618,9 +618,11 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &avi); - LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, - xavi->name.len, xavi->name.s, hname->len, hname->s); + if(hname_cnt > 1) { + cnt = xavi_rm_by_name(hname, 1, &avi); + LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, + xavi->name.len, xavi->name.s, hname->len, hname->s); + } if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) < 0) goto err;

1 0

git:5.5:d20841db: pv_headers: pvh_set_header, remove values to set null when necessary
by Victor Seva 27 Jul '21

27 Jul '21

Module: kamailio Branch: 5.5 Commit: d20841db501fbc1a4053a6cb7293d3fa3f3fee94 URL: https://github.com/kamailio/kamailio/commit/d20841db501fbc1a4053a6cb7293d3f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-07-27T11:33:10+02:00 pv_headers: pvh_set_header, remove values to set null when necessary * fix pvh_set_xavi for SR_XTYPE_NULL (cherry picked from commit af926514ac3e70dff51408baf326b29bce4eecfc) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/d20841db501fbc1a4053a6cb7293d3f… Patch: https://github.com/kamailio/kamailio/commit/d20841db501fbc1a4053a6cb7293d3f… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 96fdc292b0..b8e4f92e61 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -375,7 +375,7 @@ int pvh_set_xavi(struct sip_msg *msg, str *xname, str *name, void *data, LM_DBG("br_xname: %.*s name: %.*s append:%d\n", br_xname.len, br_xname.s, name->len, name->s, append); memset(&xval, 0, sizeof(sr_xval_t)); - if(data == NULL || SR_XTYPE_NULL) { + if(data == NULL || type == SR_XTYPE_NULL) { xval.type = SR_XTYPE_NULL; } else if(type == SR_XTYPE_STR) { xval.type = SR_XTYPE_STR; @@ -618,9 +618,11 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &avi); - LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, - xavi->name.len, xavi->name.s, hname->len, hname->s); + if(hname_cnt > 1) { + cnt = xavi_rm_by_name(hname, 1, &avi); + LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, + xavi->name.len, xavi->name.s, hname->len, hname->s); + } if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) < 0) goto err;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev