sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:5261c1d0: nat_traversal: set via branch according to "z9hG4bK..." format (instead of "branch=0")

by Dmitri Savolainen

Module: kamailio Branch: master Commit: 5261c1d0723a5b59edd231c93e42d1c963eb6375 URL: https://github.com/kamailio/kamailio/commit/5261c1d0723a5b59edd231c93e42d1c… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2016-06-27T12:53:01+03:00 nat_traversal: set via branch according to "z9hG4bK..." format (instead of "branch=0") --- Modified: modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/5261c1d0723a5b59edd231c93e42d1c… Patch: https://github.com/kamailio/kamailio/commit/5261c1d0723a5b59edd231c93e42d1c… --- diff --git a/modules/nat_traversal/nat_traversal.c b/modules/nat_traversal/nat_traversal.c index 0acdd17..fb1dd30 100644 --- a/modules/nat_traversal/nat_traversal.c +++ b/modules/nat_traversal/nat_traversal.c @@ -1508,6 +1508,8 @@ ClientNatTest(struct sip_msg *msg, unsigned int tests) #define FROM_PREFIX "sip:keepalive@" +#define MAX_BRANCHID 9999999 +#define MIN_BRANCHID 1000000 static void send_keepalive(NAT_Contact *contact) @@ -1536,7 +1538,7 @@ send_keepalive(NAT_Contact *contact) len = snprintf(buffer, sizeof(buffer), "%s %s SIP/2.0\r\n" - "Via: SIP/2.0/UDP %.*s:%d;branch=0\r\n" + "Via: SIP/2.0/UDP %.*s:%d;branch=z9hG4bK%ld\r\n" "From: %s;tag=%x\r\n" "To: %s\r\n" "Call-ID: %s-%x-%x(a)%.*s\r\n" @@ -1546,6 +1548,7 @@ send_keepalive(NAT_Contact *contact) keepalive_params.method, contact->uri, contact->socket->address_str.len, contact->socket->address_str.s, contact->socket->port_no, + (long)(rand()/(float)RAND_MAX * (MAX_BRANCHID-MIN_BRANCHID) + MIN_BRANCHID), from_uri, keepalive_params.from_tag++, contact->uri, keepalive_params.callid_prefix, keepalive_params.callid_counter++, get_ticks(),

8 years, 5 months

git:master:1edb4298: nathelper: set via branch according to "z9hG4bK..." format (instead of "branch=0")

by Dmitri Savolainen

Module: kamailio Branch: master Commit: 1edb4298ca5b890c40f9d7df5f29199a90b0c4fd URL: https://github.com/kamailio/kamailio/commit/1edb4298ca5b890c40f9d7df5f29199… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2016-06-27T12:50:19+03:00 nathelper: set via branch according to "z9hG4bK..." format (instead of "branch=0") --- Modified: modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/1edb4298ca5b890c40f9d7df5f29199… Patch: https://github.com/kamailio/kamailio/commit/1edb4298ca5b890c40f9d7df5f29199… --- diff --git a/modules/nathelper/sip_pinger.h b/modules/nathelper/sip_pinger.h index 7cd5e0c..5166a75 100644 --- a/modules/nathelper/sip_pinger.h +++ b/modules/nathelper/sip_pinger.h @@ -116,6 +116,9 @@ static inline char* build_sipping(str *curi, struct socket_info* s, str *path, str *ruid, unsigned int aorhash, int *len_p) { #define s_len(_s) (sizeof(_s)-1) +#define MAX_BRANCHID 9999999 +#define MIN_BRANCHID 1000000 +#define LEN_BRANCHID 7 /* NOTE: this must be sync with the MX and MIN values !! */ static char buf[MAX_SIPPING_SIZE]; char *p; int len; @@ -135,7 +138,7 @@ static inline char* build_sipping(str *curi, struct socket_info* s, str *path, if ( sipping_method.len + 1 + curi->len + s_len(" SIP/2.0"CRLF) + s_len("Via: SIP/2.0/UDP ") + vaddr.len + ((s->address.af==AF_INET6)?2:0) + - 1 + vport.len + s_len(";branch=0") + + 1 + vport.len + s_len(";branch=z9hG4bK") + LEN_BRANCHID + (path->len ? (s_len(CRLF"Route: ") + path->len) : 0) + s_len(CRLF"From: ") + sipping_from.len + s_len(";tag=") + ruid->len + 1 + 8 + 1 + 8 + @@ -164,13 +167,16 @@ static inline char* build_sipping(str *curi, struct socket_info* s, str *path, } *(p++) = ':'; append_str( p, vport.s, vport.len); + append_fix( p, ";branch=z9hG4bK"); + int2bstr( + (long)(rand()/(float)RAND_MAX * (MAX_BRANCHID-MIN_BRANCHID) + MIN_BRANCHID), + p+LEN_BRANCHID-INT2STR_MAX_LEN+1, NULL); + p += LEN_BRANCHID; if (path->len) { - append_fix( p, ";branch=0"CRLF"Route: "); + append_fix( p, CRLF"Route: "); append_str( p, path->s, path->len); - append_fix( p, CRLF"From: "); - } else { - append_fix( p, ";branch=0"CRLF"From: "); } + append_fix( p, CRLF"From: "); append_str( p, sipping_from.s, sipping_from.len); append_fix( p, ";tag="); append_str( p, ruid->s, ruid->len);

