sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

Start a nNew thread

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,trusty,slave #599

by jenkins＠kamailio.sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

8 years, 2 months

Jenkins build is back to normal : kamailiodev-nightly-binaries » amd64,precise,slave #599

by jenkins＠kamailio.sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

8 years, 2 months

Jenkins build is back to normal : kamailiodev-nightly-binaries » amd64,trusty,slave #599

by jenkins＠kamailio.sipwise.com

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

8 years, 2 months

git:master:3d49fd52: modules: readme files regenerated - http_client ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 3d49fd52bee6632b5d93b508236e991d028db5ed URL: https://github.com/kamailio/kamailio/commit/3d49fd52bee6632b5d93b508236e991… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-09-06T15:01:23+02:00 modules: readme files regenerated - http_client ... --- Modified: modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/3d49fd52bee6632b5d93b508236e991… Patch: https://github.com/kamailio/kamailio/commit/3d49fd52bee6632b5d93b508236e991… --- diff --git a/modules/http_client/README b/modules/http_client/README index fa7b86b..cd29956 100644 --- a/modules/http_client/README +++ b/modules/http_client/README @@ -685,18 +685,18 @@ http_get_redirect("apiserver", "$var(targeturl)"); Example 1.21. curl_http_query() usage ... # GET-Request -http_client_query("http://tutpro.com/index.php?r_uri=$(ru{s.escape.param})&f_uri -=$(fu{s.escape.param})", - "$var(result)") +http_client_query("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$( +fu{s.escape.param})", + "$var(result)"); switch ($retcode) { ... } ... ... # POST-Request -http_client_query("http://tutpro.com/index.php", "r_uri=$(ru{s.escape.param})&f_ -uri=$(fu{s.escape.param})", - "$var(result)") +http_client_query("http://api.com/index.php", "r_uri=$(ru{s.escape.param})&f_uri +=$(fu{s.escape.param})", + "$var(result)"); switch ($retcode) { ... }

8 years, 2 months

git:master:b7907be6: http_client: added semicolons in the examples

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b7907be6231bd3eb8160300c87ddf58e3fffb206 URL: https://github.com/kamailio/kamailio/commit/b7907be6231bd3eb8160300c87ddf58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-06T14:54:49+02:00 http_client: added semicolons in the examples - use generic domain for examples --- Modified: modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b7907be6231bd3eb8160300c87ddf58… Patch: https://github.com/kamailio/kamailio/commit/b7907be6231bd3eb8160300c87ddf58… --- diff --git a/modules/http_client/doc/http_client_admin.xml b/modules/http_client/doc/http_client_admin.xml index b06bc60..36aee43 100644 --- a/modules/http_client/doc/http_client_admin.xml +++ b/modules/http_client/doc/http_client_admin.xml @@ -746,8 +746,8 @@ http_get_redirect("apiserver", "$var(targeturl)"); <programlisting format="linespecific"> ... # GET-Request -http_client_query("http://tutpro.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.es…", - "$var(result)") +http_client_query("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "$var(result)"); switch ($retcode) { ... } @@ -756,8 +756,8 @@ switch ($retcode) { <programlisting format="linespecific"> ... # POST-Request -http_client_query("http://tutpro.com/index.php", "r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escape.param})", - "$var(result)") +http_client_query("http://api.com/index.php", "r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escape.param})", + "$var(result)"); switch ($retcode) { ... } @@ -791,7 +791,6 @@ switch ($retcode) { <para>Parameters:</para> <itemizedlist> <listitem><para>No parameters</para></listitem> - </itemizedlist> </section> </section>

8 years, 2 months

git:master:b933550a: topos: proper check if the last char in headr value is eol

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b933550a50d61534747e97ce5031c18c4c12f1eb URL: https://github.com/kamailio/kamailio/commit/b933550a50d61534747e97ce5031c18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-06T13:05:08+02:00 topos: proper check if the last char in headr value is eol --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/b933550a50d61534747e97ce5031c18… Patch: https://github.com/kamailio/kamailio/commit/b933550a50d61534747e97ce5031c18… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index acca572..bdd3839 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -166,7 +166,7 @@ int tps_add_headers(sip_msg_t *msg, str *hname, str *hbody, int hpos) memcpy(hs.s + hname->len + 2, hbody->s, hbody->len); /* add end of header if not present */ - if(hs.s[hname->len + 2 + hbody->len]!='\n') { + if(hs.s[hname->len + 2 + hbody->len - 1]!='\n') { hs.s[hname->len + 2 + hbody->len] = '\r'; hs.s[hname->len + 2 + hbody->len+1] = '\n'; hs.len += 2;

8 years, 2 months

git:master:5bc93940: topos: trim values before reinserting the route header

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5bc9394024690e6d931b141d708ecd2815be40ce URL: https://github.com/kamailio/kamailio/commit/5bc9394024690e6d931b141d708ecd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-06T12:51:45+02:00 topos: trim values before reinserting the route header --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/5bc9394024690e6d931b141d708ecd2… Patch: https://github.com/kamailio/kamailio/commit/5bc9394024690e6d931b141d708ecd2… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index 4757c0b..acca572 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -637,7 +637,7 @@ int tps_reappend_route(sip_msg_t *msg, tps_data_t *ptsd, str *hbody, int rev) int c; str sb; - if(hbody==NULL || hbody->s==NULL || hbody->len<=0) + if(hbody==NULL || hbody->s==NULL || hbody->len<=0 || hbody->s[0]=='\0') return 0; if(rev==1) { @@ -670,7 +670,10 @@ int tps_reappend_route(sip_msg_t *msg, tps_data_t *ptsd, str *hbody, int rev) } sb = *hbody; - if(sb.s[sb.len-1]==',') sb.len--; + if(sb.len>0 && sb.s[sb.len-1]==',') sb.len--; + trim_zeros_lr(&sb); + trim(&sb); + if(sb.len>0 && sb.s[sb.len-1]==',') sb.len--; if(tps_add_headers(msg, &hname, &sb, 0)<0) { return -1; }

8 years, 2 months

git:master:fe1fdbaf: core: macro helper to trim zeros from str value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fe1fdbaf24ac0e4e18527e0bdfd2f2e1b217dc1b URL: https://github.com/kamailio/kamailio/commit/fe1fdbaf24ac0e4e18527e0bdfd2f2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-06T12:51:45+02:00 core: macro helper to trim zeros from str value --- Modified: trim.h --- Diff: https://github.com/kamailio/kamailio/commit/fe1fdbaf24ac0e4e18527e0bdfd2f2e… Patch: https://github.com/kamailio/kamailio/commit/fe1fdbaf24ac0e4e18527e0bdfd2f2e… --- diff --git a/trim.h b/trim.h index 4989075..baee6a0 100644 --- a/trim.h +++ b/trim.h @@ -105,5 +105,19 @@ static inline void trim(str* _s) for(;(_s_).s[0]==' ';(_s_).s=(_s_).s+1,(_s_).len--); \ \ } while(0); - + +/* + * right and left zero trimming + * + * WARNING: String structure will be modified ! + * Make a copy otherwise you might be + * unable to free _s_->s for example ! + */ +#define trim_zeros_lr(_s_) \ + do{ \ + for(;(_s_)->s[(_s_)->len-1]=='\0';(_s_)->s[--(_s_)->len]=0); \ + for(;(_s_)->s[0]=='\0';(_s_)->s=(_s_)->s+1,(_s_)->len--); \ + \ + } while(0); + #endif /* TRIM_H */

8 years, 2 months

git:master:0cec8619: modules: readme files regenerated - tcpops ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 0cec8619459b14bb70bc7d41417e5ee3553ca240 URL: https://github.com/kamailio/kamailio/commit/0cec8619459b14bb70bc7d41417e5ee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-09-06T11:01:27+02:00 modules: readme files regenerated - tcpops ... --- Modified: modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/0cec8619459b14bb70bc7d41417e5ee… Patch: https://github.com/kamailio/kamailio/commit/0cec8619459b14bb70bc7d41417e5ee… --- diff --git a/modules/tcpops/README b/modules/tcpops/README index a0c7e76..3918b00 100644 --- a/modules/tcpops/README +++ b/modules/tcpops/README @@ -31,6 +31,10 @@ Olle E. Johansson 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) + 4. Event routes + + 4.1. tcp:closed + List of Examples 1.1. Set closed_event parameter @@ -59,6 +63,10 @@ Chapter 1. Admin Guide 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) + 4. Event routes + + 4.1. tcp:closed + 1. Overview This modules allows Kamailio to control the TCP connection options @@ -277,3 +285,22 @@ request_route { event_route[tcp:closed] { xlog("connection $conid was closed"); } + +4. Event routes + + 4.1. tcp:closed + +4.1. tcp:closed + + This route is called when a socket is closed by the remote party, or + reset, or timeout. The corresponding $conid variable will be available + in the event route. + + Whether this route is always called, never, or on a per socket basis is + controlled by the closed_event parameter. + +... +event_route[tcp:closed] { + xlog("L_INFO", "TCP connection closed ($conid)\n"); +} +...

8 years, 2 months

git:master:3d4dda0c: tcpops: add documentation for tcp:closed

by Camille Oudot

Module: kamailio Branch: master Commit: 3d4dda0cdc4dc452ae7f796e74fd6056e09662df URL: https://github.com/kamailio/kamailio/commit/3d4dda0cdc4dc452ae7f796e74fd605… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-09-06T10:46:43+02:00 tcpops: add documentation for tcp:closed --- Added: modules/tcpops/doc/eventroutes.xml Modified: modules/tcpops/doc/tcpops.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d4dda0cdc4dc452ae7f796e74fd605… Patch: https://github.com/kamailio/kamailio/commit/3d4dda0cdc4dc452ae7f796e74fd605… --- diff --git a/modules/tcpops/doc/eventroutes.xml b/modules/tcpops/doc/eventroutes.xml new file mode 100644 index 0000000..f219b1d --- /dev/null +++ b/modules/tcpops/doc/eventroutes.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> +<section id="tcpops.ex.event_routes"> + <title>Event routes</title> + <section> + <title> + <function moreinfo="none">tcp:closed</function> + </title> + <para> + This route is called when a socket is closed by the remote party, + or reset, or timeout. The corresponding <emphasis>$conid</emphasis> + variable will be available in the event route. + </para> + <para> + Whether this route is always called, never, or on a per socket basis + is controlled by the <emphasis>closed_event</emphasis> parameter. + </para> + <para> + <programlisting format="linespecific"> +... +event_route[tcp:closed] { + xlog("L_INFO", "TCP connection closed ($conid)\n"); +} +... + </programlisting> + </para> + </section> +</section> \ No newline at end of file diff --git a/modules/tcpops/doc/tcpops.xml b/modules/tcpops/doc/tcpops.xml index fc8d32f..5a2ef8d 100644 --- a/modules/tcpops/doc/tcpops.xml +++ b/modules/tcpops/doc/tcpops.xml @@ -57,6 +57,7 @@ <xi:include href="params.xml"/> <xi:include href="functions.xml"/> + <xi:include href="eventroutes.xml"/> </chapter> </book>

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016