sr-dev July 2009

sr-dev@lists.kamailio.org

35 participants
328 discussions

git:tmp/build_request: tm: execute event_route[tm:local-request] if defined
by Daniel-Constantin Mierla 08 Jul '09

08 Jul '09

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;

1 0

git:tmp/build_request: core: build_req_buf_from_sip_req() has a new parameter
by Daniel-Constantin Mierla 08 Jul '09

08 Jul '09

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

1 0

git:tmp/build_request: tm: update to new signature of build_req_buf_from_sip_req()
by Daniel-Constantin Mierla 08 Jul '09

08 Jul '09

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");

1 0

SF.net SVN: openser:[5898] branches
by Henning Westerholt 08 Jul '09

08 Jul '09

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.

1 0

SF.net SVN: openser:[5897] branches
by Henning Westerholt 08 Jul '09

08 Jul '09

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.

1 0

[ openser-Bugs-2818273 ] crash when Content-length too big
by SourceForge.net 08 Jul '09

08 Jul '09

Bugs item #2818273, was opened at 2009-07-08 01:28 Message generated for change (Comment added) made by klaus_darilion 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: Klaus Darilion (klaus_darilion) Date: 2009-07-08 10: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_…

1 0

[ openser-Bugs-2818273 ] crash when Content-length too big
by SourceForge.net 07 Jul '09

07 Jul '09

Bugs item #2818273, was opened at 2009-07-07 23:28 Message generated for change (Tracker Item Submitted) 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(). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2818273&group_…

1 0

git:master: drouting: Updated documentation
by Raul Alexis Betancor Santana 07 Jul '09

07 Jul '09

Module: sip-router Branch: master Commit: 94ed30477687aa255a5b022eafe3aec8811c8214 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94ed304… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Tue Jul 7 19:43:48 2009 +0100 drouting: Updated documentation - Erased references to blacklist management --- modules_k/drouting/doc/drouting_admin.xml | 33 ----------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) diff --git a/modules_k/drouting/doc/drouting_admin.xml b/modules_k/drouting/doc/drouting_admin.xml index 1e53523..ffc5cb3 100644 --- a/modules_k/drouting/doc/drouting_admin.xml +++ b/modules_k/drouting/doc/drouting_admin.xml @@ -80,15 +80,6 @@ </para> </listitem> - <listitem> - <para> - blacklisting - the module allows definition of backlists based on the - destination IPs. This blacklists are to be used to prevent malicious - forwarding to GWs (based on DNS lookups) when the script logic does - none-GE forwarding (like foreign domains). - </para> - </listitem> - </itemizedlist> </section> @@ -1005,30 +996,6 @@ modparam("drouting", "atrrs_avp", '$avp(i:67)') </section> <section> - <title><varname>define_blacklist</varname> (str)</title> - <para> - Defines a backlist based on a list of GW types - the list will contain - the IPs (no port, all protocols) of the GWs with the specified types. - </para> - <para> - Multiple instances of this param are allowed. - </para> - <para> - <emphasis>Default value is <quote>NULL</quote>. - </emphasis> - </para> - <example> - <title>Set <varname>define_blacklist</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("drouting", "define_blacklist", 'bl_name= 3,5,25,23') -modparam("drouting", "define_blacklist", 'list= 4,2') -... - </programlisting> - </example> - </section> - - <section> <title><varname>use_domain</varname> (int)</title> <para> Flag to configure whether to use domain match when querying

1 0

git:master: Merge commit 'origin/rbetancor/drouting'
by Raul Alexis Betancor Santana 07 Jul '09

07 Jul '09

Module: sip-router Branch: master Commit: dd0874121b2bc8c0a2a76a4cd3238e1a8e720be2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd08741… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Tue Jul 7 19:41:39 2009 +0100 Merge commit 'origin/rbetancor/drouting' * commit 'origin/rbetancor/drouting': drouting: blacklist functions remove drouting: Now the module compiles, but it's not tested drouting: drouting: drouting: drouting: Module for more flexible dynamic routing rules drouting: Documentation updated drouting: Updated all Copyright notices drouting: Makefile fixed to compile with OPENSER_MOD_INTERFACE drouting: new module to support Dynamic Routing ---

1 0

git:rbetancor/drouting: drouting: blacklist functions remove
by Raul Alexis Betancor Santana 07 Jul '09

07 Jul '09

Module: sip-router Branch: rbetancor/drouting Commit: 4df07e0bc7f8ac71dd788bf4d4b79072e7ea7d42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4df07e0… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Tue Jul 7 17:48:39 2009 +0100 drouting: blacklist functions remove - All blacklist management functions removed, core take cares of BL when sending out request as we only rewrite uri's --- modules_k/drouting/dr_bl.c | 203 ----------------------------------------- modules_k/drouting/dr_bl.h | 52 ----------- modules_k/drouting/drouting.c | 13 --- 3 files changed, 0 insertions(+), 268 deletions(-) diff --git a/modules_k/drouting/dr_bl.c b/modules_k/drouting/dr_bl.c deleted file mode 100644 index 3e38585..0000000 --- a/modules_k/drouting/dr_bl.c +++ /dev/null @@ -1,203 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2005-2009 Voice Sistem SRL - * - * This file is part of Kamailio, a free SIP server. - * - * Kamailio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Kamailio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * History: - * --------- - * 2009-01-19 first version (bogdan) - */ - - - -#include <string.h> - -#include "../../mem/mem.h" -#include "../../mem/shm_mem.h" -#include "../../dprint.h" -#include "../../ut.h" -#include "../../trim.h" -#include "prefix_tree.h" -#include "dr_bl.h" - - -static struct dr_bl *drbl_lists = NULL; - -static char **bl_lists=NULL; -static unsigned int bl_lists_size = 0; - - -int set_dr_bl( modparam_t type, void* val) -{ - bl_lists = pkg_realloc( bl_lists, (bl_lists_size+1)*sizeof(char*)); - if (bl_lists==NULL) { - LM_ERR("failed to realloc\n"); - return -1; - } - bl_lists[bl_lists_size] = (char*)val; - bl_lists_size++; - return 0; -} - - -int init_dr_bls(void) -{ - unsigned int i; - struct dr_bl *drbl; - str name; - str val; - char *p; - - if (bl_lists==NULL) - return 0; - - for( i=0 ; i<bl_lists_size ; i++ ) { - LM_DBG("processing bl definition <%s>\n",bl_lists[i]); - /* get name */ - p = strchr( bl_lists[i], '='); - if (p==NULL || p== bl_lists[i]) { - LM_ERR("blaclist definition <%s> has no name",bl_lists[i]); - return -1; - } - name.s = bl_lists[i]; - name.len = p - name.s; - trim(&name); - if (name.len==0) { - LM_ERR("empty name in blacklist definition <%s>\n",bl_lists[i]); - return -1; - } - LM_DBG("found list name <%.*s>\n",name.len,name.s); - /* alloc structure */ - drbl = (struct dr_bl*)shm_malloc( sizeof(struct dr_bl) ); - if (drbl==NULL) { - LM_ERR("no more shme memory\n"); - return -1; - } - memset( drbl, 0, sizeof(struct dr_bl)); - /* fill in the types */ - p++; - do { - if (drbl->no_types==MAX_TYPES_PER_BL) { - LM_ERR("too many types per rule <%s>\n",bl_lists[i]); - shm_free(drbl); - return -1; - } - val.s = p; - p = strchr( p, ','); - if (p==NULL) { - val.len = strlen(val.s); - } else { - val.len = (int)(long)(p - val.s); - p++; - } - trim(&val); - if (val.len==0) { - LM_ERR("invalid types listing in <%s>\n",bl_lists[i]); - shm_free(drbl); - return -1; - } - LM_DBG("found type <%.*s>\n",val.len,val.s); - if (str2int( &val, &drbl->types[drbl->no_types])!=0) { - LM_ERR("nonnumerical type <%.*s>\n",val.len,val.s); - shm_free(drbl); - return -1; - } - drbl->no_types++; - }while(p!=NULL); - - pkg_free(bl_lists[i]); - bl_lists[i] = NULL; - - /* create backlist for it */ - //drbl->bl = create_bl_head( 131313, 0/*flags*/, NULL, NULL, &name); - //if (drbl->bl==NULL) { - // LM_ERR("failed to create bl <%.*s>\n",name.len,name.s); - // shm_free(drbl); - // return -1; - //} - - /* link it */ - drbl->next = drbl_lists; - drbl_lists = drbl; - } - - pkg_free(bl_lists); - bl_lists = NULL; - - return 0; -} - - - -void destroy_dr_bls(void) -{ - struct dr_bl *drbl; - struct dr_bl *drbl1; - - for( drbl=drbl_lists ; drbl ; ) { - drbl1 = drbl; - drbl = drbl->next; - shm_free(drbl1); - } -} - - -int populate_dr_bls(pgw_addr_t *pgwa) -{ - unsigned int i; - struct dr_bl *drbl; - pgw_addr_t *gw; - struct bl_rule *drbl_first; - struct bl_rule *drbl_last; - struct net *gw_net; - - /* each bl list at a time */ - for( drbl=drbl_lists ; drbl ; drbl = drbl->next ) { - drbl_first = drbl_last = NULL; - /* each type at a time */ - for ( i=0 ; i<drbl->no_types ; i++ ) { - /* search in the GW list all GWs of this type */ - for( gw=pgwa ; gw ; gw=gw->next ) { - if (gw->type==drbl->types[i]) { - gw_net = mk_net_bitlen( &gw->ip, gw->ip.len*8); - if (gw_net==NULL) { - LM_ERR("failed to build net mask\n"); - continue; - } - /* add this destination to the BL */ - //add_rule_to_list( &drbl_first, &drbl_last, - // gw_net, - // NULL/*body*/, - // 0/*port*/, - // PROTO_NONE/*proto*/, - // 0/*flags*/); - pkg_free(gw_net); - } - } - } - /* the new content for the BL */ - //if (add_list_to_head( drbl->bl, drbl_first, drbl_last, 1, 0)!=0) { - // LM_ERR("failed to update bl\n"); - // return -1; - //} - } - - return 0; -} - diff --git a/modules_k/drouting/dr_bl.h b/modules_k/drouting/dr_bl.h deleted file mode 100644 index e9547b0..0000000 --- a/modules_k/drouting/dr_bl.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2005-2009 Voice Sistem SRL - * - * This file is part of Kamailio, a free SIP server. - * - * Kamailio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Kamailio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * History: - * --------- - * 2009-01-19 first version (bogdan) - */ - - -#ifndef _DR_DR_BL_H -#define _DR_DR_BL_H - -#include "../../sr_module.h" -//#include "../../blacklists.h" -#include "prefix_tree.h" - -#define MAX_TYPES_PER_BL 32 - -struct dr_bl { - unsigned int no_types; - unsigned int types[MAX_TYPES_PER_BL]; - struct bl_head *bl; - struct dr_bl *next; -}; - -int set_dr_bl( modparam_t type, void* val); - -int init_dr_bls(void); - -void destroy_dr_bls(void); - -int populate_dr_bls(pgw_addr_t *pgwa); - -#endif diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index 9c92a31..7120338 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -50,7 +50,6 @@ #include "dr_load.h" #include "prefix_tree.h" #include "routing.h" -#include "dr_bl.h" /*** DB relatede stuff ***/ @@ -174,7 +173,6 @@ static param_export_t params[] = { {"sort_order", INT_PARAM, &sort_order }, {"fetch_rows", INT_PARAM, &dr_fetch_rows }, {"force_dns", INT_PARAM, &dr_force_dns }, - {"define_blacklist",STR_PARAM|USE_FUNC_PARAM, (void*)set_dr_bl }, {0, 0, 0} }; @@ -261,9 +259,6 @@ static inline int dr_reload_data( void ) if (old_data) free_rt_data( old_data, 1 ); - /* generate new blacklist from the routing info */ - populate_dr_bls((*rdata)->pgw_addr_l); - return 0; } @@ -346,11 +341,6 @@ static int dr_init(void) } } - if (init_dr_bls()!=0) { - LM_ERR("failed to init DR blacklists\n"); - return E_CFG; - } - /* data pointer in shm */ rdata = (rt_data_t**)shm_malloc( sizeof(rt_data_t*) ); if (rdata==0) { @@ -467,9 +457,6 @@ static int dr_exit(void) if(data_refcnt) shm_free(data_refcnt); - /* destroy blacklists */ - destroy_dr_bls(); - return 0; }

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2009