sr-dev February 2022

sr-dev@lists.kamailio.org

17 participants
242 discussions

git:master:d3cf7fb4: core: crypto - stick to C99 uintXY_t only types

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3cf7fb4e6be3d8690d04e06f87c51a7797e10dd URL: https://github.com/kamailio/kamailio/commit/d3cf7fb4e6be3d8690d04e06f87c51a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-08T09:35:55+01:00 core: crypto - stick to C99 uintXY_t only types - they are used in other parts of the core, removed the option to compile with u_intXY_t variants - GH #3014 --- Modified: src/core/crypto/sha256.c Modified: src/core/crypto/sha256.h --- Diff: https://github.com/kamailio/kamailio/commit/d3cf7fb4e6be3d8690d04e06f87c51a… Patch: https://github.com/kamailio/kamailio/commit/d3cf7fb4e6be3d8690d04e06f87c51a…

2 years, 10 months

git:master:17e10b74: nathelper: updates to nh_alias_to_uri()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 17e10b74e1b018c9c06d2b640f3282b3d26a9fcf URL: https://github.com/kamailio/kamailio/commit/17e10b74e1b018c9c06d2b640f3282b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-08T09:08:43+01:00 nathelper: updates to nh_alias_to_uri() - reduce search range by size of parameter and minimum length of value - check if port is 0 (GH #3014) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/17e10b74e1b018c9c06d2b640f3282b… Patch: https://github.com/kamailio/kamailio/commit/17e10b74e1b018c9c06d2b640f3282b… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 2d9e4ee6b7..22e128ac9c 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2802,7 +2802,7 @@ static int nh_write_to_pv(struct sip_msg *msg, str *data, str *pvname) /*! * @function nh_alias_to_uri -* @abstract select alias paramter from contact_header +* @abstract select alias parameter from contact_header * then writes to alias_uri * @param contact_header Source contact header * @param alias_uri Destination string @@ -2814,43 +2814,44 @@ static int nh_alias_to_uri(str *contact_header, str *alias_uri) str host={0,0}; str port={0,0}; str proto={0,0}; - char *memchr_pointer=0; + char *memchr_pointer=NULL; if(!contact_header) return -1; - LM_DBG("Contact header [%.*s] \r\n",contact_header->len,contact_header->s); + LM_DBG("Contact header [%.*s]\n", contact_header->len, contact_header->s); - for(i=0; i<contact_header->len ;i++){ - if(strncmp(&contact_header->s[i], _ksr_contact_salias.s, _ksr_contact_salias.len) == 0){ + for(i=0; i<contact_header->len-_ksr_contact_salias.len-5/* a~b~c */; i++) { + if(strncmp(&contact_header->s[i], _ksr_contact_salias.s, + _ksr_contact_salias.len) == 0) { i=i+_ksr_contact_salias.len; host.s = &contact_header->s[i]; - memchr_pointer = memchr(host.s , 126 /* ~ */,contact_header->len-i); - if(memchr_pointer == NULL) { - LM_ERR("No alias parameter found for host\n"); - return -1; - } else { - host.len = memchr_pointer - &contact_header->s[i]; - i=i+host.len; - } - break; + memchr_pointer = memchr(host.s, 126 /* ~ */, contact_header->len-i); + if(memchr_pointer == NULL) { + LM_ERR("No alias parameter found for host\n"); + return -1; + } else { + host.len = memchr_pointer - &contact_header->s[i]; + i=i+host.len; } + break; + } } - if(!memchr_pointer){ - LM_ERR("Alias couldn't be found \n"); + if(!memchr_pointer) { + LM_ERR("Alias sign couldn't be found\n"); return -1; } - if(&memchr_pointer[1]){ + if(memchr_pointer[1]) { port.s=&memchr_pointer[1]; - }else{ - LM_ERR("Alias sign couldn't be found for port \n"); + } else { + LM_ERR("Alias port is not set\n"); return -1; } - memchr_pointer = memchr(port.s , 126 /* ~ */,contact_header->len-i); + memchr_pointer = memchr(port.s, 126 /* ~ */, contact_header->len-i); if(memchr_pointer == NULL) { - LM_ERR("Alias sign couldn't be found for proto \n"); + LM_ERR("Alias sign couldn't be found for proto\n"); return -1; } else { port.len = memchr_pointer - port.s; @@ -2860,11 +2861,12 @@ static int nh_alias_to_uri(str *contact_header, str *alias_uri) proto.s= &port.s[port.len+1]; proto_type_to_str((unsigned short)atoi(proto.s), &proto); - LM_DBG("Host [%.*s][port: %.*s][proto: %.*s] \r\n",host.len,host.s,port.len,port.s,proto.len,proto.s); + LM_DBG("Host [%.*s][port: %.*s][proto: %.*s]\n", + host.len,host.s,port.len,port.s,proto.len,proto.s); //sip:host:port;transport=udp - alias_uri->s =(char *) pkg_malloc(port.len+host.len+proto.len+16); - if(!alias_uri->s){ + alias_uri->s =(char*)pkg_malloc(port.len+host.len+proto.len+16); + if(!alias_uri->s) { LM_ERR("Allocation ERROR\n"); return -1; } @@ -2880,7 +2882,8 @@ static int nh_alias_to_uri(str *contact_header, str *alias_uri) memcpy(&alias_uri->s[4+host.len+1+port.len+11],proto.s,proto.len); alias_uri->len=port.len+host.len+16+proto.len; - LM_DBG("Alias uri [%.*s][len: %d] \r\n",alias_uri->len,alias_uri->s,alias_uri->len); + LM_DBG("Alias uri [%.*s][len: %d]\n", + alias_uri->len,alias_uri->s,alias_uri->len); return 1; }

