sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

Errored: kamailio/kamailio#1408 (master - 274f103)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #1408 Status: Errored Duration: 18 minutes and 20 seconds Commit: 274f103 (master) Author: Olle E. Johansson Message: nathelper Via header for SIP ping over IPv6 needs square brackets View the changeset: https://github.com/kamailio/kamailio/compare/b3d38eac7a24...274f1034bfb9 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/84076032 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 9 months

git:4.3:74042e3c: nathelper Via header for SIP ping over IPv6 needs square brackets

by Olle E. Johansson

Module: kamailio Branch: 4.3 Commit: 74042e3c00edd441e30d7aba25807f99617be375 URL: https://github.com/kamailio/kamailio/commit/74042e3c00edd441e30d7aba25807f9… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-07T14:04:27+02:00 nathelper Via header for SIP ping over IPv6 needs square brackets (cherry picked from commit 274f1034bfb9ea0d52ef291d2f95021ca86f3081) --- Modified: modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/74042e3c00edd441e30d7aba25807f9… Patch: https://github.com/kamailio/kamailio/commit/74042e3c00edd441e30d7aba25807f9… --- diff --git a/modules/nathelper/sip_pinger.h b/modules/nathelper/sip_pinger.h index fc18f96..295fb68 100644 --- a/modules/nathelper/sip_pinger.h +++ b/modules/nathelper/sip_pinger.h @@ -146,7 +146,13 @@ static inline char* build_sipping(str *curi, struct socket_info* s, str *path, *(p++) = ' '; append_str( p, curi->s, curi->len); append_fix( p, " SIP/2.0"CRLF"Via: SIP/2.0/UDP "); + if (s->address.af == AF_INET6) { /* Via header IP is a IPv6 reference */ + append_fix( p, "["); + } append_str( p, s->address_str.s, s->address_str.len); + if (s->address.af == AF_INET6) { + append_fix( p, "]"); + } *(p++) = ':'; append_str( p, s->port_no_str.s, s->port_no_str.len); if (path->len) {

8 years, 9 months

