sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:4.0: db_postgres: use variable for make tool in module Makefile
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: 4.0 Commit: 756e30f5c33ef4ab122b333b4d1b6ce80cec0f2f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=756e30f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 12:33:45 2013 +0200 db_postgres: use variable for make tool in module Makefile - fixes builds in BSD systems - patch by Victor (coyote), FS#335 (cherry picked from commit 7abd496560c6274680d451f49355ad1f6a14a6a7) --- modules/db_postgres/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 66292ae..aa8da69 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -40,7 +40,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-pgsql-scripts: $(bin_prefix)/$(bin_dir) - PGSQLON=yes make -C ../../utils/kamctl/ install-modules + PGSQLON=yes $(MAKE) -C ../../utils/kamctl/ install-modules install-scripts: install-pgsql-scripts

1 0

git:master: db_postgres: use variable for make tool in module Makefile
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: master Commit: 7abd496560c6274680d451f49355ad1f6a14a6a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7abd496… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 12:33:45 2013 +0200 db_postgres: use variable for make tool in module Makefile - fixes builds in BSD systems - patch by Victor (coyote), FS#335 --- modules/db_postgres/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 66292ae..aa8da69 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -40,7 +40,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-pgsql-scripts: $(bin_prefix)/$(bin_dir) - PGSQLON=yes make -C ../../utils/kamctl/ install-modules + PGSQLON=yes $(MAKE) -C ../../utils/kamctl/ install-modules install-scripts: install-pgsql-scripts

1 0

git:4.0: tm: readme regenerated from xml files
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: 4.0 Commit: 796d53ddec3fe12dcb93d4a4c293de0f610581d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=796d53d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 11:54:07 2013 +0200 tm: readme regenerated from xml files --- modules/tm/README | 2696 ----------------------------------------------------- 1 files changed, 0 insertions(+), 2696 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=796…

1 0

git:4.0: tm: updated xml docs with t_set_disable_internal_reply()
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: 4.0 Commit: e7a00bb913fc24be894a668317dd2f2ac143cbed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7a00bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 11:53:28 2013 +0200 tm: updated xml docs with t_set_disable_internal_reply() - backported from 6073949aa224ea7a973058891a88a58cc0841860 --- modules/tm/doc/functions.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index 05ca18f..9d67d8f 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1380,6 +1380,26 @@ route { </example> </section> + <section id="tm.f.t_set_disable_internal_reply"> + <title> + <function>t_set_disable_internal_reply(0|1)</function> + </title> + <para> + Turn off/on sending internally a SIP reply in case of relay errors. + </para> + <example> + <title><function>t_set_disable_internal_reply</function> usage</title> + <programlisting> +... +t_set_disable_internal_reply(1); # turn off sending internal reply on error +if(!t_relay()) { + send_reply("500", "Server error"); +} +... + </programlisting> + </example> + </section> + <section id="t_replicate"> <title> <function>t_replicate(params)</function>

1 0

git:4.0: tm: removed note about no-implentation for no-reply flag for t_relay_to()
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: 4.0 Commit: 55587b6bd035f2ab10f73c6c9bde95628688e799 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55587b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 23 21:03:13 2013 +0200 tm: removed note about no-implentation for no-reply flag for t_relay_to() (cherry picked from commit ef9b69bbb54302e9985dd37d79831b6f80463fc1) --- modules/tm/doc/functions.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index c29ed38..05ca18f 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1499,7 +1499,7 @@ t_replicate_to_udp("1.2.3.4", "5060"); </listitem> <listitem> <para><emphasis>0x02</emphasis> - do not generate reply on internal - error (NOTE: has no effect anymore). + error. </para> </listitem> <listitem>

1 0

git:4.0: rtpproxy: updated rtpproxy_manage() to handle PRACKs with sdp
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: 4.0 Commit: 98ba4cec3ca2caef40725c3884e7dd5693d6c3c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98ba4ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 11:44:23 2013 +0200 rtpproxy: updated rtpproxy_manage() to handle PRACKs with sdp (cherry picked from commit 2aa5095252f9434c7c2a63ecb130bdaf1346fde9) --- modules/rtpproxy/rtpproxy.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 783eff9..e25a3a3 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -1972,7 +1972,7 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) method = get_cseq(msg)->method_id; if(!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + || method==METHOD_BYE || method==METHOD_UPDATE || method==METHOD_PRACK)) return -1; if(method==METHOD_CANCEL || method==METHOD_BYE) @@ -1993,6 +1993,9 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(method==METHOD_ACK && nosdp==0) return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0, (ip!=NULL)?1:0); + if(method==METHOD_PRACK && nosdp==0) + return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 1, + (ip!=NULL)?1:0); if(method==METHOD_UPDATE && nosdp==0) return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 1, (ip!=NULL)?1:0); @@ -2010,6 +2013,9 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(msg->first_line.u.reply.statuscode>=300) return unforce_rtp_proxy_f(msg, flags, 0); if(nosdp==0) { + if(method==METHOD_PRACK) + return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0, + (ip!=NULL)?1:0); if(method==METHOD_UPDATE) return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0, (ip!=NULL)?1:0);

1 0

git:4.0: tm: re-added the option for no-internal reply on error
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: 4.0 Commit: 3d836040bdb6d191e6f6a54e37fe680e1e3973d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d83604… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 11:47:36 2013 +0200 tm: re-added the option for no-internal reply on error - new function t_set_disable_internal_reply(0|1) to disable|enable this option per transaction - t_relay_to() flags re-enabled for this option - backport of 0f2f9c85eff0b6ad35b4c58dfcde74c8a65559d6 --- modules/tm/h_table.h | 2 ++ modules/tm/t_funcs.c | 9 +++++++++ modules/tm/tm.c | 13 +++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index f30bd45..d13cd9b 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -299,6 +299,8 @@ struct totag_elem { # define pass_provisional(_t_) ((_t_)->flags&T_PASS_PROVISIONAL_FLAG) #endif +#define T_DISABLE_INTERNAL_REPLY (1<<12) /* don't send internal negative reply */ + /* unsigned short should be enough for a retr. timer: max. 65535 ms => * max retr. = 65 s which should be enough and saves us 2*2 bytes */ typedef unsigned short retr_timeout_t; diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index e9d9598..729b537 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -358,6 +358,15 @@ handle_ret: /* we don't want to pass upstream any reply regarding replicating * a request; replicated branch must stop at us*/ if (likely(!replicate)) { + if(t->flags&T_DISABLE_INTERNAL_REPLY) { + /* flag set to don't generate the internal negative reply + * - let the transaction live further, processing should + * continue in config */ + DBG("not generating immediate reply for error %d\n", ser_error); + tm_error=ser_error; + ret = -4; + goto done; + } #ifdef TM_DELAYED_REPLY /* current error in tm_error */ tm_error=ser_error; diff --git a/modules/tm/tm.c b/modules/tm/tm.c index a1ca634..6b03081 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -289,6 +289,7 @@ static int t_set_disable_failover(struct sip_msg* msg, char* on_off, char* f); static int t_set_no_e2e_cancel_reason(struct sip_msg* msg, char* on_off, char* f); #endif /* CANCEL_REASON_SUPPORT */ +static int t_set_disable_internal_reply(struct sip_msg* msg, char* on_off, char* f); static int t_branch_timeout(struct sip_msg* msg, char*, char*); static int t_branch_replied(struct sip_msg* msg, char*, char*); static int t_any_timeout(struct sip_msg* msg, char*, char*); @@ -448,6 +449,8 @@ static cmd_export_t cmds[]={ fixup_var_int_1, REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, #endif /* CANCEL_REASON_SUPPORT */ + {"t_set_disable_internal_reply", t_set_disable_internal_reply, 1, fixup_var_int_1, + REQUEST_ROUTE|TM_ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_branch_timeout", t_branch_timeout, 0, 0, FAILURE_ROUTE}, {"t_branch_replied", t_branch_replied, 0, 0, FAILURE_ROUTE}, {"t_any_timeout", t_any_timeout, 0, 0, @@ -1827,6 +1830,10 @@ T_SET_FLAG_GEN_FUNC(t_set_no_e2e_cancel_reason, T_NO_E2E_CANCEL_REASON) #endif /* CANCEL_REASON_SUPPORT */ +/* disable internal negative reply for the current transaction */ +T_SET_FLAG_GEN_FUNC(t_set_disable_internal_reply, T_DISABLE_INTERNAL_REPLY) + + /* script function, FAILURE_ROUTE only, returns true if the * choosed "failure" branch failed because of a timeout, * -1 otherwise */ @@ -2220,13 +2227,11 @@ inline static int w_t_relay_to(struct sip_msg *msg, char *proxy, char *flags) param.v.i = 0; t_set_auto_inv_100(msg, (char*)(&param), 0); } - /* no auto negative reply - not implemented */ - /* + /* no auto negative reply */ if(fl&2) { param.v.i = 1; - t_set_disable_internal_reply(msg, (char*)param, 0); + t_set_disable_internal_reply(msg, (char*)(&param), 0); } - */ /* no dns failover */ if(fl&4) { param.v.i = 1;

1 0

git:master: rtpproxy: updated rtpproxy_manage() to handle PRACKs with sdp
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: master Commit: 2aa5095252f9434c7c2a63ecb130bdaf1346fde9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2aa5095… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 11:44:23 2013 +0200 rtpproxy: updated rtpproxy_manage() to handle PRACKs with sdp --- modules/rtpproxy/rtpproxy.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 03ad485..ae9d291 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2018,7 +2018,7 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) method = get_cseq(msg)->method_id; if(!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + || method==METHOD_BYE || method==METHOD_UPDATE || method==METHOD_PRACK)) return -1; if(method==METHOD_CANCEL || method==METHOD_BYE) @@ -2039,6 +2039,9 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(method==METHOD_ACK && nosdp==0) return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0, (ip!=NULL)?1:0); + if(method==METHOD_PRACK && nosdp==0) + return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 1, + (ip!=NULL)?1:0); if(method==METHOD_UPDATE && nosdp==0) return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 1, (ip!=NULL)?1:0); @@ -2056,6 +2059,9 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(msg->first_line.u.reply.statuscode>=300) return unforce_rtp_proxy(msg, flags); if(nosdp==0) { + if(method==METHOD_PRACK) + return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0, + (ip!=NULL)?1:0); if(method==METHOD_UPDATE) return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0, (ip!=NULL)?1:0);

1 0

[tracker] Task opened: FreeBSD build broken with db_postgres module
by sip-router 04 Sep '13

04 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Victor (coyote) Attached to Project - sip-router Summary - FreeBSD build broken with db_postgres module Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - FreeBSD Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Error message: PGSQLON=yes make -C ../../utils/kamctl/ install-modules make: illegal option -- - usage: make [-BPSXeiknpqrstv] [-C directory] [-D variable] [-d flags] [-E variable] [-f makefile] [-I directory] [-j max_jobs] [-m directory] [-V variable] [variable=value] [target ...] gmake[1]: *** [install-pgsql-scripts] Error 2 gmake: *** [install-modules] Error 1 Need patch for using $(MAKE) variable vs direct make call. diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 66292ae..aa8da69 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -40,7 +40,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-pgsql-scripts: $(bin_prefix)/$(bin_dir) - PGSQLON=yes make -C ../../utils/kamctl/ install-modules + PGSQLON=yes $(MAKE) -C ../../utils/kamctl/ install-modules install-scripts: install-pgsql-scripts More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=335 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: usrloc: detect lost tcp connnections on timer and set associated contact as expired
by Daniel-Constantin Mierla 04 Sep '13

04 Sep '13

Module: sip-router Branch: master Commit: 72996942662b944b74e6632e1670c989402bf8af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7299694… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 4 09:56:28 2013 +0200 usrloc: detect lost tcp connnections on timer and set associated contact as expired - new module parameter to control this feature: handle_lost_tcp - at this moment it is not implemented for db only mode --- modules/usrloc/ucontact.c | 1 + modules/usrloc/ul_mod.c | 6 ++++++ modules/usrloc/ul_mod.h | 1 + modules/usrloc/urecord.c | 32 +++++++++++++++++++++++++++++++- modules/usrloc/usrloc.h | 2 ++ 5 files changed, 41 insertions(+), 1 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index d1ae1f3..e7f8938 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -135,6 +135,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->reg_id = _ci->reg_id; c->last_modified = _ci->last_modified; c->last_keepalive = _ci->last_modified; + c->tcpconn_id = _ci->tcpconn_id; #ifdef WITH_XAVP ucontact_xavp_store(c); #endif diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index 08126fd..7d88f67 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -161,6 +161,7 @@ int timer_interval = 60; /*!< Timer interval in seconds */ int db_mode = 0; /*!< Database sync scheme: 0-no db, 1-write through, 2-write back, 3-only db */ int use_domain = 0; /*!< Whether usrloc should use domain part of aor */ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ +int handle_lost_tcp = 0; int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 9; @@ -214,6 +215,7 @@ static param_export_t params[] = { {"fetch_rows", INT_PARAM, &ul_fetch_rows }, {"hash_size", INT_PARAM, &ul_hash_size }, {"nat_bflag", INT_PARAM, &nat_bflag }, + {"handle_lost_tcp", INT_PARAM, &handle_lost_tcp }, {"preload", STR_PARAM|USE_FUNC_PARAM, (void*)ul_preload_param}, {"db_update_as_insert", INT_PARAM, &ul_db_update_as_insert}, {"timer_procs", INT_PARAM, &ul_timer_procs}, @@ -387,6 +389,10 @@ static int mod_init(void) return -1; } } + + if (handle_lost_tcp && db_mode == DB_ONLY) + LM_WARN("handle_lost_tcp option makes nothing in DB_ONLY mode\n"); + init_flag = 1; return 0; diff --git a/modules/usrloc/ul_mod.h b/modules/usrloc/ul_mod.h index 2435b5e..0e61924 100644 --- a/modules/usrloc/ul_mod.h +++ b/modules/usrloc/ul_mod.h @@ -84,6 +84,7 @@ extern int ul_hash_size; extern int ul_db_update_as_insert; extern int ul_db_check_update; extern int ul_keepalive_timeout; +extern int handle_lost_tcp; /*! nat branch flag */ extern unsigned int nat_bflag; diff --git a/modules/usrloc/urecord.c b/modules/usrloc/urecord.c index 93c8446..6423dd6 100644 --- a/modules/usrloc/urecord.c +++ b/modules/usrloc/urecord.c @@ -40,6 +40,7 @@ #include "../../dprint.h" #include "../../ut.h" #include "../../hashes.h" +#include "../../tcp_conn.h" #include "ul_mod.h" #include "usrloc.h" #include "utime.h" @@ -221,6 +222,26 @@ void mem_delete_ucontact(urecord_t* _r, ucontact_t* _c) free_ucontact(_c); } +static inline int is_valid_tcpconn(ucontact_t *c) +{ + if (c->tcpconn_id == -1) + return 0; /* tcpconn_id is not present */ + else + return 1; /* valid tcpconn_id */ +} + +static inline int is_tcp_alive(ucontact_t *c) +{ + struct tcp_connection *con = NULL; + int rc = 0; + + if ((con = tcpconn_get(c->tcpconn_id, 0, 0, 0, 0))) { + tcpconn_put(con); /* refcnt-- */ + rc = 1; + } + + return rc; +} /*! * \brief Expires timer for NO_DB db_mode @@ -236,6 +257,11 @@ static inline void nodb_timer(urecord_t* _r) ptr = _r->contacts; while(ptr) { + if (handle_lost_tcp && is_valid_tcpconn(ptr) && !is_tcp_alive(ptr)) { + LM_DBG("tcp connection has been lost, expiring contact %.*s\n", ptr->c.len, ptr->c.s); + ptr->expires = UL_EXPIRED_TIME; + } + if (!VALID_CONTACT(ptr, act_time)) { /* run callbacks for EXPIRE event */ if (exists_ulcb_type(UL_CONTACT_EXPIRE)) @@ -296,7 +322,6 @@ static inline void wt_timer(urecord_t* _r) } } - /*! * \brief Write-back timer, used for WRITE_BACK db_mode * @@ -316,6 +341,11 @@ static inline void wb_timer(urecord_t* _r) ptr = _r->contacts; while(ptr) { + if (handle_lost_tcp && is_valid_tcpconn(ptr) && !is_tcp_alive(ptr)) { + LM_DBG("tcp connection has been lost, expiring contact %.*s\n", ptr->c.len, ptr->c.s); + ptr->expires = UL_EXPIRED_TIME; + } + if (!VALID_CONTACT(ptr, act_time)) { /* run callbacks for EXPIRE event */ if (exists_ulcb_type(UL_CONTACT_EXPIRE)) { diff --git a/modules/usrloc/usrloc.h b/modules/usrloc/usrloc.h index 1cf70bb..30cf354 100644 --- a/modules/usrloc/usrloc.h +++ b/modules/usrloc/usrloc.h @@ -91,6 +91,7 @@ typedef struct ucontact { unsigned int methods; /*!< Supported methods */ str instance; /*!< SIP instance value - gruu */ unsigned int reg_id; /*!< reg-id parameters */ + int tcpconn_id; /* unique tcp connection id */ #ifdef WITH_XAVP sr_xavp_t * xavp; /*!< per contact xavps */ #endif @@ -116,6 +117,7 @@ typedef struct ucontact_info { unsigned int methods; /*!< supported methods */ str instance; /*!< SIP instance value - gruu */ unsigned int reg_id; /*!< reg-id parameters */ + int tcpconn_id; #ifdef WITH_XAVP sr_xavp_t * xavp; /*!< per contact xavps */ #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013