sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:master:6a62cc66: db_mysql: extended the list of error code when to try to resend query

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6a62cc666352fbca7f1cc5a239464b42a7afc2cb URL: https://github.com/kamailio/kamailio/commit/6a62cc666352fbca7f1cc5a239464b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T18:00:58+01:00 db_mysql: extended the list of error code when to try to resend query --- Modified: modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/6a62cc666352fbca7f1cc5a239464b4… Patch: https://github.com/kamailio/kamailio/commit/6a62cc666352fbca7f1cc5a239464b4… --- diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index b132608..f1956e8 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -113,7 +113,9 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) return 0; } code = mysql_errno(CON_CONNECTION(_h)); - if (code != CR_SERVER_GONE_ERROR && code != CR_SERVER_LOST) { + if (code!=CR_SERVER_GONE_ERROR && code!=CR_SERVER_LOST + && code!=CR_SSL_CONNECTION_ERROR && code!=CR_CONNECTION_ERROR + && code!=CR_CONN_HOST_ERROR && code!=CR_SERVER_LOST_EXTENDED) { break; } counter_inc(mysql_cnts_h.driver_err);

9 years

[kamailio] dialog: wrong CSeq in BYE after PRACK (#409)

by Rick

When using the dialog module to end a dialog, the remote UA refusing the BYE after a PRACK in the dialog. ``` ---- INVITE ( CSeq: 1 INVITE ) ---> <--- 100 ( CSeq: 1 INVITE ) ------- <--- 183 ( CSeq: 1 INVITE ) ------- ---- PRACK ( CSeq: 2 PRACK ) -----> <--- 200 OK ( CSeq: 2 PRACK ) ----- <--- 200 OK ( CSeq: 1 INVITE ) ---- ---- ACK ( CSeq: 1 ACK ) ---------> { Mi: dlg.end_dlg() } <--- BYE (CSeq: 1 BYE) BYE ( CSeq: 2 BYE) ----------> <--- 500 (Bad CSeq number) -------- ``` error in the remote log "remote cseq lower than previous ones - refusing request". --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/409

9 years

Revert d0617167f0aebcaf1e12e6c7f77b2231aed9da51 as it breaks 4.2

by Øyvind Kolbu

Hi, the commit d0617167f0aebcaf1e12e6c7f77b2231aed9da51 broke Postgres on 4.2. It tries to zero variables which are not in 4.2. From buildlog: km_pg_con.c: In function 'db_postgres_new_connection': km_pg_con.c:68: error: 'keywords' undeclared (first use in this function) km_pg_con.c:68: error: (Each undeclared identifier is reported only once km_pg_con.c:68: error: for each function it appears in.) km_pg_con.c:69: error: 'values' undeclared (first use in this function) km_pg_con.c:70: error: 'to' undeclared (first use in this function) make[1]: *** [km_pg_con.o] Error 1 make: *** [modules] Error 1 -- Cheers, Øyvind

9 years

git:master:a1556c07: db_mysql: print error number when failing to do mysql query

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a1556c0708af959a3816e732a7bd692c5fa5f4dc URL: https://github.com/kamailio/kamailio/commit/a1556c0708af959a3816e732a7bd692… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T17:11:51+01:00 db_mysql: print error number when failing to do mysql query --- Modified: modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/a1556c0708af959a3816e732a7bd692… Patch: https://github.com/kamailio/kamailio/commit/a1556c0708af959a3816e732a7bd692… --- diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index a323be2..b132608 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -118,7 +118,8 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) } counter_inc(mysql_cnts_h.driver_err); } - LM_ERR("driver error on query: %s\n", mysql_error(CON_CONNECTION(_h))); + LM_ERR("driver error on query: %s (%d)\n", mysql_error(CON_CONNECTION(_h)), + mysql_errno(CON_CONNECTION(_h))); return -2; }

9 years

git:4.2:31bb02ae: db_postgres: manual revert of d0617167f0aebcaf1e12e6c7f77b2231aed9da51

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 31bb02ae994c5bb0d34d4f3e6238057a0175660d URL: https://github.com/kamailio/kamailio/commit/31bb02ae994c5bb0d34d4f3e6238057… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T16:47:53+01:00 db_postgres: manual revert of d0617167f0aebcaf1e12e6c7f77b2231aed9da51 - breaks compilation, reported by Ãyvind Kolbu --- Modified: modules/db_postgres/km_pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/31bb02ae994c5bb0d34d4f3e6238057… Patch: https://github.com/kamailio/kamailio/commit/31bb02ae994c5bb0d34d4f3e6238057… --- diff --git a/modules/db_postgres/km_pg_con.c b/modules/db_postgres/km_pg_con.c index 80a69e4..a8e0494 100644 --- a/modules/db_postgres/km_pg_con.c +++ b/modules/db_postgres/km_pg_con.c @@ -65,10 +65,6 @@ struct pg_con* db_postgres_new_connection(struct db_id* id) memset(ptr, 0, sizeof(struct pg_con)); ptr->ref = 1; - memset(keywords, 0, (sizeof(char*) * 10)); - memset(values, 0, (sizeof(char*) * 10)); - memset(to, 0, (sizeof(char) * 16)); - if (id->port) { ports = int2str(id->port, 0); LM_DBG("opening connection: postgres://xxxx:xxxx@%s:%d/%s\n", ZSW(id->host),

9 years

git:master:aab6547f: dialog: safety bump of cseq for bye if prack was involved in call setup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aab6547f39d723de6a01680cbd79b9365be8092f URL: https://github.com/kamailio/kamailio/commit/aab6547f39d723de6a01680cbd79b93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T16:43:43+01:00 dialog: safety bump of cseq for bye if prack was involved in call setup - reported by GH#409 --- Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h Modified: modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/aab6547f39d723de6a01680cbd79b93… Patch: https://github.com/kamailio/kamailio/commit/aab6547f39d723de6a01680cbd79b93… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 99235ee..55aa14f 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -1068,6 +1068,8 @@ void next_state_dlg(dlg_cell_t *dlg, int event, switch (dlg->state) { case DLG_STATE_EARLY: case DLG_STATE_CONFIRMED_NA: + dlg->iflags |= DLG_IFLAG_PRACK; + break; case DLG_STATE_DELETED: break; default: diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index 166174e..ef94514 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -76,6 +76,7 @@ #define DLG_IFLAG_KA_DST (1<<2) /*!< send keep alive to dst */ #define DLG_IFLAG_TIMER_NORESET (1<<3) /*!< don't reset dialog timers on in-dialog messages reception */ #define DLG_IFLAG_CSEQ_DIFF (1<<4) /*!< CSeq changed in dialog */ +#define DLG_IFLAG_PRACK (1<<5) /*!< PRACK was routed during initial state */ #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */ #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */ diff --git a/modules/dialog/dlg_req_within.c b/modules/dialog/dlg_req_within.c index c40a08d..7fb4f4b 100644 --- a/modules/dialog/dlg_req_within.c +++ b/modules/dialog/dlg_req_within.c @@ -348,6 +348,11 @@ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) goto err; } + /* safety bump of cseq if prack was involved in call setup */ + if(cell->iflags & DLG_IFLAG_PRACK) { + dialog_info->loc_seq.value += 80; + } + LM_DBG("sending BYE to %s\n", (dir==DLG_CALLER_LEG)?"caller":"callee"); iuid = dlg_get_iuid_shm_clone(cell);

9 years

git:4.3:f07d47d7: core: relocate dbg message before killing children at shut down

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: f07d47d7d413a1dbc4da779d7c274f88e01058e6 URL: https://github.com/kamailio/kamailio/commit/f07d47d7d413a1dbc4da779d7c274f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T16:26:36+01:00 core: relocate dbg message before killing children at shut down - can race with per module log level, debugger module can be destroyed (cherry picked from commit 5a142f7cc2899090b007654529f08b1b2f4e70b1) --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/f07d47d7d413a1dbc4da779d7c274f8… Patch: https://github.com/kamailio/kamailio/commit/f07d47d7d413a1dbc4da779d7c274f8… --- diff --git a/main.c b/main.c index 30519fb..5b37ec8 100644 --- a/main.c +++ b/main.c @@ -742,9 +742,9 @@ void handle_sigs(void) } LM_INFO("terminating due to SIGCHLD\n"); #endif + LM_DBG("terminating due to SIGCHLD\n"); /* exit */ shutdown_children(SIGTERM, 1); - LM_DBG("terminating due to SIGCHLD\n"); if (WIFSIGNALED(chld_status)) { exit(1); } else {

9 years

git:4.3:2823f0b0: tm: use svpe fixup for t replicate uri param

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 2823f0b09ff9d91ff52475abdf58bb030dee3773 URL: https://github.com/kamailio/kamailio/commit/2823f0b09ff9d91ff52475abdf58bb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T16:26:08+01:00 tm: use svpe fixup for t replicate uri param - the function expects it for getting the value (cherry picked from commit ea0b4e50f62f8a461b737882c383f17767851d3d) --- Modified: modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/2823f0b09ff9d91ff52475abdf58bb0… Patch: https://github.com/kamailio/kamailio/commit/2823f0b09ff9d91ff52475abdf58bb0… --- diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 0293a1c..ecca92e 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -319,7 +319,7 @@ static cmd_export_t cmds[]={ #endif {"t_replicate", w_t_replicate_uri, 0, 0, REQUEST_ROUTE}, - {"t_replicate", w_t_replicate_uri, 1, fixup_var_str_1, + {"t_replicate", w_t_replicate_uri, 1, fixup_spve_null, REQUEST_ROUTE}, {"t_replicate", w_t_replicate, 2, fixup_hostport2proxy, REQUEST_ROUTE},

9 years

git:4.3:20b4c9e6: db_postgress: fix compilation, NTOHLL and NTOHLL provided by OSX 10.10

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 20b4c9e6294bca137d788dd0c1750f320d3e8461 URL: https://github.com/kamailio/kamailio/commit/20b4c9e6294bca137d788dd0c1750f3… Author: Daniel Rus Morales <danirus(a)eml.cc> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T16:25:58+01:00 db_postgress: fix compilation, NTOHLL and NTOHLL provided by OSX 10.10 (cherry picked from commit b37aa66fd1cf3fe99aae50adb89d4cfecf6d90d1) --- Modified: modules/db_postgres/pg_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/20b4c9e6294bca137d788dd0c1750f3… Patch: https://github.com/kamailio/kamailio/commit/20b4c9e6294bca137d788dd0c1750f3… --- diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 46d54f0..de62c14 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -93,19 +93,23 @@ union ull { uint32_t ui32[2]; }; +#if !defined(__OS_darwin) || (defined(__OS_darwin) && !defined(NTOHLL)) 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) { 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,

9 years

git:4.3:d0c5a583: kamctl: require db or ctl engine made specific for dispatcher subcommands

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: d0c5a5835969660d43355fa91b39f1a8e08f6eb0 URL: https://github.com/kamailio/kamailio/commit/d0c5a5835969660d43355fa91b39f1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-23T16:25:43+01:00 kamctl: require db or ctl engine made specific for dispatcher subcommands (cherry picked from commit d2416957e4caec8a64abec82029ea18c52a7bc2d) --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/d0c5a5835969660d43355fa91b39f1a… Patch: https://github.com/kamailio/kamailio/commit/d0c5a5835969660d43355fa91b39f1a… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 39e89eb..22d9643 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1583,15 +1583,15 @@ cr() { ### DISPATCHER management # dispatcher() { - require_dbengine - require_ctlengine case $1 in show) + require_dbengine mecho "dispatcher gateways" QUERY="select * FROM $DISPATCHER_TABLE ORDER BY $DISPATCHER_SETID_COLUMN; " $DBROCMD "$QUERY" ;; addgw|add) + require_dbengine shift if [ $# -lt 2 ] ; then merr "too few parameters" @@ -1638,6 +1638,7 @@ dispatcher() { ;; rmgw|rm) + require_dbengine shift if [ $# -ne 1 ] ; then merr "missing gateway id to be removed" @@ -1654,10 +1655,12 @@ dispatcher() { ;; reload) + require_ctlengine $CTLCMD ds_reload ;; dump) + require_ctlengine $CTLCMD ds_list ;;

9 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015