sr-dev

sr-dev@lists.kamailio.org

13 participants
44202 discussions

git:master: core: derive default config name from -DNAME

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4c969ea99ac8a986fd7f5a4381bcd0fca0963770 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c969ea… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jul 8 15:42:47 2009 +0200 core: derive default config name from -DNAME The default config name was hard-wired to sip-router.cfg. Reported-by: Klaus Darilion klaus.mailinglists at pernau at --- config.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config.h b/config.h index 0b402c8..09ec79a 100644 --- a/config.h +++ b/config.h @@ -44,7 +44,7 @@ #define SIP_PORT 5060 #define SIPS_PORT 5061 -#define CFG_FILE CFG_DIR "sip-router.cfg" +#define CFG_FILE CFG_DIR NAME ".cfg" #define TLS_PKEY_FILE "cert.pem" #define TLS_CERT_FILE "cert.pem"

15 years, 6 months

git:master: prefix_route(s): fix: the lock should be in shm

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 17b8e2fc2858e2f5578ad7374a36d22f82f2233f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17b8e2f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jul 8 18:03:40 2009 +0200 prefix_route(s): fix: the lock should be in shm The shared_tree_lock was not in shared memory. --- modules_s/prefix_route/tree.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/modules_s/prefix_route/tree.c b/modules_s/prefix_route/tree.c index 57f07e2..30ccf7b 100644 --- a/modules_s/prefix_route/tree.c +++ b/modules_s/prefix_route/tree.c @@ -34,6 +34,8 @@ #include "../../atomic_ops.h" #include "../../mem/shm_mem.h" #include "../../str.h" +#include "../../lock_alloc.h" +#include "../../lock_ops.h" #include "tree.h" @@ -59,7 +61,7 @@ struct tree { /* Local variables */ static struct tree **shared_tree = NULL; -static gen_lock_t shared_tree_lock; +static gen_lock_t* shared_tree_lock; /** @@ -286,9 +288,9 @@ static struct tree *tree_get(void) { struct tree *tree; - lock_get(&shared_tree_lock); + lock_get(shared_tree_lock); tree = *shared_tree; - lock_release(&shared_tree_lock); + lock_release(shared_tree_lock); return tree; } @@ -298,10 +300,10 @@ static struct tree *tree_ref(void) { struct tree *tree; - lock_get(&shared_tree_lock); + lock_get(shared_tree_lock); tree = *shared_tree; atomic_inc(&tree->refcnt); - lock_release(&shared_tree_lock); + lock_release(shared_tree_lock); return tree; } @@ -318,11 +320,18 @@ struct tree *tree_deref(struct tree *tree) int tree_init(void) { /* Initialize lock */ - lock_init(&shared_tree_lock); + shared_tree_lock = lock_alloc(); + if (NULL == shared_tree_lock) { + return -1; + } + lock_init(shared_tree_lock); /* Pointer to global tree must be in shared memory */ shared_tree = (struct tree **)shm_malloc(sizeof(*shared_tree)); if (NULL == shared_tree) { + lock_destroy(shared_tree_lock); + lock_dealloc(shared_tree_lock); + shared_tree_lock=0; return -1; } @@ -337,6 +346,11 @@ void tree_close(void) if (shared_tree) tree_flush(tree_get()); shared_tree = NULL; + if (shared_tree_lock) { + lock_destroy(shared_tree_lock); + lock_dealloc(shared_tree_lock); + shared_tree_lock=0; + } } @@ -354,9 +368,9 @@ int tree_swap(struct tree_item *root) old_tree = tree_get(); /* Critical - swap trees */ - lock_get(&shared_tree_lock); + lock_get(shared_tree_lock); *shared_tree = new_tree; - lock_release(&shared_tree_lock); + lock_release(shared_tree_lock); /* Flush old tree */ tree_flush(old_tree);

15 years, 6 months

git:master: prefix_route(s): fix mod_destroy/tree_close()

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 7fc0ed074caa98f1542a5b741f00b01078c730fc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fc0ed0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jul 8 17:54:46 2009 +0200 prefix_route(s): fix mod_destroy/tree_close() tree_close(), called from mod_destroy did not take into account the possibility of mod_init not being run (e.g. startup error). Reported-by: Klaus Darilion klaus.mailinglists pernau at --- modules_s/prefix_route/tree.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_s/prefix_route/tree.c b/modules_s/prefix_route/tree.c index 94fc0f5..57f07e2 100644 --- a/modules_s/prefix_route/tree.c +++ b/modules_s/prefix_route/tree.c @@ -334,7 +334,9 @@ int tree_init(void) void tree_close(void) { - tree_flush(tree_get()); + if (shared_tree) + tree_flush(tree_get()); + shared_tree = NULL; }