8 years, 5 months

[kamailio/kamailio] Nathelper branch (#686)

by Dmitri Savolainen

It was noitced "branch=0" in sip-pinging requests, that seems not RFC compliant: > OPTIONS sip:0004*202@192.168.5.61:5062 SIP/2.0. > Via: SIP/2.0/UDP xxx.xxx.xxx.xxx:5060;branch=0. > From: sip:ping@myhost.ru;tag=uloc-5756b445-45e2-53b-223ff654-6ad81121. > To: sip:0004*202@192.168.5.61:5062. > Call-ID: 935a5981-9d632e71-c6c3075(a)xxx.xxx.xxx.xxx. > CSeq: 1 OPTIONS. > Content-Length: 0. this issue is a google search result: https://github.com/OpenSIPS/opensips/issues/145 so this patch is just a copy of [varunvairavan](https://github.com/varunvairavan) patch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/686 -- Commit Summary -- * nathelper: set via branch according to "z9hG4bK..." format (instead of "branch=0") * nat_traversal: set via branch according to "z9hG4bK..." format (instead of "branch=0") -- File Changes -- M modules/nat_traversal/nat_traversal.c (5) M modules/nathelper/sip_pinger.h (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/686.patch https://github.com/kamailio/kamailio/pull/686.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/686

8 years, 5 months

git:master:2ebdbec8: db_postgres: rename ntohll and htonll functions

by Spencer Thomason

Module: kamailio Branch: master Commit: 2ebdbec8af56027c9c94fe5e67975c9a319b9620 URL: https://github.com/kamailio/kamailio/commit/2ebdbec8af56027c9c94fe5e67975c9… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Spencer Thomason <spencer(a)whiteskycommunications.com> Date: 2016-06-24T00:01:59-07:00 db_postgres: rename ntohll and htonll functions - fix namespace conflict on platforms where these are present in system libs --- Modified: modules/db_postgres/pg_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/2ebdbec8af56027c9c94fe5e67975c9… Patch: https://github.com/kamailio/kamailio/commit/2ebdbec8af56027c9c94fe5e67975c9… --- diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index d31e2e8..820cec6 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -89,23 +89,19 @@ union ull { uint32_t ui32[2]; }; -#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) -static inline uint64_t htonll(uint64_t in) +static inline uint64_t _htonll(uint64_t in) { union ull* p = (union ull*)&in; return ((uint64_t)htonl(p->ui32[0]) << 32) + (uint64_t)htonl(p->ui32[1]); } -#endif -#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) -static inline uint64_t ntohll(uint64_t in) +static inline uint64_t _ntohll(uint64_t in) { union ull* p = (union ull*)&in; return ((uint64_t)ntohl(p->ui32[0]) << 32) + (uint64_t)ntohl(p->ui32[1]); } -#endif static inline void db_int2pg_int4(struct pg_params* dst, int i, @@ -141,7 +137,7 @@ static inline void db_int2pg_timestamp(struct pg_params* dst, int i, } else { pfld->v.dbl = (double)src->v.int4 - (double)PG_EPOCH_TIME; } - pfld->v.int8 = htonll(pfld->v.int8); + pfld->v.int8 = _htonll(pfld->v.int8); dst->fmt[i] = 1; dst->val[i] = pfld->v.byte; @@ -204,7 +200,7 @@ static inline void db_float2pg_float8(struct pg_params* dst, int i, db_fld_t* sr { struct pg_fld* pfld = DB_GET_PAYLOAD(src); pfld->v.dbl = src->v.flt; - pfld->v.int8 = htonll(pfld->v.int8); + pfld->v.int8 = _htonll(pfld->v.int8); dst->fmt[i] = 1; dst->val[i] = pfld->v.byte; @@ -215,7 +211,7 @@ static inline void db_float2pg_float8(struct pg_params* dst, int i, db_fld_t* sr static inline void db_double2pg_float8(struct pg_params* dst, int i, db_fld_t* src) { struct pg_fld* pfld = DB_GET_PAYLOAD(src); - pfld->v.int8 = htonll(src->v.int8); + pfld->v.int8 = _htonll(src->v.int8); dst->fmt[i] = 1; dst->val[i] = pfld->v.byte; @@ -682,7 +678,7 @@ static inline int pg_int4_2_db_int(db_fld_t* fld, char* val, int len) static inline int pg_int8_2_db_int(db_fld_t* fld, char* val, int len) { - fld->v.int8 = (int64_t)ntohll(*((int64_t*)val)); + fld->v.int8 = (int64_t)_ntohll(*((int64_t*)val)); return 0; } @@ -728,10 +724,10 @@ static inline int pg_timestamp2db_int(db_fld_t* fld, char* val, int len, { if (flags & PG_INT8_TIMESTAMP) { /* int8 format */ - fld->v.int4 = (int64_t)ntohll(((int64_t*)val)[0]) / (int64_t)1000000 + PG_EPOCH_TIME; + fld->v.int4 = (int64_t)_ntohll(((int64_t*)val)[0]) / (int64_t)1000000 + PG_EPOCH_TIME; } else { /* double format */ - fld->v.int4 = PG_EPOCH_TIME + ntohll(((int64_t*)val)[0]); + fld->v.int4 = PG_EPOCH_TIME + _ntohll(((int64_t*)val)[0]); } return 0; } @@ -771,7 +767,7 @@ static inline int pg_float42db_double(db_fld_t* fld, char* val, int len) static inline int pg_float82db_double(db_fld_t* fld, char* val, int len) { - fld->v.int8 = ntohll(*(uint64_t*)val); + fld->v.int8 = _ntohll(*(uint64_t*)val); return 0; }

8 years, 5 months

git:master:2dcb1183: Merge pull request #682 from sjthomason/db_postgres-build-fix

by GitHub

Module: kamailio Branch: master Commit: 2dcb11835c32395e4bf7253bdb6c6747f5ab4289 URL: https://github.com/kamailio/kamailio/commit/2dcb11835c32395e4bf7253bdb6c674… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-06-27T14:58:16+02:00 Merge pull request #682 from sjthomason/db_postgres-build-fix db_postgres: rename ntohll and htonll functions --- Modified: modules/db_postgres/pg_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/2dcb11835c32395e4bf7253bdb6c674… Patch: https://github.com/kamailio/kamailio/commit/2dcb11835c32395e4bf7253bdb6c674… --- diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index d31e2e8..820cec6 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -89,23 +89,19 @@ union ull { uint32_t ui32[2]; }; -#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) -static inline uint64_t htonll(uint64_t in) +static inline uint64_t _htonll(uint64_t in) { union ull* p = (union ull*)&in; return ((uint64_t)htonl(p->ui32[0]) << 32) + (uint64_t)htonl(p->ui32[1]); } -#endif -#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) -static inline uint64_t ntohll(uint64_t in) +static inline uint64_t _ntohll(uint64_t in) { union ull* p = (union ull*)&in; return ((uint64_t)ntohl(p->ui32[0]) << 32) + (uint64_t)ntohl(p->ui32[1]); } -#endif static inline void db_int2pg_int4(struct pg_params* dst, int i, @@ -141,7 +137,7 @@ static inline void db_int2pg_timestamp(struct pg_params* dst, int i, } else { pfld->v.dbl = (double)src->v.int4 - (double)PG_EPOCH_TIME; } - pfld->v.int8 = htonll(pfld->v.int8); + pfld->v.int8 = _htonll(pfld->v.int8); dst->fmt[i] = 1; dst->val[i] = pfld->v.byte; @@ -204,7 +200,7 @@ static inline void db_float2pg_float8(struct pg_params* dst, int i, db_fld_t* sr { struct pg_fld* pfld = DB_GET_PAYLOAD(src); pfld->v.dbl = src->v.flt; - pfld->v.int8 = htonll(pfld->v.int8); + pfld->v.int8 = _htonll(pfld->v.int8); dst->fmt[i] = 1; dst->val[i] = pfld->v.byte; @@ -215,7 +211,7 @@ static inline void db_float2pg_float8(struct pg_params* dst, int i, db_fld_t* sr static inline void db_double2pg_float8(struct pg_params* dst, int i, db_fld_t* src) { struct pg_fld* pfld = DB_GET_PAYLOAD(src); - pfld->v.int8 = htonll(src->v.int8); + pfld->v.int8 = _htonll(src->v.int8); dst->fmt[i] = 1; dst->val[i] = pfld->v.byte; @@ -682,7 +678,7 @@ static inline int pg_int4_2_db_int(db_fld_t* fld, char* val, int len) static inline int pg_int8_2_db_int(db_fld_t* fld, char* val, int len) { - fld->v.int8 = (int64_t)ntohll(*((int64_t*)val)); + fld->v.int8 = (int64_t)_ntohll(*((int64_t*)val)); return 0; } @@ -728,10 +724,10 @@ static inline int pg_timestamp2db_int(db_fld_t* fld, char* val, int len, { if (flags & PG_INT8_TIMESTAMP) { /* int8 format */ - fld->v.int4 = (int64_t)ntohll(((int64_t*)val)[0]) / (int64_t)1000000 + PG_EPOCH_TIME; + fld->v.int4 = (int64_t)_ntohll(((int64_t*)val)[0]) / (int64_t)1000000 + PG_EPOCH_TIME; } else { /* double format */ - fld->v.int4 = PG_EPOCH_TIME + ntohll(((int64_t*)val)[0]); + fld->v.int4 = PG_EPOCH_TIME + _ntohll(((int64_t*)val)[0]); } return 0; } @@ -771,7 +767,7 @@ static inline int pg_float42db_double(db_fld_t* fld, char* val, int len) static inline int pg_float82db_double(db_fld_t* fld, char* val, int len) { - fld->v.int8 = ntohll(*(uint64_t*)val); + fld->v.int8 = _ntohll(*(uint64_t*)val); return 0; }

8 years, 5 months

[kamailio/kamailio] db_postgres: rename ntohll and htonll functions (#682)

by sjthomason

- fix namespace conflict on platforms where these are present in system libs closes #665 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/682 -- Commit Summary -- * db_postgres: rename ntohll and htonll functions -- File Changes -- M modules/db_postgres/pg_fld.c (22) -- Patch Links -- https://github.com/kamailio/kamailio/pull/682.patch https://github.com/kamailio/kamailio/pull/682.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/682

8 years, 5 months

[kamailio/kamailio] db_postgres compilation fails if htonll is defined (#665)

by sjthomason

``` pg_fld.c:97:40: error: expected ‘)’ before ‘in’ static inline uint64_t htonll(uint64_t in) ^ pg_fld.c:107:40: error: expected ‘)’ before ‘in’ static inline uint64_t ntohll(uint64_t in) ^ ``` There is a fairly specific ifdef that doesn't match other platforms that define htonll and ntohll such as Solaris: ``` #if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) ``` Would it be acceptable to change these to: ``` #ifndef htonll ``` For example: ``` diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index de62c14..d9b4911 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -93,7 +93,7 @@ union ull { uint32_t ui32[2]; }; -#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) +#ifndef htonll static inline uint64_t htonll(uint64_t in) { union ull* p = (union ull*)&in; @@ -103,7 +103,7 @@ static inline uint64_t htonll(uint64_t in) #endif -#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) +#ifndef ntohll static inline uint64_t ntohll(uint64_t in) { union ull* p = (union ull*)&in; ``` --- 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/issues/665

8 years, 5 months

git:master:05e5126f: modules: readme files regenerated - sca ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 05e5126f6a702e6396276865bc882146ff29599c URL: https://github.com/kamailio/kamailio/commit/05e5126f6a702e6396276865bc88214… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-06-27T14:01:13+02:00 modules: readme files regenerated - sca ... --- Modified: modules/sca/README --- Diff: https://github.com/kamailio/kamailio/commit/05e5126f6a702e6396276865bc88214… Patch: https://github.com/kamailio/kamailio/commit/05e5126f6a702e6396276865bc88214…

8 years, 5 months

git:master:0d0d42fa: sca: sca_call_info_update() document missing parameter

by Victor Seva

Module: kamailio Branch: master Commit: 0d0d42fa4bda5f37618af4c383f40bbb9ba46067 URL: https://github.com/kamailio/kamailio/commit/0d0d42fa4bda5f37618af4c383f40bb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-27T13:52:55+02:00 sca: sca_call_info_update() document missing parameter --- Modified: modules/sca/doc/sca_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0d0d42fa4bda5f37618af4c383f40bb… Patch: https://github.com/kamailio/kamailio/commit/0d0d42fa4bda5f37618af4c383f40bb… --- diff --git a/modules/sca/doc/sca_admin.xml b/modules/sca/doc/sca_admin.xml index fd200f5..85911ce 100644 --- a/modules/sca/doc/sca_admin.xml +++ b/modules/sca/doc/sca_admin.xml @@ -320,9 +320,22 @@ if ( is_method( "SUBSCRIBE" )) { <section id="sca.f.sca_call_info_update"> <title> - <function moreinfo="none">sca_call_info_update()</function> + <function moreinfo="none">sca_call_info_update([mask])</function> </title> <para> + <itemizedlist> + <listitem> + <para><emphasis>mask</emphasis> - integer (optional)</para> + <para>controls what to check as shared line (BOTH, CALLER, CALLEE)</para> + <itemizedlist> + <listitem><para>0 - SCA_CALL_INFO_SHARED_NONE (default) check both</para></listitem> + <listitem><para>1 - SCA_CALL_INFO_SHARED_CALLER</para></listitem> + <listitem><para>2 - SCA_CALL_INFO_SHARED_CALLEE</para></listitem> + </itemizedlist> + </listitem> + </itemizedlist> + </para> + <para> The sca_call_info_update function updates call state for SCA appearances. If a request or response packet contains a Call-Info header, the function extracts call state from

8 years, 5 months

git:master:a71aa0d3: sca: doc indent using tabs

by Victor Seva

Module: kamailio Branch: master Commit: a71aa0d3338a3e925053002d875d5f3ad969065c URL: https://github.com/kamailio/kamailio/commit/a71aa0d3338a3e925053002d875d5f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-27T13:39:24+02:00 sca: doc indent using tabs --- Modified: modules/sca/doc/sca_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a71aa0d3338a3e925053002d875d5f3… Patch: https://github.com/kamailio/kamailio/commit/a71aa0d3338a3e925053002d875d5f3…

8 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2016