sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

git:master:62cdec7e: xmlops Remove SVN ID
by Olle E. Johansson 21 Feb '15

21 Feb '15

Module: kamailio Branch: master Commit: 62cdec7eacc73fbdef2b993621fceef4084a9f34 URL: https://github.com/kamailio/kamailio/commit/62cdec7eacc73fbdef2b993621fceef… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-21T18:51:23+01:00 xmlops Remove SVN ID --- Modified: modules/xmlops/pv_xml.c Modified: modules/xmlops/pv_xml.h Modified: modules/xmlops/xmlops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/62cdec7eacc73fbdef2b993621fceef… Patch: https://github.com/kamailio/kamailio/commit/62cdec7eacc73fbdef2b993621fceef… --- diff --git a/modules/xmlops/pv_xml.c b/modules/xmlops/pv_xml.c index f41d1aa..dbaed90 100644 --- a/modules/xmlops/pv_xml.c +++ b/modules/xmlops/pv_xml.c @@ -1,5 +1,4 @@ /** - * $Id$ * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) * diff --git a/modules/xmlops/pv_xml.h b/modules/xmlops/pv_xml.h index af3f6cb..fe73f43 100644 --- a/modules/xmlops/pv_xml.h +++ b/modules/xmlops/pv_xml.h @@ -1,5 +1,4 @@ /** - * $Id$ * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) * diff --git a/modules/xmlops/xmlops_mod.c b/modules/xmlops/xmlops_mod.c index d0f842b..47bd387 100644 --- a/modules/xmlops/xmlops_mod.c +++ b/modules/xmlops/xmlops_mod.c @@ -1,5 +1,4 @@ /** - * $Id$ * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) *

1 0

had to export BASEDIR in debian rules
by Juha Heinanen 21 Feb '15

21 Feb '15

i had to export BASEDIR in my debian/rules in order to get value $(BASEDIR)/$(PREFIX) assigned to runbasedir. -- juha

1 0

git:master:5c1a9df4: xhttp: use proper function to set the ip addres of the fake via
by Daniel-Constantin Mierla 20 Feb '15

20 Feb '15

Module: kamailio Branch: master Commit: 5c1a9df4fc8bd72f44066bcef13f381f01cd9d07 URL: https://github.com/kamailio/kamailio/commit/5c1a9df4fc8bd72f44066bcef13f381… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-20T20:40:39+01:00 xhttp: use proper function to set the ip addres of the fake via - for ipv6 it has to be enclosed in between [ ] - reported by Sergey Okhapkin --- Modified: modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5c1a9df4fc8bd72f44066bcef13f381… Patch: https://github.com/kamailio/kamailio/commit/5c1a9df4fc8bd72f44066bcef13f381… --- diff --git a/modules/xhttp/xhttp_mod.c b/modules/xhttp/xhttp_mod.c index eff079a..9085af3 100644 --- a/modules/xhttp/xhttp_mod.c +++ b/modules/xhttp/xhttp_mod.c @@ -199,7 +199,7 @@ static char* xhttp_to_sip(sip_msg_t* msg, int* new_msg_len) struct hostport hp; struct dest_info dst; - ip.s = ip_addr2a(&msg->rcv.src_ip); + ip.s = ip_addr2strz(&msg->rcv.src_ip); ip.len = strlen(ip.s); port.s = int2str(msg->rcv.src_port, &port.len); hp.host = &ip;

1 0

git:master:7978bfd6: tcpops: rename set_connection_lifetime -> tcp_set_connection_lifetime
by Camille Oudot 20 Feb '15

20 Feb '15

Module: kamailio Branch: master Commit: 7978bfd638ff1d6b644ff011fd69e64f68273aa5 URL: https://github.com/kamailio/kamailio/commit/7978bfd638ff1d6b644ff011fd69e64… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-20T15:00:07+01:00 tcpops: rename set_connection_lifetime -> tcp_set_connection_lifetime --- Modified: modules/tcpops/README Modified: modules/tcpops/doc/functions.xml Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7978bfd638ff1d6b644ff011fd69e64… Patch: https://github.com/kamailio/kamailio/commit/7978bfd638ff1d6b644ff011fd69e64…

1 0

git:master:99e65e15: tcpops: new function set_connection_lifetime()
by Camille Oudot 20 Feb '15

20 Feb '15

Module: kamailio Branch: master Commit: 99e65e1526f7720ffc861dd874eb74464e7c12ad URL: https://github.com/kamailio/kamailio/commit/99e65e1526f7720ffc861dd874eb744… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-20T14:25:15+01:00 tcpops: new function set_connection_lifetime() --- Modified: modules/tcpops/doc/functions.xml Modified: modules/tcpops/tcpops.c Modified: modules/tcpops/tcpops.h Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/99e65e1526f7720ffc861dd874eb744… Patch: https://github.com/kamailio/kamailio/commit/99e65e1526f7720ffc861dd874eb744…

2 2

git:master:85c7a3d8: tcpops: README update
by Camille Oudot 20 Feb '15

20 Feb '15

Module: kamailio Branch: master Commit: 85c7a3d80dc44ec3bb0302656b3f11e6ee6713c5 URL: https://github.com/kamailio/kamailio/commit/85c7a3d80dc44ec3bb0302656b3f11e… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-20T14:27:41+01:00 tcpops: README update --- Modified: modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/85c7a3d80dc44ec3bb0302656b3f11e… Patch: https://github.com/kamailio/kamailio/commit/85c7a3d80dc44ec3bb0302656b3f11e… --- diff --git a/modules/tcpops/README b/modules/tcpops/README index 63d5750..dbe5ba7 100644 --- a/modules/tcpops/README +++ b/modules/tcpops/README @@ -17,11 +17,13 @@ Camille Oudot 3.1. tcp_keepalive_enable([conid], idle, count, interval) 3.2. tcp_keepalive_disable([conid]) + 3.3. set_connection_lifetime([conid], lifetime) List of Examples 1.1. tcp_keepalive_enable usage 1.2. tcp_keepalive_disable usage + 1.3. set_connection_lifetime usage Chapter 1. Admin Guide @@ -33,6 +35,7 @@ Chapter 1. Admin Guide 3.1. tcp_keepalive_enable([conid], idle, count, interval) 3.2. tcp_keepalive_disable([conid]) + 3.3. set_connection_lifetime([conid], lifetime) 1. Overview @@ -49,6 +52,7 @@ Chapter 1. Admin Guide 3.1. tcp_keepalive_enable([conid], idle, count, interval) 3.2. tcp_keepalive_disable([conid]) + 3.3. set_connection_lifetime([conid], lifetime) 3.1. tcp_keepalive_enable([conid], idle, count, interval) @@ -113,3 +117,30 @@ onreply_route { } ... } + +3.3. set_connection_lifetime([conid], lifetime) + + Sets the connection lifetime of a connection (TCP). + + Meaning of the parameters is as follows: + * conid (optionnal): the kamailio internal connection id on which to + set the new lifetime. If no parameter is given, it will be set on + the current message source connection. + * lifetime (seconds): the new connection lifetime. + + Retuns 1 on success, -1 on failure. + + Example 1.3. set_connection_lifetime usage +... +# use 10s as default lifetime +tcp_connection_lifetime=10 +... + +request_route { + ... + if (is_method("REGISTER") && pv_www_authenticate("$td", "xxx", "0")) { + # raise the TCP lifetime to a bigger value + set_connection_lifetime("3605"); + } + ... +}

1 0

git:master:0ec36aea: modules/ims_registrar_pcscf: lookup of contact should not be based on where request comes from
by Jason Penton 20 Feb '15

20 Feb '15

Module: kamailio Branch: master Commit: 0ec36aeacb30eafbbee36a7a8cc4254d0ca8a384 URL: https://github.com/kamailio/kamailio/commit/0ec36aeacb30eafbbee36a7a8cc4254… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: 2015-02-20T15:23:45+02:00 modules/ims_registrar_pcscf: lookup of contact should not be based on where request comes from --- Modified: modules/ims_registrar_pcscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/0ec36aeacb30eafbbee36a7a8cc4254… Patch: https://github.com/kamailio/kamailio/commit/0ec36aeacb30eafbbee36a7a8cc4254… --- diff --git a/modules/ims_registrar_pcscf/lookup.c b/modules/ims_registrar_pcscf/lookup.c index 7ace378..b0f7ae2 100644 --- a/modules/ims_registrar_pcscf/lookup.c +++ b/modules/ims_registrar_pcscf/lookup.c @@ -59,17 +59,13 @@ int lookup_transport(struct sip_msg* _m, udomain_t* _d, str* _uri) { str uri; pcontact_t* pcontact; char tmp[MAX_URI_SIZE]; - char srcip[20]; - str received_host; + str received_host = {0,0}; str tmp_s; int ret = 1; if (_m->new_uri.s) uri = _m->new_uri; else uri = _m->first_line.u.request.uri; - received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); - received_host.s = srcip; - //now lookup in usrloc ul.lock_udomain(_d, &uri, &received_host, _m->rcv.src_port); if (ul.get_pcontact(_d, &uri, &received_host, _m->rcv.src_port, &pcontact) != 0) { //need to insert new contact

1 0

git:master:d335d21e: ldap Remove SVN ID and history
by Olle E. Johansson 20 Feb '15

20 Feb '15

Module: kamailio Branch: master Commit: d335d21eb617a6c5018bb92411b47abd05c426fa URL: https://github.com/kamailio/kamailio/commit/d335d21eb617a6c5018bb92411b47ab… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-20T10:30:37+01:00 ldap Remove SVN ID and history --- Modified: modules/ldap/api.h Modified: modules/ldap/iniparser.c Modified: modules/ldap/iniparser.h Modified: modules/ldap/ld_session.c Modified: modules/ldap/ld_session.h Modified: modules/ldap/ldap_api_fn.c Modified: modules/ldap/ldap_api_fn.h Modified: modules/ldap/ldap_connect.c Modified: modules/ldap/ldap_connect.h Modified: modules/ldap/ldap_escape.c Modified: modules/ldap/ldap_escape.h Modified: modules/ldap/ldap_exp_fn.c Modified: modules/ldap/ldap_exp_fn.h Modified: modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d335d21eb617a6c5018bb92411b47ab… Patch: https://github.com/kamailio/kamailio/commit/d335d21eb617a6c5018bb92411b47ab…

1 0

git:master:6a86333f: Merge pull request #95 from kamailio/coudot/core_tcp_lifetime
by Camille Oudot 20 Feb '15

20 Feb '15

Module: kamailio Branch: master Commit: 6a86333f63442380b28ce88d44f95ef0cdbcfcf6 URL: https://github.com/kamailio/kamailio/commit/6a86333f63442380b28ce88d44f95ef… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-20T10:15:19+01:00 Merge pull request #95 from kamailio/coudot/core_tcp_lifetime core: add support for per-TCP connection lifetime --- Modified: core_cmd.c Modified: tcp_conn.h Modified: tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/6a86333f63442380b28ce88d44f95ef… Patch: https://github.com/kamailio/kamailio/commit/6a86333f63442380b28ce88d44f95ef… --- diff --git a/core_cmd.c b/core_cmd.c index 51d88ee..966bcbf 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -757,7 +757,7 @@ static void core_tcp_list(rpc_t* rpc, void* c) char* state; char* type; struct tcp_connection* con; - int i, len, timeout; + int i, len, timeout, lifetime; if (tcp_disable) { rpc->fault(c, 500, "tcp support disabled"); @@ -789,6 +789,7 @@ static void core_tcp_list(rpc_t* rpc, void* c) BUG("failed to convert destination ip"); dst_ip[len] = 0; timeout = TICKS_TO_S(con->timeout - get_ticks_raw()); + lifetime = TICKS_TO_S(con->lifetime); switch(con->state) { case S_CONN_ERROR: state = "CONN_ERROR"; @@ -814,11 +815,12 @@ static void core_tcp_list(rpc_t* rpc, void* c) default: state = "UNKNOWN"; } - rpc->struct_add(handle, "dssddsdsd", + rpc->struct_add(handle, "dssdddsdsd", "id", con->id, "type", type, "state", state, "timeout", timeout, + "lifetime", lifetime, "ref_count", con->refcnt, "src_ip", src_ip, "src_port", con->rcv.src_port, diff --git a/tcp_conn.h b/tcp_conn.h index ee57066..e1c31cd 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -204,6 +204,7 @@ struct tcp_connection{ void* extra_data; /* extra data associated to the connection, 0 for tcp*/ struct timer_ln timer; ticks_t timeout;/* connection timeout, after this it will be removed*/ + ticks_t lifetime;/* connection lifetime */ unsigned id_hash; /* hash index in the id_hash */ struct tcp_connection* id_next; /* next, prev in id hash table */ struct tcp_connection* id_prev; diff --git a/tcp_main.c b/tcp_main.c index 09c4118..f8a7c6d 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -998,6 +998,7 @@ struct tcp_connection* tcpconn_new(int sock, union sockaddr_union* su, c->type=PROTO_TCP; c->rcv.proto=PROTO_TCP; c->timeout=get_ticks_raw()+cfg_get(tcp, tcp_cfg, con_lifetime); + c->lifetime = cfg_get(tcp, tcp_cfg, con_lifetime); } return c; @@ -3280,7 +3281,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) } /* update the timeout*/ t=get_ticks_raw(); - con_lifetime=cfg_get(tcp, tcp_cfg, con_lifetime); + con_lifetime=tcpconn->lifetime; tcpconn->timeout=t+con_lifetime; crt_timeout=con_lifetime; #ifdef TCP_ASYNC

1 0

git:master:2f14564f: core: add support for per-TCP connection lifetime
by Camille Oudot 20 Feb '15

20 Feb '15

Module: kamailio Branch: master Commit: 2f14564f7d87d1d51adb5deadae4ddb6b4ea4bee URL: https://github.com/kamailio/kamailio/commit/2f14564f7d87d1d51adb5deadae4ddb… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-19T18:38:40+01:00 core: add support for per-TCP connection lifetime --- Modified: core_cmd.c Modified: tcp_conn.h Modified: tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/2f14564f7d87d1d51adb5deadae4ddb… Patch: https://github.com/kamailio/kamailio/commit/2f14564f7d87d1d51adb5deadae4ddb… --- diff --git a/core_cmd.c b/core_cmd.c index 51d88ee..966bcbf 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -757,7 +757,7 @@ static void core_tcp_list(rpc_t* rpc, void* c) char* state; char* type; struct tcp_connection* con; - int i, len, timeout; + int i, len, timeout, lifetime; if (tcp_disable) { rpc->fault(c, 500, "tcp support disabled"); @@ -789,6 +789,7 @@ static void core_tcp_list(rpc_t* rpc, void* c) BUG("failed to convert destination ip"); dst_ip[len] = 0; timeout = TICKS_TO_S(con->timeout - get_ticks_raw()); + lifetime = TICKS_TO_S(con->lifetime); switch(con->state) { case S_CONN_ERROR: state = "CONN_ERROR"; @@ -814,11 +815,12 @@ static void core_tcp_list(rpc_t* rpc, void* c) default: state = "UNKNOWN"; } - rpc->struct_add(handle, "dssddsdsd", + rpc->struct_add(handle, "dssdddsdsd", "id", con->id, "type", type, "state", state, "timeout", timeout, + "lifetime", lifetime, "ref_count", con->refcnt, "src_ip", src_ip, "src_port", con->rcv.src_port, diff --git a/tcp_conn.h b/tcp_conn.h index ee57066..e1c31cd 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -204,6 +204,7 @@ struct tcp_connection{ void* extra_data; /* extra data associated to the connection, 0 for tcp*/ struct timer_ln timer; ticks_t timeout;/* connection timeout, after this it will be removed*/ + ticks_t lifetime;/* connection lifetime */ unsigned id_hash; /* hash index in the id_hash */ struct tcp_connection* id_next; /* next, prev in id hash table */ struct tcp_connection* id_prev; diff --git a/tcp_main.c b/tcp_main.c index 09c4118..f8a7c6d 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -998,6 +998,7 @@ struct tcp_connection* tcpconn_new(int sock, union sockaddr_union* su, c->type=PROTO_TCP; c->rcv.proto=PROTO_TCP; c->timeout=get_ticks_raw()+cfg_get(tcp, tcp_cfg, con_lifetime); + c->lifetime = cfg_get(tcp, tcp_cfg, con_lifetime); } return c; @@ -3280,7 +3281,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) } /* update the timeout*/ t=get_ticks_raw(); - con_lifetime=cfg_get(tcp, tcp_cfg, con_lifetime); + con_lifetime=tcpconn->lifetime; tcpconn->timeout=t+con_lifetime; crt_timeout=con_lifetime; #ifdef TCP_ASYNC

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015