sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
391 discussions

git:master:8a6f57f5: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 8a6f57f59963e53bcf98dd39615db3980275d81b URL: https://github.com/kamailio/kamailio/commit/8a6f57f59963e53bcf98dd39615db39… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-30T15:31:22+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/8a6f57f59963e53bcf98dd39615db39… Patch: https://github.com/kamailio/kamailio/commit/8a6f57f59963e53bcf98dd39615db39… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 7ee2d2f693..7f5718db5c 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -65,7 +65,7 @@ Hugh Waite result) 4.2. http_get_redirect(connection, result) - 4.3. http_client_query(url, [post-data], result) + 4.3. http_client_query(url, [post-data], [hdrs], result) 5. Pseudovariables @@ -117,7 +117,7 @@ Hugh Waite 1.18. Short http_client config file 1.19. http_connect() usage 1.20. http_get_redirect() usage - 1.21. curl_http_query() usage + 1.21. http_client_query() usage Chapter 1. Admin Guide @@ -153,7 +153,7 @@ Chapter 1. Admin Guide 4.1. http_connect(connection, url, [content_type, data,] result) 4.2. http_get_redirect(connection, result) - 4.3. http_client_query(url, [post-data], result) + 4.3. http_client_query(url, [post-data], [hdrs], result) 5. Pseudovariables @@ -609,7 +609,7 @@ http_follow_redirect = no 4.1. http_connect(connection, url, [content_type, data,] result) 4.2. http_get_redirect(connection, result) - 4.3. http_client_query(url, [post-data], result) + 4.3. http_client_query(url, [post-data], [hdrs], result) 4.1. http_connect(connection, url, [content_type, data,] result) @@ -667,7 +667,7 @@ modparam("http_client", "httpredirect", 1); http_get_redirect("apiserver", "$var(targeturl)"); ... -4.3. http_client_query(url, [post-data], result) +4.3. http_client_query(url, [post-data], [hdrs], result) Sends HTTP GET or POST request according to URL given in “url” parameter, which is a string that may contain pseudo variables. @@ -675,6 +675,12 @@ http_get_redirect("apiserver", "$var(targeturl)"); If you want to make a POST-Request, you have to define the “post”-data, that should be submitted in that request as the second parameter. + Custom headers may be specified via “hdrs” parameter (e.g., + Content-Type). + + Either of “post-data” or “hdrs” can be also set to empty string in + order to be ignored. + If HTTP server returns a class 2xx, 3xx or 4xx reply, the first line of the reply's body (if any) is stored in “result” parameter, which must be a writable pseudo variable. @@ -689,25 +695,26 @@ http_get_redirect("apiserver", "$var(targeturl)"); utils module. It is changed to use the same base library and settings as the rest of the functions in this module. - Example 1.21. curl_http_query() usage + Example 1.21. http_client_query() usage ... # GET-Request http_client_query("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$( fu{s.escape.param})", "$var(result)"); -switch ($retcode) { - ... +switch ($rc) { + ... } ... -... # POST-Request -http_client_query("http://api.com/index.php", "r_uri=$(ru{s.escape.param})&f_uri -=$(fu{s.escape.param})", - "$var(result)"); -switch ($retcode) { - ... +http_client_query("http://api.com/index.php", + "r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escape.param})", + "$var(result)"); } ... +# POST-Request +http_client_query("http://api.com/index.php", "src=$si", + "Content-Type: text/plain", "$var(result)"); +... 5. Pseudovariables

1 0

git:master:279e622b: http_client: updated docs for http_client_query()
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 279e622b53b636d49b207907c8f3fe60ff9e2cd3 URL: https://github.com/kamailio/kamailio/commit/279e622b53b636d49b207907c8f3fe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T15:17:46+02:00 http_client: updated docs for http_client_query() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/279e622b53b636d49b207907c8f3fe6… Patch: https://github.com/kamailio/kamailio/commit/279e622b53b636d49b207907c8f3fe6… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 799f47718a..9ea4f9ef3f 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -31,7 +31,7 @@ <para> The connections can either be defined with the "httpcon" module parameter or in a separate configuration file, as specified by the "config_file" module - parameter. + parameter. </para> <para> Like in SIP, the HTTP URL may need encoding to be transported safely @@ -711,21 +711,29 @@ http_get_redirect("apiserver", "$var(targeturl)"); </programlisting> </example> </section> - <section id="http_client.f.curl_http_query"> + <section id="http_client.f.http_query"> <title> - <function moreinfo="none">http_client_query(url, [post-data], result)</function> + <function moreinfo="none">http_client_query(url, [post-data], [hdrs], result)</function> </title> <para> Sends HTTP GET or POST request according to URL given in <quote>url</quote> parameter, which is a string that may contain pseudo variables. - </para> + </para> <para> If you want to make a POST-Request, you have to define the <quote>post</quote>-data, that should be submitted in that request as the second parameter. - </para> - <para> + </para> + <para> + Custom headers may be specified via <quote>hdrs</quote> parameter + (e.g., Content-Type). + </para> + <para> + Either of <quote>post-data</quote> or <quote>hdrs</quote> can be + also set to empty string in order to be ignored. + </para> + <para> If HTTP server returns a class 2xx, 3xx or 4xx reply, the first line of the reply's body (if any) is stored in <quote>result</quote> parameter, @@ -734,7 +742,7 @@ http_get_redirect("apiserver", "$var(targeturl)"); <para> Function returns reply code of HTTP reply or -1 if something went wrong. - </para> + </para> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE. @@ -744,26 +752,26 @@ http_get_redirect("apiserver", "$var(targeturl)"); It is changed to use the same base library and settings as the rest of the functions in this module. </para> <example> - <title><function>curl_http_query()</function> usage</title> + <title><function>http_client_query()</function> usage</title> <programlisting format="linespecific"> ... # GET-Request http_client_query("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", "$var(result)"); -switch ($retcode) { - ... +switch ($rc) { + ... } ... - </programlisting> - <programlisting format="linespecific"> -... # POST-Request -http_client_query("http://api.com/index.php", "r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escape.param})", - "$var(result)"); -switch ($retcode) { - ... +http_client_query("http://api.com/index.php", + "r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escape.param})", + "$var(result)"); } ... +# POST-Request +http_client_query("http://api.com/index.php", "src=$si", + "Content-Type: text/plain", "$var(result)"); +... </programlisting> </example> </section>

1 0

git:master:9c1d4cec: http_client: allow providing headers to http_client_query()
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 9c1d4cec94b47cd0b2e69e646f2fd14b84e3cf03 URL: https://github.com/kamailio/kamailio/commit/9c1d4cec94b47cd0b2e69e646f2fd14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T15:06:24+02:00 http_client: allow providing headers to http_client_query() - lost from removed http_query() in utils --- 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/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/9c1d4cec94b47cd0b2e69e646f2fd14… Patch: https://github.com/kamailio/kamailio/commit/9c1d4cec94b47cd0b2e69e646f2fd14…

1 0

git:master:fce9044e: http_client: move to next field before freeing item in fixup function
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: fce9044ece62d6b5e81330de62fa1fa402145e68 URL: https://github.com/kamailio/kamailio/commit/fce9044ece62d6b5e81330de62fa1fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T14:15:55+02:00 http_client: move to next field before freeing item in fixup function --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/fce9044ece62d6b5e81330de62fa1fa… Patch: https://github.com/kamailio/kamailio/commit/fce9044ece62d6b5e81330de62fa1fa… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index cc5c9ed497..8e73200f0e 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -679,6 +679,7 @@ int fixup_raw_http_client_conn_list(void) while (raw_conn_list != NULL) { raw_cc = raw_conn_list; + raw_conn_list = raw_conn_list->next; if (raw_cc->name.s) pkg_free(raw_cc->name.s); if (raw_cc->url.s) pkg_free(raw_cc->url.s); if (raw_cc->username.s) pkg_free(raw_cc->username.s); @@ -690,7 +691,6 @@ int fixup_raw_http_client_conn_list(void) if (raw_cc->ciphersuites.s) pkg_free(raw_cc->ciphersuites.s); if (raw_cc->http_proxy.s) pkg_free(raw_cc->http_proxy.s); pkg_free(raw_cc); - raw_conn_list = raw_conn_list->next; } return ret; }

1 0

git:master:dbcd8574: call_control: free pkg memory in case of errors when parsing params
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: dbcd85746ec1ba4a3be1af920dd2b1aad632297e URL: https://github.com/kamailio/kamailio/commit/dbcd85746ec1ba4a3be1af920dd2b1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T14:02:20+02:00 call_control: free pkg memory in case of errors when parsing params --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/dbcd85746ec1ba4a3be1af920dd2b1a… Patch: https://github.com/kamailio/kamailio/commit/dbcd85746ec1ba4a3be1af920dd2b1a… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index a31892c706..e1776de61a 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -218,13 +218,13 @@ typedef struct CallInfo { #define CHECK_COND(cond) \ if ((cond) == 0) { \ LM_ERR("malformed modparam\n"); \ - return -1; \ + goto error; \ } #define CHECK_ALLOC(p) \ if (!(p)) { \ LM_ERR("no memory left\n"); \ - return -1; \ + goto error; \ } @@ -242,9 +242,9 @@ destroy_list(AVP_List *list) { int -parse_param(void *val, AVP_List** avps) { +cc_parse_param(void *val, AVP_List** avps) { - char *p; + char *p = NULL; str s, content; AVP_List *mp = NULL; @@ -253,6 +253,10 @@ parse_param(void *val, AVP_List** avps) { content.s = (char*) val; content.len = strlen(content.s); + if(content.len==0) { + LM_ERR("empty parameter\n"); + return -1; + } p = (char*) pkg_malloc (content.len + 1); CHECK_ALLOC(p); @@ -298,26 +302,35 @@ parse_param(void *val, AVP_List** avps) { } return 0; + +error: + if(mp) { + if(mp->pv) { + pkg_free(mp->pv); + } + pkg_free(mp); + } + return -1; } int parse_param_init(unsigned int type, void *val) { - if (parse_param(val, &cc_init_avps) == -1) + if (cc_parse_param(val, &cc_init_avps) == -1) return E_CFG; return 0; } int parse_param_start(unsigned int type, void *val) { - if (parse_param(val, &cc_start_avps) == -1) + if (cc_parse_param(val, &cc_start_avps) == -1) return E_CFG; return 0; } int parse_param_stop(unsigned int type, void *val) { - if (parse_param(val, &cc_stop_avps) == -1) + if (cc_parse_param(val, &cc_stop_avps) == -1) return E_CFG; return 0; } @@ -1233,4 +1246,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_call_control_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:e5134e8c: call_obj: free current element in case of alloc failure to its field
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: e5134e8cb64828da5f607b7c74d490c8ffaf1702 URL: https://github.com/kamailio/kamailio/commit/e5134e8cb64828da5f607b7c74d490c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T13:46:21+02:00 call_obj: free current element in case of alloc failure to its field --- Modified: src/modules/call_obj/cobj.c --- Diff: https://github.com/kamailio/kamailio/commit/e5134e8cb64828da5f607b7c74d490c… Patch: https://github.com/kamailio/kamailio/commit/e5134e8cb64828da5f607b7c74d490c… --- diff --git a/src/modules/call_obj/cobj.c b/src/modules/call_obj/cobj.c index 3a6ba31e51..cf014b659f 100644 --- a/src/modules/call_obj/cobj.c +++ b/src/modules/call_obj/cobj.c @@ -436,6 +436,8 @@ int cobj_get_timestamp(uint64_t ts, cobj_elem_t **elem, int limit) elem_new->callid.s = (char*)pkg_malloc(obj->callid.len + 1); /* +1 Zero at the end */ if (!elem_new->callid.s) { LM_ERR("Cannot allocate memory for callid\n"); + pkg_free(elem_new); + elem_new = NULL; goto clean; } memcpy(elem_new->callid.s, obj->callid.s, obj->callid.len);

1 0

git:master:145d10f5: websocket: use sizeof over the type of the pointer to be allocated
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 145d10f5a2dcad3cbdb477aaabdc853bb606b355 URL: https://github.com/kamailio/kamailio/commit/145d10f5a2dcad3cbdb477aaabdc853… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T13:36:26+02:00 websocket: use sizeof over the type of the pointer to be allocated --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/145d10f5a2dcad3cbdb477aaabdc853… Patch: https://github.com/kamailio/kamailio/commit/145d10f5a2dcad3cbdb477aaabdc853… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index a01953959a..6af2bb039e 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -209,13 +209,13 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) /* Allocate send buffer and build frame */ frame_length = frame->payload_len + extended_length + 2; - if ((send_buf = pkg_malloc(sizeof(unsigned char) * frame_length)) + if ((send_buf = pkg_malloc(sizeof(char) * frame_length)) == NULL) { LM_ERR("allocating send buffer from pkg memory\n"); return -1; } - memset(send_buf, 0, sizeof(unsigned char) * frame_length); + memset(send_buf, 0, sizeof(char) * frame_length); send_buf[pos++] = 0x80 | (frame->opcode & 0xff); if (extended_length == 0) send_buf[pos++] = (frame->payload_len & 0xff);

1 0

git:master:5418f380: domain: use same condition to alloc and free local variable
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 5418f380ad55618004936102273b72f1f8e36113 URL: https://github.com/kamailio/kamailio/commit/5418f380ad55618004936102273b72f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T13:32:18+02:00 domain: use same condition to alloc and free local variable --- Modified: src/modules/domain/domain.c --- Diff: https://github.com/kamailio/kamailio/commit/5418f380ad55618004936102273b72f… Patch: https://github.com/kamailio/kamailio/commit/5418f380ad55618004936102273b72f… --- diff --git a/src/modules/domain/domain.c b/src/modules/domain/domain.c index 27951c91ab..1dbdd2f5d5 100644 --- a/src/modules/domain/domain.c +++ b/src/modules/domain/domain.c @@ -258,7 +258,7 @@ int ki_lookup_domain_prefix(struct sip_msg *_msg, str *_sdomain, str *_sprefix) val.s = did; if(add_avp(flags, name, val) < 0) { LM_ERR("unable to add a new AVP '%.*s'\n", name.s.len, name.s.s); - if(_sprefix) + if(_sprefix && _sprefix->s) pkg_free(name.s.s); return -1; }

1 0

Re: [sr-dev] [kamailio/kamailio] kamctl: added DBPORT option (18e3327)
by Daniel-Constantin Mierla 30 Jun '17

30 Jun '17

Thanks, pushed the fix to master and 5.0 branches. -- 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/commit/18e3327bedc1647a5abe0d377b15b74…

1 0

git:master:4f587124: db_mysql Look for MariaDB as well as MySQL
by Olle E. Johansson 30 Jun '17

30 Jun '17

Module: kamailio Branch: master Commit: 4f587124998e665c5ab9df7fe14cfbb3a39a9ec8 URL: https://github.com/kamailio/kamailio/commit/4f587124998e665c5ab9df7fe14cfbb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-06-30T11:00:35+02:00 db_mysql Look for MariaDB as well as MySQL --- Modified: src/modules/db_mysql/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/4f587124998e665c5ab9df7fe14cfbb… Patch: https://github.com/kamailio/kamailio/commit/4f587124998e665c5ab9df7fe14cfbb… --- diff --git a/src/modules/db_mysql/Makefile b/src/modules/db_mysql/Makefile index fd09bfcce3..c8b48f985d 100644 --- a/src/modules/db_mysql/Makefile +++ b/src/modules/db_mysql/Makefile @@ -16,6 +16,10 @@ MYSQLCFG=$(shell which mysql_config) ifeq ($(MYSQLCFG),) MYSQLCFG=$(shell which mysql_config5) endif +# If no Mysql - do we have MariaDB? +ifeq ($(MYSQLCFG),) +MYSQLCFG=$(shell which mariadb_config) +endif endif ifneq ($(MYSQLCFG),)

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
40
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017