sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:carstenbock/dialog: - added support to terminate a single dialog by providing call-id and from-tag
by Carsten Bock 18 Aug '10

18 Aug '10

Module: sip-router Branch: carstenbock/dialog Commit: df1c754e9563bc20f0c5e740ab1102f9f27c435b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df1c754… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Aug 18 22:35:01 2010 +0200 - added support to terminate a single dialog by providing call-id and from-tag - can also be used to terminate all dialogs on proxy (e.g. before shutdown) Missing: Provide optional headers for the BYE-Message. --- modules_k/dialog/dialog.c | 1 + modules_k/dialog/dlg_hash.c | 50 +++++++++++++++++++++++++++++++++ modules_k/dialog/dlg_hash.h | 7 ++++ modules_k/dialog/dlg_req_within.h | 1 + modules_k/dialog/doc/dialog_admin.xml | 39 +++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 0ca60b4..e19e56b 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -232,6 +232,7 @@ static mi_export_t mi_cmds[] = { { "dlg_list", mi_print_dlgs, 0, 0, 0}, { "dlg_list_ctx", mi_print_dlgs_ctx, 0, 0, 0}, { "dlg_end_dlg", mi_terminate_dlg, 0, 0, 0}, + { "dlg_terminate_dlgs", mi_terminate_dlgs, 0, 0, 0}, { "profile_get_size", mi_get_profile, 0, 0, 0}, { "profile_list_dlgs", mi_profile_list, 0, 0, 0}, { "dlg_bridge", mi_dlg_bridge, 0, 0, 0}, diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index b004cef..80f506f 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -60,6 +60,7 @@ #include "dlg_timer.h" #include "dlg_hash.h" #include "dlg_profile.h" +#include "dlg_req_within.h" #define MAX_LDG_LOCKS 2048 #define MIN_LDG_LOCKS 2 @@ -1065,3 +1066,52 @@ error: free_mi_tree(rpl_tree); return NULL; } + +/*! + * \brief Terminate all or selected dialogs via the MI interface + * \param cmd_tree MI command tree + * \param param unused + * \return mi node with the dialog information, or NULL on failure + */ +struct mi_root * mi_terminate_dlgs(struct mi_root *cmd_tree, void *param ) +{ + struct mi_root* rpl_tree= NULL; + struct dlg_cell* dlg = NULL; + str headers = {0, 0}; + unsigned int i; + + rpl_tree = process_mi_params( cmd_tree, &dlg); + if (rpl_tree) + /* param error */ + return rpl_tree; + + rpl_tree = init_mi_tree( 200, MI_SSTR(MI_OK)); + if (rpl_tree==0) + return 0; + + if (dlg==NULL) { + LM_DBG("terminating %i dialogs\n", d_table->size); + + for( i=0 ; i<d_table->size ; i++ ) { + dlg_lock( d_table, &(d_table->entries[i]) ); + + for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { + if (dlg_bye_all(dlg, &headers)!=0) + goto error_all; + } + dlg_unlock( d_table, &(d_table->entries[i]) ); + } + } else { + if (dlg_bye_all(dlg, &headers)!=0) + goto error; + } + return rpl_tree; +error_all: + dlg_unlock( d_table, &(d_table->entries[i]) ); + free_mi_tree(rpl_tree); + return NULL; +error: + free_mi_tree(rpl_tree); + return NULL; +} + diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index e555837..aa70d84 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -327,6 +327,13 @@ struct mi_root * mi_print_dlgs(struct mi_root *cmd, void *param ); */ struct mi_root * mi_print_dlgs_ctx(struct mi_root *cmd, void *param ); +/*! + * \brief Terminate all or selected dialogs via the MI interface + * \param cmd_tree MI command tree + * \param param unused + * \return mi node with the dialog information, or NULL on failure + */ +struct mi_root * mi_terminate_dlgs(struct mi_root *cmd_tree, void *param ); /*! * \brief Check if a dialog structure matches to a SIP message dialog diff --git a/modules_k/dialog/dlg_req_within.h b/modules_k/dialog/dlg_req_within.h index 732f430..066361f 100644 --- a/modules_k/dialog/dlg_req_within.h +++ b/modules_k/dialog/dlg_req_within.h @@ -31,6 +31,7 @@ #define DLG_REQUEST_WITHIN_H #include "dlg_hash.h" +#include "../../modules/tm/tm_load.h" #define MAX_FWD "70" #define MAX_SIZE 256 diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index af697d9..98769f5 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1530,6 +1530,45 @@ if(dlg_get("abcdef", "123", "456")) </section> <section> + <title><varname>dlg_terminate_dlgs</varname></title> + <para> + Terminates a dialog or of all dialogs (calls). If only + one dialogs is to be terminated, the dialog identifiers are to be passed + as parameter (callid and fromtag). + </para> + <para> + Name: <emphasis>dlg_terminate_dlgs</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para> + <emphasis>callid</emphasis> (optional) - callid if a single + dialog to be terminated. + </para></listitem> + <listitem><para> + <emphasis>from_tag</emphasis> (optional, but cannot be present + without the callid parameter) - from tag (as per initial request) + of the dialog to be terminated. Note that if the from_tag is not + specified, only dialogs created by a request without a from tag + are matched, which will only occur with broken clients and is + thus a very rare situation. + </para></listitem> + </itemizedlist> + <para> + MI FIFO Command Format: + </para> + <programlisting format="linespecific"> + :dlg_terminate_dlgs:_reply_fifo_file_ + _empty_line_ + </programlisting> + <programlisting format="linespecific"> + :dlg_terminate_dlgs:_reply_fifo_file_ + abcdrssfrs122444(a)192.168.1.1 + AAdfeEFF33 + </programlisting> + </section> + + <section> <title><varname>profile_get_size</varname></title> <para> Returns the number of dialogs belonging to a profile. If the profile

1 0

git:carstenbock/rtpproxy: - added support for the retrieval of RTP-Statistics through $rtpstat
by Carsten Bock 18 Aug '10

18 Aug '10

Module: sip-router Branch: carstenbock/rtpproxy Commit: ac84acd54496dec044b2c27ddf80139432f9ae28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac84acd… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Aug 18 21:27:30 2010 +0200 - added support for the retrieval of RTP-Statistics through $rtpstat - added support for sending a timeout socket towards the RTP-Proxy (for timeout notifications) --- modules_k/rtpproxy/doc/rtpproxy_admin.xml | 42 +++++++++++++- modules_k/rtpproxy/rtpproxy.c | 88 ++++++++++++++++++++++++++++- 2 files changed, 128 insertions(+), 2 deletions(-) diff --git a/modules_k/rtpproxy/doc/rtpproxy_admin.xml b/modules_k/rtpproxy/doc/rtpproxy_admin.xml index 671dff1..f23bc58 100644 --- a/modules_k/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules_k/rtpproxy/doc/rtpproxy_admin.xml @@ -232,7 +232,29 @@ modparam("rtpproxy", "nortpproxy_str", "a=sdpmangled:yes\r\n") </example> </section> </section> - + <section> + <title><varname>timeout_socket</varname> (string)</title> + <para> + The parameter sets timeout socket, which is transmitted to the RTP-Proxy. + </para> + <para> + If it is an empty string, no timeout socket will be transmitted to the RTP-Proxy. + </para> + <para> + <emphasis> + Default value is <quote></quote>. + </emphasis> + </para> + <example> + <title>Set <varname>timeout_socket</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "timeout_socket", "http://127.0.0.1:8000/RPC2") +... +</programlisting> + </example> + </section> + </section> <section> <title>Exported Functions</title> @@ -589,6 +611,24 @@ start_recording(); <section> <title>Exported Pseudo Variables</title> + <section> + <title><function moreinfo="none">$rtpstart</function></title> + <para> + Returns the RTP-Statistics from the RTP-Proxy. The RTP-Statistics from the RTP-Proxy + are provided as a string and it does contain several packet-counters. The statistics + must be retrieved before the session is deleted (before unforce_rtpproxy). + </para> + + <example> + <title>$rtpstat-Usage</title> + <programlisting format="linespecific"> +... + append_hf("X-RTP-Statistics: $rtpstat\r\n"); +... + </programlisting> + </example> + </section> + </section> <section> diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index 4303844..8f68a0f 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -306,6 +306,9 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); +/* Pseudo-Variables */ +static int pv_get_rtpstat_f(struct sip_msg *, pv_param_t *, pv_value_t *); + /*mi commands*/ static struct mi_root* mi_enable_rtp_proxy(struct mi_root* cmd_tree, void* param ); @@ -337,6 +340,8 @@ static int *rtpp_socks = 0; /*0-> disabled, 1 ->enabled*/ unsigned int *natping_state=0; +static str timeout_socket_str = {0, 0}; + static cmd_export_t cmds[] = { {"set_rtp_proxy_set", (cmd_function)set_rtp_proxy_set_f, 1, fixup_set_id, 0, @@ -390,6 +395,8 @@ static cmd_export_t cmds[] = { }; static pv_export_t mod_pvs[] = { + {{"rtpstat", (sizeof("rtpstat")-1)}, /* RTP-Statistics */ + PVT_OTHER, pv_get_rtpstat_f, 0, 0, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -400,6 +407,7 @@ static param_export_t params[] = { {"rtpproxy_disable_tout", INT_PARAM, &rtpproxy_disable_tout }, {"rtpproxy_retr", INT_PARAM, &rtpproxy_retr }, {"rtpproxy_tout", INT_PARAM, &rtpproxy_tout }, + {"timeout_socket_str", STR_PARAM, &timeout_socket_str.s }, {0, 0, 0} }; @@ -854,9 +862,17 @@ mod_init(void) if(rtpp_strings[i]) pkg_free(rtpp_strings[i]); } + if (timeout_socket_str.s==NULL || timeout_socket_str.s[0]==0) { + timeout_socket_str.len = 0; + timeout_socket_str.s = NULL; + } else { + timeout_socket_str.len = strlen(timeout_socket_str.s); + } + if (rtpp_strings) pkg_free(rtpp_strings); + return 0; } @@ -1799,7 +1815,11 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) {NULL, 0}, /* to_tag */ {";", 1}, /* separator */ {NULL, 0} /* medianum */ + {" ", 1}, /* separator */ + {NULL, 0}, /* Timeout-Socket */ }; + int iovec_param_count; + char *c1p, *c2p, *bodylimit, *o1p; char medianum_buf[20]; int medianum, media_multi; @@ -2151,7 +2171,17 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) } else { v[3].iov_len = 0; } - cp = send_rtpp_command(node, v, (to_tag.len > 0) ? 18 : 14); + if (to_tag.len > 0) { + iovec_param_count = 18; + } else { + iovec_param_count = 14; + if (timeout_socket_str.len > 0) { + iovec_param_count = 16; + STR2IOVEC(timeout_socket_str, v[15]); + } + } + + cp = send_rtpp_command(node, v, iovec_param_count); } while (cp == NULL); LM_DBG("proxy reply: %s\n", cp); /* Parse proxy reply to <argc,argv> */ @@ -2389,3 +2419,59 @@ static int start_recording_f(struct sip_msg* msg, char *foo, char *bar) return 1; } +/* + * Returns the current RTP-Statistics from the RTP-Proxy + */ +static int +pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str ret_val = {0, 0}; + int nitems; + str callid = {0, 0}; + str from_tag = {0, 0}; + str to_tag = {0, 0}; + struct rtpp_node *node; + struct iovec v[1 + 4 + 3 + 1] = {{NULL, 0}, {"Q", 1}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}, {";1 ", 3}, {";1", }, {NULL, 0}}; + + if (get_callid(msg, &callid) == -1 || callid.len == 0) { + LM_ERR("can't get Call-Id field\n"); + return -1; + } + if (get_to_tag(msg, &to_tag) == -1) { + LM_ERR("can't get To tag\n"); + return -1; + } + if (get_from_tag(msg, &from_tag) == -1 || from_tag.len == 0) { + LM_ERR("can't get From tag\n"); + return -1; + } + if(msg->id != current_msg_id){ + selected_rtpp_set = default_rtpp_set; + } + + STR2IOVEC(callid, v[3]); + STR2IOVEC(from_tag, v[5]); + STR2IOVEC(to_tag, v[7]); + node = select_rtpp_node(callid, 1); + if (!node) { + LM_ERR("no available proxies\n"); + return -1; + } + nitems = 8; + if (msg->first_line.type == SIP_REPLY) { + if (to_tag.len == 0) + return -1; + STR2IOVEC(to_tag, v[5]); + STR2IOVEC(from_tag, v[7]); + } else { + STR2IOVEC(from_tag, v[5]); + STR2IOVEC(to_tag, v[7]); + if (to_tag.len <= 0) + nitems = 6; + } + ret_val.s = send_rtpp_command(node, v, nitems); + ret_val.len = strlen(ret_val.s); + return pv_get_strval(msg, param, res, &ret_val); +} +

