sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
304 discussions

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: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: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: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: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: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: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: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

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: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

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021