sr-dev November 2014

sr-dev@lists.kamailio.org

38 participants
207 discussions

git:master: modules/ims_isc: S-CSCF should add itself to beginning of path header, not the end. fixed.

by Jason Penton

Module: sip-router Branch: master Commit: 877a018cc13714f4b3935a1f7009bd9d17f22366 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=877a018… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Nov 21 09:43:19 2014 +0200 modules/ims_isc: S-CSCF should add itself to beginning of path header, not the end. fixed. --- modules/ims_isc/third_party_reg.c | 478 ++++++++++++++++++------------------ 1 files changed, 239 insertions(+), 239 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=877…

9 years, 7 months

git:master: ims_registrar_scscf: Added params to partial notifies - previously only done in full

by Richard Good

Module: sip-router Branch: master Commit: a538cf860139e2f72c2ab8f444908965125a9ec4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a538cf8… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Nov 20 13:31:55 2014 +0200 ims_registrar_scscf: Added params to partial notifies - previously only done in full --- modules/ims_registrar_scscf/registrar_notify.c | 27 +++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index cebc889..7cc2677 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -1637,7 +1637,8 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type) { int terminate_impu = 1; ucontact_t *c_tmp; str state, event; - + param_t *param; + buf.s = bufc; buf.len = 0; pad.s = padc; @@ -1716,6 +1717,30 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type) { STR_APPEND(buf, uri_s); STR_APPEND(buf, (c->c)); STR_APPEND(buf, uri_e); + + param = c->params; + while (param && supported_param(&param->name) == 0) { + + if(param->body.len > 0) { + LM_DBG("This contact has params name: [%.*s] body [%.*s]\n", param->name.len, param->name.s, param->body.len, param->body.s); + if (param->body.s[0] == '<' && param->body.s[param->body.len -1] == '>') { + LM_DBG("This param body starts with '<' and ends with '>' we will clean these for the NOTIFY XML with < and >\n"); + sprintf(pad.s, contact_s_params_with_body_fix.s, param->name.len, param->name.s, param->body.len - 2, param->body.s + 1); + } else { + sprintf(pad.s, contact_s_params_with_body.s, param->name.len, param->name.s, param->body.len, param->body.s); + } + + pad.len = strlen(pad.s); + STR_APPEND(buf, pad); + } else { + LM_DBG("This contact has params name: [%.*s] \n", param->name.len, param->name.s); + sprintf(pad.s, contact_s_params_no_body.s, param->name.len, param->name.s); + pad.len = strlen(pad.s); + STR_APPEND(buf, pad); + } + param = param->next; + } + STR_APPEND(buf, contact_e); STR_APPEND(buf, registration_e); }

9 years, 7 months

dispatcher ideas (for the archives)

by Olle E. Johansson

Just to make sure I share some ideas I would like to see/implement in dispatcher: - Dispatcher set attributes Attributes on a set level, not per server. Default branch route or something else, like trunk ID. - Dispatch SRV sets Having a set that is defined from a DNS srv set. When TTL expires, automatically updates the set. This is to make DNS based failover easier to control. /O

9 years, 7 months

git:master: modules/ims_usrloc_scscf: fixed bug with contact counter per IMPU

by Jason Penton

Module: sip-router Branch: master Commit: 96b29f927f8a8dc9a187ec17a9d6aa7547d3142c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96b29f9… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Nov 19 16:13:25 2014 +0200 modules/ims_usrloc_scscf: fixed bug with contact counter per IMPU --- modules/ims_usrloc_scscf/impurecord.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index 6c636ff..6f6ead2 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -900,8 +900,8 @@ int link_contact_to_impu(impurecord_t* impu, ucontact_t* contact, int write_to_d LM_DBG("contact [%.*s] needs to be linked to impu [%.*s] at position %d\n", contact->c.len, contact->c.s, impu->public_identity.len, impu->public_identity.s, i); if (overwrite) unlink_contact_from_impu(impu, impu->newcontacts[i], write_to_db); //unlink the contact we are overwriting - else - impu->num_contacts = i+1; + + impu->num_contacts = i+1; //we always bump this - as unlink (in overwrite would have decremented) impu->newcontacts[i] = contact;

9 years, 7 months

git:master: dbtext database definition: several fields in subscriber can be null

by Olle E. Johansson

Module: sip-router Branch: master Commit: 43d023232ba73d74830e4b2678ed437820abb11a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43d0232… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Wed Nov 19 13:15:36 2014 +0000 dbtext database definition: several fields in subscriber can be null (cherry picked from commit 32791c6329bc54ad0b542c2459489a83433eae3c) --- utils/kamctl/dbtext/kamailio/subscriber | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/dbtext/kamailio/subscriber b/utils/kamctl/dbtext/kamailio/subscriber index 05f626c..bb335c0 100644 --- a/utils/kamctl/dbtext/kamailio/subscriber +++ b/utils/kamctl/dbtext/kamailio/subscriber @@ -1 +1 @@ -id(int,auto) username(string) domain(string) password(string) email_address(string) ha1(string) ha1b(string) rpid(string,null) +id(int,auto) username(string) domain(string) password(string) email_address(string,null) ha1(string,null) ha1b(string,null) rpid(string,null)

9 years, 7 months

git:4.2: dbtext database definition: several fields in subscriber can be null

by Olle E. Johansson

Module: sip-router Branch: 4.2 Commit: 32791c6329bc54ad0b542c2459489a83433eae3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32791c6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Wed Nov 19 13:15:36 2014 +0000 dbtext database definition: several fields in subscriber can be null --- utils/kamctl/dbtext/kamailio/subscriber | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/dbtext/kamailio/subscriber b/utils/kamctl/dbtext/kamailio/subscriber index 05f626c..bb335c0 100644 --- a/utils/kamctl/dbtext/kamailio/subscriber +++ b/utils/kamctl/dbtext/kamailio/subscriber @@ -1 +1 @@ -id(int,auto) username(string) domain(string) password(string) email_address(string) ha1(string) ha1b(string) rpid(string,null) +id(int,auto) username(string) domain(string) password(string) email_address(string,null) ha1(string,null) ha1b(string,null) rpid(string,null)

9 years, 7 months

git:master: modules/ims_isc: send path header in 3rd-party registration

by Jason Penton

Module: sip-router Branch: master Commit: ea6a8ec6a9c5dd0888f9260f5189c186430bc484 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea6a8ec… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Nov 19 12:56:34 2014 +0200 modules/ims_isc: send path header in 3rd-party registration --- modules/ims_isc/checker.c | 2 +- modules/ims_isc/mod.c | 12 ++++- modules/ims_isc/third_party_reg.c | 92 ++++++++++++++++++++++++++++++++++++- modules/ims_isc/third_party_reg.h | 5 +- 4 files changed, 106 insertions(+), 5 deletions(-) diff --git a/modules/ims_isc/checker.c b/modules/ims_isc/checker.c index 10e27ff..bbf1b1b 100644 --- a/modules/ims_isc/checker.c +++ b/modules/ims_isc/checker.c @@ -397,7 +397,7 @@ isc_match* isc_checker_find(str uri, char direction, int skip, //need to get the urecord if ((ret = isc_ulb.get_impurecord(d, &uri, &p)) != 0) { isc_ulb.unlock_udomain(d, &uri); - LM_ERR("Failure getting record"); + LM_ERR("Failure getting IMPU record for [%.*s] - ISC checker find METHOD: [%.*s]\n", uri.len, uri.s, msg->first_line.u.request.method.len, msg->first_line.u.request.method.s); return 0; }; diff --git a/modules/ims_isc/mod.c b/modules/ims_isc/mod.c index 888af13..a21e8ed 100644 --- a/modules/ims_isc/mod.c +++ b/modules/ims_isc/mod.c @@ -401,6 +401,13 @@ done: return ret; } +void clean_impu_str(str* impu_s) { + char *p; + + if ((p = memchr(impu_s->s, ';', impu_s->len))) { + impu_s->len = p - impu_s->s; + } +} /** * Checks if there is a match on REGISTER. * Inserts route headers and set the dst_uri @@ -436,7 +443,10 @@ int isc_match_filter_reg(struct sip_msg *msg, char *str1, udomain_t* d) { else k = 1; - LM_DBG("Orig User <%.*s> [%d]\n", s.len, s.s, k); + LM_DBG("Orig User before clean: <%.*s> [%d]\n", s.len, s.s, k); + clean_impu_str(&s); + LM_DBG("Orig User after clean: <%.*s> [%d]\n", s.len, s.s, k); + m = isc_checker_find(s, old_mark.direction, old_mark.skip, msg, k, d); while (m) { LM_DBG("REGISTER match found in filter criteria\n"); diff --git a/modules/ims_isc/third_party_reg.c b/modules/ims_isc/third_party_reg.c index 4b30639..6d4d599 100644 --- a/modules/ims_isc/third_party_reg.c +++ b/modules/ims_isc/third_party_reg.c @@ -45,6 +45,66 @@ #include "third_party_reg.h" +/*! \brief + * Combines all Path HF bodies into one string. + */ +int build_path_vector(struct sip_msg *_m, str *path, str *received) +{ + static char buf[MAX_PATH_SIZE]; + char *p; + struct hdr_field *hdr; + struct sip_uri puri; + + rr_t *route = 0; + + path->len = 0; + path->s = 0; + received->s = 0; + received->len = 0; + + if(parse_headers(_m, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the message\n"); + goto error; + } + + for( hdr=_m->path,p=buf ; hdr ; hdr = next_sibling_hdr(hdr)) { + /* check for max. Path length */ + if( p-buf+hdr->body.len+1 >= MAX_PATH_SIZE) { + LM_ERR("Overall Path body exceeds max. length of %d\n", + MAX_PATH_SIZE); + goto error; + } + if(p!=buf) + *(p++) = ','; + memcpy( p, hdr->body.s, hdr->body.len); + p += hdr->body.len; + } + + if (p!=buf) { + /* check if next hop is a loose router */ + if (parse_rr_body( buf, p-buf, &route) < 0) { + LM_ERR("failed to parse Path body, no head found\n"); + goto error; + } + if (parse_uri(route->nameaddr.uri.s,route->nameaddr.uri.len,&puri)<0){ + LM_ERR("failed to parse the first Path URI\n"); + goto error; + } + if (!puri.lr.s) { + LM_ERR("first Path URI is not a loose-router, not supported\n"); + goto error; + } + free_rr(&route); + } + + path->s = buf; + path->len = p-buf; + return 0; +error: + if(route) free_rr(&route); + return -1; +} + /** * Handle third party registration * @param msg - the SIP REGISTER message @@ -54,6 +114,7 @@ */ int isc_third_party_reg(struct sip_msg *msg, isc_match *m, isc_mark *mark) { r_third_party_registration r; + str path, path_received; int expires = 0; str req_uri = { 0, 0 }; str to = { 0, 0 }; @@ -82,6 +143,12 @@ int isc_third_party_reg(struct sip_msg *msg, isc_match *m, isc_mark *mark) { pvni = cscf_get_visited_network_id(msg, &hdr); /* Get P-Access-Network-Info header */ pani = cscf_get_access_network_info(msg, &hdr); + + if (build_path_vector(msg, &path, &path_received) < 0) { + LM_ERR("Failed to parse PATH header for third-party reg\n"); + return ISC_RETURN_FALSE; + } + LM_DBG("PATH header in REGISTER is [%.*s]\n", path.len, path.s); /* Get P-Charging-Vector header */ /* Just forward the charging header received from P-CSCF */ @@ -99,6 +166,7 @@ int isc_third_party_reg(struct sip_msg *msg, isc_match *m, isc_mark *mark) { r.pani = pani; r.cv = cv; r.service_info = m->service_info; + r.path = path; if (expires <= 0) r_send_third_party_reg(&r, 0); @@ -126,6 +194,15 @@ static str p_access_network_info_e = { "\r\n", 2 }; static str p_charging_vector_s = { "P-Charging-Vector: ", 19 }; static str p_charging_vector_e = { "\r\n", 2 }; + +static str path_s = { "Path: ", 6 }; +static str path_e = { "\r\n", 2 }; + +static str comma = { ",", 1}; + +static str path_mine_s = { "<", 1}; +static str path_mine_e = { ";lr>", 4}; + static str body_s = { "<ims-3gpp version=\"1\"><service-info>", 36 }; static str body_e = { "</service-info></ims-3gpp>", 26 }; @@ -159,6 +236,9 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) { if (r->cv.len) h.len += p_charging_vector_s.len + p_charging_vector_e.len + r->cv.len; + + if (r->path.len) + h.len += path_s.len + path_e.len + r->path.len + 6/*',' and ';lr' and '<' and '>'*/ + r->from.len /*adding our own address to path*/; h.s = pkg_malloc(h.len); if (!h.s) { @@ -176,6 +256,16 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) { sprintf(h.s + h.len, "%d", expires); h.len += strlen(h.s + h.len); STR_APPEND(h, expires_e); + + if (r->path.len) { + STR_APPEND(h, path_s); + STR_APPEND(h, r->path); + STR_APPEND(h, comma); + STR_APPEND(h, path_mine_s); + STR_APPEND(h, r->from); + STR_APPEND(h, path_mine_e); + STR_APPEND(h, path_e); + } STR_APPEND(h, contact_s); STR_APPEND(h, isc_my_uri_sip); @@ -198,7 +288,7 @@ int r_send_third_party_reg(r_third_party_registration *r, int expires) { STR_APPEND(h, r->cv); STR_APPEND(h, p_charging_vector_e); } - LM_CRIT("SRV INFO:<%.*s>\n", r->service_info.len, r->service_info.s); + LM_DBG("SRV INFO:<%.*s>\n", r->service_info.len, r->service_info.s); if (r->service_info.len) { b.len = body_s.len + r->service_info.len + body_e.len; b.s = pkg_malloc(b.len); diff --git a/modules/ims_isc/third_party_reg.h b/modules/ims_isc/third_party_reg.h index 2b687b0..a23cbce 100644 --- a/modules/ims_isc/third_party_reg.h +++ b/modules/ims_isc/third_party_reg.h @@ -65,13 +65,14 @@ extern struct tm_binds isc_tmb; /**< Structure with pointers to tm funcs */ /** reg event notification structure */ typedef struct _r_third_party_reg { - str req_uri; /* AS sip uri: */ + str req_uri; /* AS sip uri: */ str from; /* SCSCF uri */ str to; /* Public user id */ str pvni; /* Visited network id */ str pani; /* Access Network info */ str cv; /* Charging vector */ - str service_info; /* Service info body */ + str service_info; /* Service info body */ + str path; /* Path header */ } r_third_party_registration; int isc_third_party_reg(struct sip_msg *msg, isc_match *m, isc_mark *mark);

9 years, 7 months

git:misi/outbound: modules/outbound: Updated documentation

by Mihaly Meszaros

Module: sip-router Branch: misi/outbound Commit: 3e6f2279c90e3758d86cf4a21f86e3a8503e5586 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e6f227… Author: Mészáros Mihály <misi(a)niif.hu> Committer: Mészáros Mihály <misi(a)niif.hu> Date: Fri Nov 14 10:19:39 2014 +0100 modules/outbound: Updated documentation --- modules/outbound/README | 2 +- modules/outbound/doc/outbound_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/outbound/README b/modules/outbound/README index 1f89d4c..e837777 100644 --- a/modules/outbound/README +++ b/modules/outbound/README @@ -270,7 +270,7 @@ failure_route[FAIL_OUTBOUND] { } Example 1.2. Registrar Configuration -MAILIO +#!KAMAILIO # # Registrar configuration # diff --git a/modules/outbound/doc/outbound_admin.xml b/modules/outbound/doc/outbound_admin.xml index de3d659..efed29e 100644 --- a/modules/outbound/doc/outbound_admin.xml +++ b/modules/outbound/doc/outbound_admin.xml @@ -227,7 +227,7 @@ failure_route[FAIL_OUTBOUND] { <example> <title>Registrar Configuration</title> <programlisting><![CDATA[ -MAILIO +#!KAMAILIO # # Registrar configuration #

9 years, 7 months

git:4.2: nathelper: improved add_contact_alias() description

by Juha Heinanen

Module: sip-router Branch: 4.2 Commit: 27b566619cb69345a35f7af82b0b2a6a1c4ed5a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27b5666… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Nov 18 04:32:35 2014 +0200 nathelper: improved add_contact_alias() description - thanks to Dan Christian Bogos for pointing out the deficiency (cherry picked from commit c04f9554df58b1323a46f6e40337fa34b34f1cc9) --- modules/nathelper/README | 69 +++++++++++++++-------------- modules/nathelper/doc/nathelper_admin.xml | 9 +++- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/modules/nathelper/README b/modules/nathelper/README index bb56670..a526fe7 100644 --- a/modules/nathelper/README +++ b/modules/nathelper/README @@ -24,13 +24,13 @@ Edited by Ovidiu Sas - Copyright � 2003-2008 Sippy Software, Inc. + Copyright (c) 2003-2008 Sippy Software, Inc. - Copyright � 2005 Voice Sistem SRL + Copyright (c) 2005 Voice Sistem SRL - Copyright � 2009 TuTPro Inc. + Copyright (c) 2009 TuTPro Inc. - Copyright � 2010 VoIPEmbedded Inc. + Copyright (c) 2010 VoIPEmbedded Inc. __________________________________________________________________ Table of Contents @@ -438,7 +438,7 @@ modparam("nathelper", "udpping_from_path", 1) 5.8. handle_ruri_alias() 5.9. set_contact_alias() -5.1. fix_nated_contact() +5.1. fix_nated_contact() Rewrites the "Contact" header to contain the request's source address:port. @@ -451,7 +451,7 @@ modparam("nathelper", "udpping_from_path", 1) if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; ... -5.2. fix_nated_sdp(flags [, ip_address]) +5.2. fix_nated_sdp(flags [, ip_address]) Alters the SDP information in orer to facilitate NAT traversal. What changes to be performed may be controled via the "flags" parameter. @@ -481,7 +481,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; ... -5.3. add_rcv_param([flag]), +5.3. add_rcv_param([flag]), Add a received parameter to the "Contact" header fields or the Contact URI. The parameter will contain the URI created from the source IP, @@ -505,7 +505,7 @@ add_rcv_param(); # add the parameter to the Contact header add_rcv_param("1"); # add the parameter to the Contact URI ... -5.4. fix_nated_register() +5.4. fix_nated_register() The function creates a URI consisting of the source IP, port, and protocol and stores the URI in an Attribute-Value-Pair. The URI will be @@ -523,7 +523,7 @@ add_rcv_param("1"); # add the parameter to the Contact URI fix_nated_register(); ... -5.5. nat_uac_test(flags) +5.5. nat_uac_test(flags) Tries to guess if client's request originated behind a nat. The parameter determines what heuristics is used. @@ -552,18 +552,19 @@ fix_nated_register(); This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. -5.6. is_rfc1918(ip_address) +5.6. is_rfc1918(ip_address) Determines if the address in the parameter is an rfc1918 or rfc6598 address. The parameter allows pseudo-variables usage. This function can be used from ANY_ROUTE. -5.7. add_contact_alias([ip_addr, port, proto]) +5.7. add_contact_alias([ip_addr, port, proto]) Adds an ";alias=ip~port~transport" parameter to the contact URI containing either received ip, port, and transport protocol or those - given as parameters. + given as parameters. If called without parameters, ";alias" parameter + is only added if received ip and port differ from those in contact URI. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE. @@ -579,7 +580,7 @@ fix_nated_register(); }; ... -5.8. handle_ruri_alias() +5.8. handle_ruri_alias() Checks if the Request URI has an "alias" parameter and if so, removes it and sets the "$du" based on its value. Note that this means that @@ -614,7 +615,7 @@ fix_nated_register(); }; ... -5.9. set_contact_alias() +5.9. set_contact_alias() Adds an ";alias=ip~port~transport" parameter to the contact URI containing the received ip, port, and transport protocol. The new @@ -704,38 +705,38 @@ Chapter 2. Frequently Asked Questions 2.1. - What happend with "rtpproxy_disable" parameter? + What happend with "rtpproxy_disable" parameter? - It was removed as it became obsolete - now "rtpproxy_sock" can take - empty value to disable the rtpproxy functionality. + It was removed as it became obsolete - now "rtpproxy_sock" can take + empty value to disable the rtpproxy functionality. 2.2. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at http://www.kamailio.org/. + Take a look at http://www.kamailio.org/. 2.3. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.sip-router.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.sip-router.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.sip-router.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.sip-router.org>. - If you want to keep the mail private, send it to - <sr-users(a)lists.sip-router.org>. + If you want to keep the mail private, send it to + <sr-users(a)lists.sip-router.org>. 2.4. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - http://sip-router.org/tracker. + Please follow the guidelines provided at: + http://sip-router.org/tracker. diff --git a/modules/nathelper/doc/nathelper_admin.xml b/modules/nathelper/doc/nathelper_admin.xml index 63839f6..7283704 100644 --- a/modules/nathelper/doc/nathelper_admin.xml +++ b/modules/nathelper/doc/nathelper_admin.xml @@ -642,9 +642,12 @@ fix_nated_register(); <function moreinfo="none">add_contact_alias([ip_addr, port, proto])</function> </title> <para> - Adds an <quote>;alias=ip~port~transport</quote> parameter to the contact URI - containing either received ip, port, and transport protocol - or those given as parameters. + Adds an <quote>;alias=ip~port~transport</quote> parameter to + the contact URI containing either received ip, port, and + transport protocol or those given as parameters. If called + without parameters, <quote>;alias</quote> parameter is + only added if received ip and port differ from those in + contact URI. </para> <para> This function can be used from

9 years, 7 months

git:master: nathelper: improved add_contact_alias() description

by Juha Heinanen

Module: sip-router Branch: master Commit: c04f9554df58b1323a46f6e40337fa34b34f1cc9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c04f955… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Nov 18 04:32:35 2014 +0200 nathelper: improved add_contact_alias() description - thanks to Dan Christian Bogos for pointing out the deficiency --- modules/nathelper/README | 69 +++++++++++++++-------------- modules/nathelper/doc/nathelper_admin.xml | 9 +++- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/modules/nathelper/README b/modules/nathelper/README index bb56670..a526fe7 100644 --- a/modules/nathelper/README +++ b/modules/nathelper/README @@ -24,13 +24,13 @@ Edited by Ovidiu Sas - Copyright � 2003-2008 Sippy Software, Inc. + Copyright (c) 2003-2008 Sippy Software, Inc. - Copyright � 2005 Voice Sistem SRL + Copyright (c) 2005 Voice Sistem SRL - Copyright � 2009 TuTPro Inc. + Copyright (c) 2009 TuTPro Inc. - Copyright � 2010 VoIPEmbedded Inc. + Copyright (c) 2010 VoIPEmbedded Inc. __________________________________________________________________ Table of Contents @@ -438,7 +438,7 @@ modparam("nathelper", "udpping_from_path", 1) 5.8. handle_ruri_alias() 5.9. set_contact_alias() -5.1. fix_nated_contact() +5.1. fix_nated_contact() Rewrites the "Contact" header to contain the request's source address:port. @@ -451,7 +451,7 @@ modparam("nathelper", "udpping_from_path", 1) if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; ... -5.2. fix_nated_sdp(flags [, ip_address]) +5.2. fix_nated_sdp(flags [, ip_address]) Alters the SDP information in orer to facilitate NAT traversal. What changes to be performed may be controled via the "flags" parameter. @@ -481,7 +481,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; ... -5.3. add_rcv_param([flag]), +5.3. add_rcv_param([flag]), Add a received parameter to the "Contact" header fields or the Contact URI. The parameter will contain the URI created from the source IP, @@ -505,7 +505,7 @@ add_rcv_param(); # add the parameter to the Contact header add_rcv_param("1"); # add the parameter to the Contact URI ... -5.4. fix_nated_register() +5.4. fix_nated_register() The function creates a URI consisting of the source IP, port, and protocol and stores the URI in an Attribute-Value-Pair. The URI will be @@ -523,7 +523,7 @@ add_rcv_param("1"); # add the parameter to the Contact URI fix_nated_register(); ... -5.5. nat_uac_test(flags) +5.5. nat_uac_test(flags) Tries to guess if client's request originated behind a nat. The parameter determines what heuristics is used. @@ -552,18 +552,19 @@ fix_nated_register(); This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. -5.6. is_rfc1918(ip_address) +5.6. is_rfc1918(ip_address) Determines if the address in the parameter is an rfc1918 or rfc6598 address. The parameter allows pseudo-variables usage. This function can be used from ANY_ROUTE. -5.7. add_contact_alias([ip_addr, port, proto]) +5.7. add_contact_alias([ip_addr, port, proto]) Adds an ";alias=ip~port~transport" parameter to the contact URI containing either received ip, port, and transport protocol or those - given as parameters. + given as parameters. If called without parameters, ";alias" parameter + is only added if received ip and port differ from those in contact URI. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE, and LOCAL_ROUTE. @@ -579,7 +580,7 @@ fix_nated_register(); }; ... -5.8. handle_ruri_alias() +5.8. handle_ruri_alias() Checks if the Request URI has an "alias" parameter and if so, removes it and sets the "$du" based on its value. Note that this means that @@ -614,7 +615,7 @@ fix_nated_register(); }; ... -5.9. set_contact_alias() +5.9. set_contact_alias() Adds an ";alias=ip~port~transport" parameter to the contact URI containing the received ip, port, and transport protocol. The new @@ -704,38 +705,38 @@ Chapter 2. Frequently Asked Questions 2.1. - What happend with "rtpproxy_disable" parameter? + What happend with "rtpproxy_disable" parameter? - It was removed as it became obsolete - now "rtpproxy_sock" can take - empty value to disable the rtpproxy functionality. + It was removed as it became obsolete - now "rtpproxy_sock" can take + empty value to disable the rtpproxy functionality. 2.2. - Where can I find more about Kamailio? + Where can I find more about Kamailio? - Take a look at http://www.kamailio.org/. + Take a look at http://www.kamailio.org/. 2.3. - Where can I post a question about this module? + Where can I post a question about this module? - First at all check if your question was already answered on one of our - mailing lists: - * User Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users - * Developer Mailing List - - http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev + First at all check if your question was already answered on one of our + mailing lists: + * User Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users + * Developer Mailing List - + http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev - E-mails regarding any stable Kamailio release should be sent to - <sr-users(a)lists.sip-router.org> and e-mails regarding development - versions should be sent to <sr-dev(a)lists.sip-router.org>. + E-mails regarding any stable Kamailio release should be sent to + <sr-users(a)lists.sip-router.org> and e-mails regarding development + versions should be sent to <sr-dev(a)lists.sip-router.org>. - If you want to keep the mail private, send it to - <sr-users(a)lists.sip-router.org>. + If you want to keep the mail private, send it to + <sr-users(a)lists.sip-router.org>. 2.4. - How can I report a bug? + How can I report a bug? - Please follow the guidelines provided at: - http://sip-router.org/tracker. + Please follow the guidelines provided at: + http://sip-router.org/tracker. diff --git a/modules/nathelper/doc/nathelper_admin.xml b/modules/nathelper/doc/nathelper_admin.xml index 63839f6..7283704 100644 --- a/modules/nathelper/doc/nathelper_admin.xml +++ b/modules/nathelper/doc/nathelper_admin.xml @@ -642,9 +642,12 @@ fix_nated_register(); <function moreinfo="none">add_contact_alias([ip_addr, port, proto])</function> </title> <para> - Adds an <quote>;alias=ip~port~transport</quote> parameter to the contact URI - containing either received ip, port, and transport protocol - or those given as parameters. + Adds an <quote>;alias=ip~port~transport</quote> parameter to + the contact URI containing either received ip, port, and + transport protocol or those given as parameters. If called + without parameters, <quote>;alias</quote> parameter is + only added if received ip and port differ from those in + contact URI. </para> <para> This function can be used from

9 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2014