sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

git:sr_3.0: Fixed tm_load import ( It would be advisable to use tm_load_api instead )

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 8854c7446dc60f7133c58aa7b498c47a406d5574 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8854c74… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 22 16:31:35 2009 +0300 Fixed tm_load import (It would be advisable to use tm_load_api instead ) (cherry picked from commit 12d008ca184460755f09bf4090f0298d4a092e84) --- modules_k/pua_xmpp/pua_xmpp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pua_xmpp/pua_xmpp.c b/modules_k/pua_xmpp/pua_xmpp.c index bc60bfc..3212c8d 100644 --- a/modules_k/pua_xmpp/pua_xmpp.c +++ b/modules_k/pua_xmpp/pua_xmpp.c @@ -136,11 +136,12 @@ static int mod_init(void) server_address.len= strlen(server_address.s); /* import the TM auto-loading function */ - if((load_tm=(load_tm_f)find_export("load_tm", 0, 0))==NULL) + if((load_tm=(load_tm_f)find_export("load_tm", NO_SCRIPT, 0))==NULL) { LM_ERR("can't import load_tm\n"); return -1; } + /* let the auto-loading function load all TM stuff */ if(load_tm(&tmb)==-1)

14 years, 5 months

git:sr_3.0: Fixed include guard

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: f53daa928b52414cd910ea32e77892ddfa4d9fcd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f53daa9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 22 16:14:06 2009 +0300 Fixed include guard Defined pua_send_* symbols as they where not defined when module was loaded (cherry picked from commit 3a2477ec529f87a51a6f1c0238ab8c12790b1807) --- modules_k/pua_usrloc/pua_usrloc.c | 2 ++ modules_k/pua_usrloc/pua_usrloc.h | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/pua_usrloc/pua_usrloc.c b/modules_k/pua_usrloc/pua_usrloc.c index ac5b637..a8bfda7 100644 --- a/modules_k/pua_usrloc/pua_usrloc.c +++ b/modules_k/pua_usrloc/pua_usrloc.c @@ -63,6 +63,8 @@ static int mod_init(void); int pua_set_publish(struct sip_msg* , char*, char*); +send_publish_t pua_send_publish; +send_subscribe_t pua_send_subscribe; static cmd_export_t cmds[]= { diff --git a/modules_k/pua_usrloc/pua_usrloc.h b/modules_k/pua_usrloc/pua_usrloc.h index ba50c75..673b02a 100644 --- a/modules_k/pua_usrloc/pua_usrloc.h +++ b/modules_k/pua_usrloc/pua_usrloc.h @@ -23,7 +23,7 @@ */ #ifndef _PUA_UL_ -#define _PUA_UL +#define _PUA_UL_ #include "../pua/pua_bind.h" extern send_publish_t pua_send_publish;

14 years, 5 months

git:sr_3.0: Added kmi module to linkage (because of ../../modules_k/ xcap_client/xcap_client.so: undefined symbol: register_mi_mod )

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 4a3712da5b3e7c8ed20748d9b57931690813af47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a3712d… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 22 15:20:46 2009 +0300 Added kmi module to linkage (because of ../../modules_k/xcap_client/xcap_client.so: undefined symbol: register_mi_mod ) (cherry picked from commit b5dd92caf75c3cc9076a0fc59149fbf80bcb0949) --- modules_k/xcap_client/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/xcap_client/Makefile b/modules_k/xcap_client/Makefile index 8548d49..74843e5 100644 --- a/modules_k/xcap_client/Makefile +++ b/modules_k/xcap_client/Makefile @@ -18,4 +18,6 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 +SER_LIBS+=$(SERLIBPATH)/kmi/kmi + include ../../Makefile.modules

14 years, 5 months

git:sr_3.0: If the user parameter is "<null>" (e. g a empty username in the request URI), do not copy this value to the rewritten uri.

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 084ad8a010db913785d23ccaeba654464cfd05f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=084ad8a… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 12 15:10:55 2009 +0300 If the user parameter is "<null>" (e.g a empty username in the request URI), do not copy this value to the rewritten uri. This is the case of a REGISTER request. Added statements that the parameters to the actually_rewrite func may not be null. (cherry picked from commit e06a69d625d4c1293fceef13f9eca22e14662f9f) --- modules/carrierroute/cr_func.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 607d7a2..316fde4 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -267,11 +267,10 @@ static struct route_rule * get_rule_by_hash(const struct route_flags * rf, /** * does the work for rewrite_on_rule, writes the new URI into dest * - * @param rs the route rule used for rewriting - * @param dest the returned new destination URI - * @param msg the sip message - * @param user the localpart of the uri to be rewritten - * @param descavp the name of the AVP where the description is stored + * @param rs the route rule used for rewriting, not NULL + * @param dest the returned new destination URI, not NULL + * @param msg the sip message, not NULL + * @param user the localpart of the uri to be rewritten, not NULL * * @return 0 on success, -1 on failure * @@ -284,11 +283,23 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, int_str avp_val; int strip = 0; + str l_user = *user; + strip = (rs->strip > user->len ? user->len : rs->strip); strip = (strip < 0 ? 0 : strip); - len = rs->local_prefix.len + user->len + rs->local_suffix.len + - AT_SIGN.len + rs->host.len - strip; + if ( strcmp(user->s, "<null>") == 0 || user->len == 0) + { + l_user.s = NULL; + l_user.len = 0; + len = rs->host.len; + strip = 0; + } + else{ + len = rs->local_prefix.len + l_user.len + rs->local_suffix.len + + AT_SIGN.len + rs->host.len - strip; + } + if (msg->parsed_uri.type == SIPS_URI_T) { len += SIPS_URI.len; } else { @@ -309,11 +320,11 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, memcpy(p, SIP_URI.s, SIP_URI.len); p += SIP_URI.len; } - if (user->len) { + if (l_user.len) { memcpy(p, rs->local_prefix.s, rs->local_prefix.len); p += rs->local_prefix.len; - memcpy(p, user->s + strip, user->len - strip); - p += user->len - strip; + memcpy(p, l_user.s + strip, l_user.len - strip); + p += l_user.len - strip; memcpy(p, rs->local_suffix.s, rs->local_suffix.len); p += rs->local_suffix.len; memcpy(p, AT_SIGN.s, AT_SIGN.len);

14 years, 5 months

git:kamailio_3.0: core: drop reply in K compatible style

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 062131954268d7b43bfd2544f93f46fb134e630c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0621319… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 29 11:28:20 2009 +0100 core: drop reply in K compatible style - drop reply in default onreply_route when using 'drop' --- receive.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/receive.c b/receive.c index b6e6f6e..6ff60ee 100644 --- a/receive.c +++ b/receive.c @@ -91,6 +91,7 @@ unsigned int inc_msg_no(void) int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) { struct sip_msg* msg; + struct run_act_ctx ctx; int ret; #ifdef STATS int skipped = 1; @@ -236,12 +237,15 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* exec the onreply routing script */ if (onreply_rt.rlist[DEFAULT_RT]){ set_route_type(ONREPLY_ROUTE); - ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, 0); + ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx); +#if 0 if (ret<0){ LOG(L_WARN, "WARNING: receive_msg: " "error while trying onreply script\n"); goto error_rpl; - }else if (ret==0){ + }else +#endif + if (ctx.run_flags&DROP_R_F){ sr_event_exec(SREV_CORE_STATS, (void*)4); goto skip_send_reply; /* drop the message, no error */ } @@ -274,11 +278,13 @@ end: if (skipped) STATS_RX_DROPS; #endif return 0; +#if 0 error_rpl: /* execute post reply-script callbacks */ exec_post_script_cb(msg, ONREPLY_CB_TYPE); reset_avps(); goto error02; +#endif error_req: DBG("receive_msg: error:...\n"); /* execute post request-script callbacks */

14 years, 6 months

git:kamailio_3.0: tm: drop reply in onreply_route[x]

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 1f2388acad2f8b2e611eade1eb532d510a48985b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f2388a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 29 11:49:38 2009 +0100 tm: drop reply in onreply_route[x] - K compatible mode to drop reply in TM onreply routes by using 'drop' for reply status < 200 --- modules/tm/t_reply.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 28e635e..d643245 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1846,6 +1846,7 @@ int reply_received( struct sip_msg *p_msg ) #ifdef TMCB_ONSEND struct tmcb_params onsend_params; #endif + struct run_act_ctx ctx; /* make sure we know the associated transaction ... */ if (t_check( p_msg , &branch )==-1) @@ -1984,8 +1985,10 @@ int reply_received( struct sip_msg *p_msg ) /* Pre- and post-script callbacks have already * 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"); + run_top_route(onreply_rt.rlist[t->on_reply], p_msg, &ctx); + if ((ctx.run_flags&DROP_R_F) && (msg_status<200)) { + goto done; + } /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; getbflagsval(0, &uac->branch_flags);

14 years, 6 months

git:kamailio_3.0: version set to 3.0.0-rc1

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: adef635f7568cdd66ad2a5828000578a8af7ae39 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=adef635… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 29 11:27:59 2009 +0100 version set to 3.0.0-rc1 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index c43267d..eb8577c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -145,7 +145,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -rc1 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) )

14 years, 6 months

git:kamailio_3.0: Makefile: removed modules_s from default compile list

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: d2de5be7fa8436ec33eabc4ade016b1c219c408b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2de5be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 29 10:39:17 2009 +0100 Makefile: removed modules_s from default compile list --- Makefile.dirs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.dirs b/Makefile.dirs index 74e6e54..ac9f0a9 100644 --- a/Makefile.dirs +++ b/Makefile.dirs @@ -18,6 +18,6 @@ override makefile_dirs_included:=1 # support '-' in variables) # makefile module related targets will be defined based on them: # install-$(1), install-$(1)-doc, $(1) a.s.o. -modules_dirs= modules modules_s modules_k +modules_dirs= modules modules_k endif

14 years, 6 months

git:sr_3.0: lib/srdb1/schema/gw.xml: index changes

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: f82dcdb10b1867989b5a2c85a951387a2ca4f85a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f82dcdb… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 29 10:38:56 2009 +0200 lib/srdb1/schema/gw.xml: index changes - Added grp_id to existing gw_name index. - Added new ip_addr index. --- lib/srdb1/schema/gw.xml | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/gw.xml b/lib/srdb1/schema/gw.xml index 842c9c8..bb2c354 100644 --- a/lib/srdb1/schema/gw.xml +++ b/lib/srdb1/schema/gw.xml @@ -122,10 +122,19 @@ </column> <index> - <name>lcr_id_gw_name_idx</name> + <name>lcr_id_grp_id_gw_name_idx</name> <colref linkend="lcr_id"/> + <colref linkend="grp_id"/> <colref linkend="gw_name"/> <unique/> </index> + <index> + <name>lcr_id_grp_id_ip_addr_idx</name> + <colref linkend="lcr_id"/> + <colref linkend="grp_id"/> + <colref linkend="ip_addr"/> + <unique/> + </index> + </table>

14 years, 6 months

git:sr_3.0: modules/lcr: bug fixes

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: a375b567c86cf1e066e7a56cce4697674aa9d1b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a375b56… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 29 10:27:54 2009 +0200 modules/lcr: bug fixes - Fixed selection of gateways's attributes when same gateway has different attributes in different groups. - Fixed printing of gateway's tag by lcr.dump_gws. --- modules/lcr/lcr_mod.c | 33 ++++++++++++++++++++------------- modules/lcr/lcr_rpc.c | 6 +++--- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 549e570..2b6c719 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -151,7 +151,7 @@ struct matched_gw_info { unsigned short prefix_len; unsigned short priority; unsigned int weight; - unsigned int defunct_until; + unsigned short duplicate; }; /* @@ -1412,7 +1412,7 @@ int mi_print_gws(struct mi_node* rpl) attr = add_mi_attr(node, MI_DUP_VALUE, "TAG", 3, gws[i].tag, gws[i].tag_len); if (attr == NULL) goto err; - + p = int2str((unsigned long)gws[i].weight, &len); attr = add_mi_attr(node, MI_DUP_VALUE, "WEIGHT", 6, p, len); if (attr == NULL) goto err; @@ -1658,6 +1658,7 @@ void add_gws_into_avps(struct gw_info *gws, struct matched_gw_info *matched_gws, delete_avp(gw_uri_avp_type|AVP_VAL_STR, gw_uri_avp); for (i = 0; i < gw_cnt; i++) { + if (matched_gws[i].duplicate == 1) continue; index = matched_gws[i].gw_index; hostname_len = gws[index].hostname_len; strip = gws[index].strip; @@ -1684,7 +1685,7 @@ void add_gws_into_avps(struct gw_info *gws, struct matched_gw_info *matched_gws, add_avp(gw_uri_avp_type|AVP_VAL_STR, gw_uri_avp, val); LM_DBG("added gw_uri_avp <%.*s> with weight <%u>\n", - value.len, value.s, matched_gws[i].weight); + value.len, value.s, matched_gws[i].weight); skip: continue; } @@ -1697,8 +1698,8 @@ void add_gws_into_avps(struct gw_info *gws, struct matched_gw_info *matched_gws, static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) { str ruri_user, from_uri; - unsigned int j, k, gw_index, gw_count, now; - int lcr_id; + int i, j, lcr_id; + unsigned int gw_index, gw_count, now, ip_addr; int_str val; struct matched_gw_info matched_gws[MAX_NO_OF_GWS + 1]; struct lcr_info **lcrs, *lcr_rec, *pl; @@ -1770,18 +1771,12 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) while (j) { /* If this gw is defunct, skip it */ if (gws[j].defunct_until > now) goto gw_found; - for (k = 0; k < gw_index; k++) { - if (gws[j].ip_addr == - gws[matched_gws[k].gw_index].ip_addr) - /* Skip already existing gw */ - goto gw_found; - } - /* This is a new gw */ matched_gws[gw_index].gw_index = j; matched_gws[gw_index].prefix_len = pl->prefix_len; matched_gws[gw_index].priority = lcr_rec->priority; matched_gws[gw_index].weight = gws[j].weight * (rand() >> 8); + matched_gws[gw_index].duplicate = 0; LM_DBG("added matched_gws[%d]=[%u, %u, %u, %u]\n", gw_index, j, pl->prefix_len, lcr_rec->priority, matched_gws[gw_index].weight); @@ -1796,9 +1791,21 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) pl = pl->next; } - /* Sort gateways based on prefix_len, priority, and randomized weight */ + /* Sort gateways in reverse order based on prefix_len, priority, + and randomized weight */ qsort(matched_gws, gw_index, sizeof(struct matched_gw_info), comp_matched); + /* Remove duplicate gws */ + for (i = gw_index - 1; i >= 0; i--) { + if (matched_gws[i].duplicate == 1) continue; + ip_addr = gws[matched_gws[i].gw_index].ip_addr; + for (j = i - 1; j >= 0; j--) { + if (gws[matched_gws[j].gw_index].ip_addr == ip_addr) { + matched_gws[j].duplicate = 1; + } + } + } + /* Add gateways into gw_uris_avp */ add_gws_into_avps(gws, matched_gws, gw_index, &ruri_user); diff --git a/modules/lcr/lcr_rpc.c b/modules/lcr/lcr_rpc.c index d9f5e72..51ffd75 100644 --- a/modules/lcr/lcr_rpc.c +++ b/modules/lcr/lcr_rpc.c @@ -74,7 +74,7 @@ static void dump_gws(rpc_t* rpc, void* c) if (rpc->add(c, "{", &st) < 0) return; rpc->struct_add(st, "d", "lcr_id", j); rpc->struct_add(st, "d", "grp_id", gws[i].grp_id); - rpc->struct_printf(st, "ip_addr", "%d.%d.%d.%d", + rpc->struct_printf(st, "ip_addr", "%d.%d.%d.%d", (gws[i].ip_addr << 24) >> 24, ((gws[i].ip_addr >> 8) << 24) >> 24, ((gws[i].ip_addr >> 16) << 24) >> 24, @@ -110,9 +110,9 @@ static void dump_gws(rpc_t* rpc, void* c) tag.len=gws[i].tag_len; rpc->struct_add(st, "dSddd", "strip", gws[i].strip, - "tag", gws[i].tag, /* FIXME */ + "tag", &tag, "weight", gws[i].weight, - "flags", &tag, + "flags", gws[i].flags, "defunct_until", &gws[i].defunct_until ); }

14 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2009