sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

git:master:24a42eaf: modules: readme files regenerated - siputils ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 24a42eaf96bc084edce5daa89c254cb49be02893 URL: https://github.com/kamailio/kamailio/commit/24a42eaf96bc084edce5daa89c254cb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-11-07T10:16:16+01:00 modules: readme files regenerated - siputils ... --- Modified: modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/24a42eaf96bc084edce5daa89c254cb… Patch: https://github.com/kamailio/kamailio/commit/24a42eaf96bc084edce5daa89c254cb…

8 years

git:master:a25d1774: Merge pull request #847 from tverlaan/nathelper_force_socket

by GitHub

Module: kamailio Branch: master Commit: a25d17748a762ebce7f939afccfee76bcb759680 URL: https://github.com/kamailio/kamailio/commit/a25d17748a762ebce7f939afccfee76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-11-07T10:01:45+01:00 Merge pull request #847 from tverlaan/nathelper_force_socket nathelper: force socket if set --- Modified: modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/a25d17748a762ebce7f939afccfee76… Patch: https://github.com/kamailio/kamailio/commit/a25d17748a762ebce7f939afccfee76… --- diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 28508ca..2f02378 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -2079,9 +2079,12 @@ nh_timer(unsigned int ticks, void *timer_idx) } init_dest_info(&dst); hostent2su(&dst.to, he, 0, curi.port_no); + + if (force_socket) { + send_sock = force_socket; + } if (send_sock==0) { - send_sock=force_socket ? force_socket : - get_send_socket(0, &dst.to, PROTO_UDP); + send_sock = get_send_socket(0, &dst.to, PROTO_UDP); } if (send_sock == NULL) { LM_ERR("can't get sending socket\n");

8 years

git:master:b2ade6ca: nathelper: force socket if set

by Timmo Verlaan

Module: kamailio Branch: master Commit: b2ade6ca35499ba9c44d6f46888351244eb87299 URL: https://github.com/kamailio/kamailio/commit/b2ade6ca35499ba9c44d6f468883512… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2016-11-04T10:01:41+01:00 nathelper: force socket if set This fixes force socket in that it will always be forced and not only when there is no socket. --- Modified: modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/b2ade6ca35499ba9c44d6f468883512… Patch: https://github.com/kamailio/kamailio/commit/b2ade6ca35499ba9c44d6f468883512… --- diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 28508ca..2f02378 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -2079,9 +2079,12 @@ nh_timer(unsigned int ticks, void *timer_idx) } init_dest_info(&dst); hostent2su(&dst.to, he, 0, curi.port_no); + + if (force_socket) { + send_sock = force_socket; + } if (send_sock==0) { - send_sock=force_socket ? force_socket : - get_send_socket(0, &dst.to, PROTO_UDP); + send_sock = get_send_socket(0, &dst.to, PROTO_UDP); } if (send_sock == NULL) { LM_ERR("can't get sending socket\n");

8 years

