sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

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;

15 years, 2 months

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)

15 years, 2 months

git:sr_3.0: Fixed userblacklist exported function

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 988552519122e992911ac9e803c439fc7cbbddc5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9885525… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 19 11:27:25 2009 +0300 Fixed userblacklist exported function See http://lists.sip-router.org/pipermail/sr-dev/2009-October/004393.html thread for a complete description (cherry picked from commit ae18879b65d1a005639559ff689657b1cc2777d8) --- modules_k/userblacklist/userblacklist.c | 33 +++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/modules_k/userblacklist/userblacklist.c b/modules_k/userblacklist/userblacklist.c index 83a4f6e..57b2b84 100644 --- a/modules_k/userblacklist/userblacklist.c +++ b/modules_k/userblacklist/userblacklist.c @@ -82,6 +82,10 @@ static int check_user_blacklist_fixup(void** param, int param_no); /* ---- exported commands: */ static int check_user_blacklist(struct sip_msg *msg, char* str1, char* str2, char* str3, char* str4); static int check_user_whitelist(struct sip_msg *msg, char* str1, char* str2, char* str3, char* str4); +static int check_user_blacklist2(struct sip_msg *msg, char* str1, char* str2); +static int check_user_whitelist2(struct sip_msg *msg, char* str1, char* str2); +static int check_user_blacklist3(struct sip_msg *msg, char* str1, char* str2, char* str3); +static int check_user_whitelist3(struct sip_msg *msg, char* str1, char* str2, char* str3); static int check_blacklist(struct sip_msg *msg, struct check_blacklist_fs_t *arg1); /* ---- module init functions: */ @@ -95,10 +99,10 @@ struct mi_root * mi_reload_blacklist(struct mi_root* cmd, void* param); /* usag static cmd_export_t cmds[]={ - { "check_user_blacklist", (cmd_function)check_user_blacklist, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - { "check_user_whitelist", (cmd_function)check_user_whitelist, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - { "check_user_blacklist", (cmd_function)check_user_blacklist, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - { "check_user_whitelist", (cmd_function)check_user_whitelist, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_blacklist", (cmd_function)check_user_blacklist2, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_whitelist", (cmd_function)check_user_whitelist2, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_blacklist", (cmd_function)check_user_blacklist3, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_whitelist", (cmd_function)check_user_whitelist3, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_user_blacklist", (cmd_function)check_user_blacklist, 4, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_user_whitelist", (cmd_function)check_user_whitelist, 4, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_blacklist", (cmd_function)check_blacklist, 1, check_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, @@ -313,6 +317,27 @@ static int check_user_blacklist(struct sip_msg *msg, char* str1, char* str2, cha return check_user_list(msg, str1, str2, str3, str4, 0); } +static int check_user_whitelist2(struct sip_msg *msg, char* str1, char* str2) +{ + return check_user_list(msg, str1, str2, NULL, NULL, 1); +} + + +static int check_user_blacklist2(struct sip_msg *msg, char* str1, char* str2) +{ + return check_user_list(msg, str1, str2, NULL, NULL, 0); +} + +static int check_user_whitelist3(struct sip_msg *msg, char* str1, char* str2, char* str3) +{ + return check_user_list(msg, str1, str2, str3, NULL, 1); +} + + +static int check_user_blacklist3(struct sip_msg *msg, char* str1, char* str2, char* str3) +{ + return check_user_list(msg, str1, str2, str3, NULL, 0); +} /**

15 years, 2 months

git:sr_3.0: Fixed carrierroute module exports.

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 16f622e118daeffa2547243eeaf4d42c03f84b05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16f622e… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 19 12:46:17 2009 +0300 Fixed carrierroute module exports. See http://lists.sip-router.org/pipermail/sr-dev/2009-October/004393.html thread for a complete description (cherry picked from commit ca28401667bcf8d65d942fdb29033eadb6bb82b2) --- modules/carrierroute/carrierroute.c | 6 +++--- modules/carrierroute/cr_func.c | 23 +++++++++++++++++++++++ modules/carrierroute/cr_func.h | 9 +++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/modules/carrierroute/carrierroute.c b/modules/carrierroute/carrierroute.c index ab91609..56a76ea 100644 --- a/modules/carrierroute/carrierroute.c +++ b/modules/carrierroute/carrierroute.c @@ -87,11 +87,11 @@ static void mod_destroy(void); /************* Module Exports **********************************************/ static cmd_export_t cmds[]={ {"cr_user_carrier", (cmd_function)cr_load_user_carrier, 3, cr_load_user_carrier_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"cr_route", (cmd_function)cr_route, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"cr_route", (cmd_function)cr_route5, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_route", (cmd_function)cr_route, 6, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"cr_prime_route", (cmd_function)cr_prime_route, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"cr_prime_route", (cmd_function)cr_prime_route5, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_prime_route", (cmd_function)cr_prime_route, 6, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"cr_nofallback_route",(cmd_function)cr_nofallback_route, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"cr_nofallback_route",(cmd_function)cr_nofallback_route5, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_nofallback_route",(cmd_function)cr_nofallback_route, 6, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_next_domain", (cmd_function)cr_load_next_domain, 6, cr_load_next_domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {0, 0, 0, 0, 0, 0} diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 316fde4..425bb0c 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -677,6 +677,14 @@ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, _rewrite_user, _hsrc, alg_crc32, _descavp); } +int cr_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc) +{ + return cr_do_route(_msg, _carrier, _domain, _prefix_matching, + _rewrite_user, _hsrc, alg_crc32, NULL); +} + /** * rewrites the request URI of msg after determining the @@ -701,6 +709,13 @@ int cr_prime_route(struct sip_msg * _msg, gparam_t *_carrier, _rewrite_user, _hsrc, alg_prime, _descavp); } +int cr_prime_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc) +{ + return cr_do_route(_msg, _carrier, _domain, _prefix_matching, + _rewrite_user, _hsrc, alg_prime, NULL); +} /** * rewrites the request URI of msg after determining the * new destination URI with the crc32 hash algorithm. The difference @@ -726,6 +741,14 @@ int cr_nofallback_route(struct sip_msg * _msg, gparam_t *_carrier, _rewrite_user, _hsrc, alg_crc32_nofallback, _dstavp); } +int cr_nofallback_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc) +{ + return cr_do_route(_msg, _carrier, _domain, _prefix_matching, + _rewrite_user, _hsrc, alg_crc32_nofallback, NULL); +} + /** * Loads next domain from failure routing table and stores it in an AVP. diff --git a/modules/carrierroute/cr_func.h b/modules/carrierroute/cr_func.h index 9db6131..2fa9960 100644 --- a/modules/carrierroute/cr_func.h +++ b/modules/carrierroute/cr_func.h @@ -69,6 +69,9 @@ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, gparam_t *_descavp); +int cr_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc); /** @@ -89,6 +92,9 @@ int cr_prime_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, gparam_t *_descavp); +int cr_prime_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc); /** * @@ -111,6 +117,9 @@ int cr_nofallback_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, gparam_t *_dstavp); +int cr_nofallback_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc); /**

15 years, 2 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);

15 years, 2 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 */

15 years, 2 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) )

15 years, 2 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

15 years, 2 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>

15 years, 2 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 ); }

15 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev