sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

[tracker] Task closed: Setting only dlg_set_property("ka-dst") doesn't work
by sip-router 11 Apr '14

11 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#416 - Setting only dlg_set_property("ka-dst") doesn't work User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=416 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

[tracker] Comment added: Setting only dlg_set_property("ka-dst") doesn't work
by sip-router 11 Apr '14

11 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#416 - Setting only dlg_set_property("ka-dst") doesn't work User who did this - Daniel-Constantin Mierla (miconda) ---------- Thanks, applied to master and 4.1 branches. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=416#comment1385 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:4.1: dialog: proper detection of keepalive flag for destination
by Daniel-Constantin Mierla 11 Apr '14

11 Apr '14

Module: sip-router Branch: 4.1 Commit: 2eed3023870f793b6824d091b75099bc9a82edf9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2eed302… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 11 23:03:05 2014 +0200 dialog: proper detection of keepalive flag for destination - credit to Bill Radis, FS#416, for report and fix (cherry picked from commit 933a621f40eaa31b193e76f162f9cc016b49aeac) --- modules/dialog/dlg_hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index d8b2759..3dafc46 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -132,7 +132,7 @@ int dlg_ka_add(dlg_cell_t *dlg) if(dlg_ka_interval<=0) return 0; - if(!(dlg->iflags & (DLG_IFLAG_KA_SRC | DLG_IFLAG_KA_SRC))) + if(!(dlg->iflags & (DLG_IFLAG_KA_SRC | DLG_IFLAG_KA_DST))) return 0; dka = (dlg_ka_t*)shm_malloc(sizeof(dlg_ka_t));

1 0

git:master: dialog: proper detection of keepalive flag for destination
by Daniel-Constantin Mierla 11 Apr '14

11 Apr '14

Module: sip-router Branch: master Commit: 933a621f40eaa31b193e76f162f9cc016b49aeac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=933a621… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 11 23:03:05 2014 +0200 dialog: proper detection of keepalive flag for destination - credit to Bill Radis, FS#416, for report and fix --- modules/dialog/dlg_hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 5afece8..0ec9c36 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -132,7 +132,7 @@ int dlg_ka_add(dlg_cell_t *dlg) if(dlg_ka_interval<=0) return 0; - if(!(dlg->iflags & (DLG_IFLAG_KA_SRC | DLG_IFLAG_KA_SRC))) + if(!(dlg->iflags & (DLG_IFLAG_KA_SRC | DLG_IFLAG_KA_DST))) return 0; dka = (dlg_ka_t*)shm_malloc(sizeof(dlg_ka_t));

1 0

git:master: tmrec: fixed typo in header file guard define
by Daniel-Constantin Mierla 11 Apr '14

11 Apr '14

Module: sip-router Branch: master Commit: 3d9040bb5494bafe3411744da17bf43de6a22604 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d9040b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 11 16:21:27 2014 +0200 tmrec: fixed typo in header file guard define --- modules/tmrec/period.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tmrec/period.h b/modules/tmrec/period.h index 5c64be5..bede828 100644 --- a/modules/tmrec/period.h +++ b/modules/tmrec/period.h @@ -1,5 +1,5 @@ #ifndef _PERIOD_H_ -#define _PERIOH_H_ +#define _PERIOD_H_ int in_period(time_t t, const char *p);

1 0

git:master: srdb1: removed extern inline function prototypes
by Daniel-Constantin Mierla 11 Apr '14

11 Apr '14

Module: sip-router Branch: master Commit: 5beb495d47fa16ed94c36e340011c09de50db9c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5beb495… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 11 16:18:59 2014 +0200 srdb1: removed extern inline function prototypes - the .c files are not linked against modules code, thus inline replacing request cannot be resolved by compilers, the strict ones (e.g., llvm) throw error --- lib/srdb1/db_res.c | 12 ++++++------ lib/srdb1/db_res.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/srdb1/db_res.c b/lib/srdb1/db_res.c index 8d2146e..aa4b026 100644 --- a/lib/srdb1/db_res.c +++ b/lib/srdb1/db_res.c @@ -41,7 +41,7 @@ /* * Release memory used by rows */ -inline int db_free_rows(db1_res_t* _r) +int db_free_rows(db1_res_t* _r) { int i; @@ -70,7 +70,7 @@ inline int db_free_rows(db1_res_t* _r) /* * Release memory used by columns */ -inline int db_free_columns(db1_res_t* _r) +int db_free_columns(db1_res_t* _r) { int col; @@ -106,7 +106,7 @@ inline int db_free_columns(db1_res_t* _r) /* * Create a new result structure and initialize it */ -inline db1_res_t* db_new_result(void) +db1_res_t* db_new_result(void) { db1_res_t* r = NULL; r = (db1_res_t*)pkg_malloc(sizeof(db1_res_t)); @@ -123,7 +123,7 @@ inline db1_res_t* db_new_result(void) /* * Release memory used by a result structure */ -inline int db_free_result(db1_res_t* _r) +int db_free_result(db1_res_t* _r) { if (!_r) { @@ -143,7 +143,7 @@ inline int db_free_result(db1_res_t* _r) * Allocate storage for column names and type in existing * result structure. */ -inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols) +int db_allocate_columns(db1_res_t* _r, const unsigned int cols) { RES_NAMES(_r) = (db_key_t*)pkg_malloc(sizeof(db_key_t) * cols); if (!RES_NAMES(_r)) { @@ -173,7 +173,7 @@ inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols) * \param _res result set * \return zero on success, negative on errors */ -inline int db_allocate_rows(db1_res_t* _res) +int db_allocate_rows(db1_res_t* _res) { int len = sizeof(db_row_t) * RES_ROW_N(_res); RES_ROWS(_res) = (struct db_row*)pkg_malloc(len); diff --git a/lib/srdb1/db_res.h b/lib/srdb1/db_res.h index 62fc11c..d802cc3 100644 --- a/lib/srdb1/db_res.h +++ b/lib/srdb1/db_res.h @@ -88,7 +88,7 @@ typedef struct db1_res { * \param _r the result that should be released * \return zero on success, negative on errors */ -extern inline int db_free_rows(db1_res_t* _r); +int db_free_rows(db1_res_t* _r); /** @@ -98,20 +98,20 @@ extern inline int db_free_rows(db1_res_t* _r); * \param _r the result that should be released * \return zero on success, negative on errors */ -extern inline int db_free_columns(db1_res_t* _r); +int db_free_columns(db1_res_t* _r); /** * Create a new result structure and initialize it. * \return a pointer to the new result on success, NULL on errors */ -extern inline db1_res_t* db_new_result(void); +db1_res_t* db_new_result(void); /** * Release memory used by a result structure. * \return zero on success, negative on errors */ -extern inline int db_free_result(db1_res_t* _r); +int db_free_result(db1_res_t* _r); /** * Allocate storage for column names and type in existing result structure. @@ -121,7 +121,7 @@ extern inline int db_free_result(db1_res_t* _r); * \param cols number of columns * \return zero on success, negative on errors */ -extern inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols); +int db_allocate_columns(db1_res_t* _r, const unsigned int cols); /** @@ -129,6 +129,6 @@ extern inline int db_allocate_columns(db1_res_t* _r, const unsigned int cols); * \param _res result set * \return zero on success, negative on errors */ -extern inline int db_allocate_rows(db1_res_t* _res); +int db_allocate_rows(db1_res_t* _res); #endif /* DB1_RES_H */

1 0

git:master: cnxcc: inline functions defined in other objects throw warning in llvm
by Daniel-Constantin Mierla 11 Apr '14

11 Apr '14

Module: sip-router Branch: master Commit: da0fe20153eb9fc4b8f79a2f5260cb871bb3fc0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da0fe20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 11 16:14:06 2014 +0200 cnxcc: inline functions defined in other objects throw warning in llvm - an option would be defining whole function inside the .h file --- modules/cnxcc/cnxcc.c | 6 +++--- modules/cnxcc/cnxcc.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/cnxcc/cnxcc.c b/modules/cnxcc/cnxcc.c index e869af4..cf9619f 100644 --- a/modules/cnxcc/cnxcc.c +++ b/modules/cnxcc/cnxcc.c @@ -28,17 +28,17 @@ #include "cnxcc.h" -inline void get_datetime(str *dest) +void get_datetime(str *dest) { timestamp2isodt(dest, get_current_timestamp()); } -inline unsigned int get_current_timestamp() +unsigned int get_current_timestamp() { return time(NULL); } -inline int timestamp2isodt(str *dest, unsigned int timestamp) +int timestamp2isodt(str *dest, unsigned int timestamp) { time_t tim; struct tm *tmPtr; diff --git a/modules/cnxcc/cnxcc.h b/modules/cnxcc/cnxcc.h index 9454e16..86bcbe3 100644 --- a/modules/cnxcc/cnxcc.h +++ b/modules/cnxcc/cnxcc.h @@ -31,9 +31,9 @@ #define DATETIME_LENGTH DATETIME_SIZE - 1 -inline void get_datetime(str *dest); -inline unsigned int get_current_timestamp(); -inline int timestamp2isodt(str *dest, unsigned int timestamp); +void get_datetime(str *dest); +unsigned int get_current_timestamp(); +int timestamp2isodt(str *dest, unsigned int timestamp); double str2double(str *string); #endif /* _CNXCC_H */

1 0

git:master: srdb1: get rid of llvm warnings related to extern inline definitions
by Daniel-Constantin Mierla 11 Apr '14

11 Apr '14

Module: sip-router Branch: master Commit: 4cb7abe093ce0c56a4661377f9792fc417f83786 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4cb7abe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 11 16:11:05 2014 +0200 srdb1: get rid of llvm warnings related to extern inline definitions --- lib/srdb1/db_row.c | 4 ++-- lib/srdb1/db_row.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/srdb1/db_row.c b/lib/srdb1/db_row.c index f832411..46cb893 100644 --- a/lib/srdb1/db_row.c +++ b/lib/srdb1/db_row.c @@ -39,7 +39,7 @@ /* * Release memory used by row */ -inline int db_free_row(db_row_t* _r) +int db_free_row(db_row_t* _r) { int col; db_val_t* _val; @@ -108,7 +108,7 @@ inline int db_free_row(db_row_t* _r) * \param _row filled row * \return zero on success, negative on errors */ -inline int db_allocate_row(const db1_res_t* _res, db_row_t* _row) +int db_allocate_row(const db1_res_t* _res, db_row_t* _row) { int len = sizeof(db_val_t) * RES_COL_N(_res); ROW_VALUES(_row) = (db_val_t*)pkg_malloc(len); diff --git a/lib/srdb1/db_row.h b/lib/srdb1/db_row.h index 6bee889..f41ad32 100644 --- a/lib/srdb1/db_row.h +++ b/lib/srdb1/db_row.h @@ -62,7 +62,7 @@ typedef struct db_row { * \param _r row that should be released * \return zero on success, negative on error */ -extern inline int db_free_row(db_row_t* _r); +int db_free_row(db_row_t* _r); /** @@ -71,6 +71,6 @@ extern inline int db_free_row(db_row_t* _r); * \param _row filled row * \return zero on success, negative on errors */ -extern inline int db_allocate_row(const db1_res_t* _res, db_row_t* _row); +int db_allocate_row(const db1_res_t* _res, db_row_t* _row); #endif /* DB1_ROW_H */

1 0

git:master: tmx: allow spanning over second for fetching stats
by Daniel-Constantin Mierla 11 Apr '14

11 Apr '14

Module: sip-router Branch: master Commit: 82e742fcdd7c22391cae8e3b36d42f23d684dee8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82e742f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 11 16:04:24 2014 +0200 tmx: allow spanning over second for fetching stats - try to catch the same snapshot for all tm stats - re-enabled stats for received and relayed replies, computed from what is relayed and was was local reply - todo: check if drops replies are caught later or is ok --- modules/tmx/tmx_mod.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/tmx/tmx_mod.c b/modules/tmx/tmx_mod.c index 89f5e65..d0e2ee2 100644 --- a/modules/tmx/tmx_mod.c +++ b/modules/tmx/tmx_mod.c @@ -91,10 +91,8 @@ unsigned long tmx_stats_trans_5xx(void); unsigned long tmx_stats_trans_6xx(void); unsigned long tmx_stats_trans_inuse(void); unsigned long tmx_stats_trans_active(void); -#if 0 unsigned long tmx_stats_rcv_rpls(void); unsigned long tmx_stats_rld_rpls(void); -#endif unsigned long tmx_stats_loc_rpls(void); static stat_export_t mod_stats[] = { @@ -107,10 +105,8 @@ static stat_export_t mod_stats[] = { {"6xx_transactions" , STAT_IS_FUNC, (stat_var**)tmx_stats_trans_6xx }, {"inuse_transactions" , STAT_IS_FUNC, (stat_var**)tmx_stats_trans_inuse }, {"active_transactions" , STAT_IS_FUNC, (stat_var**)tmx_stats_trans_active}, -#if 0 {"received_replies" , STAT_IS_FUNC, (stat_var**)tmx_stats_rcv_rpls }, {"relayed_replies" , STAT_IS_FUNC, (stat_var**)tmx_stats_rld_rpls }, -#endif {"local_replies" , STAT_IS_FUNC, (stat_var**)tmx_stats_loc_rpls }, {0,0,0} }; @@ -612,7 +608,7 @@ void tmx_stats_update(void) { ticks_t t; t = get_ticks(); - if(t!=_tmx_stats_tm) { + if(t>_tmx_stats_tm+1) { _tmx_tmb.get_stats(&_tmx_stats_all); _tmx_stats_tm = t; } @@ -672,19 +668,26 @@ unsigned long tmx_stats_trans_active(void) return (_tmx_stats_all.transactions - _tmx_stats_all.waiting); } -#if 0 unsigned long tmx_stats_rcv_rpls(void) { tmx_stats_update(); - return 0; + return _tmx_stats_all.completed_6xx + + _tmx_stats_all.completed_5xx + + _tmx_stats_all.completed_4xx + + _tmx_stats_all.completed_3xx + + _tmx_stats_all.completed_2xx; } unsigned long tmx_stats_rld_rpls(void) { tmx_stats_update(); - return 0; + return _tmx_stats_all.completed_6xx + + _tmx_stats_all.completed_5xx + + _tmx_stats_all.completed_4xx + + _tmx_stats_all.completed_3xx + + _tmx_stats_all.completed_2xx + - _tmx_stats_all.replied_locally; } -#endif unsigned long tmx_stats_loc_rpls(void) {

1 0

git:master: tm: avoid tryin to mitigate relaying 487 for local canceling branches when a reply is forced from config
by Daniel-Constantin Mierla 10 Apr '14

10 Apr '14

Module: sip-router Branch: master Commit: 198e123e89c849da39efec1973c25c3c25a2be89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=198e123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 10 08:56:13 2014 +0200 tm: avoid tryin to mitigate relaying 487 for local canceling branches when a reply is forced from config - it can result in deadlock if there is a local retransmission timeout and the response code is overwritten by admin in failure route with a t_reply() - reported by Jason Penton --- modules/tm/h_table.h | 2 ++ modules/tm/t_cancel.c | 7 ++++++- modules/tm/timer.c | 1 + modules/tm/tm.c | 1 + 4 files changed, 10 insertions(+), 1 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 5790935..977f3fe 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -155,6 +155,7 @@ enum kill_reason { REQ_FWDED=1, REQ_RPLD=2, REQ_RLSD=4, REQ_EXIST=8, #define F_RB_NH_STRICT 0x200 /* next hop is a strict router */ /* must detect when neither loose nor strict flag is set -> two flags. * alternatively, 1x flag for strict/loose and 1x for loose|strict set/not */ +#define F_RB_RELAYREPLY 0x400 /* branch under relay reply condition */ /* if canceled or intended to be canceled, return true */ @@ -320,6 +321,7 @@ typedef struct async_state { #define T_ASYNC_CONTINUE (1<<12) /* Is this transaction in a continuation after being suspended */ #define T_DISABLE_INTERNAL_REPLY (1<<13) /* don't send internal negative reply */ +#define T_ADMIN_REPLY (1<<14) /* t reply sent by admin (e.g., from cfg script) */ /* 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 */ diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index 1b39648..c670041 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -245,7 +245,12 @@ int cancel_branch( struct cell *t, int branch, /* remove BUSY_BUFFER -- mark cancel buffer as not used */ pcbuf=&crb->buffer; /* workaround for type punning warnings */ atomic_set_long(pcbuf, 0); - if (flags & F_CANCEL_B_FAKE_REPLY){ + /* try to relay auto-generated 487 canceling response only when + * another one is not under relaying on the branch and there is + * no forced response per transaction from script */ + if((flags & F_CANCEL_B_FAKE_REPLY) + && !(irb->flags&F_RB_RELAYREPLY) + && !(t->flags&T_ADMIN_REPLY)) { LOCK_REPLIES(t); if (relay_reply(t, FAKED_REPLY, branch, 487, &tmp_cd, 1) == RPS_ERROR){ diff --git a/modules/tm/timer.c b/modules/tm/timer.c index aae9532..5e340a7 100644 --- a/modules/tm/timer.c +++ b/modules/tm/timer.c @@ -345,6 +345,7 @@ static void fake_reply(struct cell *t, int branch, int code ) do_cancel_branch = is_invite(t) && prepare_cancel_branch(t, branch, 0); /* mark branch as canceled */ t->uac[branch].request.flags|=F_RB_CANCELED; + t->uac[branch].request.flags|=F_RB_RELAYREPLY; if ( is_local(t) ) { reply_status=local_reply( t, FAKED_REPLY, branch, code, &cancel_data ); diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 3bdc7fb..61d90ff 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -1319,6 +1319,7 @@ inline static int w_t_reply(struct sip_msg* msg, char* p1, char* p2) * the safe version would lead to a deadlock */ + t->flags |= T_ADMIN_REPLY; if (is_route_type(FAILURE_ROUTE)) { DBG("DEBUG: t_reply_unsafe called from w_t_reply\n"); ret = t_reply_unsafe(t, msg, code, r);

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014