sr-dev

sr-dev@lists.kamailio.org

13 participants
44206 discussions

git:tmp/build_request: tm: local req. route: cache route id

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/build_request Commit: 5c037f80bd047518c6bc879f33acad611014143a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c037f8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 21 11:58:51 2009 +0200 tm: local req. route: cache route id - resolve the route name only once, at startup (mod_init since this route name is fixed) and cache it. - more likely()/unlikely() added to the ifs (optimizing for no local req. route and local req. route not changing the message). --- modules/tm/tm.c | 9 ++++++--- modules/tm/uac.c | 25 ++++++++++++++----------- modules/tm/uac.h | 6 ++++++ 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 034b8c7..18565c1 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -435,7 +435,7 @@ static param_export_t params[]={ {"max_noninv_lifetime", PARAM_INT, &default_tm_cfg.tm_max_noninv_lifetime}, {"noisy_ctimer", PARAM_INT, &default_tm_cfg.noisy_ctimer }, {"auto_inv_100", PARAM_INT, &default_tm_cfg.tm_auto_inv_100 }, - {"auto_inv_100_reason", PARAM_STRING, &default_tm_cfg.tm_auto_inv_100_r }, + {"auto_inv_100_reason", PARAM_STRING, &default_tm_cfg.tm_auto_inv_100_r }, {"unix_tx_timeout", PARAM_INT, &default_tm_cfg.tm_unix_tx_timeout }, {"restart_fr_on_each_reply", PARAM_INT, &default_tm_cfg.restart_fr_on_each_reply}, @@ -460,10 +460,8 @@ static param_export_t params[]={ {"cancel_b_method", PARAM_INT, &default_tm_cfg.cancel_b_flags}, {"reparse_on_dns_failover", PARAM_INT, &default_tm_cfg.reparse_on_dns_failover}, {"on_sl_reply", PARAM_STRING|PARAM_USE_FUNC, fixup_on_sl_reply }, - {"fr_inv_timer_next", PARAM_INT, &default_tm_cfg.fr_inv_timeout_next }, {"contacts_avp", PARAM_STRING, &contacts_avp_param }, - {0,0,0} }; @@ -768,6 +766,11 @@ static int mod_init(void) LOG(L_ERR,"ERROR:tm:mod_init: failed to process AVP params\n"); return -1; } +#ifdef WITH_EVENT_LOCAL_REQUEST + goto_on_local_req=route_lookup(&event_rt, "tm:local-request"); + if (goto_on_local_req>=0 && event_rt.rlist[goto_on_local_req]==0) + goto_on_local_req=-1; /* disable */ +#endif /* WITH_EVENT_LOCAL_REQUEST */ tm_init = 1; return 0; } diff --git a/modules/tm/uac.c b/modules/tm/uac.c index c3b49be..b1a79fa 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -90,6 +90,11 @@ #define FROM_TAG_LEN (MD5_LEN + 1 /* - */ + CRC16_LEN) /* length of FROM tags */ +#ifdef WITH_EVENT_LOCAL_REQUEST +/* where to go for the local request route ("tm:local-request") */ +int goto_on_local_req=-1; /* default disabled */ +#endif /* WITH_EVEN_LOCAL_REQuEST */ + static char from_tag[FROM_TAG_LEN + 1]; /* @@ -200,7 +205,6 @@ static inline int t_uac_prepare(uac_req_t *uac_r, #endif long nhtype; #ifdef WITH_EVENT_LOCAL_REQUEST - int rt; static struct sip_msg lreq; char *buf1; int buf_len1; @@ -325,13 +329,12 @@ static inline int t_uac_prepare(uac_req_t *uac_r, } #ifdef WITH_EVENT_LOCAL_REQUEST - /* todo: cache this at startup */ - rt = route_lookup(&event_rt, "tm:local-request"); - if (rt>=0 && event_rt.rlist[rt]!=NULL) { - LM_DBG("executing event_route[tm:local-request]\n"); - if(build_sip_msg_from_buf(&lreq, buf, buf_len, inc_msg_no())==0) { + if (unlikely(goto_on_local_req>=0)) { + DBG("executing event_route[tm:local-request]\n"); + if(likely(build_sip_msg_from_buf(&lreq, buf, buf_len, inc_msg_no()) + == 0)) { /* fill some field in sip_msg */ - if (set_dst_uri(&lreq, uac_r->dialog->hooks.next_hop)) { + if (unlikely(set_dst_uri(&lreq, uac_r->dialog->hooks.next_hop))) { LM_ERR("failed to set dst_uri"); free_sip_msg(&lreq); } else { @@ -365,7 +368,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, /* run the route */ backup_route_type = get_route_type(); set_route_type(LOCAL_ROUTE); - run_top_route(event_rt.rlist[rt], &lreq, 0); + run_top_route(event_rt.rlist[goto_on_local_req], &lreq, 0); set_route_type( backup_route_type ); /* restore original environment */ @@ -378,20 +381,20 @@ static inline int t_uac_prepare(uac_req_t *uac_r, set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to); setsflagsval(sflag_bk); - if (lreq.new_uri.s) + if (unlikely(lreq.new_uri.s)) { pkg_free(lreq.new_uri.s); lreq.new_uri.s=0; lreq.new_uri.len=0; } - if (lreq.dst_uri.s) + if (unlikely(lreq.dst_uri.s)) { pkg_free(lreq.dst_uri.s); lreq.dst_uri.s=0; lreq.dst_uri.len=0; } - if (lreq.add_rm || lreq.body_lumps) { + if (unlikely(lreq.add_rm || lreq.body_lumps)) { LM_DBG("apply new updates to sip msg\n"); buf1 = build_req_buf_from_sip_req(&lreq, (unsigned int*)&buf_len1, diff --git a/modules/tm/uac.h b/modules/tm/uac.h index 8106727..2f98aa8 100644 --- a/modules/tm/uac.h +++ b/modules/tm/uac.h @@ -73,6 +73,12 @@ typedef struct uac_req { (_req)->cbp = (_cbp); \ } while (0) + +#ifdef WITH_EVENT_LOCAL_REQUEST +/* where to go for the local request route ("tm:local-request") */ +extern int goto_on_local_req; +#endif /* WITH_EVEN_LOCAL_REQuEST */ + /* * Function prototypes */

15 years, 5 months

git:tmp/build_request: tm: local req. route rcv init fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/build_request Commit: ef6fed5b07e4f199974e2236d1f44526d487559c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef6fed5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 21 11:10:48 2009 +0200 tm: local req. route rcv init fix - dialog->send_sock can be null and should not be used (switched to dst.send_sock which is guaranteed to be non-null at that point) - initialize also the other members of the msg rcv structure: dst_ip, dst_port, src_su, bind_address and dst.comp. Note: the rcv structure is initialized as if the message originated from the dst.send_sock, so in the script src_ip & friends will be the send ip. This is different from on_send route, were src_ip is the original forwarded message source and snd_ip is the send ip. --- modules/tm/uac.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 0a238bd..4e46489 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -336,9 +336,16 @@ static inline int t_uac_prepare(uac_req_t *uac_r, free_sip_msg(&lreq); } else { lreq.force_send_socket = uac_r->dialog->send_sock; - lreq.rcv.proto = uac_r->dialog->send_sock->proto; - lreq.rcv.src_ip = uac_r->dialog->send_sock->address; - lreq.rcv.src_port = uac_r->dialog->send_sock->port_no; + lreq.rcv.proto = dst.send_sock->proto; + lreq.rcv.src_ip = dst.send_sock->address; + lreq.rcv.src_port = dst.send_sock->port_no; + lreq.rcv.dst_port = su_getport(&dst.to); + su2ip_addr(&lreq.rcv.dst_ip, &dst.to); + lreq.rcv.src_su=dst.send_sock->su; + lreq.rcv.bind_address=dst.send_sock; + #ifdef USE_COMP + lreq.rcv.comp=dst.comp; + #endif /* USE_COMP */ /* backup environment (e.g., AVP lists, ...) */ backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &new_cell->uri_avps_from);

15 years, 5 months

SF.net SVN: openser:[5904] branches/1.5/modules/sanity/sanity.c

by Daniel-Constantin Mierla

Revision: 5904 http://openser.svn.sourceforge.net/openser/?rev=5904&view=rev Author: miconda Date: 2009-07-20 15:05:13 +0000 (Mon, 20 Jul 2009) Log Message: ----------- - proper return code check for r-uri parsing - reported by Dubravko Caric Modified Paths: -------------- branches/1.5/modules/sanity/sanity.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 5 months

[ openser-Bugs-2824350 ] Presence DB support completely broken

by SourceForge.net

Bugs item #2824350, was opened at 2009-07-20 15:49 Message generated for change (Comment added) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Alex Hermann (axlh) Assigned to: Nobody/Anonymous (nobody) Summary: Presence DB support completely broken Initial Comment: As subject. commit 5840 did the damage ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 17:52 Message: fallback to db is in presence and the insert function is used by rls module as well. I had no time to check the impact now. With this idea, to be safe, fallback2db param has to be directed to another variable, fallback2db initialized to 0 and set to param value in each child, via child_init. Otherwise can be a conflict of loading order. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 16:37 Message: I don't know if changing the API and ABI is appropriate for the stable series. What about setting the fallback2db variable only AFTER loading the DB contents? ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 16:22 Message: The function is used in presence and rls modules. Does not look like big changes to add a new param to specify the mode. Do you think of something else? ---------------------------------------------------------------------- Comment By: Alex Hermann (axlh) Date: 2009-07-20 16:07 Message: New subscriptions don't get stored in the DB because the test for 'fallback2db' was wrong. I just noticed the insert_shtable() function is also used to load from DB initially, so my patch is wrong. Fix is a bit more non-trivial. The problem is that the function is used for both DB-load at startup and new subscriptions during runtime. The db_flag in the hash table record needs to be INSERTDB_FLAG during runtime, and NO_UPDATEDB_FLAG for initial load. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 15:53 Message: Please provide a bit more details of what got broken. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_…

15 years, 5 months

[ openser-Bugs-2824350 ] Presence DB support completely broken

by SourceForge.net

Bugs item #2824350, was opened at 2009-07-20 15:49 Message generated for change (Comment added) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Alex Hermann (axlh) Assigned to: Nobody/Anonymous (nobody) Summary: Presence DB support completely broken Initial Comment: As subject. commit 5840 did the damage ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 16:37 Message: I don't know if changing the API and ABI is appropriate for the stable series. What about setting the fallback2db variable only AFTER loading the DB contents? ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 16:22 Message: The function is used in presence and rls modules. Does not look like big changes to add a new param to specify the mode. Do you think of something else? ---------------------------------------------------------------------- Comment By: Alex Hermann (axlh) Date: 2009-07-20 16:07 Message: New subscriptions don't get stored in the DB because the test for 'fallback2db' was wrong. I just noticed the insert_shtable() function is also used to load from DB initially, so my patch is wrong. Fix is a bit more non-trivial. The problem is that the function is used for both DB-load at startup and new subscriptions during runtime. The db_flag in the hash table record needs to be INSERTDB_FLAG during runtime, and NO_UPDATEDB_FLAG for initial load. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 15:53 Message: Please provide a bit more details of what got broken. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_…

15 years, 5 months

git:master: tmx(k): mi_tm_uac_dlg uris fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f90cfa15340ad74737cc3b2cc67f08347e7fbacc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f90cfa1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 20 18:28:03 2009 +0200 tmx(k): mi_tm_uac_dlg uris fix Replaced dlg.hooks.request_uri with dlg.rem_uri and dlg.hooks.next_hop with dlg.rem_target. [ In sr tm the dialog hooks should not be changed, they are only used for internal caching. Any change to the hooks will be lost immediately after t_uac() is called (t_uac() re-calculates the hooks each time it is called). One should use instead the correspondent dlg structure members. ] --- modules_k/tmx/t_mi.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index e2fa5b4..54c9ff1 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -610,8 +610,9 @@ struct mi_root* mi_tm_uac_dlg(struct mi_root* cmd_tree, void* param) dlg.loc_uri = tmp_msg.from->body; dlg.rem_uri = tmp_msg.to->body; - dlg.hooks.request_uri = ruri; - dlg.hooks.next_hop = (nexthop ? nexthop : ruri); + dlg.rem_target = *ruri; + if (nexthop) + dlg.dst_uri = *nexthop; dlg.send_sock = sock; memset(&uac_r, 0, sizeof(uac_req_t));

15 years, 5 months

[ openser-Bugs-2824350 ] Presence DB support completely broken

by SourceForge.net

Bugs item #2824350, was opened at 2009-07-20 15:49 Message generated for change (Comment added) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Alex Hermann (axlh) Assigned to: Nobody/Anonymous (nobody) Summary: Presence DB support completely broken Initial Comment: As subject. commit 5840 did the damage ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 16:22 Message: The function is used in presence and rls modules. Does not look like big changes to add a new param to specify the mode. Do you think of something else? ---------------------------------------------------------------------- Comment By: Alex Hermann (axlh) Date: 2009-07-20 16:07 Message: New subscriptions don't get stored in the DB because the test for 'fallback2db' was wrong. I just noticed the insert_shtable() function is also used to load from DB initially, so my patch is wrong. Fix is a bit more non-trivial. The problem is that the function is used for both DB-load at startup and new subscriptions during runtime. The db_flag in the hash table record needs to be INSERTDB_FLAG during runtime, and NO_UPDATEDB_FLAG for initial load. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 15:53 Message: Please provide a bit more details of what got broken. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_…

15 years, 5 months

[ openser-Bugs-2824350 ] Presence DB support completely broken

by SourceForge.net

Bugs item #2824350, was opened at 2009-07-20 17:49 Message generated for change (Comment added) made by axlh You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Alex Hermann (axlh) Assigned to: Nobody/Anonymous (nobody) Summary: Presence DB support completely broken Initial Comment: As subject. commit 5840 did the damage ---------------------------------------------------------------------- >Comment By: Alex Hermann (axlh) Date: 2009-07-20 18:07 Message: New subscriptions don't get stored in the DB because the test for 'fallback2db' was wrong. I just noticed the insert_shtable() function is also used to load from DB initially, so my patch is wrong. Fix is a bit more non-trivial. The problem is that the function is used for both DB-load at startup and new subscriptions during runtime. The db_flag in the hash table record needs to be INSERTDB_FLAG during runtime, and NO_UPDATEDB_FLAG for initial load. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-20 17:53 Message: Please provide a bit more details of what got broken. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_…

15 years, 5 months

[ openser-Bugs-2824350 ] Presence DB support completely broken

by SourceForge.net

15 years, 5 months

[ openser-Bugs-2824350 ] Presence DB support completely broken

by SourceForge.net

Bugs item #2824350, was opened at 2009-07-20 17:49 Message generated for change (Tracker Item Submitted) made by axlh You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Alex Hermann (axlh) Assigned to: Nobody/Anonymous (nobody) Summary: Presence DB support completely broken Initial Comment: As subject. commit 5840 did the damage ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2824350&group_…

15 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev