sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:master:dd0fd701: htable: more checks of updateexpire when item is updated
by Daniel-Constantin Mierla 18 Sep '15

18 Sep '15

Module: kamailio Branch: master Commit: dd0fd7011b750e34c595936b6c95759ccb77f786 URL: https://github.com/kamailio/kamailio/commit/dd0fd7011b750e34c595936b6c95759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-18T09:33:20+02:00 htable: more checks of updateexpire when item is updated --- Modified: modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/dd0fd7011b750e34c595936b6c95759… Patch: https://github.com/kamailio/kamailio/commit/dd0fd7011b750e34c595936b6c95759… --- diff --git a/modules/htable/ht_api.c b/modules/htable/ht_api.c index 1a77376..4e272cc 100644 --- a/modules/htable/ht_api.c +++ b/modules/htable/ht_api.c @@ -460,7 +460,10 @@ int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode) } cell->next = it->next; cell->prev = it->prev; - cell->expire = now + ht->htexpire; + if(ht->updateexpire) + cell->expire = now + ht->htexpire; + else + cell->expire = it->expire; if(it->prev) it->prev->next = cell; else @@ -489,7 +492,10 @@ int ht_set_cell(ht_t *ht, str *name, int type, int_str *val, int mode) if(mode) ht_slot_unlock(ht, idx); return -1; } - cell->expire = now + ht->htexpire; + if(ht->updateexpire) + cell->expire = now + ht->htexpire; + else + cell->expire = it->expire; cell->next = it->next; cell->prev = it->prev; if(it->prev) @@ -649,7 +655,8 @@ ht_cell_t* ht_cell_value_add(ht_t *ht, str *name, int val, int mode, return NULL; } else { it->value.n += val; - it->expire = now + ht->htexpire; + if(ht->updateexpire) + it->expire = now + ht->htexpire; if(old!=NULL) { if(old->msize>=it->msize)

1 0

git:master:bda43b9c: Merge pull request #328 from mslehto/master
by Daniel-Constantin Mierla 18 Sep '15

18 Sep '15

Module: kamailio Branch: master Commit: bda43b9c889f52a1d9d851e224e11bb4b090889c URL: https://github.com/kamailio/kamailio/commit/bda43b9c889f52a1d9d851e224e11bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-18T09:20:19+02:00 Merge pull request #328 from mslehto/master modules/path: fixes typo in outbound RFC number --- Modified: modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bda43b9c889f52a1d9d851e224e11bb… Patch: https://github.com/kamailio/kamailio/commit/bda43b9c889f52a1d9d851e224e11bb… --- diff --git a/modules/path/doc/path_admin.xml b/modules/path/doc/path_admin.xml index 464486a..2a7ade6 100644 --- a/modules/path/doc/path_admin.xml +++ b/modules/path/doc/path_admin.xml @@ -150,7 +150,7 @@ modparam("path", "use_received", 1) If the <quote>outbound</quote> module was loaded before this module, and outbound is required for this request, the header will be in the form <quote>Path: <sip:flowtoken@1.2.3.4;lr;ob></quote>, where <quote>flowtoken</quote> - is the RFC 5636 flow-token that can be used to identify the source and local address and + is the RFC 5626 flow-token that can be used to identify the source and local address and transport the request was received on, and where <quote>1.2.3.4</quote> is the address of the outgoing interface. </para>

1 0

git:master:8ceba7e7: modules/path: fixes typo in outbound RFC number
by Mikko Lehto 18 Sep '15

18 Sep '15

Module: kamailio Branch: master Commit: 8ceba7e73b29c5cbc0c8ac050237570e762ce698 URL: https://github.com/kamailio/kamailio/commit/8ceba7e73b29c5cbc0c8ac050237570… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-09-18T01:00:47+03:00 modules/path: fixes typo in outbound RFC number --- Modified: modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8ceba7e73b29c5cbc0c8ac050237570… Patch: https://github.com/kamailio/kamailio/commit/8ceba7e73b29c5cbc0c8ac050237570… --- diff --git a/modules/path/doc/path_admin.xml b/modules/path/doc/path_admin.xml index 464486a..2a7ade6 100644 --- a/modules/path/doc/path_admin.xml +++ b/modules/path/doc/path_admin.xml @@ -150,7 +150,7 @@ modparam("path", "use_received", 1) If the <quote>outbound</quote> module was loaded before this module, and outbound is required for this request, the header will be in the form <quote>Path: <sip:flowtoken@1.2.3.4;lr;ob></quote>, where <quote>flowtoken</quote> - is the RFC 5636 flow-token that can be used to identify the source and local address and + is the RFC 5626 flow-token that can be used to identify the source and local address and transport the request was received on, and where <quote>1.2.3.4</quote> is the address of the outgoing interface. </para>

1 0

[kamailio] modules/path: fixes typo in outbound RFC number (#328)
by Mikko Lehto 18 Sep '15

18 Sep '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/328 -- Commit Summary -- * modules/path: fixes typo in outbound RFC number -- File Changes -- M modules/path/doc/path_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/328.patch https://github.com/kamailio/kamailio/pull/328.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/328

2 3

[kamailio] utils module - http_query - Empty first response line (#317)
by Laurent Debacker 18 Sep '15

18 Sep '15

Hi, I am using http_query to retrieve content served by an http web server. Unfortunately, the http server tends to output an empty first line in the response. As http_query only retrieves the first line, the result of the http_query is empty. Would it be possible to ignore empty lines in the http response (trim the response)? Thanks for the response, Laurent. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/317

2 3

git:master:1e18e4f9: utils: readme updated for http_response_mode
by Daniel-Constantin Mierla 18 Sep '15

18 Sep '15

Module: kamailio Branch: master Commit: 1e18e4f9ce3020684d18152d6a35083bd3278261 URL: https://github.com/kamailio/kamailio/commit/1e18e4f9ce3020684d18152d6a35083… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T22:23:39+02:00 utils: readme updated for http_response_mode --- Modified: modules/utils/README --- Diff: https://github.com/kamailio/kamailio/commit/1e18e4f9ce3020684d18152d6a35083… Patch: https://github.com/kamailio/kamailio/commit/1e18e4f9ce3020684d18152d6a35083…

1 0

git:master:05c7dfb9: utils: documentation for http_response_mode
by Daniel-Constantin Mierla 18 Sep '15

18 Sep '15

Module: kamailio Branch: master Commit: 05c7dfb9d71c8ada339bf68842823e09bf75e89e URL: https://github.com/kamailio/kamailio/commit/05c7dfb9d71c8ada339bf68842823e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T22:23:39+02:00 utils: documentation for http_response_mode --- Modified: modules/utils/doc/utils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/05c7dfb9d71c8ada339bf68842823e0… Patch: https://github.com/kamailio/kamailio/commit/05c7dfb9d71c8ada339bf68842823e0… --- diff --git a/modules/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml index d4a60b7..1c00eb1 100644 --- a/modules/utils/doc/utils_admin.xml +++ b/modules/utils/doc/utils_admin.xml @@ -93,6 +93,26 @@ modparam("utils", "http_query_timeout", 2) </programlisting> </example> </section> + <section id="utils.p.http_response_mode"> + <title><varname>http_response_mode</varname> (int)</title> + <para> + Control what part of the HTTP reponse is returned: only + first line (for value 0), or all response (for value 1). + </para> + <para> + <emphasis> + Default value is 0 (return only the first line). + </emphasis> + </para> + <example> + <title>Set <varname>http_response_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("utils", "http_response_mode", 1) +... + </programlisting> + </example> + </section> <section id="utils.p.http_response_trim"> <title><varname>http_response_trim</varname> (int)</title> <para> @@ -113,7 +133,6 @@ modparam("utils", "http_response_trim", 1) </programlisting> </example> </section> - <section id="utils.p.forward_active"> <title><varname>forward_active</varname> (int)</title> <para>

1 0

git:master:7e866d62: utils: new parameter http_response_mode to control what response part is returned
by Daniel-Constantin Mierla 18 Sep '15

18 Sep '15

Module: kamailio Branch: master Commit: 7e866d62c52239574c52b5cb7797bfe907925e06 URL: https://github.com/kamailio/kamailio/commit/7e866d62c52239574c52b5cb7797bfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T22:23:39+02:00 utils: new parameter http_response_mode to control what response part is returned - if http_response_mode=0, only the first line is returned (like so far) - if http_response_mode=1, all the response is returned - default 0 --- Modified: modules/utils/functions.c Modified: modules/utils/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/7e866d62c52239574c52b5cb7797bfe… Patch: https://github.com/kamailio/kamailio/commit/7e866d62c52239574c52b5cb7797bfe… --- diff --git a/modules/utils/functions.c b/modules/utils/functions.c index 4231150..115cd14 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -45,6 +45,7 @@ extern int http_response_trim; +extern int http_response_mode; /* * curl write function that saves received data as zero terminated @@ -208,14 +209,15 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post, char* _h if(http_response_trim) { trim(&hres); } - /* search for line feed */ - at = memchr(hres.s, (char)10, hres.len); - if (at == NULL) { - /* not found: use whole stream */ - val.rs = hres; - } else { - val.rs.s = hres.s; - val.rs.len = at - hres.s; + val.rs = hres; + if(http_response_mode==0) { + /* only first line - search for line feed */ + at = memchr(hres.s, (char)10, hres.len); + if (at != NULL) { + /* found: use first line */ + val.rs.s = hres.s; + val.rs.len = at - hres.s; + } } LM_DBG("http_query result: %.*s\n", val.rs.len, val.rs.s); val.flags = PV_VAL_STR; diff --git a/modules/utils/utils.c b/modules/utils/utils.c index 08334b6..368f5b9 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -59,6 +59,7 @@ MODULE_VERSION /* Module parameter variables */ int http_query_timeout = 4; int http_response_trim = 0; +int http_response_mode = 0; static int forward_active = 0; static int mp_max_id = 0; static char* mp_switch = ""; @@ -124,6 +125,7 @@ static param_export_t params[] = { {"xcap_table", PARAM_STR, &xcap_table}, {"http_query_timeout", INT_PARAM, &http_query_timeout}, {"http_response_trim", INT_PARAM, &http_response_trim}, + {"http_response_mode", INT_PARAM, &http_response_mode}, {"forward_active", INT_PARAM, &forward_active}, {0, 0, 0} };

1 0

git:master:bc74d54a: utils: regenerated the readme file
by Daniel-Constantin Mierla 18 Sep '15

18 Sep '15

Module: kamailio Branch: master Commit: bc74d54ac2f5611303b592b9aae687d40c8999ef URL: https://github.com/kamailio/kamailio/commit/bc74d54ac2f5611303b592b9aae687d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T22:23:38+02:00 utils: regenerated the readme file --- Modified: modules/utils/README --- Diff: https://github.com/kamailio/kamailio/commit/bc74d54ac2f5611303b592b9aae687d… Patch: https://github.com/kamailio/kamailio/commit/bc74d54ac2f5611303b592b9aae687d…

1 0

git:master:cac4d70a: utils: documentation for http_response_trim
by Daniel-Constantin Mierla 18 Sep '15

18 Sep '15

Module: kamailio Branch: master Commit: cac4d70a1b685f4859016d01c6de3f0f3bd9b50a URL: https://github.com/kamailio/kamailio/commit/cac4d70a1b685f4859016d01c6de3f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-17T22:23:38+02:00 utils: documentation for http_response_trim --- Modified: modules/utils/doc/utils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cac4d70a1b685f4859016d01c6de3f0… Patch: https://github.com/kamailio/kamailio/commit/cac4d70a1b685f4859016d01c6de3f0… --- diff --git a/modules/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml index 337e84c..d4a60b7 100644 --- a/modules/utils/doc/utils_admin.xml +++ b/modules/utils/doc/utils_admin.xml @@ -93,6 +93,27 @@ modparam("utils", "http_query_timeout", 2) </programlisting> </example> </section> + <section id="utils.p.http_response_trim"> + <title><varname>http_response_trim</varname> (int)</title> + <para> + Control if white space, tab and end of line characters should be + trimmed from leading and trailing parts of HTTP response. + </para> + <para> + <emphasis> + Default value is 0 (don't trim). + </emphasis> + </para> + <example> + <title>Set <varname>http_response_trim</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("utils", "http_response_trim", 1) +... + </programlisting> + </example> + </section> + <section id="utils.p.forward_active"> <title><varname>forward_active</varname> (int)</title> <para>

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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 September 2015