sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:master: tcp: fix fd leak on async error or quick connect

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b8d528b657bd52fce0b342e01380001b4ffa15fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8d528b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 18 20:52:37 2009 +0200 tcp: fix fd leak on async error or quick connect In some error cases (from which the most likely to appear in real-life would be maximum global send queue size exceeded), the fd for a new created connection (in tcp_send()) was not closed when the connection was destroyed. Same thing happened in the case of a "quick" connect (connect & send finish immediately, this happens in general only on localhost) for a connection marked as close-after-send (via the new msg send_flags). --- tcp_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index a72e3cc..d2f7b59 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -2270,6 +2270,9 @@ conn_wait_close: * connection (tcpconn_chld_put(c))) or when tcp_main receives a * CONN_ERROR it*/ c->state=S_CONN_BAD; + /* we are here only if we opened a new fd (and not reused a cached or + a reader one) => if the connect was successful close the fd */ + if (fd>=0) close(fd); TCPCONN_LOCK; if (c->flags & F_CONN_HASHED){ /* if some other parallel tcp_send did send CONN_ERROR to

15 years, 4 months

git:master: tm: send_flags can be used in branch & reply routes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: cc256eba86a81f61ead4e00c39d81858b5e5e56c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc256eb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 18 21:03:26 2009 +0200 tm: send_flags can be used in branch & reply routes Forwarding send flags can now be used in branch routes (and they will affect only the current branch) and in reply routes (if the reply will be forwarded, either as provisional or final reply, the send_flags will affect it, but they will not affect other replies). --- modules/tm/t_fwd.c | 30 +++++++++++++++++++++++++++++- modules/tm/t_reply.c | 5 ++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 0590c10..2ef3025 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -144,6 +144,23 @@ unsigned int get_on_branch(void) } +/** create a branch "buffer". + * Creates the buffer used in the branch rb and runs the on_branch route. + * @param t - transaction + * @param i_req - corresponding sip_msg, must be non-null, flags might be + * be modified (on_branch route) + * @param branch - branch no + * @param uri + * @param path - path vector (list of route like destination in text form, + * e.g.: "<sip:1.2.3.4;lr>, <sip:5.6.7.8;lr>") + * @param len - resul parameter, it will be filled with the created buffer + * lenght. + * @param dst - value/result parameter. It will be used to generate the + * message. All the values except the send_flags are read-only. + * send_flags it's updated. + * @return pointer to shm alloc'ed buffer on success (*len and dst->send_flags + * are filled/modified), 0 on failure + */ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, int branch, str *uri, str* path, unsigned int *len, struct dest_info* dst) { @@ -156,6 +173,8 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, str path_bak; int path_backed_up; int backup_route_type; + snd_flags_t fwd_snd_flags_bak; + snd_flags_t rpl_snd_flags_bak; shbuf=0; msg_uri_bak.s=0; /* kill warnings */ @@ -208,11 +227,20 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, set_route_type(BRANCH_ROUTE); tm_ctx_set_branch_index(branch+1); if (exec_pre_script_cb(i_req, BRANCH_CB_TYPE)>0) { + /* backup ireq msg send flags */ + fwd_snd_flags_bak=i_req->fwd_send_flags;; + rpl_snd_flags_bak=i_req->rpl_send_flags; + i_req->fwd_send_flags=dst->send_flags /* intial value */; if (run_top_route(branch_rt.rlist[branch_route], i_req, 0) < 0) { LOG(L_ERR, "Error in run_top_route\n"); } + /* update dst send_flags */ + dst->send_flags=i_req->fwd_send_flags; + /* restore ireq_msg flags */ + i_req->fwd_send_flags=fwd_snd_flags_bak; + i_req->rpl_send_flags=rpl_snd_flags_bak; exec_post_script_cb(i_req, BRANCH_CB_TYPE); - } + } tm_ctx_set_branch_index(0); set_route_type(backup_route_type); } diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 981efd2..fa99650 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1607,6 +1607,9 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (branch!=relay) { free_via_clen_lump(&relayed_msg->add_rm); } + /* update send_flags with possible additions from the + reply route */ + uas_rb->dst.send_flags|=relayed_msg->rpl_send_flags; } } update_reply_stats( relayed_code ); @@ -1978,7 +1981,7 @@ int reply_received( struct sip_msg *p_msg ) backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); setbflagsval(0, uac->branch_flags); /* Pre- and post-script callbacks have already - * been execueted by the core. (Miklos) + * been executed by the core. (Miklos) */ if (run_top_route(onreply_rt.rlist[t->on_reply], p_msg, 0)<0) LOG(L_ERR, "ERROR: on_reply processing failed\n");

15 years, 4 months

git:master: core: send_flags support in the onsend_route

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8ed9165103cfe93172ee18904a2f210674edfdce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ed9165… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 18 20:58:20 2009 +0200 core: send_flags support in the onsend_route send_flags can now be set also in the onsend_route (via set_forward_no_connect() or set_forward_close()). E.g.: onsend_route{ if (dsp_ip!=10.0.0.0/8) set_forward_no_connect(); # don't open new connection, # only reuse } --- cfg.y | 4 ++++ onsend.h | 12 ++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/cfg.y b/cfg.y index af5335c..528a70a 100644 --- a/cfg.y +++ b/cfg.y @@ -2053,6 +2053,10 @@ fcmd: case ISFLAGSET_T: case IF_T: case MODULE_T: + case SET_FWD_NO_CONNECT_T: + case SET_RPL_NO_CONNECT_T: + case SET_FWD_CLOSE_T: + case SET_RPL_CLOSE_T: $$=$1; break; default: diff --git a/onsend.h b/onsend.h index 433100d..deec874 100644 --- a/onsend.h +++ b/onsend.h @@ -55,6 +55,7 @@ extern struct onsend_info* p_onsend; /* * returns: 0 drop the message, >= ok, <0 error (but forward the message) + * it also migh change dst->send_flags! * WARNING: buf must be 0 terminated (to allow regex matches on it) */ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, char* buf, int len) @@ -63,6 +64,8 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, int ret; struct run_act_ctx ra_ctx; int backup_route_type; + snd_flags_t fwd_snd_flags_bak; + snd_flags_t rpl_snd_flags_bak; ret=1; if (onsend_rt.rlist[DEFAULT_RT]){ @@ -74,8 +77,17 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, backup_route_type=get_route_type(); set_route_type(ONSEND_ROUTE); if (exec_pre_script_cb(orig_msg, ONSEND_CB_TYPE)>0) { + /* backup orig_msg send flags */ + fwd_snd_flags_bak=orig_msg->fwd_send_flags; + rpl_snd_flags_bak=orig_msg->rpl_send_flags; + orig_msg->fwd_send_flags=dst->send_flags; /* intial value */ init_run_actions_ctx(&ra_ctx); ret=run_actions(&ra_ctx, onsend_rt.rlist[DEFAULT_RT], orig_msg); + /* update dst send_flags */ + dst->send_flags=orig_msg->fwd_send_flags; + /* restore orig_msg flags */ + orig_msg->fwd_send_flags=fwd_snd_flags_bak; + orig_msg->rpl_send_flags=rpl_snd_flags_bak; exec_post_script_cb(orig_msg, ONSEND_CB_TYPE); } else { ret=0; /* drop the message */

15 years, 4 months

git:master: Merge branch 'rpc_async'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 5b1cd719918a51ca8f4b4a05dbc34e27fd1ae58c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b1cd71… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 18 13:16:26 2009 +0200 Merge branch 'rpc_async' * rpc_async: tm: async t_uac (t_uac_wait) support xmlrpc(s): basic support for delayed replies core: rpc capabilities and delayed reply api core+tm: moved sip msg clone functions to the core ---

15 years, 4 months

git:master: Merge commit 'origin/andrei/path'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0fa4b2d5a4d9700eed970d36ed1bb803c1f07d21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0fa4b2d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 18 13:36:33 2009 +0200 Merge commit 'origin/andrei/path' * commit 'origin/andrei/path': core: add path route headers after local via core: path support when forwarding tm: path support xlog(s): updated to the new next_branch() registrar(s): updated to the new append_branch() permissions(s): updated to the new next_branch() osp(s): updated to the new append_branch() exec(s): use ser_append_branch() instead of append_branch() cpl-c(s): updated to the new append_branch() tm: updated to the new append_branch() & next_branch() enum: s/km_append_brach/append_branch/ avpops: updated to the new append_branch() core: append_branch & next_branch api changes Conflicts: modules/tm/sip_msg.c modules/tm/t_fwd.c ---

15 years, 4 months

git:master: Merge commit 'origin/andrei/send_flags'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 643491da0b3cb9a87d278c08ed5e0879511ddfc1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=643491d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 18 12:57:42 2009 +0200 Merge commit 'origin/andrei/send_flags' * commit 'origin/andrei/send_flags': NEWS: update core: new close after send and reuse only script functions tcp: send_flags support sl: use the msg reply send_flags tm: support for send_flags core: send flags support ---

15 years, 4 months

git:master: Merge commit 'origin/andrei/to_parser_fix'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 43d869ccd2ae997338e4009aa760862589feca3d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43d869c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 18 12:54:50 2009 +0200 Merge commit 'origin/andrei/to_parser_fix' * commit 'origin/andrei/to_parser_fix': core: to parser fix ---

15 years, 4 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev