sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:4.3:51bf77b2: kazoo: check amqp version
by Daniel-Constantin Mierla 25 Nov '15

25 Nov '15

Module: kamailio Branch: 4.3 Commit: 51bf77b20de2ddca20e3376d3671beb362475550 URL: https://github.com/kamailio/kamailio/commit/51bf77b20de2ddca20e3376d3671beb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-25T13:11:22+01:00 kazoo: check amqp version - checks amqp version for amqp_exchange_declare - manual backport from 29aaeb5 --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/51bf77b20de2ddca20e3376d3671beb… Patch: https://github.com/kamailio/kamailio/commit/51bf77b20de2ddca20e3376d3671beb… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 9664cfd..9ec34e5 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -50,6 +50,17 @@ extern pv_spec_t kz_query_timeout_spec; const amqp_bytes_t kz_amqp_empty_bytes = { 0, NULL }; const amqp_table_t kz_amqp_empty_table = { 0, NULL }; + +amqp_exchange_declare_ok_t * AMQP_CALL kz_amqp_exchange_declare(amqp_connection_state_t state, amqp_channel_t channel, + amqp_bytes_t exchange, amqp_bytes_t type, + amqp_boolean_t passive, amqp_boolean_t durable, amqp_table_t arguments) { +#if AMQP_VERSION_MINOR == 5 + return amqp_exchange_declare(state, channel, exchange, type, passive, durable, arguments); +#else + return amqp_exchange_declare(state, channel, exchange, type, passive, durable, 0, 0, arguments); +#endif +} + static char *kz_amqp_str_dup(str *src) { char *res; @@ -1270,7 +1281,7 @@ int kz_amqp_bind_targeted_channel(kz_amqp_conn_ptr kz_conn, int idx ) goto error; } - amqp_exchange_declare(kz_conn->conn, channels[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); + kz_amqp_exchange_declare(kz_conn->conn, channels[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); if (kz_amqp_error("Declaring exchange", amqp_get_rpc_reply(kz_conn->conn))) { ret = -RET_AMQP_ERROR; @@ -1331,7 +1342,7 @@ int kz_amqp_bind_targeted_channel_ex(kz_amqp_conn_ptr kz_conn, int loopcount, in goto error; } - amqp_exchange_declare(kz_conn->conn, channels[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); + kz_amqp_exchange_declare(kz_conn->conn, channels[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); if (kz_amqp_error("Declaring exchange", amqp_get_rpc_reply(kz_conn->conn))) { ret = -RET_AMQP_ERROR; @@ -1379,7 +1390,7 @@ int kz_amqp_bind_consumer_ex(kz_amqp_conn_ptr kz_conn, kz_amqp_bind_ptr bind, in goto error; } - amqp_exchange_declare(kz_conn->conn, chan[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); + kz_amqp_exchange_declare(kz_conn->conn, chan[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); if (kz_amqp_error("Declaring exchange", amqp_get_rpc_reply(kz_conn->conn))) { ret = -RET_AMQP_ERROR; @@ -1424,7 +1435,7 @@ int kz_amqp_bind_consumer(kz_amqp_conn_ptr kz_conn, kz_amqp_bind_ptr bind) goto error; } - amqp_exchange_declare(kz_conn->conn, channels[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); + kz_amqp_exchange_declare(kz_conn->conn, channels[idx].channel, bind->exchange, bind->exchange_type, 0, 0, kz_amqp_empty_table); if (kz_amqp_error("Declaring exchange", amqp_get_rpc_reply(kz_conn->conn))) { ret = -RET_AMQP_ERROR;

1 0

git:4.3:8d8a4306: db_mysql: explicitely set the reconenct flag via mysql cloent api
by Daniel-Constantin Mierla 25 Nov '15

25 Nov '15

Module: kamailio Branch: 4.3 Commit: 8d8a43064f6ba7419473b139997f44bd4ef698a5 URL: https://github.com/kamailio/kamailio/commit/8d8a43064f6ba7419473b139997f44b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-25T13:05:46+01:00 db_mysql: explicitely set the reconenct flag via mysql cloent api - old mode setting connection fied directly still in place, but now should be safer if that changes (cherry picked from commit e89c77f641311415b13b00dc9d469c0424362d53) --- Modified: modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/8d8a43064f6ba7419473b139997f44b… Patch: https://github.com/kamailio/kamailio/commit/8d8a43064f6ba7419473b139997f44b… --- diff --git a/modules/db_mysql/km_my_con.c b/modules/db_mysql/km_my_con.c index 5558d66..d5f4dd2 100644 --- a/modules/db_mysql/km_my_con.c +++ b/modules/db_mysql/km_my_con.c @@ -43,6 +43,9 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) struct my_con* ptr; char *host, *grp, *egrp; unsigned int connection_flag = 0; +#if MYSQL_VERSION_ID > 50012 + my_bool rec; +#endif if (!id) { LM_ERR("invalid parameter value\n"); @@ -99,6 +102,13 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const char *)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&db_mysql_timeout_interval); +#if MYSQL_VERSION_ID > 50012 + /* set reconnect flag if enabled */ + if (db_mysql_auto_reconnect) { + rec = 1; + mysql_options(ptr->con, MYSQL_OPT_RECONNECT, &rec); + } +#endif if (db_mysql_update_affected_found) { connection_flag |= CLIENT_FOUND_ROWS;

1 0

git:4.3:b2361d71: db_mysql: extended the list of error code when to try to resend query
by Daniel-Constantin Mierla 25 Nov '15

25 Nov '15

Module: kamailio Branch: 4.3 Commit: b2361d71de4208227468244754c0fc8229e7bcab URL: https://github.com/kamailio/kamailio/commit/b2361d71de4208227468244754c0fc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-25T13:05:46+01:00 db_mysql: extended the list of error code when to try to resend query (cherry picked from commit 6a62cc666352fbca7f1cc5a239464b42a7afc2cb) --- Modified: modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/b2361d71de4208227468244754c0fc8… Patch: https://github.com/kamailio/kamailio/commit/b2361d71de4208227468244754c0fc8… --- 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);

1 0

git:4.3:71ff3942: db_mysql: print error number when failing to do mysql query
by Daniel-Constantin Mierla 25 Nov '15

25 Nov '15

Module: kamailio Branch: 4.3 Commit: 71ff3942698e33e8f2e79c5a5ac2a35a27b060b8 URL: https://github.com/kamailio/kamailio/commit/71ff3942698e33e8f2e79c5a5ac2a35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-25T13:05:46+01:00 db_mysql: print error number when failing to do mysql query (cherry picked from commit a1556c0708af959a3816e732a7bd692c5fa5f4dc) --- Modified: modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/71ff3942698e33e8f2e79c5a5ac2a35… Patch: https://github.com/kamailio/kamailio/commit/71ff3942698e33e8f2e79c5a5ac2a35… --- 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; }

1 0

git:4.3:863739de: dialog: safety bump of cseq for bye if prack was involved in call setup
by Daniel-Constantin Mierla 25 Nov '15

25 Nov '15

Module: kamailio Branch: 4.3 Commit: 863739dec78161fdce871c281601a011572515a2 URL: https://github.com/kamailio/kamailio/commit/863739dec78161fdce871c281601a01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-25T13:05:46+01:00 dialog: safety bump of cseq for bye if prack was involved in call setup - reported by GH#409 (cherry picked from commit aab6547f39d723de6a01680cbd79b9365be8092f) --- 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/863739dec78161fdce871c281601a01… Patch: https://github.com/kamailio/kamailio/commit/863739dec78161fdce871c281601a01… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 656833c..6582ded 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -999,6 +999,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 64fb037..f756dc4 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 f862ab2..6c5922c 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);

1 0

git:4.3:8962cb71: lib/srdb1: url parser extracts the db name before the url parameters
by Daniel-Constantin Mierla 25 Nov '15

25 Nov '15

Module: kamailio Branch: 4.3 Commit: 8962cb713c397da2960e6c3db3b58cd2e6769d43 URL: https://github.com/kamailio/kamailio/commit/8962cb713c397da2960e6c3db3b58cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-25T13:05:45+01:00 lib/srdb1: url parser extracts the db name before the url parameters - some database urls can have parameters after db name, like: driver://username:password@dbhost:port/dbname?params - reported by Kelvin Chua for db_mongodb (cherry picked from commit 4da5d898da9a0a8f2780dcdf864354098268a7e9) --- Modified: lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/8962cb713c397da2960e6c3db3b58cd… Patch: https://github.com/kamailio/kamailio/commit/8962cb713c397da2960e6c3db3b58cd… --- diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index f1969c1..5a283f0 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -55,6 +55,30 @@ static int dupl_string(char** dst, const char* begin, const char* end) return 0; } +/** + * Duplicate a string name (until a params separator found) + * \param dst destination + * \param begin start of the string + * \param end end of the string + */ +static int dupl_string_name(char** dst, const char* begin, const char* end) +{ + char *p; + if (*dst) pkg_free(*dst); + + for(p=(char*)begin; p<end; p++) { + if(*p=='?') break; + } + *dst = pkg_malloc(p - begin + 1); + if ((*dst) == NULL) { + return -1; + } + + memcpy(*dst, begin, p - begin); + (*dst)[p - begin] = '\0'; + return 0; +} + /** * Parse a database URL of form @@ -151,7 +175,7 @@ static int parse_db_url(struct db_id* id, const str* url) case '/': if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; - if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; + if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; @@ -178,7 +202,7 @@ static int parse_db_url(struct db_id* id, const str* url) id->host = prev_token; prev_token = 0; id->port = str2s(begin, url->s + i - begin, 0); - if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; + if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; @@ -193,7 +217,7 @@ static int parse_db_url(struct db_id* id, const str* url) case '/': if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; - if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; + if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; @@ -202,7 +226,7 @@ static int parse_db_url(struct db_id* id, const str* url) switch(url->s[i]) { case '/': id->port = str2s(begin, url->s + i - begin, 0); - if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; + if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break;

1 0

[kamailio] crash from kamailio could be cnxcc related (#408)
by Rick 25 Nov '15

25 Nov '15

I was trying to set up kamailio with cnxcc, and suddenly I got this: ``` Nov 23 13:32:02 sip42 kamailio[4744]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=15.000000, ca2=14.000000 Nov 23 13:32:03 sip42 kamailio[4744]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=16.000000, ca2=15.000000 Nov 23 13:32:04 sip42 kamailio[4744]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=17.000000, ca2=16.000000 Nov 23 13:32:05 sip42 kamailio[4744]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=18.000000, ca2=17.000000 Nov 23 13:32:06 sip42 kamailio[4744]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=19.000000, ca2=18.000000 Nov 23 13:32:07 sip42 kamailio[4744]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=20.000000, ca2=19.000000 Nov 23 13:32:07 sip42 sems[14299]: [#7f117d358700] [onRxReqSanity, AmBasicSipDialog.cpp:293] INFO: remote cseq lower than previous ones - refusing request Nov 23 13:32:07 sip42 kamailio[4744]: INFO: <script>: [b6aps.CcAJpV6zEGbgAPuyvg6N6irS7l]: call killed Nov 23 13:32:12 sip42 kamailio[4733]: : <core> [mem/q_malloc.c:121]: qm_debug_frag(): BUG: qm_*: fragm. 0x7f21b7731498 (address 0x7f21b77314c8) beginning overwritten(0)! Nov 23 13:32:12 sip42 kamailio[4757]: CRITICAL: <core> [pass_fd.c:275]: receive_fd(): EOF on 39 Nov 23 13:32:12 sip42 kamailio[4698]: ALERT: <core> [main.c:728]: handle_sigs(): child process 4733 exited by a signal 6 Nov 23 13:32:12 sip42 kamailio[4698]: ALERT: <core> [main.c:731]: handle_sigs(): core was not generated Nov 23 13:32:12 sip42 kamailio[4698]: INFO: <core> [main.c:743]: handle_sigs(): terminating due to SIGCHLD Nov 23 13:32:12 sip42 kamailio[4757]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received Nov 23 13:32:12 sip42 kamailio[4754]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received Nov 23 13:32:12 sip42 kamailio[4753]: INFO: <core> [main.c:798]: sig_usr(): signal 15 received Nov 23 13:32:12 sip42 kamailio[4698]: WARNING: tm [h_table.c:130]: free_cell_helper(): removed cell 0x7f21b77319f0 is still linked in hash table (h_table.c:440) Nov 23 13:32:12 sip42 kamailio[4698]: : <core> [mem/q_malloc.c:121]: qm_debug_frag(): BUG: qm_*: fragm. 0x7f21b7731498 (address 0x7f21b77314c8) beginning overwritten(0)! ``` I was not able to reproduce it: ``` Nov 23 13:40:55 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=1.000000, ca2=0.000000 Nov 23 13:40:56 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=3.000000, ca2=1.000000 Nov 23 13:40:57 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=4.000000, ca2=3.000000 Nov 23 13:40:58 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=5.000000, ca2=4.000000 Nov 23 13:40:59 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=6.000000, ca2=5.000000 Nov 23 13:41:00 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=7.000000, ca2=6.000000 Nov 23 13:41:01 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=8.000000, ca2=7.000000 Nov 23 13:41:02 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=9.000000, ca2=8.000000 Nov 23 13:41:03 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=10.000000, ca2=9.000000 Nov 23 13:41:04 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=11.000000, ca2=10.000000 Nov 23 13:41:05 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=12.000000, ca2=11.000000 Nov 23 13:41:06 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=13.000000, ca2=12.000000 Nov 23 13:41:07 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=14.000000, ca2=13.000000 Nov 23 13:41:08 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=15.000000, ca2=14.000000 Nov 23 13:41:09 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=16.000000, ca2=15.000000 Nov 23 13:41:10 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=17.000000, ca2=16.000000 Nov 23 13:41:11 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=18.000000, ca2=17.000000 Nov 23 13:41:12 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=19.000000, ca2=18.000000 Nov 23 13:41:13 sip42 kamailio[4813]: INFO: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): ec=0.000000, ca=20.000000, ca2=19.000000 Nov 23 13:41:13 sip42 sems[14299]: [#7f117d459700] [onRxReqSanity, AmBasicSipDialog.cpp:293] INFO: remote cseq lower than previous ones - refusing request Nov 23 13:41:13 sip42 kamailio[4813]: INFO: <script>: [CEMClRtq-0bIDGKdphgjaeGK5KStdRhL]: call killed ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/408

2 4

Force-close TCP connection from usrloc timer
by Camille Oudot 25 Nov '15

25 Nov '15

Hi, following the memory issues reported by some users, pointing to the `close_expired_tcp` functionality of usrloc, I have successfully reproduced the issue, and fixed it in master & 4.3. The current approach for force-closing the TCP connection is to send a CONN_EOF message to the main TCP process. The main TCP loop and logic are quite complex, so it's difficult for me to foresee some tricky side effects this method may have. The tests so far, apart from the above mentioned memory leak, showed no issue. I wonder what the other approaches for closing the connections are. Since the usrloc timer function that is responsible of this `close_expired_tcp` behavior does not acquire + release the file descriptor as the TCP workers do, marking the connection as bad, or using the SND_F_CON_CLOSE won't work: the flags are set, but the connection is not effectively closed (this should happen the next time the client or the server tries to write data on it). So, should we stick to the current implementation, or do you have a suggestion on how this could be done differently? -- Camille

1 0

git:4.3:5fcac5c5: usrloc: fix mem leak when closing expired TCP
by Camille Oudot 25 Nov '15

25 Nov '15

Module: kamailio Branch: 4.3 Commit: 5fcac5c54fd487014efe1645f4db0e31dd6564e7 URL: https://github.com/kamailio/kamailio/commit/5fcac5c54fd487014efe1645f4db0e3… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-11-25T11:59:39+01:00 usrloc: fix mem leak when closing expired TCP CONN_EOF handler already decreases the reference counter for us (cherry picked from commit daa2509a58438505a6faa57e1a8befcc667a3b28) --- Modified: modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/5fcac5c54fd487014efe1645f4db0e3… Patch: https://github.com/kamailio/kamailio/commit/5fcac5c54fd487014efe1645f4db0e3… --- diff --git a/modules/usrloc/urecord.c b/modules/usrloc/urecord.c index 36f747b..414a958 100644 --- a/modules/usrloc/urecord.c +++ b/modules/usrloc/urecord.c @@ -252,7 +252,6 @@ static inline int close_connection(int conid) { msg[1] = CONN_EOF; n = send_all(unix_tcp_sock, msg, sizeof(msg)); - tcpconn_put(con); if (unlikely(n <= 0)){ LM_ERR("failed to send close request: %s (%d)\n", strerror(errno), errno); return 0;

1 0

git:master:daa2509a: usrloc: fix mem leak when closing expired TCP
by Camille Oudot 25 Nov '15

25 Nov '15

Module: kamailio Branch: master Commit: daa2509a58438505a6faa57e1a8befcc667a3b28 URL: https://github.com/kamailio/kamailio/commit/daa2509a58438505a6faa57e1a8befc… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-11-25T11:44:55+01:00 usrloc: fix mem leak when closing expired TCP CONN_EOF handler already decreases the reference counter for us --- Modified: modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/daa2509a58438505a6faa57e1a8befc… Patch: https://github.com/kamailio/kamailio/commit/daa2509a58438505a6faa57e1a8befc… --- diff --git a/modules/usrloc/urecord.c b/modules/usrloc/urecord.c index 6b30336..7f3a1dd 100644 --- a/modules/usrloc/urecord.c +++ b/modules/usrloc/urecord.c @@ -252,7 +252,6 @@ static inline int close_connection(int conid) { msg[1] = CONN_EOF; n = send_all(unix_tcp_sock, msg, sizeof(msg)); - tcpconn_put(con); if (unlikely(n <= 0)){ LM_ERR("failed to send close request: %s (%d)\n", strerror(errno), errno); return 0;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015