sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:kamailio_3.0: drouting: adding db table definitions

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 53a25f097d127eea7fef3c3c32f7f24421aaad15 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53a25f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 3 13:27:57 2010 +0100 drouting: adding db table definitions - built based on readme - needs further updates as the code is ahead of documentation with what tables are used and their structure --- lib/srdb1/schema/dr_gateways.xml | 71 ++++++++++++++++++++++++++ lib/srdb1/schema/dr_rules.xml | 86 ++++++++++++++++++++++++++++++++ lib/srdb1/schema/kamailio-drouting.xml | 14 +++++ 3 files changed, 171 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/dr_gateways.xml b/lib/srdb1/schema/dr_gateways.xml new file mode 100644 index 0000000..e96773b --- /dev/null +++ b/lib/srdb1/schema/dr_gateways.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="dr_gateways" xmlns:db="http://docbook.org/ns/docbook"> + <name>dr_gateways</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the douting module - keeps the + gateways data. + </db:para> + </description> + + <column id="gwid"> + <name>gwid</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID per gateway + </description> + </column> + + <column id="type"> + <name>type</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>Type of gateway</description> + </column> + + <column id="address"> + <name>address</name> + <type>string</type> + <size>128</size> + <description>Address of gateway (hostname or ip and port)</description> + </column> + + <column id="strip"> + <name>strip</name> + <type>unsigned int</type> + <size>11</size> + <default>0</default> + <description>Number of digits to strip from dialed number</description> + </column> + + <column id="pri_prefix"> + <name>pri_prefix</name> + <type>string</type> + <size>64</size> + <null/> + <default><null/></default> + <description>What to prefix to dialed number</description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Short description of gateway</description> + </column> +</table> + diff --git a/lib/srdb1/schema/dr_rules.xml b/lib/srdb1/schema/dr_rules.xml new file mode 100644 index 0000000..213332a --- /dev/null +++ b/lib/srdb1/schema/dr_rules.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="dr_rules" xmlns:db="http://docbook.org/ns/docbook"> + <name>dr_rules</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the drouting module - keeps the + routing rules data. + </db:para> + </description> + + <column id="ruleid"> + <name>ruleid</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Rule unique ID + </description> + </column> + + <column id="groupid"> + <name>groupid</name> + <type>string</type> + <size>255</size> + <description>list of routing group IDs + </description> + </column> + + <column id="prefix"> + <name>prefix</name> + <type>string</type> + <size>64</size> + <description>Destination prefix for this rule</description> + </column> + + <column id="timerec"> + <name>timerec</name> + <type>string</type> + <size>255</size> + <description>Time recurrence for this rule.</description> + </column> + + <column id="priority"> + <name>priority</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>Priority of the rule.</description> + </column> + + <column id="routeid"> + <name>routeid</name> + <type>string</type> + <size>64</size> + <description>Name of route block (from cfg script) to be + executed when matching this rule.</description> + </column> + + <column id="gwlist"> + <name>gwlist</name> + <type>string</type> + <size>255</size> + <description>The list of destinations (gws) to be used when + matching this rule.</description> + </column> + + <column id="description"> + <name>description</name> + <type>string</type> + <size>128</size> + <default></default> + <description>Short description of the rule</description> + </column> + +</table> + diff --git a/lib/srdb1/schema/kamailio-drouting.xml b/lib/srdb1/schema/kamailio-drouting.xml new file mode 100644 index 0000000..183c87b --- /dev/null +++ b/lib/srdb1/schema/kamailio-drouting.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<database xmlns:xi="http://www.w3.org/2001/XInclude"> + <name>DRouting</name> + <xi:include href="dr_gateways.xml"/> + <xi:include href="dr_rules.xml"/> +</database>

15 years

git:kamailio_3.0: drouting: lookup route block by name

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 94f834041eb43121e6750cf524c32225aaf1c80d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94f8340… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 3 12:38:48 2010 +0100 drouting: lookup route block by name - routes are identified in 3.0 by string name - if name is "0", do not execute the route (this is the main one) for backward compatibility - based on patch by Andrey 'Krieger' Utkin, 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..bea5b29 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] && str_vals[3][0]!='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; }

15 years

git:kamailio_3.0: modules_k/nathelper: removed garbage from documentation ( credits to Klaus)

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 455cc830b07621bda68cde3689430bddcf94b3c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=455cc83… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 31 14:57:01 2009 +0200 modules_k/nathelper: removed garbage from documentation (credits to Klaus) (cherry picked from commit c16ac01fc138b6e17b90853dc4d0b885d6970d59) --- modules_k/nathelper/README | 2 -- modules_k/nathelper/doc/nathelper_admin.xml | 3 --- 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/modules_k/nathelper/README b/modules_k/nathelper/README index cf67a99..9f923db 100644 --- a/modules_k/nathelper/README +++ b/modules_k/nathelper/README @@ -854,8 +854,6 @@ start_recording(); that you screen alias parameter value of Request URI the same way as you would screen Request URI itself. - Note that th - This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE. diff --git a/modules_k/nathelper/doc/nathelper_admin.xml b/modules_k/nathelper/doc/nathelper_admin.xml index 5f75ee2..856f950 100644 --- a/modules_k/nathelper/doc/nathelper_admin.xml +++ b/modules_k/nathelper/doc/nathelper_admin.xml @@ -1040,9 +1040,6 @@ start_recording(); Request URI itself. </para> <para> - Note that th - </para> - <para> This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE. </para>

15 years

git:kamailio_3.0: modules_k/nathelper: improved handle_ruri_alias() documentation

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 5b03a409076e5ccf1b0bcf356ce7365972d134d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b03a40… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 30 22:47:35 2009 +0200 modules_k/nathelper: improved handle_ruri_alias() documentation - Improved handle_ruri_alias() documentation based on suggestion by Klaus. (cherry picked from commit 7bb718bb680dd5faf398217583796247bb51813a) --- modules_k/nathelper/README | 8 +++++++- modules_k/nathelper/doc/nathelper_admin.xml | 11 ++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/modules_k/nathelper/README b/modules_k/nathelper/README index 449bfd3..cf67a99 100644 --- a/modules_k/nathelper/README +++ b/modules_k/nathelper/README @@ -848,7 +848,13 @@ start_recording(); 6.15. handle_ruri_alias() Checks if Request URI has alias param and if so, removes it and sets - $du based on its value. + $du based on its value. Note that this means that routing of request is + based on alias parameter value of Request URI rather than Request URI + itself. If you call handle_ruri_alias() on a request, make thus sure + that you screen alias parameter value of Request URI the same way as + you would screen Request URI itself. + + Note that th This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE. diff --git a/modules_k/nathelper/doc/nathelper_admin.xml b/modules_k/nathelper/doc/nathelper_admin.xml index 3a4d3c7..5f75ee2 100644 --- a/modules_k/nathelper/doc/nathelper_admin.xml +++ b/modules_k/nathelper/doc/nathelper_admin.xml @@ -1031,7 +1031,16 @@ start_recording(); </title> <para> Checks if Request URI has alias param and if so, removes - it and sets $du based on its value. + it and sets $du based on its value. Note that this + means that routing of request is based on alias + parameter value of Request URI rather than Request URI + itself. If you call handle_ruri_alias() on a request, + make thus sure that you screen alias parameter value of + Request URI the same way as you would screen + Request URI itself. + </para> + <para> + Note that th </para> <para> This function can be used from

15 years

git:kamailio_3.0: modules/lcr and modules_k/nathelper: fixed compiler warnings

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 8bf879a1d827f6c8210e704c2f1c149e27309ef2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bf879a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 30 19:22:14 2009 +0200 modules/lcr and modules_k/nathelper: fixed compiler warnings - Fixed compiler warnings that went earlier unnoticed, because I didn't have -Wall gcc option. (cherry picked from commit 8b53323dde13c166676378f21f402a79d36b5a23) --- modules/lcr/lcr_mod.c | 2 +- modules_k/nathelper/nathelper.c | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 7eb3747..9748024 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -2054,7 +2054,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) uri_str.len = r_uri_len; LM_DBG("appending branch <%.*s>\n", uri_str.len, uri_str.s); if (append_branch(_m, &uri_str, 0, 0, Q_UNSPECIFIED, 0, 0) == -1) { - LM_ERR("when appending branch <%.*s>\n", rval); + LM_ERR("when appending branch <%.*s>\n", uri_str.len, uri_str.s); return -1; } } diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 27ef349..90fca05 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -283,8 +283,6 @@ static int add_contact_alias_f(struct sip_msg *, char *, char *); static int handle_ruri_alias_f(struct sip_msg *, char *, char *); static int pv_get_rr_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int pv_get_rr_top_count_f(struct sip_msg *, pv_param_t *, pv_value_t *); -static int rr_count_f(struct sip_msg *, char *, char *); -static int rr_top_count_f(struct sip_msg *, char *, char *); static int fix_nated_sdp_f(struct sip_msg *, char *, char *); static int extract_mediaip(str *, str *, int *, char *); static int extract_mediainfo(str *, str *, str *); @@ -1643,8 +1641,6 @@ static int pv_get_rr_top_count_f(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - unsigned int count; - struct hdr_field *header; str uri; struct sip_uri puri;

15 years

git:kamailio_3.0: * modules_k/nathelper

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: accf708dc5878f387ec1f5769b83b2760a1d2539 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=accf708… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 16 00:45:27 2009 +0200 * modules_k/nathelper Added two new functions add_contact_alias() and handle_ruri_alias() and two new pseudo variables $rr_count and $rr_top_count that can be used to implement tcp connection sharing and produce correct Request URI for in-dialog requests to NATed UAs. (cherry picked from commit a85444180860da454831c5c0b366a6cc2f7f189f) --- modules_k/nathelper/README | 871 ++++++++++++++++----------- modules_k/nathelper/doc/nathelper.xml | 19 + modules_k/nathelper/doc/nathelper_admin.xml | 127 ++++- modules_k/nathelper/nathelper.c | 297 +++++++++- 4 files changed, 959 insertions(+), 355 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=acc…

15 years

git:kamailio_3.0: modules_k/nathelper: handle_uri_alias() alias handling fix

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 96a6391c00ab4de2c9d331dda770640554f38fe2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96a6391… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 30 12:19:03 2009 +0200 modules_k/nathelper: handle_uri_alias() alias handling fix - handle_uri_alias() now finds ;alias r-uri param even if it is not the first param. (cherry picked from commit 9d98ca32bb131c0fb190e012ed0bff3f9a26557a) --- modules_k/nathelper/nathelper.c | 53 ++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 20 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index fadc93f..27ef349 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1501,41 +1501,54 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) static int handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) { - str params, uri, proto; - char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri; - unsigned int len, plen, alias_len, proto_type, cur_uri_len; + str uri, proto; + char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri, *rest; + unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, + ip_port_len; if ((msg->parsed_uri_ok == 0) && (parse_sip_msg_uri(msg) < 0)) { LM_ERR("while parsing Request-URI\n"); return -1; } - params = msg->parsed_uri.params; - if (params.len == 0) { + rest = msg->parsed_uri.params.s; + rest_len = msg->parsed_uri.params.len; + if (rest_len == 0) { LM_DBG("no params\n"); return 2; } - if ((params.len < ALIAS_LEN) || - (strncmp(params.s, ALIAS, ALIAS_LEN) != 0)) { + while (rest_len >= ALIAS_LEN) { + if (strncmp(rest, ALIAS, ALIAS_LEN) == 0) break; + sep = memchr(rest, 59 /* ; */, rest_len); + if (sep == NULL) { + LM_DBG("no alias param\n"); + return 2; + } else { + rest_len = rest_len - (sep - rest + 1); + rest = sep + 1; + } + } + + if (rest_len < ALIAS_LEN) { LM_DBG("no alias param\n"); return 2; } /* set dst uri based on alias param value */ - val = params.s + ALIAS_LEN; - plen = params.len - ALIAS_LEN; - sep = memchr(val, 116 /* t */, plen); + val = rest + ALIAS_LEN; + val_len = rest_len - ALIAS_LEN; + sep = memchr(val, 116 /* t */, val_len); if (sep == NULL) { - LM_ERR("no 't' in alias param\n"); + LM_ERR("no 't' in alias param value\n"); return -1; } at = &(buf[0]); append_str(at, "sip:", 4); - len = sep - val; - alias_len = SALIAS_LEN + len + 2 /* tn */; - memcpy(at, val, len); - at = at + len; + ip_port_len = sep - val; + alias_len = SALIAS_LEN + ip_port_len + 2 /* tn */; + memcpy(at, val, ip_port_len); + at = at + ip_port_len; trans = sep + 1; - if ((len + 2 > plen) || (*trans == ';') || (*trans == '?')) { + if ((ip_port_len + 2 > val_len) || (*trans == ';') || (*trans == '?')) { LM_ERR("no proto in alias param\n"); return -1; } @@ -1543,7 +1556,7 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) if (proto_type != PROTO_UDP) { proto_type_to_str(proto_type, &proto); if (proto.len == 0) { - LM_ERR("unkown proto in alias param\n"); + LM_ERR("unknown proto in alias param\n"); return -1; } append_str(at, ";transport=", 11); @@ -1551,7 +1564,7 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) at = at + proto.len; } next = trans + 1; - if ((len + 2 < plen) && (*next != ';') && (*next != '?')) { + if ((ip_port_len + 2 < val_len) && (*next != ';') && (*next != '?')) { LM_ERR("invalid alias param value\n"); return -1; } @@ -1572,11 +1585,11 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) cur_uri_len = msg->first_line.u.request.uri.len; } at = &(buf[0]); - len = params.s - 1 /* ; */ - cur_uri; + len = rest - 1 /* ; */ - cur_uri; memcpy(at, cur_uri, len); at = at + len; len = cur_uri_len - alias_len - len; - memcpy(at, params.s + alias_len - 1, len); + memcpy(at, rest + alias_len - 1, len); uri.s = &(buf[0]); uri.len = cur_uri_len - alias_len; LM_DBG("rewriting r-uri to <%.*s>\n", uri.len, uri.s);

15 years

git:kamailio_3.0: topoh: updated README

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 68c73622f6ce4d5413e2b39abfb58e6af7913425 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68c7362… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 20 18:48:37 2009 +0100 topoh: updated README (cherry picked from commit 63664db5030d1a6c5e700e645cebac9238e985ba) --- modules/topoh/README | 15 +++++++++++++++ modules/topoh/doc/topoh_admin.xml | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/modules/topoh/README b/modules/topoh/README index 7582106..d0249b1 100644 --- a/modules/topoh/README +++ b/modules/topoh/README @@ -31,6 +31,7 @@ Daniel-Constantin Mierla 3.4. uparam_prefix (str) 3.5. vparam_name (str) 3.6. vparam_prefix (str) + 3.7. callid_prefix (str) 4. Exported Functions @@ -44,6 +45,7 @@ Daniel-Constantin Mierla 1.4. Set uparam_prefix parameter 1.5. Set vparam_name parameter 1.6. Set vparam_prefix parameter + 1.7. Set callid_prefix parameter Chapter 1. Admin Guide @@ -63,6 +65,7 @@ Chapter 1. Admin Guide 3.4. uparam_prefix (str) 3.5. vparam_name (str) 3.6. vparam_prefix (str) + 3.7. callid_prefix (str) 4. Exported Functions @@ -109,6 +112,7 @@ Chapter 1. Admin Guide 3.4. uparam_prefix (str) 3.5. vparam_name (str) 3.6. vparam_prefix (str) + 3.7. callid_prefix (str) 3.1. mask_key (str) @@ -179,6 +183,17 @@ modparam("topoh", "vparam_name", "myv") modparam("topoh", "vparam_prefix", "xyz") ... +3.7. callid_prefix (str) + + Prefix to be added in encoded Call-ID: headers. + + Default value is "!!:". + + Example 1.7. Set callid_prefix parameter +... +modparam("topoh", "callid_prefix", "***") +... + 4. Exported Functions 4.1. diff --git a/modules/topoh/doc/topoh_admin.xml b/modules/topoh/doc/topoh_admin.xml index 85648df..1d3651f 100644 --- a/modules/topoh/doc/topoh_admin.xml +++ b/modules/topoh/doc/topoh_admin.xml @@ -184,6 +184,25 @@ modparam("topoh", "vparam_prefix", "xyz") </programlisting> </example> </section> + <section> + <title><varname>callid_prefix</varname> (str)</title> + <para> + Prefix to be added in encoded Call-ID: headers. + </para> + <para> + <emphasis> + Default value is "!!:". + </emphasis> + </para> + <example> + <title>Set <varname>callid_prefix</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "callid_prefix", "***") +... +</programlisting> + </example> + </section> </section> <section>

15 years

git:kamailio_3.0: topoh: update Replaces header

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: e37d76d8958107d949f230178d79408ba35bd8e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e37d76d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 20 18:44:33 2009 +0100 topoh: update Replaces header - case when call-id is masked (cherry picked from commit f03706ce3b8670d052619ac4a38fda4fa35bedfd) --- modules/topoh/th_msg.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ modules/topoh/th_msg.h | 1 + modules/topoh/topoh_mod.c | 1 + 3 files changed, 69 insertions(+), 0 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index db0de77..731d831 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -24,6 +24,7 @@ #include "../../mem/mem.h" #include "../../data_lump.h" #include "../../forward.h" +#include "../../trim.h" #include "../../msg_translator.h" #include "../../parser/parse_rr.h" #include "../../parser/parse_uri.h" @@ -728,6 +729,72 @@ int th_unmask_refer_to(sip_msg_t *msg) return 0; } +int th_update_hdr_replaces(sip_msg_t *msg) +{ + struct hdr_field *hf = NULL; + str replaces; + str rcallid; + struct lump* l; + str out; + + LM_DBG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + if(th_param_mask_callid==0) + return 0; + + if(!((get_cseq(msg)->method_id)&(METHOD_INVITE))) + return 0; + + for (hf=msg->headers; hf; hf=hf->next) + { + if (hf->name.len==8 && strncasecmp(hf->name.s, "Replaces", 8)==0) + break; + } + + if(hf==NULL) + return 0; + + replaces = hf->body; + trim(&replaces); + rcallid.s = replaces.s; + for(rcallid.len=0; rcallid.len<replaces.len; rcallid.len++) + { + if(rcallid.s[rcallid.len]==';') + break; + } + + if(rcallid.len>th_callid_prefix.len + && strncmp(rcallid.s, th_callid_prefix.s, th_callid_prefix.len)==0) + { + /* value encoded - decode it */ + out.s = th_mask_decode(rcallid.s, rcallid.len, + &th_callid_prefix, 0, &out.len); + } else { + /* value decoded - encode it */ + out.s = th_mask_encode(rcallid.s, rcallid.len, + &th_callid_prefix, &out.len); + } + if(out.s==NULL) + { + LM_ERR("cannot update Replaces callid\n"); + return -1; + } + + l=del_lump(msg, rcallid.s-msg->buf, rcallid.len, 0); + if (l==0) + { + LM_ERR("failed deleting Replaces callid\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 b68f63b..874f704 100644 --- a/modules/topoh/th_msg.h +++ b/modules/topoh/th_msg.h @@ -33,6 +33,7 @@ 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); +int th_update_hdr_replaces(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 5fb092b..6cbd213 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -300,6 +300,7 @@ int th_msg_sent(void *data) } } else { /* initial request */ + th_update_hdr_replaces(&msg); th_mask_callid(&msg); } } else {

15 years

git:kamailio_3.0: topoh: code to update Refer-to URI

by Daniel-Constantin Mierla

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

15 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev