sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

git:4.3:60585019: counters: fix return statement in void function
by Daniel-Constantin Mierla 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.3 Commit: 60585019c82f23f24fe51a2cb3d04db65aed012a URL: https://github.com/kamailio/kamailio/commit/60585019c82f23f24fe51a2cb3d04db… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-05T12:01:21+02:00 counters: fix return statement in void function (cherry picked from commit 37355281dffccc42b1d83f413e3d528bdcf6cdd0) (cherry picked from commit 33073d2af70ed0f289de6cfa2d754763e037ce1b) --- Modified: modules/counters/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/60585019c82f23f24fe51a2cb3d04db… Patch: https://github.com/kamailio/kamailio/commit/60585019c82f23f24fe51a2cb3d04db… --- diff --git a/modules/counters/counters.c b/modules/counters/counters.c index 7d7f85e..d90ead1 100644 --- a/modules/counters/counters.c +++ b/modules/counters/counters.c @@ -288,7 +288,8 @@ static void cnt_get_rpc(rpc_t* rpc, void* c) if (rpc->scan(c, "s", &group) < 1) return; if (rpc->scan(c, "*s", &name) < 1) - return cnt_grp_get_all(rpc, c, group); + cnt_grp_get_all(rpc, c, group); + return; /* group & name read */ if (counter_lookup(&h, group, name) < 0) { rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); @@ -427,7 +428,7 @@ static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) /* rpc->fault(c, 400, "group name required"); */ return; } - return cnt_grp_get_all(rpc, c, group); + cnt_grp_get_all(rpc, c, group); }

1 0

git:4.3:a06d5419: db_unixodbc: detect DB disconnection with generic HY000 status
by Daniel-Constantin Mierla 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.3 Commit: a06d5419699183f98bfb4908d29bd768a0eb0a0a URL: https://github.com/kamailio/kamailio/commit/a06d5419699183f98bfb4908d29bd76… Author: Giovanni Mele <giovanni.mele(a)nagra.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-05T11:58:24+02:00 db_unixodbc: detect DB disconnection with generic HY000 status (cherry picked from commit d80376f9ea087328a0c46d97b908993baeb5b1b4) (cherry picked from commit e2874495b1ecad9e85b47f6d8bdb847fceb0c3ad) --- Modified: modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a06d5419699183f98bfb4908d29bd76… Patch: https://github.com/kamailio/kamailio/commit/a06d5419699183f98bfb4908d29bd76… --- diff --git a/modules/db_unixodbc/dbase.c b/modules/db_unixodbc/dbase.c index d5c7d27..304b4d4 100644 --- a/modules/db_unixodbc/dbase.c +++ b/modules/db_unixodbc/dbase.c @@ -138,7 +138,8 @@ static int db_unixodbc_submit_query(const db1_con_t* _h, const str* _s) /* Connection broken */ if( !strncmp((char*)sqlstate,"08003",5) || - !strncmp((char*)sqlstate,"08S01",5) + !strncmp((char*)sqlstate,"08S01",5) || + !strncmp((char*)sqlstate,"HY000",5) /* ODBC 3 General error */ ) { ret = reconnect(_h);

1 0

git:4.4:379e6df1: modules: readme files regenerated - topos ...
by Kamailio Dev 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.4 Commit: 379e6df158837c2510592c75d4a71c19c32f4d13 URL: https://github.com/kamailio/kamailio/commit/379e6df158837c2510592c75d4a71c1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-07-05T12:01:18+02:00 modules: readme files regenerated - topos ... --- Modified: modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/379e6df158837c2510592c75d4a71c1… Patch: https://github.com/kamailio/kamailio/commit/379e6df158837c2510592c75d4a71c1… --- diff --git a/modules/topos/README b/modules/topos/README index acbe077..3fc421c 100644 --- a/modules/topos/README +++ b/modules/topos/README @@ -112,6 +112,9 @@ modparam("topos", "db_url", "dbdriver://username:password@dbhost/dbname") 3.2. mask_callid (int) + Note: this functionality is not implemented yet - the parameter is + present in order to be in pair with topoh module. + Whether to replace or not the Call-ID with another unique id generated by Kamailio.

1 0

git:4.4:79555606: core: ensure cfg_block structure is 8 byte aligned
by Daniel-Constantin Mierla 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.4 Commit: 795556061412439618c640ef19e8579486f0c58a URL: https://github.com/kamailio/kamailio/commit/795556061412439618c640ef19e8579… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-05T11:52:31+02:00 core: ensure cfg_block structure is 8 byte aligned - prevents bus error on stricter cpu architectures like sparc - reported by GH #655 (cherry picked from commit 0fd0715d015a2396b0ec66cb0bc83ec0b61c0d08) --- Modified: cfg/cfg_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/795556061412439618c640ef19e8579… Patch: https://github.com/kamailio/kamailio/commit/795556061412439618c640ef19e8579… --- diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 452bb90..6436eed 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -129,6 +129,7 @@ typedef struct _cfg_block { atomic_t refcnt; /*!< reference counter, the block is automatically deleted when it reaches 0 */ + int _pad; /*!< force 8 byte alignment */ unsigned char vars[1]; /*!< blob that contains the values */ } cfg_block_t;

1 0

git:4.4:301017af: uid_avp_db: remove GCC specific -Wall
by Daniel-Constantin Mierla 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.4 Commit: 301017af120d0e7c75821c00dad07892b6a366c2 URL: https://github.com/kamailio/kamailio/commit/301017af120d0e7c75821c00dad0789… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-05T11:52:18+02:00 uid_avp_db: remove GCC specific -Wall (cherry picked from commit 4fc8d37df84d856b848fd4e894c21e0fbf02bb56) --- Modified: modules/uid_avp_db/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/301017af120d0e7c75821c00dad0789… Patch: https://github.com/kamailio/kamailio/commit/301017af120d0e7c75821c00dad0789… --- diff --git a/modules/uid_avp_db/Makefile b/modules/uid_avp_db/Makefile index 0b9a74c..2b08ae2 100644 --- a/modules/uid_avp_db/Makefile +++ b/modules/uid_avp_db/Makefile @@ -8,7 +8,6 @@ include ../../Makefile.defs auto_gen= NAME=uid_avp_db.so LIBS= -DEFS += -Wall DEFS+=-DSER_MOD_INTERFACE

1 0

git:4.4:c5d8095c: ctl: remove return statement from void function
by Daniel-Constantin Mierla 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.4 Commit: c5d8095c7fa548a7199a03bf1f5d69d56202568a URL: https://github.com/kamailio/kamailio/commit/c5d8095c7fa548a7199a03bf1f5d69d… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-05T11:51:38+02:00 ctl: remove return statement from void function (cherry picked from commit 16e6bdf814576e26a5f5f46bdfcb98ab1fd4e04d) --- Modified: modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/c5d8095c7fa548a7199a03bf1f5d69d… Patch: https://github.com/kamailio/kamailio/commit/c5d8095c7fa548a7199a03bf1f5d69d… --- diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index 3b9153e..5bdd869 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -486,7 +486,7 @@ static void rpc_fault(struct binrpc_ctx* ctx, int code, char* fmt, ...) va_end(ap); len++; /* vnsprintf doesn't include the terminating 0 */ - return _rpc_fault(ctx, code, buf, len); + _rpc_fault(ctx, code, buf, len); } /* Prepare the error reply without sending out the message */

1 0

git:4.4:aea83a03: dialog: remove return statement from void functions
by Daniel-Constantin Mierla 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.4 Commit: aea83a031cfb9a774d855462f50e4311cf9f7b43 URL: https://github.com/kamailio/kamailio/commit/aea83a031cfb9a774d855462f50e431… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-05T11:51:28+02:00 dialog: remove return statement from void functions (cherry picked from commit d90f3b86299223cd37fc21bf6af718540c76b380) --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/aea83a031cfb9a774d855462f50e431… Patch: https://github.com/kamailio/kamailio/commit/aea83a031cfb9a774d855462f50e431… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 36a807f..6b12d0a 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -603,7 +603,7 @@ static void dlg_seq_onreply_helper(struct cell* t, int type, */ static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *param) { - return dlg_seq_onreply_helper(t, type, param, DLG_DIR_UPSTREAM); + dlg_seq_onreply_helper(t, type, param, DLG_DIR_UPSTREAM); } @@ -616,7 +616,7 @@ static void dlg_seq_up_onreply(struct cell* t, int type, struct tmcb_params *par */ static void dlg_seq_down_onreply(struct cell* t, int type, struct tmcb_params *param) { - return dlg_seq_onreply_helper(t, type, param, DLG_DIR_DOWNSTREAM); + dlg_seq_onreply_helper(t, type, param, DLG_DIR_DOWNSTREAM); }

