sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:master: Merge commit 'origin/rbetancor/drouting'

by Raul Alexis Betancor Santana

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 ---

15 years, 6 months

git:rbetancor/drouting: drouting: blacklist functions remove

by Raul Alexis Betancor Santana

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; }

15 years, 6 months

git:rbetancor/drouting: Merge branch 'master' into drouting

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: 75837023e6793499720e06cff4a867633e8f21e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7583702… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Thu Jul 2 21:14:37 2009 +0100 Merge branch 'master' into drouting * master: (728 commits) tm: suspended transaction was not always replied and freed core: fix EXTRA_DEBUG information about second via in parse_msg nathelper(k): fix for very long payload-type nathelper (k): fix for flag 'l' avpops: merge avpops modules according to Di-Shi are K's and ser's osp module more or less the same, whereas Kamailio's osp module should be more up2date than ser's module. Thus, ser's osp module will be removed and K's osp module will be used as common OSP module. remove shm_str_dup() from tls_util.[c|h] as it breaks compilation and is not used at all cfg framework: documentation for cfg_read_var* Add missed <sys/select.h> include. cfg framework: read variables by name with a handle domain: init db connection for RPC process presence: use event name from parsed structure core: parse_event - skip first ; for parameters select_core: fix @ruri.rn_user moving parsed ptr modules/lcr: fixed printing of lcr_id by lcr.dump_lcrs carrierroute: port from 1.5 branch, r5885 siputils(k): port from 1.5 branch, r5880 carrierroute: port from 1.5 branch, r5877 carrierroute: port from 1.5 branch, r5876, remove dead code (double return) registrar(k): port from 1.5 branch, r5873 ... ---

15 years, 6 months

git merge

by Raúl Alexis Betancor Santana

Before doing a dissaster .. :-P How should I merge the rbentancor/drouting branch into the master branch taking into account that master branch have changes I do not have on drouting branch. There are not possible conflicts, because I only worked on the drouting module, anything more. -- Raúl Alexis Betancor Santana Dimensión Virtual

15 years, 6 months

irc devel meeting

by Daniel-Constantin Mierla

Hello, within K project, we had from time to time an IRC meeting for short term planning. IMO it is the time for next one since probably we need at least a kamailio 1.5.2 release. The place was the irc channel #kamailio on freenode.net, now we can host it on #sip-router. Presence is not mandatory and anyone is welcome to join. From the perspective of K project, here are the topics I would like to approach: - kamailio 1.5.2 - show-stoppers, when? - shall we do another branch 1.4-based release - kamailio 3.0 - current status - what is missing, what can be worked-around, prioritizing tasks... - documentation - migration tutorials - release roadmap For sip router: - logistics: anything missing for project now? - what can be done to make adoption easier (new tools, etc...) - suggestions for future development I propose Tuesday, July 7, 2009, we can adjust to fit the best for the people that want to attend. I started a wiki page, feel free to add there: https://sip-router.org/wiki/devel/irc-meetings/2009-07-07 Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 6 months

SF.net SVN: openser:[5896] branches/1.5/packaging/debian

by Henning Westerholt

Revision: 5896 http://openser.svn.sourceforge.net/openser/?rev=5896&view=rev Author: henningw Date: 2009-07-07 14:50:00 +0000 (Tue, 07 Jul 2009) Log Message: ----------- - fix recently introduced error in postinst, user is called kamailio - add migration helper preinst for core and radius - add watch file Modified Paths: -------------- branches/1.5/packaging/debian/kamailio.postinst Added Paths: ----------- branches/1.5/packaging/debian/kamailio-radius-modules.preinst branches/1.5/packaging/debian/kamailio.preinst branches/1.5/packaging/debian/watch 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:[5895] branches

by Henning Westerholt

Revision: 5895 http://openser.svn.sourceforge.net/openser/?rev=5895&view=rev Author: henningw Date: 2009-07-07 14:26:47 +0000 (Tue, 07 Jul 2009) Log Message: ----------- - fix (partly) wrong Changelog update in r5886, this belong to a _new_ release Modified Paths: -------------- branches/1.4/ChangeLog branches/1.5/ChangeLog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

git:master: core: error handling for non-sip hooks

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 471589c5c0ae27e9d3937e3b9318982a8ec96fc7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=471589c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 6 22:54:52 2009 +0200 core: error handling for non-sip hooks receive_msg will exit with error if a non-sip msg hook returns NONSIP_MSG_ERROR. --- receive.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/receive.c b/receive.c index ac92867..d5215bf 100644 --- a/receive.c +++ b/receive.c @@ -125,8 +125,11 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if (msg->first_line.type==SIP_REQUEST){ if (!IS_SIP(msg)){ - if (nonsip_msg_run_hooks(msg)!=NONSIP_MSG_ACCEPT) + if ((ret=nonsip_msg_run_hooks(msg))!=NONSIP_MSG_ACCEPT){ + if (unlikely(ret==NONSIP_MSG_ERROR)) + goto error03; goto end; /* drop the message */ + } } /* sanity checks */ if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ @@ -257,6 +260,7 @@ error_req: DBG("receive_msg: error:...\n"); /* execute post request-script callbacks */ exec_post_script_cb(msg, REQUEST_CB_TYPE); +error03: /* free possible loaded avps -bogdan */ reset_avps(); error02:

15 years, 6 months

git:master: xmlrpc: propagate route error exit

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 78120e1cad5769d18899e77f1583b863a03ecbea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78120e1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 6 22:58:19 2009 +0200 xmlrpc: propagate route error exit If the xmlrpc route exits with error, propagate the error downwards (return NONSIP_MSG_ERROR instead of NONSIP_MSG_DROP). --- modules_s/xmlrpc/xmlrpc.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules_s/xmlrpc/xmlrpc.c b/modules_s/xmlrpc/xmlrpc.c index 6b90298..56b2151 100644 --- a/modules_s/xmlrpc/xmlrpc.c +++ b/modules_s/xmlrpc/xmlrpc.c @@ -1737,9 +1737,11 @@ static char* http_xmlrpc2sip(sip_msg_t* msg, int* new_msg_len) static int em_receive_request(sip_msg_t* orig_msg, char* new_buf, unsigned int new_len) { + int ret; sip_msg_t tmp_msg, *msg; struct run_act_ctx ra_ctx; + ret=0; if (new_buf && new_len) { memset(&tmp_msg, 0, sizeof(sip_msg_t)); tmp_msg.buf = new_buf; @@ -1772,7 +1774,8 @@ static int em_receive_request(sip_msg_t* orig_msg, /* exec routing script */ init_run_actions_ctx(&ra_ctx); if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { - WARN("xmlrpc: error while trying script\n"); + ret=-1; + DBG("xmlrpc: error while trying script\n"); goto end; } end: @@ -1782,7 +1785,7 @@ static int em_receive_request(sip_msg_t* orig_msg, too) */ free_sip_msg(msg); } - return 0; + return ret; error: return -1; } @@ -1793,11 +1796,13 @@ static int em_receive_request(sip_msg_t* orig_msg, */ static int process_xmlrpc(sip_msg_t* msg) { + int ret; char* fake_msg; int fake_msg_len; unsigned char* method; unsigned int method_len, n_method; + ret=NONSIP_MSG_DROP; if (IS_HTTP(msg)) { method = (unsigned char*)msg->first_line.u.request.method.s; method_len = msg->first_line.u.request.method.len; @@ -1815,21 +1820,23 @@ static int process_xmlrpc(sip_msg_t* msg) fake_msg = http_xmlrpc2sip(msg, &fake_msg_len); if (fake_msg == 0) { ERR("xmlrpc: out of memory\n"); + ret=NONSIP_MSG_ERROR; } else { /* send it */ DBG("new fake xml msg created (%d bytes):\n<%.*s>\n", fake_msg_len, fake_msg_len, fake_msg); - em_receive_request(msg, fake_msg, fake_msg_len); - /* ignore the return code */ + if (em_receive_request(msg, fake_msg, fake_msg_len)<0) + ret=NONSIP_MSG_ERROR; pkg_free(fake_msg); } - return NONSIP_MSG_DROP; /* we "ate" the message, + return ret; /* we "ate" the message, stop processing */ } else { /* the message has a via */ DBG("http xml msg unchanged (%d bytes):\n<%.*s>\n", msg->len, msg->len, msg->buf); - em_receive_request(msg, 0, 0); - return NONSIP_MSG_DROP; + if (em_receive_request(msg, 0, 0)<0) + ret=NONSIP_MSG_ERROR; + return ret; } } else { ERR("xmlrpc: bad HTTP request method: \"%.*s\"\n",

15 years, 6 months

[tracker] Task opened: (kamailio) Modify branch attributes via psuedo variables

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Bob McGilvray (rmcgilvr) Attached to Project - sip-router Summary - (kamailio) Modify branch attributes via psuedo variables Task Type - Feature Request Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - It's not currently possible (in kamailio) to modify the Q value of a branch via psuedo variables and since append_branch doesn't support avps or script variables it's not possible to do at all dynamically (at least from the script itself). It would be nice to see something along the lines of what was just introduced into opensips, using the $branch(...) pv, or a modification to $br to allow assignment of a Q when creating the branch. $br = "<sip:" + $avp(s:newuri) + ";q=" + $avp(s:newuri_q); $(branch(q)[0]) = 1.0; $(branch(q)[1]) = 0.9; I apologize if this isn't the right tracker, I'm following a suggestion by someone on the kam users list. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=8 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

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