[kamailio/kamailio] nathelper: force socket if set (#847)

by Timmo Verlaan

This fixes force socket in that it will always be forced and not only when there is no socket. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/847 -- Commit Summary -- * nathelper: force socket if set -- File Changes -- M modules/nathelper/nathelper.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/847.patch https://github.com/kamailio/kamailio/pull/847.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/847

8 years

git:master:beda05be: Merge pull request #850 from mslehto/pcv

by GitHub

Module: kamailio Branch: master Commit: beda05be61e6ac54f0d9d3c9dc3f64cf15b20af7 URL: https://github.com/kamailio/kamailio/commit/beda05be61e6ac54f0d9d3c9dc3f64c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-11-07T10:01:20+01:00 Merge pull request #850 from mslehto/pcv P-Charging-Vector related updates --- Modified: modules/siputils/chargingvector.c Modified: modules/siputils/chargingvector.h Modified: modules/siputils/doc/siputils_admin.xml Modified: modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/beda05be61e6ac54f0d9d3c9dc3f64c… Patch: https://github.com/kamailio/kamailio/commit/beda05be61e6ac54f0d9d3c9dc3f64c…

8 years

git:master:345bbbe2: modules/siputils: document P-Charging-Vector related pseudo variables

by Mikko Lehto

Module: kamailio Branch: master Commit: 345bbbe24a769a01122f4c28f82d2d68c802ef09 URL: https://github.com/kamailio/kamailio/commit/345bbbe24a769a01122f4c28f82d2d6… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:49:08+02:00 modules/siputils: document P-Charging-Vector related pseudo variables --- Modified: modules/siputils/chargingvector.h Modified: modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/345bbbe24a769a01122f4c28f82d2d6… Patch: https://github.com/kamailio/kamailio/commit/345bbbe24a769a01122f4c28f82d2d6… --- diff --git a/modules/siputils/chargingvector.h b/modules/siputils/chargingvector.h index c171672..cb7ef81 100644 --- a/modules/siputils/chargingvector.h +++ b/modules/siputils/chargingvector.h @@ -19,19 +19,22 @@ */ /* - * Support for rfc3455 P-Charging-Vector + * Support for RFC3455 / RFC7315 P-Charging-Vector * - parse charging vector from SIP message * - generate new unique charging vector * - can remove charging vector * - * pseudo variables are exported and enable R ondly access to charging vector fields + * pseudo variables are exported and enable read only access to charging vector fields * $pcv(all) = whole field * $pcv(value) = icid-value field (see RFC3455 section 5.6) * $pcv(genaddr) = icid-generated-at field (see RFC3455 section 5.6) + * $pcv(orig) = orig-ioi field (see RFC3455 section 5.6) + * $pcv(term) = term-ioi field (see RFC3455 section 5.6) * - * to be supported - * $pcv(orig) - * $pcv(term) + * missing: + * $pcv(transit-ioi) RFC7315 5.6 + * $pcv(related-icid) RFC7315 5.6 + * $pcv(related-icid-gen-addr) RFC7315 5.6 */ #ifndef _CHARGINGVECTOR_H_ diff --git a/modules/siputils/doc/siputils_admin.xml b/modules/siputils/doc/siputils_admin.xml index 208ee3a..ccca958 100644 --- a/modules/siputils/doc/siputils_admin.xml +++ b/modules/siputils/doc/siputils_admin.xml @@ -1066,7 +1066,7 @@ if(is_first_hop()) { ... } <function moreinfo="none">sip_p_charging_vector(flags)</function> </title> <para> - Manage the P-Charging-Vector header (RFC3455). The flags can be: + Manage the P-Charging-Vector header (RFC7315). The flags can be: 'r' - remove; 'g' - generate; 'f' - force (remove + generate). </para> <para> @@ -1083,4 +1083,34 @@ sip_p_charging_vector("g"); </section> </section> + <section> + <title>Exported pseudo-variables</title> + <section id="siputils.v.pcv_all"> + <title><varname>$pcv(all)</title> + <para> + full P-Charging-Vector header + </para> + <section id="siputils.v.pcv_value"> + <title><varname>$pcv(value)</title> + <para> + icid-value field (see RFC7315 section 5.6) + </para> + <section id="siputils.v.pcv_genaddr"> + <title><varname>$pcv(genaddr)</title> + <para> + icid-generated-at field (see RFC7315 section 5.6) + </para> + <section id="siputils.v.pcv_orig"> + <title><varname>$pcv(orig)</title> + <para> + orig-ioi field (see RFC7315 section 5.6) + </para> + <section id="siputils.v.pcv_term"> + <title><varname>$pcv(term)</title> + <para> + term-ioi field (see RFC7315 section 5.6) + </para> + </section> + <section> + </chapter>

8 years

git:master:c2235f12: modules/siputils: add P-Charging-Vector related pseudo variables

by Mikko Lehto

Module: kamailio Branch: master Commit: c2235f12957c5ffccbc6c1bfaf3fbb673394b1ec URL: https://github.com/kamailio/kamailio/commit/c2235f12957c5ffccbc6c1bfaf3fbb6… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:48:59+02:00 modules/siputils: add P-Charging-Vector related pseudo variables pcv(orig) - orig-ioi field pcv(term) - term-ioi field --- Modified: modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/c2235f12957c5ffccbc6c1bfaf3fbb6… Patch: https://github.com/kamailio/kamailio/commit/c2235f12957c5ffccbc6c1bfaf3fbb6… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index ab9f275..2d61b14 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -36,8 +36,10 @@ #define PCV_BUF_SIZE 256 static char pcv_buf[PCV_BUF_SIZE]; static str pcv = { pcv_buf, 0 }; -static str pcv_host = { NULL, 0 }; static str pcv_id = { NULL, 0 }; +static str pcv_host = { NULL, 0 }; +static str pcv_orig = { NULL, 0 }; +static str pcv_term = { NULL, 0 }; static uint64_t counter = 0; @@ -192,6 +194,34 @@ static int sip_parse_charging_vector(const char * pcv_value, unsigned int len) pcv_host.len = 0; } + s = strstr(pcv_value, "orig-ioi="); + if (s != NULL) + { + pcv_orig.s = s + strlen("orig-ioi="); + pcv_orig.len = sip_param_end(pcv_orig.s, len); + LM_INFO("parsed P-Charging-Vector orig-ioi=%.*s\n", + pcv_orig.len, pcv_orig.s ); + } + else + { + pcv_orig.s = NULL; + pcv_orig.len = 0; + } + + s = strstr(pcv_value, "term-ioi="); + if (s != NULL) + { + pcv_term.s = s + strlen("term-ioi="); + pcv_term.len = sip_param_end(pcv_term.s, len); + LM_INFO("parsed P-Charging-Vector term-ioi=%.*s\n", + pcv_term.len, pcv_term.s ); + } + else + { + pcv_term.s = NULL; + pcv_term.len = 0; + } + // only icid-value is mandatory, log anyway when missing icid-generated-at if ( pcv_host.s == NULL && pcv_id.s != NULL && len > 0) { @@ -436,6 +466,12 @@ int pv_get_charging_vector(struct sip_msg *msg, pv_param_t *param, pv_value_t *r LM_DBG("pcv_status==PCV_PARSED\n"); switch( param->pvn.u.isname.name.n ) { + case 5: + pcv_pv = pcv_term; + break; + case 4: + pcv_pv = pcv_orig; + break; case 2: pcv_pv = pcv_host; break; @@ -477,6 +513,13 @@ int pv_parse_charging_vector_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break; + case 4: + if(strncmp(in->s, "orig", 4)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "term", 4)==0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; case 5: if(strncmp(in->s, "value", 5)==0) sp->pvp.pvn.u.isname.name.n = 3;

8 years

git:master:03643835: modules/siputils: populate $pcv(all) after succesful parse

by Mikko Lehto

Module: kamailio Branch: master Commit: 0364383549f69241037a96a5e5e20179b2ac6efe URL: https://github.com/kamailio/kamailio/commit/0364383549f69241037a96a5e5e2017… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:48:49+02:00 modules/siputils: populate $pcv(all) after succesful parse --- Modified: modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/0364383549f69241037a96a5e5e2017… Patch: https://github.com/kamailio/kamailio/commit/0364383549f69241037a96a5e5e2017… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index 48bc125..ab9f275 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -237,10 +237,15 @@ static int sip_get_charging_vector(struct sip_msg *msg, struct hdr_field ** hf_p if ( sip_parse_charging_vector( pcv_body, hf->body.len ) == 0) { LM_ERR("P-Charging-Vector header found but failed to parse value [%s].\n", pcv_body); + pcv_status = PCV_NONE; + pcv.s = NULL; + pcv.len = 0; } else { pcv_status = PCV_PARSED; + pcv.s = hf->body.s; + pcv.len = hf->body.len; } return 2; }

8 years

git:master:eecc0a1a: modules/siputils: do not let $pcv(value) to contain invalid value

by Mikko Lehto

Module: kamailio Branch: master Commit: eecc0a1ae7a4f4d243ebbe713dd884493611b45c URL: https://github.com/kamailio/kamailio/commit/eecc0a1ae7a4f4d243ebbe713dd8844… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:48:43+02:00 modules/siputils: do not let $pcv(value) to contain invalid value --- Modified: modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/eecc0a1ae7a4f4d243ebbe713dd8844… Patch: https://github.com/kamailio/kamailio/commit/eecc0a1ae7a4f4d243ebbe713dd8844… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index 7e64a52..48bc125 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -172,6 +172,7 @@ static int sip_parse_charging_vector(const char * pcv_value, unsigned int len) } else { + LM_WARN("mandatory icid-value not found\n"); pcv_id.s = NULL; pcv_id.len = 0; } @@ -186,16 +187,15 @@ static int sip_parse_charging_vector(const char * pcv_value, unsigned int len) } else { + LM_DBG("icid-generated-at not found\n"); pcv_host.s = NULL; pcv_host.len = 0; } - // Buggy charging vector where only icid-value is sent ... - if ( pcv_host.s == NULL && pcv_id.s == NULL && len > 0) + // only icid-value is mandatory, log anyway when missing icid-generated-at + if ( pcv_host.s == NULL && pcv_id.s != NULL && len > 0) { - pcv_id.s = (char *) pcv_value, - pcv_id.len = sip_param_end(pcv_id.s, len); - LM_WARN("parsed BUGGY P-Charging-Vector %.*s\n", pcv_id.len, pcv_id.s ); + LM_WARN("icid-generated-at is missing %.*s\n", len, pcv_value); } return (pcv_id.s != NULL);

8 years

git:master:8d570538: modules/siputils: fix $pcv(genaddr) length issue

by Mikko Lehto

Module: kamailio Branch: master Commit: 8d5705380ac7b79f22a61ea117ecb1cfd31b2efc URL: https://github.com/kamailio/kamailio/commit/8d5705380ac7b79f22a61ea117ecb1c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-07T01:48:35+02:00 modules/siputils: fix $pcv(genaddr) length issue $pcv(genaddr) was truncated when field "icid-value" was shorter than field "icid-generated-at" --- Modified: modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/8d5705380ac7b79f22a61ea117ecb1c… Patch: https://github.com/kamailio/kamailio/commit/8d5705380ac7b79f22a61ea117ecb1c… --- diff --git a/modules/siputils/chargingvector.c b/modules/siputils/chargingvector.c index 51d113e..7e64a52 100644 --- a/modules/siputils/chargingvector.c +++ b/modules/siputils/chargingvector.c @@ -180,7 +180,7 @@ static int sip_parse_charging_vector(const char * pcv_value, unsigned int len) if (s != NULL) { pcv_host.s = s + strlen("icid-generated-at="); - pcv_host.len = sip_param_end(pcv_id.s, len); + pcv_host.len = sip_param_end(pcv_host.s, len); LM_DBG("parsed P-Charging-Vector icid-generated-at=%.*s\n", pcv_host.len, pcv_host.s ); }

8 years

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016