1 0

Suggesting fix for t_request and pua_dialoginfo
by Jasmin Schnatterbeck 18 Aug '10

18 Aug '10

Hello List, some months ago I reported a problem with pua_dialoginfo: Avps declared in request route are not available anymore in branch route, if pua_dialoginfo module is loaded. I do not know whether there are some experiences with this problem or not, so I looked for the reason. pua_dialoginfo uses pua for sending PUBLISH request pua uses tm t_request for sending PUBLISH request t_request() is located in uac.c (tm): - in line 411 avp list is reset - in line 276 build_cell() is called: build_cell() is located in h_table.c, where lines 305-323 delete avps If I comment out the mentioned lines, which delete avps, then avps set in request route are also available in branch route. But I do not know, what is also affected by this change. So would it be reasonable, to add a parameter to build_cell() for not changing the AVP list? Best Regards Jasmin

3 6

git:refs/tags/sr_3.1_freeze: tmx: updated for last tm changes
by Andrei Pelinescu-Onciul 18 Aug '10

18 Aug '10

Module: sip-router Branch: refs/tags/sr_3.1_freeze Commit: aff441b32d2f87dfeee112432174e6692c4d6f42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aff441b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 16 18:35:45 2010 +0200 tmx: updated for last tm changes - cancel_uacs() takes new type of paraeters - reply function takes str* parameters --- modules_k/tmx/t_mi.c | 41 ++++++++++++++++++++--------------------- modules_k/tmx/tmx_mod.c | 29 +++++++++++++++++------------ 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 84288df..44c5054 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -663,6 +663,7 @@ struct mi_root* mi_tm_uac_dlg(struct mi_root* cmd_tree, void* param) */ struct mi_root* mi_tm_cancel(struct mi_root* cmd_tree, void* param) { + struct cancel_info cancel_data; struct mi_node *node; struct cell *trans; @@ -676,7 +677,9 @@ struct mi_root* mi_tm_cancel(struct mi_root* cmd_tree, void* param) /* cancel the call */ LM_DBG("cancelling transaction %p\n",trans); - _tmx_tmb.cancel_uacs( trans, ~0/*all branches*/, 0); + init_cancel_info(&cancel_data); + cancel_data.cancel_bitmap = ~0; /*all branches*/ + _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); _tmx_tmb.unref_cell(trans); @@ -753,11 +756,11 @@ struct mi_root* mi_tm_reply(struct mi_root* cmd_tree, void* param) unsigned int hash_label; unsigned int rpl_code; struct cell *trans; - char *reason; - char *totag; - char *new_hdrs; - char *body; - str tmp; + str reason = {0, 0}; + str totag = {0, 0}; + str new_hdrs = {0, 0}; + str body = {0, 0}; + str tmp = {0, 0}; char *p; int n; @@ -774,49 +777,45 @@ struct mi_root* mi_tm_reply(struct mi_root* cmd_tree, void* param) /* reason text (param 2) */ node = node->next; - reason = as_asciiz(&node->value); + reason = node->value; /* trans_id (param 3) */ node = node->next; tmp = node->value; p = memchr( tmp.s, ':', tmp.len); - if ( p==NULL) + if(p==NULL) return init_mi_tree( 400, "Invalid trans_id", 16); tmp.len = p-tmp.s; - if( str2int( &tmp, &hash_index)!=0 ) + if(str2int(&tmp, &hash_index)!=0) return init_mi_tree( 400, "Invalid index in trans_id", 25); tmp.s = p+1; tmp.len = (node->value.s+node->value.len) - tmp.s; - if( str2int( &tmp, &hash_label)!=0 ) + if(str2int(&tmp, &hash_label)!=0) return init_mi_tree( 400, "Invalid label in trans_id", 25); - if( _tmx_tmb.t_lookup_ident( &trans, hash_index, hash_label)<0 ) + if(_tmx_tmb.t_lookup_ident( &trans, hash_index, hash_label)<0) return init_mi_tree( 404, "Transaction not found", 21); /* to_tag (param 4) */ node = node->next; - totag = as_asciiz(&node->value); + totag = node->value; /* new headers (param 5) */ node = node->next; - if (node->value.len==1 && node->value.s[0]=='.') - new_hdrs = 0; - else - new_hdrs = as_asciiz(&node->value); + if (!(node->value.len==1 && node->value.s[0]=='.')) + new_hdrs = node->value; /* body (param 5 - optional) */ node = node->next; if (node) - body = as_asciiz(&node->value); - else - body = 0; + body = node->value; /* it's refcounted now, t_reply_with body unrefs for me -- I can * continue but may not use T anymore */ - n = _tmx_tmb.t_reply_with_body( trans, rpl_code, reason, body, - new_hdrs, totag); + n = _tmx_tmb.t_reply_with_body(trans, rpl_code, &reason, &body, + &new_hdrs, &totag); if (n<0) return init_mi_tree( 500, "Reply failed", 12); diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 420cb30..3714fed 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -232,7 +232,7 @@ static int fixup_cancel_branches(void** param, int param_no) */ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) { - branch_bm_t cb = 0; + struct cancel_info cancel_data; struct cell *t = 0; tm_ctx_t *tcx = 0; int n=0; @@ -244,26 +244,30 @@ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) if(tcx != NULL) idx = tcx->branch_index; n = (int)(long)k; + init_cancel_info(&cancel_data); switch(n) { case 1: /* prepare cancel for every branch except idx */ - _tmx_tmb.prepare_to_cancel(t, &cb, 1<<idx); + _tmx_tmb.prepare_to_cancel(t, + &cancel_data.cancel_bitmap, 1<<idx); case 2: if(msg->first_line.u.reply.statuscode>=200) break; - cb = 1<<idx; + cancel_data.cancel_bitmap = 1<<idx; break; default: if (msg->first_line.u.reply.statuscode>=200) /* prepare cancel for every branch except idx */ - _tmx_tmb.prepare_to_cancel(t, &cb, 1<<idx); + _tmx_tmb.prepare_to_cancel(t, + &cancel_data.cancel_bitmap, 1<<idx); else - _tmx_tmb.prepare_to_cancel(t, &cb, 0); + _tmx_tmb.prepare_to_cancel(t, + &cancel_data.cancel_bitmap, 0); } - LM_DBG("canceling %d/%d\n", n, (int)cb); - if(cb==0) + LM_DBG("canceling %d/%d\n", n, (int)cancel_data.cancel_bitmap); + if(cancel_data.cancel_bitmap==0) return -1; - _tmx_tmb.cancel_uacs(t, cb, 0); + _tmx_tmb.cancel_uacs(t, &cancel_data, 0); return 1; } @@ -287,12 +291,11 @@ static int fixup_cancel_callid(void** param, int param_no) static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *flag) { struct cell *trans; - branch_bm_t cancel_bm; + struct cancel_info cancel_data; str cseq_s; str callid_s; int fl; - cancel_bm=0; fl = -1; if(fixup_get_svalue(msg, (gparam_p)cid, &callid_s)<0) @@ -321,8 +324,10 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla DBG("Now calling cancel_uacs\n"); if(trans->uas.request && fl>0 && fl<32) setflag(trans->uas.request, fl); - _tmx_tmb.prepare_to_cancel(trans, &cancel_bm, 0); - _tmx_tmb.cancel_uacs(trans, cancel_bm, 0); + init_cancel_info(&cancel_data); + cancel_data.cancel_bitmap = 0; + _tmx_tmb.prepare_to_cancel(trans, &cancel_data.cancel_bitmap, 0); + _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); //_tmx_tmb.unref_cell(trans);

1 0

git:master: kstats: cleanup - move type defs. to separate file
by Andrei Pelinescu-Onciul 18 Aug '10

18 Aug '10

Module: sip-router Branch: master Commit: 742ce3ae28a4d1294ce0b7f63f0bc0968bff8ea3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=742ce3a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 20:01:31 2010 +0200 kstats: cleanup - move type defs. to separate file - moved kamailio statistics type defs to kstats_types.h (from lib/kcore/kstats_wrapper.h). This removes core dependency on lib/kcore include files (the statistics types are needed for the kamailio module interface defs). - removed statistics.h (it is obsolete, counters.h should be used instead and if somebody really needs it, it should include lib/kcore/kstats_wrapper.h or lib/kcore/statistics.h). --- kstats_types.h | 69 ++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/kstats_wrapper.h | 27 ++--------------- sr_module.h | 2 +- statistics.h | 33 --------------------- 4 files changed, 73 insertions(+), 58 deletions(-) diff --git a/kstats_types.h b/kstats_types.h new file mode 100644 index 0000000..b8d1629 --- /dev/null +++ b/kstats_types.h @@ -0,0 +1,69 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** kamailio statistics types. + * This file contains type declaration for kamailio statistics. + * They are needed when modules are loaded (sr_module.c). + * The rest of kamailio stats are in lib/kcore (include + * lib/kcore/kstats_wrapper.h or lib/kcore/statistics.h and link with + * libkcore). + * Note: kamailio statistics are obsolete. Use sr counters in new code + * (counters.h). + * @file kstats_types.h + * @ingroup: core + */ +/* + * History: + * -------- + * 2010-08-18 initial version (andrei) +*/ + +#ifndef __kstats_types_h +#define __kstats_types_h + +#include "counters.h" + +/* types */ + +typedef counter_val_t stat_val; +/* stat_var is always used as a pointer in k, we missuse + stat_var* for holding out counter id */ +typedef void stat_var; +/* get val callback + * TODO: change it to counter_cbk_f compatible callback? + */ +typedef counter_val_t (*stat_function)(void); + +/* statistic module interface */ +struct stat_export_s { + char* name; + int flags; + stat_var** stat_pointer; /* pointer to the memory location + (where a counter handle will be stored) + Note: it's a double pointer because of + the original k version which needed it + allocated in shm. This version + will store the counter id at *stat_pointer. + */ +}; + +typedef struct stat_export_s stat_export_t; + + +#endif /*__kstats_types_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/lib/kcore/kstats_wrapper.h b/lib/kcore/kstats_wrapper.h index 1d6ba47..1c9559b 100644 --- a/lib/kcore/kstats_wrapper.h +++ b/lib/kcore/kstats_wrapper.h @@ -35,12 +35,15 @@ * History: * -------- * 2010-08-08 initial version (andrei) + * 2010-08-18 type declaration needed by sr_module.c moved to + * ../../kstats_types.h (andrei) */ #ifndef __kstats_wrapper_h #define __kstats_wrapper_h #include "../../counters.h" +#include "../../kstats_types.h" /* k stat flags */ #define STAT_NO_RESET 1 /* used in dialog(k), nat_traversal(k), @@ -49,31 +52,7 @@ #define STAT_SHM_NAME 4 /* used only from usrloc(k) */ #define STAT_IS_FUNC 8 -/* types */ -typedef counter_val_t stat_val; -/* stat_var is always used as a pointer in k, we missuse - stat_var* for holding out counter id */ -typedef void stat_var; -/* get val callback - * TODO: change it to counter_cbk_f compatible callback? - */ -typedef counter_val_t (*stat_function)(void); - -/* statistic module interface */ -struct stat_export_s { - char* name; - int flags; - stat_var** stat_pointer; /* pointer to the memory location - (where a counter handle will be stored) - Note: it's a double pointer because of - the original k version which needed it - allocated in shm. This version - will store the counter id at *stat_pointer. - */ -}; - -typedef struct stat_export_s stat_export_t; #ifdef STATISTICS diff --git a/sr_module.h b/sr_module.h index baf1081..4d32514 100644 --- a/sr_module.h +++ b/sr_module.h @@ -68,7 +68,7 @@ #include "str.h" /* kamailio compat */ -#include "statistics.h" +#include "kstats_types.h" #include "mi/mi_types.h" #include "pvar.h" diff --git a/statistics.h b/statistics.h deleted file mode 100644 index e9e430a..0000000 --- a/statistics.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2008 iptelorg GmbH - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * statistics compatibility wrapper for kamailio - * for now it doesn't do anything - * (obsolete, do not use anymore) - * - * History: - * -------- - * 2008-11-17 initial version compatible with kamailio statistics.h (andrei) - */ - -#ifndef _STATISTICS_H_ -#define _STATISTICS_H_ - -#include "lib/kcore/statistics.h" - -#endif /* _STATISTICS_H_ */

1 0

git:master: modules*: add k stats. includes where needed
by Andrei Pelinescu-Onciul 18 Aug '10

18 Aug '10

Module: sip-router Branch: master Commit: 4380fb9b63d58462f67ea972467556064b7cf0bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4380fb9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 20:06:25 2010 +0200 modules*: add k stats. includes where needed Add k statistics includes (../../lib/kcore/kstats_wrapper.h) for modules using k statistics and missing them (needed after no longer automatically including k stats via sr_module.h) --- modules/sl/sl_stats.c | 1 + modules_k/dialog/dialog.c | 1 + modules_k/dialog/dlg_req_within.c | 1 + modules_k/snmpstats/snmpSIPStatusCodesTable.c | 1 + modules_k/tmx/tmx_mod.c | 1 + 5 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/sl/sl_stats.c b/modules/sl/sl_stats.c index ab55134..7b3ff53 100644 --- a/modules/sl/sl_stats.c +++ b/modules/sl/sl_stats.c @@ -33,6 +33,7 @@ #include "../../config.h" #include "../../pt.h" #include "sl_stats.h" +#include "../../lib/kcore/kstats_wrapper.h" #include <strings.h> #include <stdio.h> diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 0ca60b4..8cada91 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -53,6 +53,7 @@ #include "../../script_cb.h" #include "../../lib/kcore/faked_msg.h" #include "../../lib/kcore/hash_func.h" +#include "../../lib/kcore/kstats_wrapper.h" #include "../../mem/mem.h" #include "../../lib/kmi/mi.h" #include "../../lvalue.h" diff --git a/modules_k/dialog/dlg_req_within.c b/modules_k/dialog/dlg_req_within.c index 3b6c57d..7d50926 100644 --- a/modules_k/dialog/dlg_req_within.c +++ b/modules_k/dialog/dlg_req_within.c @@ -38,6 +38,7 @@ #include "../../modules/tm/tm_load.h" #include "../../lib/kmi/tree.h" #include "../../lib/kcore/km_ut.h" +#include "../../lib/kcore/kstats_wrapper.h" #include "dlg_timer.h" #include "dlg_hash.h" #include "dlg_req_within.h" diff --git a/modules_k/snmpstats/snmpSIPStatusCodesTable.c b/modules_k/snmpstats/snmpSIPStatusCodesTable.c index eda8fbc..6686c05 100644 --- a/modules_k/snmpstats/snmpSIPStatusCodesTable.c +++ b/modules_k/snmpstats/snmpSIPStatusCodesTable.c @@ -84,6 +84,7 @@ #include "snmpSIPStatusCodesTable.h" #include "snmpstats_globals.h" +#include "../../lib/kcore/statistics.h" static netsnmp_handler_registration *my_handler = NULL; static netsnmp_table_array_callbacks cb; diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 3714fed..6e6f758 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -28,6 +28,7 @@ #include "../../dprint.h" #include "../../mod_fix.h" #include "../../modules/tm/tm_load.h" +#include "../../lib/kcore/kstats_wrapper.h" #include "t_var.h" #include "t_mi.h"

1 0

git:master: modules_k/*: add missing lib/kmi/mi.h include
by Andrei Pelinescu-Onciul 18 Aug '10

18 Aug '10

Module: sip-router Branch: master Commit: 65f879ee58a6881eb95ff6fde062498e786115c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65f879e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 19:58:44 2010 +0200 modules_k/*: add missing lib/kmi/mi.h include --- modules/matrix/matrix.c | 2 +- modules/pdb/pdb.c | 1 + modules_k/pua_mi/pua_mi.c | 1 + modules_k/rtpproxy/rtpproxy.c | 2 +- modules_k/tmx/t_mi.c | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/matrix/matrix.c b/modules/matrix/matrix.c index 05c8f82..3c921c3 100644 --- a/modules/matrix/matrix.c +++ b/modules/matrix/matrix.c @@ -24,7 +24,7 @@ #include "../../mem/shm_mem.h" #include "../../sr_module.h" -#include "../../mi/mi.h" +#include "../../lib/kmi/mi.h" #include "../../mem/mem.h" #include "../../usr_avp.h" #include "../../locking.h" diff --git a/modules/pdb/pdb.c b/modules/pdb/pdb.c index 721363c..5ae47f3 100644 --- a/modules/pdb/pdb.c +++ b/modules/pdb/pdb.c @@ -29,6 +29,7 @@ #include "../../sr_module.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" +#include "../../lib/kmi/mi.h" #include <sys/time.h> #include <poll.h> #include <stdlib.h> diff --git a/modules_k/pua_mi/pua_mi.c b/modules_k/pua_mi/pua_mi.c index a6ab82c..c78d4f4 100644 --- a/modules_k/pua_mi/pua_mi.c +++ b/modules_k/pua_mi/pua_mi.c @@ -40,6 +40,7 @@ #include "../../mem/mem.h" #include "../../pt.h" #include "../../modules/tm/tm_load.h" +#include "../../lib/kmi/mi.h" #include "../pua/pua_bind.h" #include "mi_func.h" diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index 4303844..595cfdc 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -209,7 +209,7 @@ #include "../../ut.h" #include "../../pt.h" #include "../../timer_proc.h" -#include "../../lib/kmi/attr.h" +#include "../../lib/kmi/mi.h" #include "../../lib/kcore/km_ut.h" #include "../../lib/kcore/parser_helpers.h" #include "../../pvar.h" diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 44c5054..405ed88 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -37,6 +37,7 @@ #include <stdlib.h> #include "../../parser/parse_from.h" #include "../../modules/tm/ut.h" +#include "../../lib/kmi/mi.h" #include "tmx_mod.h" /*! simple string list */

1 0

git:master: mi: cleanup - move type defs. to separate file
by Andrei Pelinescu-Onciul 18 Aug '10

18 Aug '10

Module: sip-router Branch: master Commit: 627a1969b49446360f227fe23c56b80683145e5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=627a196… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 19:54:09 2010 +0200 mi: cleanup - move type defs. to separate file Moved MI types defs to mi/mi_types.h (from lib/kmi/mi.h). This removes core dependency on lib/mi include files (mi types are needed for kamailio module interface defs). --- lib/kmi/mi.h | 16 +---------- lib/kmi/tree.h | 18 ++---------- mi/mi.h | 35 ------------------------ mi/mi_types.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sr_module.h | 2 +- 5 files changed, 86 insertions(+), 65 deletions(-) diff --git a/lib/kmi/mi.h b/lib/kmi/mi.h index 5c0ac19..988bcd1 100644 --- a/lib/kmi/mi.h +++ b/lib/kmi/mi.h @@ -23,6 +23,7 @@ * History: * --------- * 2006-09-08 first version (bogdan) + * 2010-08-18 use mi types from ../../mi/mi_types.h (andrei) */ /*! @@ -36,6 +37,7 @@ #define _MI_MI_H_ #include "../../str.h" +#include "../../mi/mi_types.h" #include "tree.h" #define MI_ASYNC_RPL_FLAG (1<<0) @@ -43,11 +45,6 @@ #define MI_ROOT_ASYNC_RPL ((struct mi_root*)-1) -struct mi_handler; - -typedef struct mi_root* (mi_cmd_f)(struct mi_root*, void *param); -typedef int (mi_child_init_f)(void); -typedef void (mi_handler_f)(struct mi_root *, struct mi_handler *, int); struct mi_handler { @@ -66,15 +63,6 @@ struct mi_cmd { }; -typedef struct mi_export_ { - char *name; - mi_cmd_f *cmd; - unsigned int flags; - void *param; - mi_child_init_f *init_f; -}mi_export_t; - - int register_mi_cmd( mi_cmd_f f, char *name, void *param, mi_child_init_f in, unsigned int flags); diff --git a/lib/kmi/tree.h b/lib/kmi/tree.h index 4a42823..ef6e657 100644 --- a/lib/kmi/tree.h +++ b/lib/kmi/tree.h @@ -23,6 +23,7 @@ * History: * --------- * 2006-09-08 first version (bogdan) + * 2010-08-18 use mi types from ../../mi/mi_types.h (andrei) */ /*! @@ -39,6 +40,7 @@ #include <stdarg.h> #include "../../str.h" +#include "../../mi/mi_types.h" struct mi_node; struct mi_handler; @@ -63,21 +65,7 @@ struct mi_handler; #define MI_MISSING_PARM MI_MISSING_PARM_S #define MI_BAD_PARM MI_BAD_PARM_S -struct mi_node { - str value; - str name; - struct mi_node *kids; - struct mi_node *next; - struct mi_node *last; - struct mi_attr *attributes; -}; - -struct mi_root { - unsigned int code; - str reason; - struct mi_handler *async_hdl; - struct mi_node node; -}; + struct mi_root *init_mi_tree(unsigned int code, char *reason, int reason_len); diff --git a/mi/mi.h b/mi/mi.h deleted file mode 100644 index b3c106f..0000000 --- a/mi/mi.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2008 iptelorg GmbH - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * mi compatibility wrapper for kamailio - * for now it doesn't do anything, it just a compile helper - * (obsolete, do not use anymore) - * - * History: - * -------- - * 2008-11-17 initial version compatible with kamailio mi/mi.h (andrei) - */ - -#ifndef _mi_h_ -#define _mi_h_ - -#include "../lib/kmi/mi.h" - -#endif /* _mi_h_ */ - - diff --git a/mi/mi_types.h b/mi/mi_types.h new file mode 100644 index 0000000..4da303c --- /dev/null +++ b/mi/mi_types.h @@ -0,0 +1,80 @@ +/* + * $Id$ + * + * Copyright (C) 2008 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * mi compatibility wrapper for kamailio + * It contains only the type definition, needed for loading kamilio modules + * (used by sr_module.c). + * Note that MI usage in new modules is opsolete. They should implement RPCs + * instead. To use MI include lib/kmi/mi.h and link with lib kmi. + * + * History: + * -------- + * 2008-11-17 initial version compatible with kamailio mi/mi.h (andrei) + * 2010-08-18 remove everything but the data types definition (andrei) + */ + +#ifndef _mi_h_ +#define _mi_h_ + +#include "../str.h" + +struct mi_node { + str value; + str name; + struct mi_node *kids; + struct mi_node *next; + struct mi_node *last; + struct mi_attr *attributes; +}; + + +struct mi_handler; + +struct mi_root { + unsigned int code; + str reason; + struct mi_handler *async_hdl; + struct mi_node node; +}; + +typedef struct mi_root* (mi_cmd_f)(struct mi_root*, void *param); +typedef int (mi_child_init_f)(void); +typedef void (mi_handler_f)(struct mi_root *, struct mi_handler *, int); + +/* FIXME +struct mi_handler { + mi_handler_f *handler_f; + void * param; +}; +*/ + + +struct mi_export_ { + char *name; + mi_cmd_f *cmd; + unsigned int flags; + void *param; + mi_child_init_f *init_f; +}; + +typedef struct mi_export_ mi_export_t; + + +#endif /* _mi_h_ */ + + diff --git a/sr_module.h b/sr_module.h index 1940a96..baf1081 100644 --- a/sr_module.h +++ b/sr_module.h @@ -69,7 +69,7 @@ /* kamailio compat */ #include "statistics.h" -#include "mi/mi.h" +#include "mi/mi_types.h" #include "pvar.h"

1 0

git:master: tm: don't reply if the reply dest. is not yet set
by Andrei Pelinescu-Onciul 18 Aug '10

18 Aug '10

Module: sip-router Branch: master Commit: 96e1bc629bc7ed78dd64b221bc54b266cd45e3ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96e1bc6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 18:39:43 2010 +0200 tm: don't reply if the reply dest. is not yet set - relay_reply() doesn't attempt to send the reply if the reply destination is not yet fully set. This can happen for example if reply_to_via is set, Via contains a host name (and not an ip) and before having a chance to resolve the name a reply must be sent (reply for a message that hasn't been sent yet: very unlikely, but possible). - use a membar_write() in init_rb(), before setting the reply send socket (the reply send socket is also used as a flag for a fully initialized reply destination and the membar_write() makes sure that everything else was written before the send socket and no re-ordering will take place). --- modules/tm/t_lookup.c | 17 ++--------------- modules/tm/t_reply.c | 8 +++++--- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index b0ddfa6..e69fdec 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1196,7 +1196,6 @@ int init_rb( struct retr_buf *rb, struct sip_msg *msg) /*struct socket_info* send_sock;*/ struct via_body* via; int proto; - int backup_mhomed; /* rb. timers are init. init_t()/new_cell() */ via=msg->via1; @@ -1220,20 +1219,8 @@ int init_rb( struct retr_buf *rb, struct sip_msg *msg) rb->dst.comp=via->comp_no; #endif rb->dst.send_flags=msg->rpl_send_flags; - /* turn off mhomed for generating replies -- they are ideally sent to where - request came from to make life with NATs and other beasts easier - */ - backup_mhomed=mhomed; - mhomed=0; - mhomed=backup_mhomed; - /* use for sending replies the incoming interface of the request -bogdan */ - /*send_sock=get_send_socket(msg, &rb->dst.to, proto); - if (send_sock==0) { - LOG(L_ERR, "ERROR: init_rb: cannot fwd to af %d, proto %d " - "no socket\n", rb->dst.to.s.sa_family, proto); - ser_error=E_BAD_VIA; - return 0; - }*/ + + membar_write(); rb->dst.send_sock=msg->rcv.bind_address; return 1; } diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index df372e1..1a90844 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -637,7 +637,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, If reply_to_via is set and via contains a host name (and not an ip) the chances for this increase a lot. */ - if (!trans->uas.response.dst.send_sock) { + if (unlikely(!trans->uas.response.dst.send_sock)) { LOG(L_ERR, "ERROR: _reply_light: no resolved dst to send reply to\n"); } else { if (likely(SEND_PR_BUFFER( rb, buf, len )>=0)){ @@ -1786,7 +1786,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (reply_status == RPS_COMPLETED) { start_final_repl_retr(t); } - if (SEND_PR_BUFFER( uas_rb, buf, res_len )>=0){ + if (likely(uas_rb->dst.send_sock && + SEND_PR_BUFFER( uas_rb, buf, res_len ) >= 0)){ if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_OUT))){ run_trans_callbacks( TMCB_RESPONSE_OUT, t, t->uas.request, relayed_msg, relayed_code); @@ -1801,7 +1802,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, run_onsend_callbacks2(TMCB_RESPONSE_SENT, t, &onsend_params); } #endif - } + } else if (unlikely(uas_rb->dst.send_sock == 0)) + ERR("no resolved dst to send reply to\n"); /* Call put_on_wait() only if we really send out * the reply. It can happen that the reply has been already sent from * failure_route or from a callback and the timer has been already

1 0

git:master: tcp: fix double increment for the established stats
by Andrei Pelinescu-Onciul 18 Aug '10

18 Aug '10

Module: sip-router Branch: master Commit: 66cda7bc5f642ce892124cfb35f1e5effd78e9d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66cda7b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 18 18:36:14 2010 +0200 tcp: fix double increment for the established stats The counter/stats for established TCP connections were incremented twice in the case of accept()-ed connections: once immediately after the accept() and another time after the first packet received or sent on the connection. Now they are incremented only after the first successful send or receive. --- tcp_main.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index a1761f6..31fc0fa 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -3973,7 +3973,15 @@ static inline int handle_new_connect(struct socket_info* si) return 1; /* success, because the accept was succesfull */ } (*tcp_connections_no)++; - TCP_STATS_ESTABLISHED(S_CONN_ACCEPT); + /* stats for established connections are incremented after + the first received or sent packet. + Alternatively they could be incremented here for accepted + connections, but then the connection state must be changed to + S_CONN_OK: + TCP_STATS_ESTABLISHED(S_CONN_ACCEPT); + ... + tcpconn=tcpconn_new(new_sock, &su, dst_su, si, si->proto, S_CONN_OK); + */ dst_su=&si->su; if (unlikely(si->flags & SI_IS_ANY)){

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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 August 2010