- sr-dev - kamailio.org

[kamailio/kamailio] Wkampich/dev (#2675)
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

#### 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 - [x] 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 - [x] Related to issue #2574 and #2641 #### Description  lost: new features, attributes and a new function to dereference location - features: LoST redirect, dynamic HELD url resolving (#2574), LoST NAPTR, POST request to dereference loation - attributes: reponse_time (-1:emergencyDispatch, 0:emergencyRouting, >0[ms]); post_request (POST method to dereference location #2641); recursion (1:yes/0:no); location_profile (PIDF/LO profile selection: 0:first/1:last/2:geo/3:civic); verbose 0/1 (detailed LoST response as log INFO); geoheader_type (filter schema: 0:any/1:cid/2:http/3:https); geoheader_order (0:first/1:last) - function: lost_held_dereference (specific function to dereference location using POST method); attributes are url (r;string), resp.-time (r;string), resp.-type (r;string), pidf (r/w;string) and error (r/w;string) - general: The extension of the module allows dynamic querying of LIS/HELD and LOST services via NAPTR lookup. In the case of LOST, a redirect response is evaluated. In case a lost_held_request (used to connect to a LIS via POST or GET) is passed with an empty string ("") for the connection parameter, then P-A-I or From header value hostnames are used for NAPTR lookup to get a corresponding service. http_client: http_client_request (api) content-type header support - new api call including a content-type argument implemented as new function - required to resolve geolocation url using POST (#2641) - Note: not sure if this is the most elegant solution, but it helps to avoid backward compatibility issues You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2675 -- Commit Summary -- * http_client: http_client_request (api) content-type header support * lost: new features, attributes and a new function to dereference location -- File Changes -- M src/modules/http_client/curl_api.c (1) M src/modules/http_client/curl_api.h (3) M src/modules/http_client/functions.c (68) M src/modules/http_client/functions.h (14) M src/modules/lost/functions.c (902) M src/modules/lost/functions.h (3) M src/modules/lost/lost.c (88) A src/modules/lost/naptr.c (255) A src/modules/lost/naptr.h (38) M src/modules/lost/pidf.c (5) A src/modules/lost/response.c (991) A src/modules/lost/response.h (131) M src/modules/lost/utilities.c (447) M src/modules/lost/utilities.h (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2675.patch https://github.com/kamailio/kamailio/pull/2675.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/2675

5 52

git:master:9a8ff2b8: Merge pull request #2675 from kamailio/wkampich/dev
by GitHub 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 9a8ff2b8408c7b462d39f6ea25d81865b70ade42 URL: https://github.com/kamailio/kamailio/commit/9a8ff2b8408c7b462d39f6ea25d8186… Author: Wolfgang Kampichler <49035738+wkampich(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2021-04-09T16:10:45+02:00 Merge pull request #2675 from kamailio/wkampich/dev extensions to lost and http_client modules and core/parse_body.c/part_multipart_headers_cmp() log output changed from ERR to DBG in case a header does not exist --- Added: src/modules/lost/naptr.c Added: src/modules/lost/naptr.h Added: src/modules/lost/response.c Added: src/modules/lost/response.h Modified: src/core/parser/parse_body.c Modified: src/modules/http_client/curl_api.c Modified: src/modules/http_client/curl_api.h Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/lost/doc/lost.xml Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/functions.c Modified: src/modules/lost/functions.h Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/9a8ff2b8408c7b462d39f6ea25d8186… Patch: https://github.com/kamailio/kamailio/commit/9a8ff2b8408c7b462d39f6ea25d8186…

1 0

git:master:106b8a65: core: parse_body.c/part_multipart_headers_cmp() changed log output from ERR to DBG in case a header does not exist
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 106b8a659bd4a53e8a6872e9db8a9af0f12ff70a URL: https://github.com/kamailio/kamailio/commit/106b8a659bd4a53e8a6872e9db8a9af… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-07T13:10:30+02:00 core: parse_body.c/part_multipart_headers_cmp() changed log output from ERR to DBG in case a header does not exist --- Modified: src/core/parser/parse_body.c --- Diff: https://github.com/kamailio/kamailio/commit/106b8a659bd4a53e8a6872e9db8a9af… Patch: https://github.com/kamailio/kamailio/commit/106b8a659bd4a53e8a6872e9db8a9af… --- diff --git a/src/core/parser/parse_body.c b/src/core/parser/parse_body.c index 9794e43fb1..a9a3e64b82 100644 --- a/src/core/parser/parse_body.c +++ b/src/core/parser/parse_body.c @@ -475,8 +475,9 @@ int part_multipart_headers_cmp (char *buffer, ; } } else { + /* Nothing matched */ error = -9; - error_msg = "We reached the end of the buffer"; + error_msg = "Unsuccessfully reached the end of the buffer"; } found = found_content_type * found_content_id * found_content_length; if ((!found) && (!error)) { @@ -504,7 +505,7 @@ int part_multipart_headers_cmp (char *buffer, } if (error < 0) { - if(error == -2) { + if ((error == -2) || (error == -9)) { LM_DBG("result code: \"%i\" text: \"%s\".\n", error, error_msg); } else { LM_ERR("error code: \"%i\" error text: \"%s\".\n", error, error_msg);

1 0

git:master:5f1959cd: lost: typedef naming changed and copyright added
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 5f1959cd42ff925009dd9e0fdd87f9d0487ec4fe URL: https://github.com/kamailio/kamailio/commit/5f1959cd42ff925009dd9e0fdd87f9d… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-08T21:31:24+02:00 lost: typedef naming changed and copyright added --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/naptr.c Modified: src/modules/lost/naptr.h Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/5f1959cd42ff925009dd9e0fdd87f9d… Patch: https://github.com/kamailio/kamailio/commit/5f1959cd42ff925009dd9e0fdd87f9d…

1 0

git:master:25378c03: lost: README update
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 25378c0388bb4365e8d4f1a4e874381fe339cd3b URL: https://github.com/kamailio/kamailio/commit/25378c0388bb4365e8d4f1a4e874381… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-30T21:50:48+02:00 lost: README update --- Modified: src/modules/lost/doc/lost.xml Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/25378c0388bb4365e8d4f1a4e874381… Patch: https://github.com/kamailio/kamailio/commit/25378c0388bb4365e8d4f1a4e874381…

1 0

git:master:01fa6d96: lost: removed some typos and added explanatory text to doc
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 01fa6d962258a7ea82e6d3fe2d56f98b94806a31 URL: https://github.com/kamailio/kamailio/commit/01fa6d962258a7ea82e6d3fe2d56f98… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-04T23:09:02+02:00 lost: removed some typos and added explanatory text to doc --- Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/lost.c --- Diff: https://github.com/kamailio/kamailio/commit/01fa6d962258a7ea82e6d3fe2d56f98… Patch: https://github.com/kamailio/kamailio/commit/01fa6d962258a7ea82e6d3fe2d56f98… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 2ef2605f19..1df4aefd21 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -185,8 +185,7 @@ <title><varname>post_request</varname> (int)</title> <para> Dereferencing the location can be done using either the HTTP GET or POST method. This parameter - This parameter globally defines whether only HTTP POST method should be used. Values are 0 (GET) - or 1 (POST). + globally defines whether only HTTP POST method should be used. Values are 0 (GET) or 1 (POST). </para> <para> Default: 0 (GET) @@ -405,6 +404,7 @@ xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$va </title> <para> Sends a HELD POST locationRequest to a given URL. Attributes are responseTime and resposeType. + The <emphasis>locationType</emphasis> property "exact" is set to "false". </para> <itemizedlist> <listitem><para> diff --git a/src/modules/lost/lost.c b/src/modules/lost/lost.c index ab6ef510e6..06b3bff2a2 100644 --- a/src/modules/lost/lost.c +++ b/src/modules/lost/lost.c @@ -411,7 +411,7 @@ static int w_lost_held_deref(struct sip_msg *_m, char *_url, char *_rtime, } /* - * Wrapper for lost_query w/o pudf, urn + * Wrapper for lost_query w/o pidf, urn */ static int w_lost_query( struct sip_msg *_m, char *_con, char *_uri, char *_name, char *_err)

1 0

git:master:b458bbcb: lost: memory leak fix and code refactoring
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: b458bbcba00cd6678617f004bbdeff2a1b0c524d URL: https://github.com/kamailio/kamailio/commit/b458bbcba00cd6678617f004bbdeff2… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-31T23:14:14+02:00 lost: memory leak fix and code refactoring --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/b458bbcba00cd6678617f004bbdeff2… Patch: https://github.com/kamailio/kamailio/commit/b458bbcba00cd6678617f004bbdeff2…

1 0

git:master:2f48d0cd: lost: DOM level count fix
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 2f48d0cdc84eaa583a2f2b6837e6251e62abc901 URL: https://github.com/kamailio/kamailio/commit/2f48d0cdc84eaa583a2f2b6837e6251… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-30T21:15:56+02:00 lost: DOM level count fix --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/2f48d0cdc84eaa583a2f2b6837e6251… Patch: https://github.com/kamailio/kamailio/commit/2f48d0cdc84eaa583a2f2b6837e6251… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 7aef5ea9d3..06a1727d74 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -1234,8 +1234,11 @@ int lost_xpath_location(xmlDocPtr doc, char *path, p_loc_t loc) } else { LM_WARN("xpath location-info element(%d) ignored\n", i + 1); } + /* clean up */ xmlFree(xmlbuff); xmlFreeDoc(new); + /* reset level count */ + nok = -1; } } } else {

1 0

git:master:5f50cc0e: http_client: duplicated code removed
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 5f50cc0ec7017a325d25249e6e66e6a2feb4dd08 URL: https://github.com/kamailio/kamailio/commit/5f50cc0ec7017a325d25249e6e66e6a… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-30T21:33:09+02:00 http_client: duplicated code removed --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/5f50cc0ec7017a325d25249e6e66e6a… Patch: https://github.com/kamailio/kamailio/commit/5f50cc0ec7017a325d25249e6e66e6a… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 54edfe9d32..7e2a9d66ba 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -637,10 +637,10 @@ int curl_con_query_url(struct sip_msg *_m, const str *connection, /*! * Performs http request and saves possible result (first body line of reply) * to pvar. - * This is the same http_query as used to be in the utils module. + * Similar to http_client_request but supports setting a content type attribute. */ -int http_client_request_c( - sip_msg_t *_m, char *_url, str *_dst, char *_body, char* ctype, char *_hdrs, char *_met) +int http_client_request_c(sip_msg_t *_m, char *_url, str *_dst, char *_body, + char* _ctype, char *_hdrs, char *_met) { int res; curl_query_t query_params; @@ -649,7 +649,7 @@ int http_client_request_c( query_params.username = NULL; query_params.secret = NULL; query_params.authmethod = default_authmethod; - query_params.contenttype = ctype ? (char *)ctype : "text/plain"; + query_params.contenttype = _ctype; query_params.hdrs = _hdrs; query_params.post = _body; query_params.clientcert = NULL; @@ -699,53 +699,7 @@ int http_client_request_c( int http_client_request( sip_msg_t *_m, char *_url, str *_dst, char *_body, char *_hdrs, char *_met) { - int res; - curl_query_t query_params; - - memset(&query_params, 0, sizeof(curl_query_t)); - query_params.username = NULL; - query_params.secret = NULL; - query_params.authmethod = default_authmethod; - query_params.contenttype = NULL; - query_params.hdrs = _hdrs; - query_params.post = _body; - query_params.clientcert = NULL; - query_params.clientkey = NULL; - query_params.cacert = NULL; - query_params.ciphersuites = NULL; - query_params.tlsversion = default_tls_version; - query_params.verify_peer = default_tls_verify_peer; - query_params.verify_host = default_tls_verify_host; - query_params.timeout = default_connection_timeout; - query_params.http_follow_redirect = default_http_follow_redirect; - query_params.oneline = default_query_result; - query_params.maxdatasize = default_query_maxdatasize; - query_params.netinterface = default_netinterface; - if(default_useragent.s != NULL && default_useragent.len > 0) { - query_params.useragent = default_useragent.s; - } - if(default_http_proxy.s != NULL && default_http_proxy.len > 0) { - query_params.http_proxy = default_http_proxy.s; - if(default_http_proxy_port > 0) { - query_params.http_proxy_port = default_http_proxy_port; - } - } - if(default_tls_clientcert.s != NULL && default_tls_clientcert.len > 0) { - query_params.clientcert = default_tls_clientcert.s; - } - if(default_tls_clientkey.s != NULL && default_tls_clientkey.len > 0) { - query_params.clientkey = default_tls_clientkey.s; - } - if(default_tls_cacert != NULL) { - query_params.cacert = default_tls_cacert; - } - if(default_cipher_suite_list.s != NULL && default_cipher_suite_list.len) { - query_params.ciphersuites = default_cipher_suite_list.s; - } - - res = curL_request_url(_m, _met, _url, _dst, &query_params); - - return res; + return http_client_request_c(_m, _url, _dst, _body, NULL, _hdrs, _met); } /*!

1 0

git:master:f7f68c57: http_client: http_client_request (api) content-type header support
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: f7f68c57e11124bd94ae21a40d11fcab93a8508f URL: https://github.com/kamailio/kamailio/commit/f7f68c57e11124bd94ae21a40d11fca… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-15T14:13:11+01:00 http_client: http_client_request (api) content-type header support - new api call including a content-type argument implemented as new function - required to resolve geolocation url using POST (#2641) - Note: not sure if this is the most elegant solution, but it helps to avoid backward compatibility issues --- Modified: src/modules/http_client/curl_api.c Modified: src/modules/http_client/curl_api.h Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h --- Diff: https://github.com/kamailio/kamailio/commit/f7f68c57e11124bd94ae21a40d11fca… Patch: https://github.com/kamailio/kamailio/commit/f7f68c57e11124bd94ae21a40d11fca…

1 0

git:master:356fba18: lost: new features, attributes and a new function to dereference location
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 356fba18ac5eef25e67a2357b4cdcd9255810094 URL: https://github.com/kamailio/kamailio/commit/356fba18ac5eef25e67a2357b4cdcd9… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-15T14:18:57+01:00 lost: new features, attributes and a new function to dereference location - features: LoST redirect, dynamic HELD url resolving (#2574), LoST NAPTR, POST request to dereference loation - attributes: reponse_time (-1:emergencyDispatch, 0:emergencyRouting, >0[ms]); post_request (POST method to dereference location #2641); recursion (yes/no); location_profile (PIDF/LO profile selection: first/last/geo/civic); verbose (detailed LoST response as log INFO); geoheader_type (filter schema: any/cid/http/https); geoheader_order (first/last) - function: lost_held_dereference (specific function to dereference location using POST method); attributes are url (r), resp.-time (r), resp.-type (r), pidf (r/w) and error (r/w) - general: The extension of the module allows dynamic querying of LIS/HELD and LOST services via NAPTR lookup. In the case of LOST, a redirect response is evaluated. In case a lost_held_request (used to connect to a LIS via POST or GET) is passed with an empty string ("") for the connection parameter, then P-A-I or From header value hostnames are used for NAPTR lookup to get a corresponding service. --- Added: src/modules/lost/naptr.c Added: src/modules/lost/naptr.h Added: src/modules/lost/response.c Added: src/modules/lost/response.h Modified: src/modules/lost/functions.c Modified: src/modules/lost/functions.h Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/356fba18ac5eef25e67a2357b4cdcd9… Patch: https://github.com/kamailio/kamailio/commit/356fba18ac5eef25e67a2357b4cdcd9…

1 0

git:master:ffb0a862: lost: bug-fix due to a code formatting error
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: ffb0a8624af952e619ddc5f6fa29c6655f17d4c9 URL: https://github.com/kamailio/kamailio/commit/ffb0a8624af952e619ddc5f6fa29c66… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-16T10:29:04+01:00 lost: bug-fix due to a code formatting error --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/ffb0a8624af952e619ddc5f6fa29c66… Patch: https://github.com/kamailio/kamailio/commit/ffb0a8624af952e619ddc5f6fa29c66… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 8f56a61816..7aef5ea9d3 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -442,7 +442,10 @@ p_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) && (hf->name.len == LOST_GEOLOC_HEADER_SIZE - 2)) { /* possible hit */ if(strncasecmp(hf->name.s, LOST_GEOLOC_HEADER, - LOST_GEOLOC_HEADER_SIZE) == 0) { + LOST_GEOLOC_HEADER_SIZE) == 0) { + + hdr.s = hf->body.s; + hdr.len = hf->body.len; LM_DBG("found geolocation header [%.*s]\n", hdr.len, hdr.s);

1 0

xflag losing state on serial forking
by David Escartin 09 Apr '21

09 Apr '21

Dear all i think i have noticed a wrong behaviour with xflags. When they are set in a failure_route and a t_relay is done after that to a destination, its state is lost in the next on_reply route. This doesn't happen with regular transaction flags, and it doesn't happen with xflags either when xflag is set inside an onreply_route. We have seen it on versions 5.3 and 5.4 Could you please confirm this? thanks a lot regards david escartin -- [image: Logo] David Escartín Almudévar VoIP/Switch Engineer descartin(a)sonoc.io *SONOC* C/ Josefa Amar y Borbón, 10, 4ª · 50001 Zaragoza, España Tlf: +34 917019888 · www.sonoc.io

1 2

git:master:abf9f244: core: main - checking of optarg for covering all unixes
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: abf9f244a96a9c2112036af24a1cc3435b6be41d URL: https://github.com/kamailio/kamailio/commit/abf9f244a96a9c2112036af24a1cc34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T09:34:29+02:00 core: main - checking of optarg for covering all unixes --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/abf9f244a96a9c2112036af24a1cc34… Patch: https://github.com/kamailio/kamailio/commit/abf9f244a96a9c2112036af24a1cc34… --- diff --git a/src/main.c b/src/main.c index 44fb940393..405b442158 100644 --- a/src/main.c +++ b/src/main.c @@ -2095,6 +2095,10 @@ int main(int argc, char** argv) ksr_cfg_print_mode = 1; break; case KARGOPTVAL+10: + if (optarg == NULL) { + fprintf(stderr, "bad atexit value\n"); + goto error; + } if(optarg[0]=='y' || optarg[0]=='1') { ksr_atexit_mode = 1; } else if(optarg[0]=='n' || optarg[0]=='0') { @@ -2234,6 +2238,10 @@ int main(int argc, char** argv) }; break; case 'u': + if (optarg == NULL) { + fprintf(stderr, "bad -u parameter\n"); + goto error; + } /* user needed for possible shm. pre-init */ user=optarg; break; @@ -2293,6 +2301,10 @@ int main(int argc, char** argv) /* long options */ case KARGOPTVAL: + if (optarg == NULL) { + fprintf(stderr, "bad alias parameter\n"); + goto error; + } if(parse_phostport(optarg, &tmp, &tmp_len, &port, &proto)!=0) { fprintf(stderr, "Invalid alias value '%s'\n", optarg); @@ -2304,24 +2316,40 @@ int main(int argc, char** argv) } break; case KARGOPTVAL+1: + if (optarg == NULL) { + fprintf(stderr, "bad subst parameter\n"); + goto error; + } if(pp_subst_add(optarg)<0) { LM_ERR("failed to add subst expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+2: + if (optarg == NULL) { + fprintf(stderr, "bad substdef parameter\n"); + goto error; + } if(pp_substdef_add(optarg, 0)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+3: + if (optarg == NULL) { + fprintf(stderr, "bad substdefs parameter\n"); + goto error; + } if(pp_substdef_add(optarg, 1)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+4: + if (optarg == NULL) { + fprintf(stderr, "bad server if parameter\n"); + goto error; + } server_id=(int)strtol(optarg, &tmp, 10); if ((tmp==0) || (*tmp)){ LM_ERR("bad server_id value: %s\n", optarg); @@ -2383,12 +2411,20 @@ int main(int argc, char** argv) while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { switch(c) { case KARGOPTVAL+5: + if (optarg == NULL) { + fprintf(stderr, "bad load module parameter\n"); + goto error; + } if (load_module(optarg)!=0) { LM_ERR("failed to load the module: %s\n", optarg); goto error; } break; case KARGOPTVAL+6: + if (optarg == NULL) { + fprintf(stderr, "bad modparam parameter\n"); + goto error; + } if(set_mod_param_serialized(optarg) < 0) { LM_ERR("failed to set modparam: %s\n", optarg); goto error;

1 0

New Module Hash Table
by Dave Greeko 09 Apr '21

09 Apr '21

Dear All, I've successfully created a Kamailio module(thanks to the concise documentation.) My logic requires a synchronized access to an in-memory-only hash table from multiple Kamailio child-processes. Here is what I am trying to do: 1. Create a hash table(s) upon module init 2. Insert entries from any child process (based on business logic) 3. Retrieve entries from any child process with proper locking 4. Delete entries from any child process I would really appreciate it if anyone can point me to some samples where I can incorporate into my module the hash table functionalities that already exists in kamailio tree instead of doing my own because I would like to take advantage of Kamailio's memory managers(shared and private). Best Regards, Dave

1 0

[CRON] Still Failing: dbank888/kamailio#131 (master - 491e19e)
by Travis CI 08 Apr '21

08 Apr '21

Build Update for dbank888/kamailio ------------------------------------- Build: #131 Status: Still Failing Duration: 5 mins and 30 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/766405168?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:42d90d36: rr: conditions adjustmets for append from tag in record route preset
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 42d90d3665256c3d38945193b0a14ad199221bc6 URL: https://github.com/kamailio/kamailio/commit/42d90d3665256c3d38945193b0a14ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T13:19:17+02:00 rr: conditions adjustmets for append from tag in record route preset --- Modified: src/modules/rr/record.c Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42d90d3665256c3d38945193b0a14ad… Patch: https://github.com/kamailio/kamailio/commit/42d90d3665256c3d38945193b0a14ad… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 083955803f..8624ee5e13 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -570,7 +570,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) hdr.len += user.len + 1; /* @ */ hdr.len += _data->len; - if (append_fromtag && from->tag_value.len) { + if (append_fromtag && from && from->tag_value.len) { hdr.len += RR_FROMTAG_LEN + from->tag_value.len; } @@ -612,7 +612,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) memcpy(p, _data->s, _data->len); p += _data->len; - if (append_fromtag && from->tag_value.len) { + if (append_fromtag && from && from->tag_value.len) { memcpy(p, RR_FROMTAG, RR_FROMTAG_LEN); p += RR_FROMTAG_LEN; memcpy(p, from->tag_value.s, from->tag_value.len); diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index d9cfedfaf9..67828d5d2d 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -253,7 +253,6 @@ static int direction_fixup(void** param, int param_no) return E_CFG; } if (param_no==1) { - n = 0; s = (char*) *param; if ( strcasecmp(s,"downstream")==0 ) { n = RR_FLOW_DOWNSTREAM;

1 0

git:master:f33abd5e: nat_traversal: check parameter for send_keepalive()
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: f33abd5e2d5978ba9e6e8a48066b0daff70c0b3b URL: https://github.com/kamailio/kamailio/commit/f33abd5e2d5978ba9e6e8a48066b0da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T12:05:07+02:00 nat_traversal: check parameter for send_keepalive() --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/f33abd5e2d5978ba9e6e8a48066b0da… Patch: https://github.com/kamailio/kamailio/commit/f33abd5e2d5978ba9e6e8a48066b0da… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 27dbf2736d..4cfe8d4018 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1554,6 +1554,11 @@ static void send_keepalive(NAT_Contact *contact) unsigned short lport; char lproto; + if(contact==NULL || contact->socket==NULL) { + LM_ERR("invalid parameters\n"); + return; + } + if(keepalive_params.from == NULL) { if(contact->socket != last_socket) { memcpy(from_ip, contact->socket->address_str.s,

1 0

git:master:c200d2e9: rtpengine: reworked condition around locking for easier pairing
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: c200d2e9109a5581491bebd91c30162716b0f4fa URL: https://github.com/kamailio/kamailio/commit/c200d2e9109a5581491bebd91c30162… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:54:33+02:00 rtpengine: reworked condition around locking for easier pairing - inside rtpengine_hash_table_insert() --- Modified: src/modules/rtpengine/rtpengine_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/c200d2e9109a5581491bebd91c30162… Patch: https://github.com/kamailio/kamailio/commit/c200d2e9109a5581491bebd91c30162… --- diff --git a/src/modules/rtpengine/rtpengine_hash.c b/src/modules/rtpengine/rtpengine_hash.c index eda947fe26..770bf494e0 100644 --- a/src/modules/rtpengine/rtpengine_hash.c +++ b/src/modules/rtpengine/rtpengine_hash.c @@ -221,16 +221,16 @@ int rtpengine_hash_table_insert(str callid, str viabranch, struct rtpengine_hash // get entry list hash_index = str_hash(callid); entry = rtpengine_hash_table->row_entry_list[hash_index]; - last_entry = entry; - // lock - if (rtpengine_hash_table->row_locks[hash_index]) { - lock_get(rtpengine_hash_table->row_locks[hash_index]); - } else { - LM_ERR("NULL rtpengine_hash_table->row_locks[%d]\n", hash_index); + if (entry==NULL || rtpengine_hash_table->row_locks[hash_index]==NULL) { + LM_ERR("NULL entry or lock for hash table slot[%d]\n", hash_index); return 0; } + last_entry = entry; + // lock + lock_get(rtpengine_hash_table->row_locks[hash_index]); + while (entry) { // if found, don't add new entry if (str_equal(entry->callid, new_entry->callid) &&

1 0

git:master:7ea3b97c: core: dns cache - safety checks for rdata field
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 7ea3b97c8acf8b623563b7a9fbf4ba23ea3e9170 URL: https://github.com/kamailio/kamailio/commit/7ea3b97c8acf8b623563b7a9fbf4ba2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:37:08+02:00 core: dns cache - safety checks for rdata field --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/7ea3b97c8acf8b623563b7a9fbf4ba2… Patch: https://github.com/kamailio/kamailio/commit/7ea3b97c8acf8b623563b7a9fbf4ba2… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 9a63a5bd21..7dbde8f378 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -4012,7 +4012,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, size = e->total_size; if (rdata_size) { /* we have to extend the entry */ - rounded_size = ROUND_POINTER(size); /* size may not have been + rounded_size = ROUND_POINTER(size); /* size may not have been rounded previously */ switch (e->type) { case T_A: @@ -4064,7 +4064,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, /* fix the pointers inside the rr structures */ last_rr = NULL; for (rr=new->rr_lst; rr; rr=rr->next) { - rr->rdata = (void*)translate_pointer((char*)new, (char*)e, + rr->rdata = (void*)translate_pointer((char*)new, (char*)e, (char*)rr->rdata); if (rr->next) rr->next = (struct dns_rr*)translate_pointer((char*)new, (char*)e, @@ -4074,6 +4074,10 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, switch(e->type){ case T_NAPTR: + if(rr->rdata==NULL) { + LM_WARN("null rdata filed for type: %u\n", e->type); + break; + } /* there are pointers inside the NAPTR rdata stucture */ ((struct naptr_rdata*)rr->rdata)->flags = translate_pointer((char*)new, (char*)e, @@ -4092,6 +4096,10 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, ((struct naptr_rdata*)rr->rdata)->repl); break; case T_TXT: + if(rr->rdata==NULL) { + LM_WARN("null rdata filed for type: %u\n", e->type); + break; + } /* there are pointers inside the TXT structure */ for (i=0; i<((struct txt_rdata*)rr->rdata)->cstr_no; i++){ ((struct txt_rdata*)rr->rdata)->txt[i].cstr= @@ -4100,6 +4108,10 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, } break; case T_EBL: + if(rr->rdata==NULL) { + LM_WARN("null rdata filed for type: %u\n", e->type); + break; + } /* there are pointers inside the EBL structure */ ((struct ebl_rdata*)rr->rdata)->separator = translate_pointer((char*)new, (char*)e, @@ -4140,7 +4152,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, * If there is an existing record with the same name and value * (ip address in case of A/AAAA record, name in case of SRV record) * only the remaining fields are updated. - * + * * Note that permanent records cannot be overwritten unless * the new record is also permanent. A permanent record * completely replaces a non-permanent one.

1 0

git:master:1737e944: core: parse headers - check if anything was parsed
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 1737e9443d6617350c5e6044aef07be565a345d0 URL: https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:20:32+02:00 core: parse headers - check if anything was parsed --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… Patch: https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 4efb875d85..795c96a350 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -316,13 +316,14 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (unlikely(next)) { orig_flag = msg->parsed_flag; msg->parsed_flag &= ~flags; - }else + } else { orig_flag=0; + } #ifdef EXTRA_DEBUG DBG("flags=%llx\n", (unsigned long long)flags); #endif - while( tmp<end && (flags & msg->parsed_flag) != flags){ + while(tmp<end && (flags & msg->parsed_flag) != flags) { prefetch_loc_r(tmp+64, 1); hf=pkg_malloc(sizeof(struct hdr_field)); if (unlikely(hf==0)){ @@ -619,18 +620,25 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int #endif tmp=rest; } + skip: msg->unparsed=tmp; + if(msg->headers==NULL) { + /* nothing parsed - invalid input sip message */ + goto error1; + } /* restore original flags */ msg->parsed_flag |= orig_flag; return 0; error: - ser_error=E_BAD_REQ; if (hf) { clean_hdr_field(hf); pkg_free(hf); } + +error1: + ser_error=E_BAD_REQ; /* restore original flags */ msg->parsed_flag |= orig_flag; return -1;

1 0

git:master:9c7a509f: tm: t_fifo.c - free app in case of error
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 9c7a509f7189de8ce600a97b7c1c5f9e4f5afdb1 URL: https://github.com/kamailio/kamailio/commit/9c7a509f7189de8ce600a97b7c1c5f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:25:05+02:00 tm: t_fifo.c - free app in case of error --- Modified: src/modules/tm/t_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/9c7a509f7189de8ce600a97b7c1c5f9… Patch: https://github.com/kamailio/kamailio/commit/9c7a509f7189de8ce600a97b7c1c5f9… --- diff --git a/src/modules/tm/t_fifo.c b/src/modules/tm/t_fifo.c index cd3bb296ab..ea4e96b99a 100644 --- a/src/modules/tm/t_fifo.c +++ b/src/modules/tm/t_fifo.c @@ -214,6 +214,7 @@ int parse_tw_append( modparam_t type, void* val) app->name.s = (char*)pkg_malloc( foo.len+1 ); if (app->name.s==0) { PKG_MEM_ERROR; + pkg_free(app); goto error; } memcpy( app->name.s, foo.s, foo.len);

1 0

git:master:74fa6c55: core: main - coherent behaviour for fix_cfg_file()
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 74fa6c5570d6394af8c5352bd37e21e970f1575c URL: https://github.com/kamailio/kamailio/commit/74fa6c5570d6394af8c5352bd37e21e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:38:48+02:00 core: main - coherent behaviour for fix_cfg_file() - duplicate to build the output always, safer not to try to change the static string defined via macro at runtime --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/74fa6c5570d6394af8c5352bd37e21e… Patch: https://github.com/kamailio/kamailio/commit/74fa6c5570d6394af8c5352bd37e21e… --- diff --git a/src/main.c b/src/main.c index 4dac30179c..44fb940393 100644 --- a/src/main.c +++ b/src/main.c @@ -1260,14 +1260,15 @@ static struct name_lst* parse_phostport_mh(char* s, char** host, int* hlen, -/** Update \c cfg_file variable to contain full pathname. The function updates +/** Update \c cfg_file variable to contain full pathname or '-' (for stdin) + * allocated in system memory. The function updates * the value of \c cfg_file global variable to contain full absolute pathname - * to the main configuration file of SER. The function uses CFG_FILE macro to + * to the main configuration file. The function uses CFG_FILE macro to * determine the default path to the configuration file if the user did not * specify one using the command line option. If \c cfg_file contains an - * absolute pathname then it is used unmodified, if it contains a relative + * absolute pathname then it is cloned unmodified, if it contains a relative * pathanme than the value returned by \c getcwd function will be added at the - * beginning. This function must be run before SER changes its current working + * beginning. This function must be run before changing its current working * directory to / (in daemon mode). * @return Zero on success, negative number * on error. @@ -1276,34 +1277,55 @@ int fix_cfg_file(void) { char* res = NULL; size_t max_len, cwd_len, cfg_len; - + if (cfg_file == NULL) cfg_file = CFG_FILE; - if (cfg_file[0] == '/') return 0; - if (cfg_file[0] == '-' && strlen(cfg_file)==1) return 0; - + if (cfg_file[0] == '/') { + cfg_len = strlen(cfg_file); + if(cfg_len < 2) { + /* do not accept only '/' */ + fprintf(stderr, "ERROR: invalid cfg file value\n"); + return -1; + } + if ((res = malloc(cfg_len + 1)) == NULL) goto error; + memcpy(res, cfg_file, cfg_len); + cfg_file[cfg_len] = 0; + cfg_file = res; + return 0; + } + if (cfg_file[0] == '-') { + cfg_len = strlen(cfg_file); + if(cfg_len == 1) { + if ((res = malloc(2)) == NULL) goto error; + res[0] = '-'; + res[1] = '\0'; + cfg_file = res; + return 0; + } + } + /* cfg_file contains a relative pathname, get the current * working directory and add it at the beginning */ cfg_len = strlen(cfg_file); - + max_len = pathmax(); if ((res = malloc(max_len)) == NULL) goto error; - + if (getcwd(res, max_len) == NULL) goto error; cwd_len = strlen(res); - + /* Make sure that the buffer is big enough */ if (cwd_len + 1 + cfg_len >= max_len) goto error; - + res[cwd_len] = '/'; memcpy(res + cwd_len + 1, cfg_file, cfg_len); - + res[cwd_len + 1 + cfg_len] = '\0'; /* Add terminating zero */ cfg_file = res; return 0; - + error: - fprintf(stderr, "ERROR: Unable to fix cfg_file to contain full pathname\n"); + fprintf(stderr, "ERROR: Unable to fix cfg file to contain full pathname\n"); if (res) free(res); return -1; }