15 years, 6 months

git:master: makefile: fix make cfg when the cfg vars are already exported

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b5cb01a366c63dd1e3cbf1f488f38a5dd61c8f7d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5cb01a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jul 8 17:31:56 2009 +0200 makefile: fix make cfg when the cfg vars are already exported - when make cfg was called with the cfg vars already exported it failed to generate a proper config.mak (e.g. called from make deb) - extra config sanity check - s/mysql/db_mysql in the mysql module group - added "deb" to the list of targets that don't need dependencies (minor optimization) --- Makefile | 10 ++++++++-- Makefile.cfg | 1 + Makefile.targets | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a98b596..e203739 100644 --- a/Makefile +++ b/Makefile @@ -156,8 +156,8 @@ module_group_standard_dep=acc_db acc_radius auth_db auth_radius avp_db \ presence_b2b rls speeddial uri_db xcap xmlrpc # For mysql -module_group_mysql=acc_db auth_db avp_db db_ops uri_db domain lcr msilo mysql\ - speeddial +module_group_mysql=acc_db auth_db avp_db db_ops db_mysql uri_db domain lcr \ + msilo speeddial # For radius module_group_radius=acc_radius auth_radius avp_radius misc_radius peering @@ -264,6 +264,9 @@ ifeq ($(makefile_defs),1) $(info config.mak loaded) # config_make valid & used config_mak=1 +ifeq ($(MAIN_NAME),) +$(error "bad config.mak, try re-running make cfg") +endif endif else # config.mak doesn't need to be used ifneq (,$(filter cfg config cfg-defs,$(word 1,$(MAKECMDGOALS)))) @@ -273,6 +276,9 @@ ifneq (,$(filter cfg config cfg-defs,$(word 1,$(MAKECMDGOALS)))) # $(value ...) expansion or would cause some warning (if Makefile.defs exec. # is skipped in the "main" makefile invocation). $(shell rm -rf config.mak) +config_mak=0 +makefile_defs=0 +exported_vars=0 endif endif diff --git a/Makefile.cfg b/Makefile.cfg index d7b7c71..0ef3ead 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -14,6 +14,7 @@ #create config if needed $(COREPATH)/config.mak: makefile_defs=0 $(COREPATH)/config.mak: exported_vars=0 +$(COREPATH)/config.mak: config_mak=0 $(COREPATH)/config.mak: $(COREPATH)/Makefile.defs $(MAKE) -wC $(COREPATH) cfg-defs diff --git a/Makefile.targets b/Makefile.targets index 9ba0ef8..43d5d2b 100644 --- a/Makefile.targets +++ b/Makefile.targets @@ -35,7 +35,7 @@ doc_targets:= README man install-doc install-man install-ser-man \ # auxiliary: maintance, debugging, etc. (don't affect code/objects) aux_targets:= TAGS tar dist cfg-defs cfg config config.mak print-modules \ dbg dbinstall librpath.lst makecfg.lst modules.lst modules-cfg \ - modules-list modules-lst mk-install_dirs autover.h + modules-list modules-lst mk-install_dirs autover.h deb # other targets that don't produce code in the current directory ("external") ext_targets:= every-module $(modules_dirs) libs utils \ install-cfg install-utils install-modules-all install-every-module\

15 years, 6 months

[ openser-Bugs-2818273 ] crash when Content-length too big

by SourceForge.net

Bugs item #2818273, was opened at 2009-07-07 23:28 Message generated for change (Comment added) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2818273&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: None Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: crash when Content-length too big Initial Comment: Recently we encountered some crashes of kamailio 1.5.0 caused by messages with too big value of Content-length (more than 30000). When the parser in nathelper.c looks for old and new port it sometimes finds occurences after the real end of the message. Then the sanity check in del_lump() in data_lump.c finds that either offset or offset+len is greater than msg->len and calls abort(). ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-08 15:17 Message: 'kamailio -V' says 'kamailio 1.5.0-notls (x86_64/linux)' ---------------------------------------------------------------------- Comment By: Klaus Darilion (klaus_darilion) Date: 2009-07-08 08:38 Message: Which excat version are you using? There were some bugfixes recently. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2818273&group_…

15 years, 6 months

git:tmp/build_request: tm: update to new signature of build_req_buf_from_sip_req()

by Daniel-Constantin Mierla

Module: sip-router Branch: tmp/build_request Commit: fda26842518a286471ce27b5a74699dc798f64ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fda2684… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 8 13:09:50 2009 +0200 tm: update to new signature of build_req_buf_from_sip_req() --- modules/tm/t_fwd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 61e4315..d395664 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -211,7 +211,7 @@ static char *print_uac_request( struct cell *t, struct sip_msg *i_req, -i_req->REQ_METHOD); /* ... and build it now */ - buf=build_req_buf_from_sip_req( i_req, len, dst); + buf=build_req_buf_from_sip_req( i_req, len, dst, 0); #ifdef DBG_MSG_QA if (buf[*len-1]==0) { LOG(L_ERR, "ERROR: print_uac_request: sanity check failed\n");

15 years, 6 months

git:tmp/build_request: core: build_req_buf_from_sip_req() has a new parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: tmp/build_request Commit: 61f864106e136ab3100717f35511a0a82bcf9668 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61f8641… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 8 13:10:37 2009 +0200 core: build_req_buf_from_sip_req() has a new parameter - mode - a set of flags that define how the sip request is printed to buffer - BUILD_NO_LOCAL_VIA (1<<0) - skip adding local via - BUILD_NO_VIA1_UPDATE (1<<1) - skip updating top most via - BUILD_IN_SHM (1<<2) - output buffer allocated in memory - new function inc_msg_no() - increment and return msg_no - new function build_sip_msg_from_buf(...) to parse and partially fill sip_msg structure from a buffer --- forward.c | 2 +- msg_translator.c | 57 ++++++++++++++++++++++++++++++++++++++++++++--------- msg_translator.h | 9 +++++++- receive.c | 7 ++++++ receive.h | 2 +- 5 files changed, 64 insertions(+), 13 deletions(-) diff --git a/forward.c b/forward.c index f651120..3a9cb0c 100644 --- a/forward.c +++ b/forward.c @@ -433,7 +433,7 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port, #endif if (buf) pkg_free(buf); send_info->proto=proto; - buf = build_req_buf_from_sip_req(msg, &len, send_info); + buf = build_req_buf_from_sip_req(msg, &len, send_info, 0); if (!buf){ LOG(L_ERR, "ERROR: forward_request: building failed\n"); ret=E_OUT_OF_MEM; /* most probable */ diff --git a/msg_translator.c b/msg_translator.c index 2d1e9e5..41878e3 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1522,8 +1522,8 @@ error: */ char * build_req_buf_from_sip_req( struct sip_msg* msg, unsigned int *returned_len, - struct dest_info* send_info - ) + struct dest_info* send_info, + unsigned int mode) { unsigned int len, new_len, received_len, rport_len, uri_len, via_len, body_delta; @@ -1561,6 +1561,9 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, goto error00; } + if(unlikely(mode&BUILD_NO_LOCAL_VIA)) + goto after_local_via; + /* create the via header */ branch.s=msg->add_to_branch_s; branch.len=msg->add_to_branch_len; @@ -1571,6 +1574,9 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, "memory allocation failure\n"); goto error00; } +after_local_via: + if(unlikely(mode&BUILD_NO_VIA1_UPDATE)) + goto after_update_via1; /* check if received needs to be added */ if ( received_test(msg) ) { if ((received_buf=received_builder(msg,&received_len))==0){ @@ -1645,6 +1651,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, } +after_update_via1: /* compute new msg len and fix overlapping zones*/ new_len=len+body_delta+lumps_len(msg, msg->add_rm, send_info)+via_len; #ifdef XL_DEBUG @@ -1653,7 +1660,8 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, udp_mtu=cfg_get(core, core_cfg, udp_mtu); di.proto=PROTO_NONE; if (unlikely((send_info->proto==PROTO_UDP) && udp_mtu && - (flags & FL_MTU_FB_MASK) && (new_len>udp_mtu))){ + (flags & FL_MTU_FB_MASK) && (new_len>udp_mtu) + && (!(mode&BUILD_NO_LOCAL_VIA)))){ di=*send_info; /* copy whole struct - will be used in the Via builder */ di.proto=PROTO_NONE; /* except the proto */ @@ -1681,7 +1689,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, if (di.proto!=PROTO_NONE){ new_len-=via_len; - pkg_free(line_buf); + if(likely(line_buf)) pkg_free(line_buf); line_buf = create_via_hf( &via_len, msg, &di, &branch); if (!line_buf){ LOG(L_ERR,"ERROR: build_req_buf_from_sip_req: " @@ -1694,17 +1702,21 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, /* add via header to the list */ /* try to add it before msg. 1st via */ /* add first via, as an anchor for second via*/ - via_anchor=anchor_lump(msg, msg->via1->hdr.s-buf, 0, HDR_VIA_T); - if (via_anchor==0) goto error04; - if ((via_lump=insert_new_lump_before(via_anchor, line_buf, via_len, + if(likely(line_buf)) { + via_anchor=anchor_lump(msg, msg->via1->hdr.s-buf, 0, HDR_VIA_T); + if (via_anchor==0) goto error04; + if ((via_lump=insert_new_lump_before(via_anchor, line_buf, via_len, HDR_VIA_T))==0) - goto error04; - + goto error04; + } if (msg->new_uri.s){ uri_len=msg->new_uri.len; new_len=new_len-msg->first_line.u.request.uri.len+uri_len; } - new_buf=(char*)pkg_malloc(new_len+1); + if(unlikely(mode&BUILD_IN_SHM)) + new_buf=(char*)shm_malloc(new_len+1); + else + new_buf=(char*)pkg_malloc(new_len+1); if (new_buf==0){ ser_error=E_OUT_OF_MEM; LOG(L_ERR, "ERROR: build_req_buf_from_sip_req: out of memory\n"); @@ -2543,3 +2555,28 @@ char * build_all( struct sip_msg* msg, int touch_clen, *returned_len = offset; return new_buf; } + + + +/** + * parse buf in msg and fill several fields + */ +int build_sip_msg_from_buf(struct sip_msg *msg, char *buf, int len, + unsigned int id) +{ + if(msg==0 || buf==0) + return -1; + + memset(msg, 0, sizeof(sip_msg_t)); + msg->id = id; + msg->buf = buf; + msg->len = len; + if (parse_msg(buf, len, msg)!=0) { + LM_ERR("parsing failed"); + return -1; + } + msg->set_global_address=default_global_address; + msg->set_global_port=default_global_port; + return 0; +} + diff --git a/msg_translator.h b/msg_translator.h index a2a6b6a..95758df 100644 --- a/msg_translator.h +++ b/msg_translator.h @@ -48,6 +48,10 @@ /*#define MAX_CONTENT_LEN_BUF INT2STR_MAX_LEN *//* see ut.h/int2str() */ +#define BUILD_NO_LOCAL_VIA (1<<0) +#define BUILD_NO_VIA1_UPDATE (1<<1) +#define BUILD_IN_SHM (1<<2) + #include "parser/msg_parser.h" #include "ip_addr.h" @@ -76,7 +80,8 @@ struct hostport { }while(0) char * build_req_buf_from_sip_req ( struct sip_msg* msg, - unsigned int *returned_len, struct dest_info* send_info); + unsigned int *returned_len, struct dest_info* send_info, + unsigned int mode); char * build_res_buf_from_sip_res( struct sip_msg* msg, unsigned int *returned_len); @@ -152,4 +157,6 @@ char * build_all( struct sip_msg* msg, int adjust_clen, /** cfg framework fixup */ void fix_global_req_flags(str* gname, str* name); +int build_sip_msg_from_buf(struct sip_msg *msg, char *buf, int len, + unsigned int id); #endif diff --git a/receive.c b/receive.c index d5215bf..9f59933 100644 --- a/receive.c +++ b/receive.c @@ -76,6 +76,13 @@ str default_global_port={0,0}; str default_via_address={0,0}; str default_via_port={0,0}; +/** + * increment msg_no and return the new value + */ +unsigned int inc_msg_no(void) +{ + return ++msg_no; +} /* WARNING: buf must be 0 terminated (buf[len]=0) or some things might diff --git a/receive.h b/receive.h index 5cdc25b..911598f 100644 --- a/receive.h +++ b/receive.h @@ -33,6 +33,6 @@ #include "ip_addr.h" int receive_msg(char* buf, unsigned int len, struct receive_info *ri); - +unsigned int inc_msg_no(void); #endif

15 years, 6 months

git:tmp/build_request: tm: execute event_route[tm:local-request] if defined

by Daniel-Constantin Mierla

Module: sip-router Branch: tmp/build_request Commit: 8bae6347fdc3957110ae562e443f63dd8fd598a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bae634… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 8 13:08:30 2009 +0200 tm: execute event_route[tm:local-request] if defined - call event_route[tm:local-request] if defined and local requests are sent by tm (similar to K local_route) --- modules/tm/uac.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 96 insertions(+), 2 deletions(-) diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 6dfd0fc..e5aab83 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -82,7 +82,11 @@ #include "../../dns_cache.h" #include "../../cfg_core.h" /* cfg_get(core, core_cfg, use_dns_failover) */ #endif - +#ifdef WITH_EVENT_LOCAL_REQUEST +#include "../../receive.h" +#include "../../route.h" +#include "../../action.h" +#endif #define FROM_TAG_LEN (MD5_LEN + 1 /* - */ + CRC16_LEN) /* length of FROM tags */ @@ -187,7 +191,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, struct cell *new_cell; struct retr_buf *request; char* buf; - int buf_len, ret; + int buf_len, ret; unsigned int hi; int is_ack; ticks_t lifetime; @@ -195,6 +199,17 @@ static inline int t_uac_prepare(uac_req_t *uac_r, struct dns_srv_handle dns_h; #endif long nhtype; +#ifdef WITH_EVENT_LOCAL_REQUEST + int rt; + static struct sip_msg lreq; + char *buf1; + int buf_len1; + int sflag_bk; + int backup_route_type; + avp_list_t* backup_user_from, *backup_user_to; + avp_list_t* backup_domain_from, *backup_domain_to; + avp_list_t* backup_uri_from, *backup_uri_to; +#endif ret=-1; hi=0; /* make gcc happy */ @@ -309,6 +324,85 @@ static inline int t_uac_prepare(uac_req_t *uac_r, goto error1; } +#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) { + /* fill some field in sip_msg */ + if (set_dst_uri(&lreq, uac_r->dialog->hooks.next_hop)) { + LM_ERR("failed to set dst_uri"); + 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; + /* backup environment (e.g., AVP lists, ...) */ + backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, + &new_cell->uri_avps_from); + backup_uri_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, + &new_cell->uri_avps_to); + backup_user_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, + &new_cell->user_avps_from); + backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, + &new_cell->user_avps_to); + backup_domain_from = set_avp_list( + AVP_TRACK_FROM | AVP_CLASS_DOMAIN, + &new_cell->domain_avps_from); + backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, + &new_cell->domain_avps_to); + sflag_bk = getsflags(); + + /* run the route */ + backup_route_type = get_route_type(); + set_route_type(LOCAL_ROUTE); + run_top_route(event_rt.rlist[rt], &lreq); + set_route_type( backup_route_type ); + + /* restore original environment */ + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, backup_user_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, + backup_domain_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to); + setsflagsval(sflag_bk); + + if (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) + { + pkg_free(lreq.dst_uri.s); + lreq.dst_uri.s=0; + lreq.dst_uri.len=0; + } + + if (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, + &dst, BUILD_NO_LOCAL_VIA|BUILD_NO_VIA1_UPDATE| + BUILD_IN_SHM); + if (!buf1) { + free_sip_msg(&lreq); + } else { + shm_free(buf); + buf = buf1; + buf_len = buf_len1; + } + } + } + } + } +#endif + new_cell->method.s = buf; new_cell->method.len = uac_r->method->len;

15 years, 6 months

SF.net SVN: openser:[5898] branches

by Henning Westerholt

Revision: 5898 http://openser.svn.sourceforge.net/openser/?rev=5898&view=rev Author: henningw Date: 2009-07-08 10:57:37 +0000 (Wed, 08 Jul 2009) Log Message: ----------- - documentation extension related to the prime route behaviour Modified Paths: -------------- branches/1.3/modules/carrierroute/README branches/1.3/modules/carrierroute/doc/carrierroute_user.sgml branches/1.4/modules/carrierroute/README branches/1.4/modules/carrierroute/doc/carrierroute_admin.xml branches/1.5/modules/carrierroute/README branches/1.5/modules/carrierroute/doc/carrierroute_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

SF.net SVN: openser:[5897] branches

by Henning Westerholt

Revision: 5897 http://openser.svn.sourceforge.net/openser/?rev=5897&view=rev Author: henningw Date: 2009-07-08 10:38:08 +0000 (Wed, 08 Jul 2009) Log Message: ----------- - small fix in doxygen, fix obselete function description Modified Paths: -------------- branches/1.3/modules/carrierroute/route_func.c branches/1.4/modules/carrierroute/route_func.c branches/1.5/modules/carrierroute/cr_func.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev