sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
390 discussions

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/… [View More]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> [View Less]

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/… [View More]

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/… [View More]

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/… [View More]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 +} [View Less]

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/… [View More]

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/… [View More]

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/… [View More]

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://… [View More]

1 0

regarding offline charging
by Anabham Manusha 30 Jun '17

30 Jun '17

hi iam implementing ims so far i have done calling through sip clients like xlite and jitsi now i lke to add offline charging to my IMS modules.can an one suggest how can i add??

2 3

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017