1 0

git:master:563c6f69: core: cfg.lex - free after log message
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 563c6f69aef22a90fc7870398fcfbd4242e33779 URL: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:36:02+02:00 core: cfg.lex - free after log message --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… Patch: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d36fc72b54..2b90fbb66a 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1802,13 +1802,14 @@ static int sr_push_yy_state(char *fin, int mode) fp = fopen(newf, "r" ); if ( fp==NULL ) { - pkg_free(newf); if(mode==0) { LM_CRIT("cannot open included file: %s (%s)\n", fbuf, newf); + pkg_free(newf); return -1; } else { LM_DBG("importing file ignored: %s (%s)\n", fbuf, newf); + pkg_free(newf); return 0; } }

1 0

git:master:7dd643a8: dlgs: safety check for accessing next field
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 7dd643a88fd7944ee86b795298c76e6d5fd58b8f URL: https://github.com/kamailio/kamailio/commit/7dd643a88fd7944ee86b795298c76e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:36:49+02:00 dlgs: safety check for accessing next field --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/7dd643a88fd7944ee86b795298c76e6… Patch: https://github.com/kamailio/kamailio/commit/7dd643a88fd7944ee86b795298c76e6… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 1f6af22ba3..d3084084d5 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -970,7 +970,9 @@ void dlgs_ht_timer(unsigned int ticks, void *param) it->prev = NULL; } } else { - ite->prev->next = it; + if(ite->prev) { + ite->prev->next = it; + } if(it!=NULL) { it->prev = ite->prev; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev