sr-dev January 2010

sr-dev@lists.kamailio.org

28 participants
289 discussions

git:kamailio_3.0: topoh: code to update Refer-to URI
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 0583dc249d72b36fe93763542e861d881fb0830f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0583dc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 20 17:50:51 2009 +0100 topoh: code to update Refer-to URI (cherry picked from commit e9400dba371252edef970407be7b85dbe45e1ea3) --- modules/topoh/th_msg.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ modules/topoh/th_msg.h | 1 + modules/topoh/topoh_mod.c | 1 + 3 files changed, 62 insertions(+), 0 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index 5a4837c..db0de77 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -32,6 +32,7 @@ #include "../../parser/parse_to.h" #include "../../parser/parse_via.h" #include "../../parser/contact/parse_contact.h" +#include "../../parser/parse_refer_to.h" #include "th_mask.h" #include "th_msg.h" @@ -668,6 +669,65 @@ int th_unmask_ruri(sip_msg_t *msg) return 0; } +int th_unmask_refer_to(sip_msg_t *msg) +{ + str eval; + str *uri; + int ulen; + struct lump* l; + str out; + + if(!((get_cseq(msg)->method_id)&(METHOD_REFER))) + return 0; + + if(parse_refer_to_header(msg)==-1) + { + LM_DBG("no Refer-To header\n"); + return 0; + } + if(msg->refer_to==NULL || get_refer_to(msg)==NULL) + { + LM_DBG("Refer-To header not found\n"); + return 0; + } + + uri = &(get_refer_to(msg)->uri); + if(th_get_uri_param_value(uri, &th_uparam_name, &eval)<0 + || eval.len<=0) + return -1; + + out.s = th_mask_decode(eval.s, eval.len, + &th_uparam_prefix, 0, &out.len); + if(out.s==NULL) + { + LM_ERR("cannot decode r-uri\n"); + return -1; + } + + LM_DBG("+decoded: %d: [%.*s]\n", out.len, out.len, out.s); + for(ulen=0; ulen<uri->len; ulen++) + { + if(uri->s[ulen]=='?') + break; + } + + l=del_lump(msg, uri->s-msg->buf, ulen, 0); + if (l==0) + { + LM_ERR("failed deleting r-uri\n"); + pkg_free(out.s); + return -1; + } + if (insert_new_lump_after(l, out.s, out.len, 0)==0) + { + LM_ERR("could not insert new lump\n"); + pkg_free(out.s); + return -1; + } + + return 0; +} + char* th_msg_update(sip_msg_t *msg, unsigned int *olen) { struct dest_info dst; diff --git a/modules/topoh/th_msg.h b/modules/topoh/th_msg.h index 6e1fd99..b68f63b 100644 --- a/modules/topoh/th_msg.h +++ b/modules/topoh/th_msg.h @@ -32,6 +32,7 @@ int th_unmask_callid(sip_msg_t *msg); int th_flip_record_route(sip_msg_t *msg, int mode); int th_unmask_ruri(sip_msg_t *msg); int th_unmask_route(sip_msg_t *msg); +int th_unmask_refer_to(sip_msg_t *msg); char* th_msg_update(sip_msg_t *msg, unsigned int *olen); int th_add_via_cookie(sip_msg_t *msg, struct via_body *via); int th_add_hdr_cookie(sip_msg_t *msg); diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 4b341dd..5fb092b 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -207,6 +207,7 @@ int th_msg_received(void *data) /* dialog request */ th_unmask_ruri(&msg); th_unmask_route(&msg); + th_unmask_refer_to(&msg); if(direction==1) { th_unmask_callid(&msg);

1 0

git:kamailio_3.0: topoh: callid prefix can be set via param
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: aa33e011e20e5a5faa5c15d8e64eaf875aaeb788 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa33e01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 20 12:49:59 2009 +0100 topoh: callid prefix can be set via param (cherry picked from commit a8f1190d0a400c34809af798a482311539b15527) --- modules/topoh/topoh_mod.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 53eb111..4b341dd 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -66,6 +66,7 @@ static param_export_t params[]={ {"uparam_prefix", STR_PARAM, &th_uparam_prefix.s}, {"vparam_name", STR_PARAM, &th_vparam_name.s}, {"vparam_prefix", STR_PARAM, &th_vparam_prefix.s}, + {"callid_prefix", STR_PARAM, &th_callid_prefix.s}, {0,0,0} }; @@ -97,6 +98,7 @@ static int mod_init(void) th_uparam_prefix.len = strlen(th_uparam_prefix.s); th_vparam_name.len = strlen(th_vparam_name.s); th_vparam_prefix.len = strlen(th_vparam_prefix.s); + th_callid_prefix.len = strlen(th_callid_prefix.s); /* 'SIP/2.0/UDP ' + ip + ';' + param + '=' + prefix (+ '\0') */ th_via_prefix.len = 12 + th_ip.len + 1 + th_vparam_name.len + 1

1 0

git:kamailio_3.0: topoh: add prefix to encoded callid
by Daniel-Constantin Mierla 03 Jan '10

03 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 89c8c1733777f48a94004eedb6a891717260c0e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89c8c17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 20 12:46:10 2009 +0100 topoh: add prefix to encoded callid (cherry picked from commit 9d5a1ff7736d49794d5ca0f29e118d90f0ee5b68) --- modules/topoh/th_msg.c | 9 +++++---- modules/topoh/topoh_mod.c | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index eab6a42..5a4837c 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -39,6 +39,7 @@ extern str th_cookie_name; extern str th_cookie_value; extern str th_via_prefix; extern str th_uri_prefix; +extern str th_callid_prefix; extern str th_ip; extern str th_uparam_name; @@ -208,8 +209,8 @@ int th_mask_callid(sip_msg_t *msg) return -1; } - out.s = th_mask_encode(msg->callid->body.s, msg->callid->body.len, 0, - &out.len); + out.s = th_mask_encode(msg->callid->body.s, msg->callid->body.len, + &th_callid_prefix, &out.len); if(out.s==NULL) { LM_ERR("cannot encode callid\n"); @@ -444,8 +445,8 @@ int th_unmask_callid(sip_msg_t *msg) return -1; } - out.s = th_mask_decode(msg->callid->body.s, msg->callid->body.len, 0, 0, - &out.len); + out.s = th_mask_decode(msg->callid->body.s, msg->callid->body.len, + &th_callid_prefix, 0, &out.len); if(out.s==NULL) { LM_ERR("cannot decode callid\n"); diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index fdba6a1..53eb111 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -47,6 +47,7 @@ str th_uparam_prefix = {"sr-", 0}; str th_vparam_name = {"branch", 0}; str th_vparam_prefix = {"z9hG4bKsr-", 0}; +str th_callid_prefix = {"!!:", 3}; str th_via_prefix = {0, 0}; str th_uri_prefix = {0, 0};

1 0

git:master: modules_k/drouting: Merging changes with recent OpenSIPS module
by Raul Alexis Betancor Santana 03 Jan '10

03 Jan '10

Module: sip-router Branch: master Commit: d8990997b914b4f806da703b58791db57ff041ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d899099… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Sun Jan 3 06:20:55 2010 +0000 modules_k/drouting: Merging changes with recent OpenSIPS module - routeid field of database table ?dr_rules? as string, not as int Patch provided by Andrey 'Krieger' Utkin <andrey.utkin(a)wildix.com> FS#24 --- modules_k/drouting/dr_load.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/modules_k/drouting/dr_load.c b/modules_k/drouting/dr_load.c index 3d833d9..a8b6f05 100644 --- a/modules_k/drouting/dr_load.c +++ b/modules_k/drouting/dr_load.c @@ -34,6 +34,7 @@ #include "../../dprint.h" +#include "../../route.h" //#include "../../db/db.h" #include "../../mem/shm_mem.h" @@ -280,7 +281,7 @@ rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db1_con_t* db_hdl, str *drd_table, str *drl_table, str* drr_table ) { int int_vals[4]; - char * str_vals[4]; + char * str_vals[5]; str tmp; db_key_t columns[7]; db1_res_t* res; @@ -509,31 +510,41 @@ rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db1_con_t* db_hdl, check_val( ROW_VALUES(row)+4, DB1_INT, 1, 0); int_vals[2] = VAL_INT (ROW_VALUES(row)+4); /* ROUTE_ID column */ - check_val( ROW_VALUES(row)+5, DB1_INT, 1, 0); - int_vals[3] = VAL_INT (ROW_VALUES(row)+5); + check_val( ROW_VALUES(row)+5, DB1_STRING, 1, 0); + str_vals[3] = (char*)VAL_STRING(ROW_VALUES(row)+5); /* DSTLIST column */ check_val( ROW_VALUES(row)+6, DB1_STRING, 1, 1); - str_vals[3] = (char*)VAL_STRING(ROW_VALUES(row)+6); + str_vals[4] = (char*)VAL_STRING(ROW_VALUES(row)+6); /* parse the time definition */ if ((time_rec=parse_time_def(str_vals[2]))==0) { LM_ERR("bad time definition <%s> for rule id %d -> skipping\n", str_vals[2], int_vals[0]); continue; } + /* lookup for the script route ID */ + if (str_vals[3][0]) { + int_vals[3] = route_lookup(&main_rt, str_vals[3]); + if (int_vals[3]==-1) { + LM_WARN("route <%s> does not exist\n",str_vals[3]); + int_vals[3] = 0; + } + } else { + int_vals[3] = 0; + } /* is gw_list a list or a list id? */ - if (str_vals[3][0]=='#') { - s_id.s = str_vals[3]+1; + if (str_vals[4][0]=='#') { + s_id.s = str_vals[4]+1; s_id.len = strlen(s_id.s); if ( str2int( &s_id, &id)!=0 || - (str_vals[3]=get_tmp_gw_list(id))==NULL ) { + (str_vals[4]=get_tmp_gw_list(id))==NULL ) { LM_ERR("invalid reference to a GW list <%s> -> skipping\n", - str_vals[3]); + str_vals[4]); continue; } } /* build the routing rule */ if ((ri = build_rt_info( int_vals[2], time_rec, int_vals[3], - str_vals[3], rdata->pgw_l))== 0 ) { + str_vals[4], rdata->pgw_l))== 0 ) { LM_ERR("failed to add routing info for rule id %d -> " "skipping\n", int_vals[0]); tmrec_free( time_rec ); @@ -573,5 +584,6 @@ error: dr_dbf->free_result(db_hdl, res); if (rdata) free_rt_data( rdata, 1 ); + rdata = NULL; return 0; }

1 0

git:master: modules/privacy: Privacy module, for handling RFC3325
by Raul Alexis Betancor Santana 03 Jan '10

03 Jan '10

Module: sip-router Branch: master Commit: 16ee270b5442015d43b10e38f5626b96ab845fc9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16ee270… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Wed Dec 30 22:45:34 2009 +0000 modules/privacy: Privacy module, for handling RFC3325 - Initial docs --- modules/privacy/doc/Makefile | 4 +++ modules/privacy/doc/privacy.xml | 43 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/modules/privacy/doc/Makefile b/modules/privacy/doc/Makefile new file mode 100644 index 0000000..bfe9c15 --- /dev/null +++ b/modules/privacy/doc/Makefile @@ -0,0 +1,4 @@ +docs = privacy.xml + +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/privacy/doc/privacy.xml b/modules/privacy/doc/privacy.xml new file mode 100644 index 0000000..f9c17ac --- /dev/null +++ b/modules/privacy/doc/privacy.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<book xmlns:xi="http://www.w3.org/2001/XInclude"> + <bookinfo> + <title>Privacy Module</title> + <authorgroup> + <author> + <firstname>Ra�l Alexis</firstname> + <surname>Betancor Santana</surname> + <affiliation><orgname>Dimensi�n Virtual S.L.</orgname></affiliation> + <email>rabs(a)dimension-virtual.com</email> + </author> + <editor> + <firstname>Ra�l Alexis</firstname> + <surname>Betancor Santana</surname> + <email>rabs(a)dimension-virtual.com</email> + </editor> + </authorgroup> + <copyright> + <year>2009</year> + <year>2010</year> + <holder>Dimensi�n Virtual S.L.</holder> + </copyright> + <para></para> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </bookinfo> + <toc></toc> + + <xi:include href="privacy_admin.xml"/> +</book>

1 0

[tracker] Comment added: Module drouting, address routeid as string
by sip-router 02 Jan '10

02 Jan '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#24 - Module drouting, address routeid as string User who did this - Daniel-Constantin Mierla (miconda) ---------- as a side comment, probably this should be migrated to an event_route in the future, kind of: event_route[drouting:id] where id is given in db table column. It can be, for example: event_route[drouting:match] ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=24#comment22 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.

1 0

[tracker] Comment added: Module drouting, address routeid as string
by sip-router 02 Jan '10

02 Jan '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#24 - Module drouting, address routeid as string User who did this - Daniel-Constantin Mierla (miconda) ---------- The module can run a route block when a match happens. That is given in route_id column. In 1.5 that is integer as the definition of routes takes only integer id as index. But in 3.0 that is string, so a lookup on name is needed to get the integer index. Or I am missing something obvious after the parties in the last days :-) ? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=24#comment21 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.

1 0

[tracker] Comment added: Module drouting, address routeid as string
by sip-router 02 Jan '10

02 Jan '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#24 - Module drouting, address routeid as string User who did this - Raúl Alexis Betancor Santana (rbetancor) ---------- Hi Daniel, I'm reviewing the patch, I'm trying to guest what is the advange of using named route_id's on the module, because It's not related with named route blocks, so I don't see the improvement on this. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=24#comment20 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.

1 0

[tracker] Comment added: Module drouting, address routeid as string
by sip-router 02 Jan '10

02 Jan '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#24 - Module drouting, address routeid as string User who did this - Daniel-Constantin Mierla (miconda) ---------- Hi Raul, thanks for update and your new work. The new version will be in next major release, I suppose, 3.0.0 being schedule to happen in a week or so. The patch fixes the support to lookup route names. In kamailio 1.5 the route names were only integers, now they can be string. The patch looks ok, imo, if you have time to review and commit before 3.0.0 would be good. It still needs update of db table definition. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=24#comment19 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.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2010