sr-dev May 2020

sr-dev@lists.kamailio.org

24 participants
393 discussions

git:master:d780945b: smsops: use gmtime_r() for a safer multi-thread usage

by Victor Seva

Module: kamailio Branch: master Commit: d780945bc9a186d54439e1258ac540cd5f7bd86d URL: https://github.com/kamailio/kamailio/commit/d780945bc9a186d54439e1258ac540c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:54:04+02:00 smsops: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/d780945bc9a186d54439e1258ac540c… Patch: https://github.com/kamailio/kamailio/commit/d780945bc9a186d54439e1258ac540c… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 5271444039..b284d83c62 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -370,24 +370,24 @@ static int DecodePhoneNumber(char* buffer, int len, str phone) { // Generate a 7 Byte Long Time static void EncodeTime(char * buffer) { time_t ts; - struct tm * now; + struct tm now; int i = 0; time(&ts); /* Get GMT time */ - now = gmtime(&ts); + gmtime_r(&ts, &now); - i = now->tm_year % 100; + i = now.tm_year % 100; buffer[0] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_mon + 1; + i = now.tm_mon + 1; buffer[1] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_mday; + i = now.tm_mday; buffer[2] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_hour; + i = now.tm_hour; buffer[3] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_min; + i = now.tm_min; buffer[4] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_sec; + i = now.tm_sec; buffer[5] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); buffer[6] = 0; // Timezone, we use no time offset. }

4 years, 6 months

git:master:150e757e: db_mysql: use gmtime_r() for a safer multi-thread usage

by Victor Seva

Module: kamailio Branch: master Commit: 150e757ec0fdadeee7b0ce8b6362f1a01aa0c382 URL: https://github.com/kamailio/kamailio/commit/150e757ec0fdadeee7b0ce8b6362f1a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:51:48+02:00 db_mysql: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/db_mysql/my_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/150e757ec0fdadeee7b0ce8b6362f1a… Patch: https://github.com/kamailio/kamailio/commit/150e757ec0fdadeee7b0ce8b6362f1a… --- diff --git a/src/modules/db_mysql/my_cmd.c b/src/modules/db_mysql/my_cmd.c index c12d649dd4..23dfb27f81 100644 --- a/src/modules/db_mysql/my_cmd.c +++ b/src/modules/db_mysql/my_cmd.c @@ -476,7 +476,7 @@ static int build_update_cmd(str* sql_cmd, db_cmd_t* cmd) static inline void update_field(MYSQL_BIND *param, db_fld_t* fld) { struct my_fld* fp; /* field payload */ - struct tm* t; + struct tm t; fp = DB_GET_PAYLOAD(fld); @@ -524,13 +524,13 @@ static inline void update_field(MYSQL_BIND *param, db_fld_t* fld) break; case DB_DATETIME: - t = gmtime(&fld->v.time); - fp->time.second = t->tm_sec; - fp->time.minute = t->tm_min; - fp->time.hour = t->tm_hour; - fp->time.day = t->tm_mday; - fp->time.month = t->tm_mon + 1; - fp->time.year = t->tm_year + 1900; + gmtime_r(&fld->v.time, &t); + fp->time.second = t.tm_sec; + fp->time.minute = t.tm_min; + fp->time.hour = t.tm_hour; + fp->time.day = t.tm_mday; + fp->time.month = t.tm_mon + 1; + fp->time.year = t.tm_year + 1900; break; case DB_NONE:

4 years, 6 months

git:master:60072749: jsonrpcs: use gmtime_r() for a safer multi-thread usage

by Victor Seva

Module: kamailio Branch: master Commit: 6007274938387359bb0a9b54528a5f3c87700356 URL: https://github.com/kamailio/kamailio/commit/6007274938387359bb0a9b54528a5f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:49:47+02:00 jsonrpcs: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6007274938387359bb0a9b54528a5f3… Patch: https://github.com/kamailio/kamailio/commit/6007274938387359bb0a9b54528a5f3… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 5843d87a5f..b07ae802df 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -470,7 +470,7 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) srjson_t *nj = NULL; char buf[JSONRPC_PRINT_VALUE_BUF_LEN]; time_t dt; - struct tm* t; + struct tm t; str *sp; switch(fmt) { @@ -488,9 +488,9 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) break; case 't': dt = va_arg(*ap, time_t); - t = gmtime(&dt); + gmtime_r(&dt, &t); if (strftime(buf, JSONRPC_PRINT_VALUE_BUF_LEN, - "%Y%m%dT%H:%M:%S", t) == 0) { + "%Y%m%dT%H:%M:%S", &t) == 0) { LM_ERR("Error while converting time\n"); return NULL; }

4 years, 6 months

git:master:d54eed9e: msilo: use ctime_r() for a safer multi-thread usage

by Victor Seva

Module: kamailio Branch: master Commit: d54eed9eb2f3a09a70f679ea0fb7cac64a5aa14a URL: https://github.com/kamailio/kamailio/commit/d54eed9eb2f3a09a70f679ea0fb7cac… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:46:15+02:00 msilo: use ctime_r() for a safer multi-thread usage > The reentrant version ctime_r() does the same, but stores > the string in a user-supplied buffer which should have > room for at least 26 bytes. --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/d54eed9eb2f3a09a70f679ea0fb7cac… Patch: https://github.com/kamailio/kamailio/commit/d54eed9eb2f3a09a70f679ea0fb7cac… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index bf5758d350..0bf53ecc5a 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -1337,6 +1337,7 @@ void m_send_ontimer(unsigned int ticks, void *param) str str_vals[4], hdr_str, body_str; str extra_hdrs_str = {0}; time_t stime; + char t_buf[26] = {0}; if(ms_reminder.s==NULL) { @@ -1384,14 +1385,13 @@ void m_send_ontimer(unsigned int ticks, void *param) goto done; } + ctime_r((const time_t*)&ttime, t_buf); if (RES_ROW_N(db_res) <= 0) { - LM_DBG("no message for <%.*s>!\n", 24, ctime((const time_t*)&ttime)); + LM_DBG("no message for <%.*s>!\n", 24, t_buf); goto done; } - - LM_DBG("dumping [%d] messages for <%.*s>!!!\n", RES_ROW_N(db_res), 24, - ctime((const time_t*)&ttime)); + LM_DBG("dumping [%d] messages for <%.*s>!!!\n", RES_ROW_N(db_res), 24, t_buf); for(i = 0; i < RES_ROW_N(db_res); i++) {

4 years, 6 months

git:master:3dc960b6: xprint: use ctime_r() for a safer multi-thread usage

by Victor Seva

Module: kamailio Branch: master Commit: 3dc960b6db3dc5807814fc73887f985bf2ff91d7 URL: https://github.com/kamailio/kamailio/commit/3dc960b6db3dc5807814fc73887f985… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:38:43+02:00 xprint: use ctime_r() for a safer multi-thread usage > The reentrant version ctime_r() does the same, but stores > the string in a user-supplied buffer which should have > room for at least 26 bytes. --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/3dc960b6db3dc5807814fc73887f985… Patch: https://github.com/kamailio/kamailio/commit/3dc960b6db3dc5807814fc73887f985… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index bbe2ceaafe..5771b77399 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -164,7 +164,7 @@ static int xl_get_times(struct sip_msg *msg, str *res, str *hp, int hi, int hf) } static int xl_get_timef(struct sip_msg *msg, str *res, str *hp, int hi, int hf) { - char *ch = NULL; + char ch[26] = {0}; if(msg==NULL || res==NULL) return -1; @@ -174,7 +174,7 @@ static int xl_get_timef(struct sip_msg *msg, str *res, str *hp, int hi, int hf) msg_id = msg->id; } - ch = ctime(&msg_tm); + ctime_r(&msg_tm, ch); res->s = ch; res->len = strlen(ch)-1;

4 years, 6 months

git:master:f9ae1174: db_redis: use localtime_r() for a safer multi-thread usage

by Victor Seva

Module: kamailio Branch: master Commit: f9ae11746fb820bb24057f4b3509bd59b6d3e936 URL: https://github.com/kamailio/kamailio/commit/f9ae11746fb820bb24057f4b3509bd5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:30:26+02:00 db_redis: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f9ae11746fb820bb24057f4b3509bd5… Patch: https://github.com/kamailio/kamailio/commit/f9ae11746fb820bb24057f4b3509bd5… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index f3b7c1f019..ea1a6aa43e 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -81,6 +81,7 @@ static int db_redis_val2str(const db_val_t *v, str *_str) { const char *s; const str *tmpstr; int vtype = VAL_TYPE(v); + struct tm _time; _str->s = NULL; _str->len = 32; // default for numbers @@ -144,7 +145,8 @@ static int db_redis_val2str(const db_val_t *v, str *_str) { LM_DBG("converting datetime value %ld to str\n", VAL_TIME(v)); _str->s = (char*)pkg_malloc(_str->len); if (!_str->s) goto memerr; - strftime(_str->s, _str->len, "%Y-%m-%d %H:%M:%S", localtime(&(VAL_TIME(v)))); + localtime_r(&(VAL_TIME(v)), &_time); + strftime(_str->s, _str->len, "%Y-%m-%d %H:%M:%S", &_time); _str->len = strlen(_str->s); break; case DB1_DOUBLE:

4 years, 6 months

git:master:8f8ebbe6: textops: use gmtime_r() for a safer multi-thread usage

by Victor Seva

Module: kamailio Branch: master Commit: 8f8ebbe65cfa5d90a7a4186be605192c179a6483 URL: https://github.com/kamailio/kamailio/commit/8f8ebbe65cfa5d90a7a4186be605192… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:22:24+02:00 textops: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/8f8ebbe65cfa5d90a7a4186be605192… Patch: https://github.com/kamailio/kamailio/commit/8f8ebbe65cfa5d90a7a4186be605192… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index e2884745ea..fb1c08eac2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1950,17 +1950,15 @@ static int append_time_f(struct sip_msg* msg, char* p1, char *p2) size_t len; char time_str[MAX_TIME]; time_t now; - struct tm *bd_time; + struct tm bd_time; now=time(0); - - bd_time=gmtime(&now); - if (bd_time==NULL) { + if (gmtime_r(&now, &bd_time)==NULL) { LM_ERR("gmtime failed\n"); return -1; } - len=strftime(time_str, MAX_TIME, TIME_FORMAT, bd_time); + len=strftime(time_str, MAX_TIME, TIME_FORMAT, &bd_time); if (len>MAX_TIME-2 || len==0) { LM_ERR("unexpected time length\n"); return -1; @@ -1983,14 +1981,12 @@ static int append_time_request_f(struct sip_msg* msg, char* p1, char *p2) { str time_str = {0, 0}; time_t now; - struct tm *bd_time; + struct tm bd_time; struct hdr_field *hf = msg->headers; struct lump *anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); now=time(0); - - bd_time=gmtime(&now); - if (bd_time==NULL) { + if (gmtime_r(&now, &bd_time)==NULL) { LM_ERR("gmtime failed\n"); goto error; } @@ -2000,7 +1996,7 @@ static int append_time_request_f(struct sip_msg* msg, char* p1, char *p2) LM_ERR("no more pkg memory\n"); goto error; } - time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, bd_time); + time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, &bd_time); if (time_str.len>MAX_TIME-2 || time_str.len==0) { LM_ERR("unexpected time length\n"); goto error;

4 years, 6 months

git:master:90275e02: modules: readme files regenerated - keepalive ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 90275e02faf75454026597c1e720487b5d845f79 URL: https://github.com/kamailio/kamailio/commit/90275e02faf75454026597c1e720487… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-12T14:16:12+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/90275e02faf75454026597c1e720487… Patch: https://github.com/kamailio/kamailio/commit/90275e02faf75454026597c1e720487… --- diff --git a/src/modules/keepalive/README b/src/modules/keepalive/README index 4437803128..f69641e421 100644 --- a/src/modules/keepalive/README +++ b/src/modules/keepalive/README @@ -56,7 +56,7 @@ Yasin CANER 1. Available Functions 1.1. add_destination(uri, owner, flags, ping_interval, - [callback, [user_attr]]) + [statechanged_clb, response_clb, [user_attr]]) 1.2. Examples @@ -324,8 +324,8 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, ping_interval, [callback, - [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, + [statechanged_clb, response_clb, [user_attr]]) 1.2. Examples @@ -338,13 +338,13 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, ping_interval, [callback, - [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, + [statechanged_clb, response_clb, [user_attr]]) 1.2. Examples -1.1. add_destination(uri, owner, flags, ping_interval, [callback, -[user_attr]]) +1.1. add_destination(uri, owner, flags, ping_interval, [statechanged_clb, +response_clb, [user_attr]]) This function registers a new destination to monitor. Monitoring of the destination starts as soon as it returns with success (0 value). @@ -361,7 +361,7 @@ Chapter 2. Developer Guide * flags (integer) - destination flags (unused for now, use 0 value) * ping_interval (integer) - Pinging interval in seconds for this destination - * callback (ka_statechanged_f, optional) - callback function, + * statechanged_clb (ka_statechanged_f, optional) - callback function, executed on destination's state change. The callback function is of type void (*ka_statechanged_f)(str *uri, int state, void *user_attr);. Use NULL to set no callback. @@ -370,9 +370,17 @@ Chapter 2. Developer Guide waiting first ping replies or timeout) + 1 - destination is UP + 2 - destination is DOWN - * user_attr (void * pointer, optional) - If callback function is - setup, this parameter will be forwarded to it, as last parameter. - Use NULL to set no user_attr parameter. + * response_clb (ka_response_f, optional) - callback function, + executed on destination's response provided. + The callback function is of type void (*ka_response_f)(str *uri, + struct tmcb_params *ps, void *user_attr);. Use NULL to set no + callback. + ps is a pack structure with all params passed to callback function. + Defined in t_hooks.h + * user_attr (void * pointer, optional) - If any callback function is + setup, this parameter will be forwarded to it (or both callbacks in + both are defined), as last parameter. Use NULL to set no user_attr + parameter. Returned values: * 0 if ok @@ -395,17 +403,18 @@ if (bind_keepalive( &ka_api ) != 0) { } ... ... -/* callback function */ -void my_callback(str uri, int state, void *user_attr) { - +/* callback function (on state changed) */ +void my_state_changed_clb(str uri, int state, void *user_attr) { printf("%.*s new state is: %d\n", uri.len, uri.str, state) } -/* register a new destination */ -str dest = str_init("sip:192.168.10.21:5060"); -str owner = str_init("mymodule"); +/* callback function (on each response received) */ +void my_response_clb(str *uri, struct tmcb_params *ps, void *user_attr) { + printf("response [%d] from %.*s\n", ps->code, uri.len, uri.str) +} -if (ka_api.add_destination(dest, owner, 0, 60, my_callback, NULL) != 0) { +if (ka_api.add_destination(dest, owner, 0, 60, my_state_changed_clb, + my_response_clb, NULL) != 0) { LM_ERR("can't add destination\n"); goto error; }

4 years, 6 months

[kamailio/kamailio] keepalive: update rpc response to include current state (#2323)

by Kinshuk Bairagi

#### Pre-Submission Checklist  - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Expose current state of keepalive monitor in rpc response so that the response can be parsed easlily and used to populate external dashboards You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2323 -- Commit Summary -- * keepalive: update rpc response -- File Changes -- M src/modules/keepalive/keepalive_rpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2323.patch https://github.com/kamailio/kamailio/pull/2323.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/2323

4 years, 6 months

git:master:2372dc93: Merge pull request #2323 from voiceip/keepalive-rpc-change

by GitHub

Module: kamailio Branch: master Commit: 2372dc933926611dad22812e0d550ae736249a06 URL: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:05:27+02:00 Merge pull request #2323 from voiceip/keepalive-rpc-change keepalive: update rpc response to include current state --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… Patch: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 8d9a84a428..3a72b31474 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -96,6 +96,7 @@ static void keepalive_rpc_list(rpc_t *rpc, void *ctx) _dtime = ctime(&dest->last_down); _dtime[strlen(_dtime) - 1] = '\0'; rpc->struct_add(sub, "s", "last down", _dtime); + rpc->struct_add(sub, "d", "state", (int) dest->state); } return;

4 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2020