2 years, 10 months

git:master:a8d56242: ims_dialog: updated test conditions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a8d56242da48708949149c11c06d031b5c2fad49 URL: https://github.com/kamailio/kamailio/commit/a8d56242da48708949149c11c06d031… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-08T09:14:08+01:00 ims_dialog: updated test conditions - GH #3014 --- Modified: src/modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/a8d56242da48708949149c11c06d031… Patch: https://github.com/kamailio/kamailio/commit/a8d56242da48708949149c11c06d031… --- diff --git a/src/modules/ims_dialog/dlg_hash.c b/src/modules/ims_dialog/dlg_hash.c index bc32282d9e..cfe0148e7b 100644 --- a/src/modules/ims_dialog/dlg_hash.c +++ b/src/modules/ims_dialog/dlg_hash.c @@ -253,7 +253,7 @@ void destroy_dlg(struct dlg_cell *dlg) { shm_free(var); } - if (&(dlg->dlg_entry_out)) { + if (dlg->dlg_entry_out.first) { lock_get(dlg->dlg_out_entries_lock); destroy_entry_out(&(dlg->dlg_entry_out)); lock_release(dlg->dlg_out_entries_lock);

2 years, 10 months

git:master:937be943: app_lua_sr: define luaL_openlib for lua >=5.4 for custom exports

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 937be943e8f261e5f5228e339e2fbb605b313156 URL: https://github.com/kamailio/kamailio/commit/937be943e8f261e5f5228e339e2fbb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-08T08:36:50+01:00 app_lua_sr: define luaL_openlib for lua >=5.4 for custom exports --- Modified: src/modules/app_lua_sr/app_lua_sr_api.c Modified: src/modules/app_lua_sr/app_lua_sr_api.h --- Diff: https://github.com/kamailio/kamailio/commit/937be943e8f261e5f5228e339e2fbb6… Patch: https://github.com/kamailio/kamailio/commit/937be943e8f261e5f5228e339e2fbb6… --- diff --git a/src/modules/app_lua_sr/app_lua_sr_api.c b/src/modules/app_lua_sr/app_lua_sr_api.c index 884330c604..aa74ea9efb 100644 --- a/src/modules/app_lua_sr/app_lua_sr_api.c +++ b/src/modules/app_lua_sr/app_lua_sr_api.c @@ -45,10 +45,6 @@ #include "app_lua_sr_api.h" #include "app_lua_sr_exp.h" -#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 -#define luaL_openlib ksr_luaL_openlib -#endif - extern app_lua_api_t _app_lua_api; diff --git a/src/modules/app_lua_sr/app_lua_sr_api.h b/src/modules/app_lua_sr/app_lua_sr_api.h index 726e4e9339..f700fb2fdf 100644 --- a/src/modules/app_lua_sr/app_lua_sr_api.h +++ b/src/modules/app_lua_sr/app_lua_sr_api.h @@ -35,5 +35,11 @@ void lua_sr_kemi_register_libs(lua_State *L); int sr_kemi_lua_exec_func(lua_State* L, int eidx); +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 +void ksr_luaL_openlib(lua_State *L, const char *libname, + const luaL_Reg *lfuncs, int nup); +#define luaL_openlib ksr_luaL_openlib +#endif + #endif

2 years, 10 months

git:master:d3daed0a: db_perlvdb: removed unnecessary condition

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3daed0a617024fde1efabbcdab27dc4c5c140c8 URL: https://github.com/kamailio/kamailio/commit/d3daed0a617024fde1efabbcdab27dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-08T08:29:55+01:00 db_perlvdb: removed unnecessary condition --- Modified: src/modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/d3daed0a617024fde1efabbcdab27dc… Patch: https://github.com/kamailio/kamailio/commit/d3daed0a617024fde1efabbcdab27dc… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index f263774658..fcf7b024a5 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -57,9 +57,8 @@ AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* va for (i = 0; i < n; i++) { if (ops) { - if (ops + i) - if (*(ops + i)) - element = cond2perlcond(*(keys + i), + if (*(ops + i)) + element = cond2perlcond(*(keys + i), *(ops + i), vals + i); } else { /* OP_EQ is defined in Kamailio _and_ perl. Includes collide :( */

2 years, 10 months

git:master:e85c6bf7: nats: moved static global in the c file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e85c6bf7636b15170ddd7d0c51ae462e51c2c974 URL: https://github.com/kamailio/kamailio/commit/e85c6bf7636b15170ddd7d0c51ae462… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-08T08:23:01+01:00 nats: moved static global in the c file - it is used only in that file --- Modified: src/modules/nats/defs.h Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e85c6bf7636b15170ddd7d0c51ae462… Patch: https://github.com/kamailio/kamailio/commit/e85c6bf7636b15170ddd7d0c51ae462… --- diff --git a/src/modules/nats/defs.h b/src/modules/nats/defs.h index 5f7dfafe0b..0ec06451e5 100644 --- a/src/modules/nats/defs.h +++ b/src/modules/nats/defs.h @@ -46,7 +46,6 @@ typedef struct _nats_evroutes int connected; int disconnected; } nats_evroutes_t; -static nats_evroutes_t _nats_rts; typedef struct _init_nats_sub { diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 05f71ea443..2a53beda82 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -39,6 +39,8 @@ char *eventData = NULL; int *nats_pub_worker_pipes_fds = NULL; int *nats_pub_worker_pipes = NULL; +static nats_evroutes_t _nats_rts; + static pv_export_t nats_mod_pvs[] = { {{"natsData", (sizeof("natsData") - 1)}, PVT_OTHER, nats_pv_get_event_payload, 0, 0, 0, 0, 0},

2 years, 10 months

[kamailio/kamailio] misleading-indentation warning (Issue #3012)

by sergey-safarov

**1** ``` CC (gcc) [M sms.so] libsms_putsms.o CC (gcc) [M sms.so] sms.o CC (gcc) [M sms.so] sms_funcs.o sms_funcs.c: In function 'modem_process': sms_funcs.c:884:17: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 884 | if (used_mem) | ^~ sms_funcs.c:886:25: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 886 | for(i=1,k=1;k<=used_mem && i<=max_mem;i++) { | ^~~ CC (gcc) [M sms.so] sms_report.o LD (gcc) [M sms.so] sms.so CC (gcc) [M sst.so] parse_sst.o ``` **2** ``` CC (gcc) [M ims_charging.so] ims_charging_stats.o CC (gcc) [M ims_charging.so] ims_ro.o ims_ro.c: In function 'create_cca_fui_avps': ims_ro.c:1622:5: warning: this 'else' clause does not guard... [-Wmisleading-indentation] 1622 | else | ^~~~ ims_ro.c:1625:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'else' 1625 | if (redirecturi && redirecturi->len >0 && redirecturi->s) { | ^~ CC (gcc) [M ims_charging.so] ro_avp.o CC (gcc) [M ims_charging.so] ro_db_handler.o CC (gcc) [M ims_charging.so] ro_fixup.o ``` **3** ``` CC (gcc) [M kazoo.so] kazoo.o CC (gcc) [M kazoo.so] kz_amqp.o kz_amqp.c: In function 'kz_amqp_channel_close': kz_amqp.c:802:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 802 | if (!rmq) | ^~ In file included from ../../core/mem/pkg.h:32, from ../../core/mem/mem.h:41, from kz_amqp.c:38: ../../core/mem/../dprint.h:298:25: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 298 | do { \ | ^~ ../../core/mem/../dprint.h:345:25: note: in expansion of macro 'LOG_FX' 345 | LOG_FX(facility, level, lname, prefix, _FUNC_NAME_, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ ../../core/mem/../dprint.h:401:45: note: in expansion of macro 'LOG' 401 | # define DBG(fmt, args...) LOG(L_DBG, fmt , ## args) | ^~~ ../../core/mem/../dprint.h:405:36: note: in expansion of macro 'DBG' 405 | # define DEBUG(fmt, args...) DBG(fmt , ## args) | ^~~ ../../core/mem/../dprint.h:422:16: note: in expansion of macro 'DEBUG' 422 | #define LM_DBG DEBUG | ^~~~~ kz_amqp.c:805:9: note: in expansion of macro 'LM_DBG' 805 | LM_DBG("close channel: %d rmq(%p)->channel(%d)\n", getpid(), (void *)rmq, channel); | ^~~~~~ kz_amqp.c: In function 'kz_amqp_pipe_send': kz_amqp.c:1132:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 1132 | if(s_local_routing_key) | ^~ kz_amqp.c:1135:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 1135 | return ret; | ^~~~~~ kz_amqp.c: In function 'kz_amqp_subscribe_simple': kz_amqp.c:2051:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 2051 | if(binding != NULL) | ^~ kz_amqp.c:2054:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 2054 | return -1; | ^~~~~~ CC (gcc) [M kazoo.so] kz_fixup.o CC (gcc) [M kazoo.so] kz_hash.o CC (gcc) [M kazoo.so] kz_json.o CC (gcc) [M kazoo.so] kz_pua.o CC (gcc) [M kazoo.so] kz_trans.o ``` **4** ``` CC (gcc) [M ndb_redis.so] ndb_redis_mod.o CC (gcc) [M ndb_redis.so] redis_client.o redis_client.c: In function 'redisc_init': redis_client.c:43:17: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~ redis_client.c:235:21: note: in expansion of macro 'redisCommandNR' 235 | if (redisCommandNR(rsrv->ctxRedis, "PING")) { | ^~~~~~~~~~~~~~ redis_client.c:43:52: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~~~~ redis_client.c:235:21: note: in expansion of macro 'redisCommandNR' 235 | if (redisCommandNR(rsrv->ctxRedis, "PING")) { | ^~~~~~~~~~~~~~ redis_client.c:43:17: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~ redis_client.c:240:51: note: in expansion of macro 'redisCommandNR' 240 | if ((redis_cluster_param == 0) && redisCommandNR(rsrv->ctxRedis, | ^~~~~~~~~~~~~~ redis_client.c:43:52: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~~~~ redis_client.c:240:51: note: in expansion of macro 'redisCommandNR' 240 | if ((redis_cluster_param == 0) && redisCommandNR(rsrv->ctxRedis, | ^~~~~~~~~~~~~~ redis_client.c: In function 'redisc_reconnect_server': redis_client.c:43:17: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~ redis_client.c:549:13: note: in expansion of macro 'redisCommandNR' 549 | if (redisCommandNR(rsrv->ctxRedis, "PING")) | ^~~~~~~~~~~~~~ redis_client.c:43:52: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~~~~ redis_client.c:549:13: note: in expansion of macro 'redisCommandNR' 549 | if (redisCommandNR(rsrv->ctxRedis, "PING")) | ^~~~~~~~~~~~~~ redis_client.c:43:52: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~~~~ redis_client.c:549:13: note: in expansion of macro 'redisCommandNR' 549 | if (redisCommandNR(rsrv->ctxRedis, "PING")) | ^~~~~~~~~~~~~~ redis_client.c:43:17: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~ redis_client.c:551:43: note: in expansion of macro 'redisCommandNR' 551 | if ((redis_cluster_param == 0) && redisCommandNR(rsrv->ctxRedis, | ^~~~~~~~~~~~~~ redis_client.c:43:52: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~~~~ redis_client.c:551:43: note: in expansion of macro 'redisCommandNR' 551 | if ((redis_cluster_param == 0) && redisCommandNR(rsrv->ctxRedis, | ^~~~~~~~~~~~~~ redis_client.c:43:17: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~ redis_client.c:555:21: note: in expansion of macro 'redisCommandNR' 555 | if (redisCommandNR(rsrv->ctxRedis, "FLUSHALL")) | ^~~~~~~~~~~~~~ redis_client.c:43:52: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 43 | if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) | ^~~~~ redis_client.c:555:21: note: in expansion of macro 'redisCommandNR' 555 | if (redisCommandNR(rsrv->ctxRedis, "FLUSHALL")) | ^~~~~~~~~~~~~~ LD (gcc) [M ndb_redis.so] ndb_redis.so CC (gcc) [M topos_redis.so] topos_redis_mod.o CC (gcc) [M topos_redis.so] topos_redis_storage.o ``` **5** ``` CC (gcc) [M xhttp_pi.so] xhttp_pi.o CC (gcc) [M xhttp_pi.so] xhttp_pi_fnc.o xhttp_pi_fnc.c: In function 'ph_run_pi_cmd': xhttp_pi_fnc.c:2904:25: warning: this 'if' clause does not guard... [-Wmisleading-indentation] 2904 | if(c_vals) pkg_free(c_vals); c_vals = NULL; | ^~ xhttp_pi_fnc.c:2904:54: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 2904 | if(c_vals) pkg_free(c_vals); c_vals = NULL; | ^~~~~~ make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M xhttp_pi.so] xhttp_pi.so CC (gcc) [M xmlrpc.so] http.o CC (gcc) [M xmlrpc.so] xmlrpc.o LD (gcc) [M xmlrpc.so] xmlrpc.so ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3012 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3012(a)github.com>

2 years, 10 months

git:master:08b29fe5: ndb_redis: wrap if block in curly braces

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 08b29fe56357d669ed888c5b94cbfe7bbde5bbef URL: https://github.com/kamailio/kamailio/commit/08b29fe56357d669ed888c5b94cbfe7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-08T08:19:03+01:00 ndb_redis: wrap if block in curly braces - GH #3012 --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/08b29fe56357d669ed888c5b94cbfe7… Patch: https://github.com/kamailio/kamailio/commit/08b29fe56357d669ed888c5b94cbfe7… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index bb6adc20b1..aad0b6c1b6 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -39,8 +39,10 @@ #include "redis_client.h" -#define redisCommandNR(a...) (int)({ void *__tmp; __tmp = redisCommand(a); \ - if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;}) +#define redisCommandNR(a...) (int)({ \ + void *__tmp; __tmp = redisCommand(a); \ + if (__tmp) { freeReplyObject(__tmp); }; \ + __tmp ? 0 : -1;}) static redisc_server_t * _redisc_srv_list=NULL;

2 years, 10 months

git:master:37580a25: xhttp_pi: wrap freeing and setting to null in curly braces

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 37580a25694d5e5b0b4c89a92d1ba2d8b77aacba URL: https://github.com/kamailio/kamailio/commit/37580a25694d5e5b0b4c89a92d1ba2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-08T08:06:02+01:00 xhttp_pi: wrap freeing and setting to null in curly braces - GH #3012 --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/37580a25694d5e5b0b4c89a92d1ba2d… Patch: https://github.com/kamailio/kamailio/commit/37580a25694d5e5b0b4c89a92d1ba2d… --- diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c index a11b3f40a2..96f1707649 100644 --- a/src/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c @@ -2901,7 +2901,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) case 0: LM_ERR("no record on clause key [%.*s]\n", command->c_keys[0]->len, command->c_keys[0]->s); - if(c_vals) pkg_free(c_vals); c_vals = NULL; + if(c_vals) { pkg_free(c_vals); c_vals = NULL; } goto finish_page; case 1: LM_DBG("got [%d] rows for key [%.*s]\n",

2 years, 10 months

[kamailio/kamailio] format-truncation warning (Issue #3013)

by sergey-safarov

**1** ``` CC (gcc) [M presence.so] notify.o CC (gcc) [M presence.so] presence.o presence.c: In function 'child_init': presence.c:570:62: warning: '%d' directive output may be truncated writing between 1 and 11 bytes into a region of size 3 [-Wformat-truncation=] 570 | snprintf(tmp, 21, "PRESENCE NOTIFIER %d", i); | ^~ presence.c:570:43: note: directive argument in the range [-2147483647, 2147483646] 570 | snprintf(tmp, 21, "PRESENCE NOTIFIER %d", i); | ^~~~~~~~~~~~~~~~~~~~~~ presence.c:570:25: note: 'snprintf' output between 20 and 30 bytes into a destination of size 21 570 | snprintf(tmp, 21, "PRESENCE NOTIFIER %d", i); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC (gcc) [M presence.so] presence_dmq.o CC (gcc) [M presence.so] presentity.o CC (gcc) [M presence.so] publish.o CC (gcc) [M presence.so] subscribe.o CC (gcc) [M presence.so] utils_func.o ``` **2** ``` CC (gcc) [M rls.so] resource_notify.o CC (gcc) [M rls.so] rls.o rls.c: In function 'child_init': rls.c:688:57: warning: '%d' directive output may be truncated writing between 1 and 11 bytes into a region of size 3 [-Wformat-truncation=] 688 | snprintf(tmp, 16, "RLS NOTIFIER %d", i); | ^~ rls.c:688:43: note: directive argument in the range [-2147483647, 2147483646] 688 | snprintf(tmp, 16, "RLS NOTIFIER %d", i); | ^~~~~~~~~~~~~~~~~ rls.c:688:25: note: 'snprintf' output between 15 and 25 bytes into a destination of size 16 688 | snprintf(tmp, 16, "RLS NOTIFIER %d", i); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC (gcc) [M rls.so] rls_db.o CC (gcc) [M rls.so] subscribe.o CC (gcc) [M rls.so] utils.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3013 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3013(a)github.com>

2 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2022