1 0

git:4.4:33073d2a: counters: fix return statement in void function
by Daniel-Constantin Mierla 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.4 Commit: 33073d2af70ed0f289de6cfa2d754763e037ce1b URL: https://github.com/kamailio/kamailio/commit/33073d2af70ed0f289de6cfa2d75476… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-05T11:51:16+02:00 counters: fix return statement in void function (cherry picked from commit 37355281dffccc42b1d83f413e3d528bdcf6cdd0) --- Modified: modules/counters/counters.c --- Diff: https://github.com/kamailio/kamailio/commit/33073d2af70ed0f289de6cfa2d75476… Patch: https://github.com/kamailio/kamailio/commit/33073d2af70ed0f289de6cfa2d75476… --- diff --git a/modules/counters/counters.c b/modules/counters/counters.c index 7d7f85e..d90ead1 100644 --- a/modules/counters/counters.c +++ b/modules/counters/counters.c @@ -288,7 +288,8 @@ static void cnt_get_rpc(rpc_t* rpc, void* c) if (rpc->scan(c, "s", &group) < 1) return; if (rpc->scan(c, "*s", &name) < 1) - return cnt_grp_get_all(rpc, c, group); + cnt_grp_get_all(rpc, c, group); + return; /* group & name read */ if (counter_lookup(&h, group, name) < 0) { rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); @@ -427,7 +428,7 @@ static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) /* rpc->fault(c, 400, "group name required"); */ return; } - return cnt_grp_get_all(rpc, c, group); + cnt_grp_get_all(rpc, c, group); }

1 0

git:4.4:bed895fc: core: fix Sun Studio build
by Daniel-Constantin Mierla 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.4 Commit: bed895fcdd3cc7bc3ea131873405df0c90f8eb18 URL: https://github.com/kamailio/kamailio/commit/bed895fcdd3cc7bc3ea131873405df0… Author: Spencer Thomason <spencer(a)whiteskycommunications.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-05T11:51:04+02:00 core: fix Sun Studio build - update Makefile.defs for recent versions of Solaris Studio (cherry picked from commit 2a3915d456289cfc1685b081ab351fc00c1e3dfb) --- Modified: Makefile.defs Modified: action.c Modified: atomic/atomic_sparc64.h Modified: io_wait.h Modified: ip_addr.h Modified: sr_module.h Modified: tls_hooks.h --- Diff: https://github.com/kamailio/kamailio/commit/bed895fcdd3cc7bc3ea131873405df0… Patch: https://github.com/kamailio/kamailio/commit/bed895fcdd3cc7bc3ea131873405df0…

1 0

git:4.4:e2874495: db_unixodbc: detect DB disconnection with generic HY000 status
by Daniel-Constantin Mierla 05 Jul '16

05 Jul '16

Module: kamailio Branch: 4.4 Commit: e2874495b1ecad9e85b47f6d8bdb847fceb0c3ad URL: https://github.com/kamailio/kamailio/commit/e2874495b1ecad9e85b47f6d8bdb847… Author: Giovanni Mele <giovanni.mele(a)nagra.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-05T11:50:41+02:00 db_unixodbc: detect DB disconnection with generic HY000 status (cherry picked from commit d80376f9ea087328a0c46d97b908993baeb5b1b4) --- Modified: modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/e2874495b1ecad9e85b47f6d8bdb847… Patch: https://github.com/kamailio/kamailio/commit/e2874495b1ecad9e85b47f6d8bdb847… --- diff --git a/modules/db_unixodbc/dbase.c b/modules/db_unixodbc/dbase.c index d5c7d27..304b4d4 100644 --- a/modules/db_unixodbc/dbase.c +++ b/modules/db_unixodbc/dbase.c @@ -138,7 +138,8 @@ static int db_unixodbc_submit_query(const db1_con_t* _h, const str* _s) /* Connection broken */ if( !strncmp((char*)sqlstate,"08003",5) || - !strncmp((char*)sqlstate,"08S01",5) + !strncmp((char*)sqlstate,"08S01",5) || + !strncmp((char*)sqlstate,"HY000",5) /* ODBC 3 General error */ ) { ret = reconnect(_h);

1 0

← Newer
1
...
23
24
25
26
27
28
29
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016