[kamailio] nathelper: Bad IPv6 reference in Via header (#363)

by Olle E. Johansson

Nathelper sends a Via header with IPv6 address with no square brackets This cause parsing errors on the receiving side and all kinds of unhappy packets in the universe and Internet of SIP. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/363

8 years, 9 months

git:master:274f1034: nathelper Via header for SIP ping over IPv6 needs square brackets

by Olle E. Johansson

Module: kamailio Branch: master Commit: 274f1034bfb9ea0d52ef291d2f95021ca86f3081 URL: https://github.com/kamailio/kamailio/commit/274f1034bfb9ea0d52ef291d2f95021… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-07T13:44:03+02:00 nathelper Via header for SIP ping over IPv6 needs square brackets --- Modified: modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/274f1034bfb9ea0d52ef291d2f95021… Patch: https://github.com/kamailio/kamailio/commit/274f1034bfb9ea0d52ef291d2f95021… --- diff --git a/modules/nathelper/sip_pinger.h b/modules/nathelper/sip_pinger.h index 9db8144..0ff60b1 100644 --- a/modules/nathelper/sip_pinger.h +++ b/modules/nathelper/sip_pinger.h @@ -158,7 +158,13 @@ static inline char* build_sipping(str *curi, struct socket_info* s, str *path, *(p++) = ' '; append_str( p, curi->s, curi->len); append_fix( p, " SIP/2.0"CRLF"Via: SIP/2.0/UDP "); + if (s->address.af == AF_INET6) { /* Via header IP is a IPv6 reference */ + append_fix( p, "["); + } append_str( p, vaddr.s, vaddr.len); + if (s->address.af == AF_INET6) { + append_fix( p, "]"); + } *(p++) = ':'; append_str( p, vport.s, vport.len); if (path->len) {

8 years, 9 months

git:master:0ef0791e: core: faked message api moved to core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0ef0791e5e5ff01622ce8e9575ecc8f40fa4d726 URL: https://github.com/kamailio/kamailio/commit/0ef0791e5e5ff01622ce8e9575ecc8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-07T12:14:24+02:00 core: faked message api moved to core --- Added: fmsg.c Added: fmsg.h Modified: lib/kcore/faked_msg.h Removed: lib/kcore/faked_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/0ef0791e5e5ff01622ce8e9575ecc8f… Patch: https://github.com/kamailio/kamailio/commit/0ef0791e5e5ff01622ce8e9575ecc8f…

8 years, 9 months

git:master:3c086a85: tsilo: unref the transaction after appending new branches

by Federico Cabiddu

Module: kamailio Branch: master Commit: 3c086a85b99d59dabc48f77893d4c68199af0577 URL: https://github.com/kamailio/kamailio/commit/3c086a85b99d59dabc48f77893d4c68… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-10-07T09:29:39+02:00 tsilo: unref the transaction after appending new branches --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/3c086a85b99d59dabc48f77893d4c68… Patch: https://github.com/kamailio/kamailio/commit/3c086a85b99d59dabc48f77893d4c68… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index 1079632..4e8f172 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -72,24 +72,32 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str *uri) { struct cell *t; + struct cell *orig_t; struct sip_msg *orig_msg; int ret; + orig_t = _tmb.t_gett(); + if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) { LM_ERR("transaction [%u:%u] not found\n", tindex, tlabel); - return -1; + ret = -1; + goto done; } + if (t->flags & T_CANCELED) { LM_DBG("trasaction [%u:%u] was cancelled\n", tindex, tlabel); - return -2; + ret = -2; + goto done; } + if (t->uas.status >= 200) { LM_DBG("trasaction [%u:%u] sent out a final response already - %d\n", tindex, tlabel, t->uas.status); - return -3; + ret = -3; + goto done; } orig_msg = t->uas.request; @@ -99,10 +107,20 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * } else { ret = _regapi.lookup_to_dset(orig_msg, table, uri); } + if(ret != 1) { LM_DBG("transaction %u:%u: error updating dset (%d)\n", tindex, tlabel, ret); - return -4; + ret = -4; + goto done; } - - return _tmb.t_append_branches(); + + ret = _tmb.t_append_branches(); + +done: + /* unref the transaction which had been referred by t_lookup_ident() call. + * Restore the original transaction (if any) */ + _tmb.unref_cell(t); + _tmb.t_sett(orig_t, T_BR_UNDEFINED); + + return ret; }

8 years, 9 months

git:master:e1a40492: htable: documenting timer_procs module parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e1a404920b7f912cbf7a0b480129a705849bca79 URL: https://github.com/kamailio/kamailio/commit/e1a404920b7f912cbf7a0b480129a70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-07T05:42:04+02:00 htable: documenting timer_procs module parameter --- Modified: modules/htable/README Modified: modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e1a404920b7f912cbf7a0b480129a70… Patch: https://github.com/kamailio/kamailio/commit/e1a404920b7f912cbf7a0b480129a70…

8 years, 9 months

git:master:ab7b3e69: htable: new parameter to specify if the module should start own timer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ab7b3e69e000a2c970ecc35520197c8bc7c88a62 URL: https://github.com/kamailio/kamailio/commit/ab7b3e69e000a2c970ecc35520197c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-07T05:40:58+02:00 htable: new parameter to specify if the module should start own timer - timer is used for scanning expired items --- Modified: modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/ab7b3e69e000a2c970ecc35520197c8… Patch: https://github.com/kamailio/kamailio/commit/ab7b3e69e000a2c970ecc35520197c8… --- diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 3f6a1e9..3e803fe 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -28,6 +28,7 @@ #include "../../sr_module.h" #include "../../timer.h" +#include "../../timer_proc.h" #include "../../route.h" #include "../../dprint.h" #include "../../hashes.h" @@ -51,6 +52,7 @@ MODULE_VERSION int ht_timer_interval = 20; int ht_db_expires_flag = 0; int ht_enable_dmq = 0; +int ht_timer_procs = 0; static int htable_init_rpc(void); @@ -144,6 +146,7 @@ static param_export_t params[]={ {"timer_interval", INT_PARAM, &ht_timer_interval}, {"db_expires", INT_PARAM, &ht_db_expires_flag}, {"enable_dmq", INT_PARAM, &ht_enable_dmq}, + {"timer_procs", PARAM_INT, &ht_timer_procs}, {0,0,0} }; @@ -202,10 +205,14 @@ static int mod_init(void) LM_DBG("starting auto-expire timer\n"); if(ht_timer_interval<=0) ht_timer_interval = 20; - if(register_timer(ht_timer, 0, ht_timer_interval)<0) - { - LM_ERR("failed to register timer function\n"); - return -1; + if(ht_timer_procs<=0) { + if(register_timer(ht_timer, 0, ht_timer_interval)<0) + { + LM_ERR("failed to register timer function\n"); + return -1; + } + } else { + register_sync_timers(1); } } @@ -227,6 +234,17 @@ static int child_init(int rank) int rtb, rt; LM_DBG("rank is (%d)\n", rank); + + if(rank==PROC_MAIN) { + if(ht_timer_procs>0) { + if(fork_sync_timer(PROC_TIMER, "HTable Timer", 1 /*socks flag*/, + ht_timer, NULL, ht_timer_interval)<0) { + LM_ERR("failed to start timer routine as process\n"); + return -1; /* error */ + } + } + } + if (rank!=PROC_INIT) return 0;

8 years, 9 months

[kamailio] Building a json/rest module (#318)

by Laurent Debacker

Any plans to build a json/rest over http module? There is such a module over rpc, but not over http. Could the http_query module be used as a basis for such a module? Potentially with https and basic authentication? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/318

8 years, 9 months

git:master:743fee55: tm: support to add text in Reason header for local generated CANCEL

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 743fee551c833bd31f1bfdf1a4b422886243f8b6 URL: https://github.com/kamailio/kamailio/commit/743fee551c833bd31f1bfdf1a4b4228… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-06T17:53:15+02:00 tm: support to add text in Reason header for local generated CANCEL --- Modified: modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/743fee551c833bd31f1bfdf1a4b4228… Patch: https://github.com/kamailio/kamailio/commit/743fee551c833bd31f1bfdf1a4b4228… --- diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index 69c5525..ce18354 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -37,6 +37,36 @@ #include "t_hooks.h" +typedef struct cancel_reason_map { + int code; + str text; +} cancel_reason_map_t; + +static cancel_reason_map_t _cancel_reason_map[] = { + 200, str_init("Answered elsewhere"), + 0, {0, 0} +}; + +/** + * + */ +void cancel_reason_text(struct cancel_info* cancel_data) +{ + int i; + + if(cancel_data->reason.cause<=0 + || cancel_data->reason.u.text.s!=NULL) return; + + for(i=0; _cancel_reason_map[i].text.s!=0; i++) { + if(_cancel_reason_map[i].code==cancel_data->reason.cause) { + cancel_data->reason.u.text = _cancel_reason_map[i].text; + return; + } + } + + return; +} + /** Prepare to cancel a transaction. * Determine which branches should be canceled and prepare them (internally * mark them as "cancel in progress", see prepare_cancel_branch()). @@ -87,6 +117,9 @@ int cancel_uacs( struct cell *t, struct cancel_info* cancel_data, int flags) int r; ret=0; + + cancel_reason_text(cancel_data); + /* cancel pending client transactions, if any */ for( i=0 ; i<t->nr_of_outgoings ; i++ ) if (cancel_data->cancel_bitmap & (1<<i)){

8 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015