sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
475 discussions

git:master:c32c6f34: cfgt: be more verbose on disk errors

by Victor Seva

Module: kamailio Branch: master Commit: c32c6f34e2ee2d8703587739705eb3275852474b URL: https://github.com/kamailio/kamailio/commit/c32c6f34e2ee2d8703587739705eb32… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-15T12:51:03+01:00 cfgt: be more verbose on disk errors based on https://github.com/sipwise/kamailio/commit/7157ca348cebb4534634459cd1e61e92… by Andreas Granig <agranig(a)sipwise.com> --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/c32c6f34e2ee2d8703587739705eb32… Patch: https://github.com/kamailio/kamailio/commit/c32c6f34e2ee2d8703587739705eb32… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index e2f402f587..2a0777ebcb 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -21,6 +21,8 @@ */ #include <stdio.h> #include <sys/stat.h> +#include <string.h> +#include <errno.h> #include "../../core/events.h" #include "../../core/strutils.h" @@ -334,7 +336,7 @@ void cfgt_save_node(cfgt_node_p node) } LM_DBG("dir [%s]\n", dest.s); if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { - LM_ERR("failed to make directory (%d)\n", errno); + LM_ERR("failed to make directory: %s\n", strerror(errno)); return; } dest.s[dir] = '/'; @@ -349,7 +351,7 @@ void cfgt_save_node(cfgt_node_p node) return; } if(fputs(dest.s, fp) < 0) { - LM_ERR("failed writing to file\n"); + LM_ERR("failed writing to file: %s\n", strerror(errno)); } fclose(fp); node->jdoc.free_fn(dest.s);

7 years

git:master:b933b2a7: usrloc: partion column name can be set via modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b933b2a7bf631b157bf81b86afffe6b8a43a0308 URL: https://github.com/kamailio/kamailio/commit/b933b2a7bf631b157bf81b86afffe6b… Author: Oyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-15T12:11:04+01:00 usrloc: partion column name can be set via modparam --- Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b933b2a7bf631b157bf81b86afffe6b… Patch: https://github.com/kamailio/kamailio/commit/b933b2a7bf631b157bf81b86afffe6b… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index f7ac066c29..96ff750f97 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -516,6 +516,26 @@ modparam("usrloc", "keepalive_column", "kalive") </example> </section> + <section id="usrloc.p.partition_column"> + <title><varname>partition_column</varname> (string)</title> + <para> + Name of database table column containing the value for partition id. + </para> + <para> + <emphasis> + Default value is <quote>partition</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>partitioncolumn</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "partition_column", "part") +... +</programlisting> + </example> + </section> + <section id="usrloc.p.use_domain"> <title><varname>use_domain</varname> (integer)</title> <para> diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 3191e1bb1e..2eb9037f24 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -218,6 +218,7 @@ static param_export_t params[] = { {"server_id_column", PARAM_STR, &srv_id_col }, {"connection_id_column",PARAM_STR, &con_id_col }, {"keepalive_column", PARAM_STR, &keepalive_col }, + {"partition_column", PARAM_STR, &partition_col }, {"matching_mode", INT_PARAM, &matching_mode }, {"cseq_delay", INT_PARAM, &cseq_delay }, {"fetch_rows", INT_PARAM, &ul_fetch_rows },

7 years

git:master:b579d64f: modules: readme files regenerated - usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b579d64ffe010cd782aad03cb72d1bdec6b5dd17 URL: https://github.com/kamailio/kamailio/commit/b579d64ffe010cd782aad03cb72d1bd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-12-15T12:16:37+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/b579d64ffe010cd782aad03cb72d1bd… Patch: https://github.com/kamailio/kamailio/commit/b579d64ffe010cd782aad03cb72d1bd…

7 years

[kamailio/kamailio] [Low Priority] Minor build warnings with gcc-7.2.1-2.fc27.x86_64 (#1325)

by Anthony Messina

Getting prepared for the next set of builds with an updated Fedora 27 system using gcc-7.2.1-2.fc27.x86_64, the following are the warnings dumped out. Feel free to close if this isn't important. I am not reporting that any of these create issues in my running Kamailio instance. ``` rtpengine.c: In function 'add_rtpengine_socks': rtpengine.c:778:24: warning: comparison between pointer and zero character constant [-Wpointer-compare] if (p1 != NULL && p1 != '\0') { ^~ rtpengine.c:778:21: note: did you mean to dereference the pointer? if (p1 != NULL && p1 != '\0') { ``` ``` libsms_modem.c: In function 'initmodem': libsms_modem.c:230:36: warning: '%s' directive writing up to 128 bytes into a region of size 91 [-Wformat-overflow=] clen=sprintf(command,"AT+CPIN=\"%s\"\r",mdm->pin); ^~ libsms_modem.c:230:8: note: 'sprintf' output between 12 and 140 bytes into a destination of size 100 clen=sprintf(command,"AT+CPIN=\"%s\"\r",mdm->pin); ``` ``` xhttp_rpc_fnc.c:188:18: warning: 'XHTTP_RPC_Post_1a' defined but not used [-Wunused-const-variable=] static const str XHTTP_RPC_Post_1a = str_init("\n"\ ^~~~~~~~~~~~~~~~~ xhttp_rpc_fnc.c:176:18: warning: 'XHTTP_RPC_ATTR_VAL_SEPARATOR' defined but not used [-Wunused-const-variable=] static const str XHTTP_RPC_ATTR_VAL_SEPARATOR = str_init("="); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ xhttp_rpc_fnc.c:175:18: warning: 'XHTTP_RPC_ATTR_SEPARATOR' defined but not used [-Wunused-const-variable=] static const str XHTTP_RPC_ATTR_SEPARATOR = str_init(" "); ^~~~~~~~~~~~~~~~~~~~~~~~ xhttp_rpc_fnc.c:174:18: warning: 'XHTTP_RPC_NODE_SEPARATOR' defined but not used [-Wunused-const-variable=] static const str XHTTP_RPC_NODE_SEPARATOR = str_init(":: "); ^~~~~~~~~~~~~~~~~~~~~~~~ ``` ``` uac_reg.c: In function 'reg_ht_add': uac_reg.c:558:81: warning: ?: using integer constants in boolean context [-Wint-in-bool-context] uac_reg.c:502:13: p = p + ((bsize)?(bsize):(dst)->len) + 1; \ ~~~~~~~ uac_reg.c:558:81: reg_copy_shm(&nr->callid, &str_empty, reg_keep_callid ? UAC_REG_TM_CALLID_SIZE : 0); uac_reg.c:502:14: note: in definition of macro 'reg_copy_shm' p = p + ((bsize)?(bsize):(dst)->len) + 1; \ ^~~~~ ``` ``` cr_fifo.c:64:12: warning: 'get_fifo_opts' declared 'static' but never defined [-Wunused-function] static int get_fifo_opts(str * buf, fifo_opt_t * opts, unsigned int opt_set[]); ^~~~~~~~~~~~~ cr_fifo.c:66:12: warning: 'update_route_data' declared 'static' but never defined [-Wunused-function] static int update_route_data(fifo_opt_t * opts); ^~~~~~~~~~~~~~~~~ cr_fifo.c:753:12: warning: 'update_route_data_recursor' defined but not used [-Wunused-function] static int update_route_data_recursor(struct dtrie_node_t *node, str * act_domain, fifo_opt_t * opts) { ^~~~~~~~~~~~~~~~~~~~~~~~~~ cr_fifo.c:78:12: warning: 'str_toklen' defined but not used [-Wunused-function] static int str_toklen(str * str, const char * delims) ^~~~~~~~~~ ``` ``` authorize.c:158:12: warning: 'get_ha1' defined but not used [-Wunused-function] static int get_ha1(struct username* _username, str* _domain, ^~~~~~~ ``` ``` java_msgobj.c: In function 'fill_sipmsg_object': java_msgobj.c:88:30: warning: passing argument 2 of '(*env)->SetIntField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetIntField(env, SipMsgInstance, fid, msg->id); ^~~~~~~~~~~~~~ java_msgobj.c:88:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:103:30: warning: passing argument 2 of '(*env)->SetIntField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetIntField(env, SipMsgInstance, fid, msg->pid); ^~~~~~~~~~~~~~ java_iface.c: In function 'java_exec': java_iface.c:193:48: warning: passing argument 2 of '(*env)->NewLocalRef' from incompatible pointer type [-Wincompatible-pointer-types] invk_method_ref = (*env)->NewLocalRef(env, invk_method); ^~~~~~~~~~~ java_iface.c:193:48: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_iface.c:193:21: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] invk_method_ref = (*env)->NewLocalRef(env, invk_method); ^ java_iface.c:197:30: warning: passing argument 2 of '(*env)->DeleteLocalRef' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->DeleteLocalRef(env, invk_method_ref); ^~~~~~~~~~~~~~~ java_iface.c:197:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_iface.c:206:32: warning: passing argument 2 of '(*env)->MonitorEnter' from incompatible pointer type [-Wincompatible-pointer-types] if ((*env)->MonitorEnter(env, invk_method_ref) != JNI_OK) ^~~~~~~~~~~~~~~ java_iface.c:206:32: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_iface.c:228:34: warning: passing argument 2 of '(*env)->DeleteLocalRef' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->DeleteLocalRef(env, invk_method_ref); ^~~~~~~~~~~~~~~ java_iface.c:228:34: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_iface.c:229:34: warning: passing argument 2 of '(*env)->DeleteLocalRef' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->DeleteLocalRef(env, invk_method); ^~~~~~~~~~~ java_iface.c:229:34: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_iface.c:251:30: warning: passing argument 2 of '(*env)->DeleteLocalRef' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->DeleteLocalRef(env, invk_method_ref); ^~~~~~~~~~~~~~~ java_iface.c:251:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_iface.c:252:30: warning: passing argument 2 of '(*env)->DeleteLocalRef' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->DeleteLocalRef(env, invk_method); ^~~~~~~~~~~ java_iface.c:252:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_iface.c:260:31: warning: passing argument 2 of '(*env)->MonitorExit' from incompatible pointer type [-Wincompatible-pointer-types] if ((*env)->MonitorExit(env, invk_method_ref) != JNI_OK) ^~~~~~~~~~~~~~~ java_iface.c:260:31: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_iface.c:266:33: warning: passing argument 2 of '(*env)->DeleteLocalRef' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->DeleteLocalRef(env, invk_method_ref); ^~~~~~~~~~~~~~~ java_iface.c:266:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_iface.c:267:33: warning: passing argument 2 of '(*env)->DeleteLocalRef' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->DeleteLocalRef(env, invk_method); ^~~~~~~~~~~ java_iface.c:267:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_msgobj.c:103:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' app_java_mod.c: In function 'child_init': java_msgobj.c:119:33: warning: passing argument 2 of '(*env)->SetObjectField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetObjectField(env, SipMsgInstance, fid, jStrParam); ^~~~~~~~~~~~~~ java_msgobj.c:119:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' app_java_mod.c:230:33: warning: passing argument 2 of '(*env)->DeleteLocalRef' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->DeleteLocalRef(env, child_init_id); ^~~~~~~~~~~~~ java_native_methods.c: In function 'Java_org_siprouter_SipMsg_ParseSipMsg': java_native_methods.c:478:12: warning: return from incompatible pointer type [-Wincompatible-pointer-types] return fill_sipmsg_object(jenv, msg); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ java_msgobj.c:136:33: warning: passing argument 2 of '(*env)->SetObjectField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetObjectField(env, SipMsgInstance, fid, jStrParam); ^~~~~~~~~~~~~~ java_msgobj.c:136:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:153:33: warning: passing argument 2 of '(*env)->SetObjectField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetObjectField(env, SipMsgInstance, fid, jStrParam); ^~~~~~~~~~~~~~ app_java_mod.c:230:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'jmethodID {aka struct _jmethodID *}' java_msgobj.c:153:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:169:30: warning: passing argument 2 of '(*env)->SetIntField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetIntField(env, SipMsgInstance, fid, msg->len); ^~~~~~~~~~~~~~ java_msgobj.c:169:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:185:33: warning: passing argument 2 of '(*env)->SetObjectField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetObjectField(env, SipMsgInstance, fid, jStrParam); ^~~~~~~~~~~~~~ java_msgobj.c:185:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:202:33: warning: passing argument 2 of '(*env)->SetObjectField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetObjectField(env, SipMsgInstance, fid, jStrParam); ^~~~~~~~~~~~~~ java_msgobj.c:202:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:218:30: warning: passing argument 2 of '(*env)->SetIntField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetIntField(env, SipMsgInstance, fid, msg->parsed_orig_ruri_ok); ^~~~~~~~~~~~~~ java_msgobj.c:218:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:234:33: warning: passing argument 2 of '(*env)->SetObjectField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetObjectField(env, SipMsgInstance, fid, jStrParam); ^~~~~~~~~~~~~~ java_msgobj.c:234:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:250:30: warning: passing argument 2 of '(*env)->SetIntField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetIntField(env, SipMsgInstance, fid, msg->add_to_branch_len); ^~~~~~~~~~~~~~ java_msgobj.c:250:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:265:30: warning: passing argument 2 of '(*env)->SetIntField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetIntField(env, SipMsgInstance, fid, msg->hash_index); ^~~~~~~~~~~~~~ java_msgobj.c:265:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:280:30: warning: passing argument 2 of '(*env)->SetIntField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetIntField(env, SipMsgInstance, fid, msg->msg_flags); ^~~~~~~~~~~~~~ java_msgobj.c:280:30: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:296:33: warning: passing argument 2 of '(*env)->SetObjectField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetObjectField(env, SipMsgInstance, fid, jStrParam); ^~~~~~~~~~~~~~ java_msgobj.c:296:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' java_msgobj.c:313:33: warning: passing argument 2 of '(*env)->SetObjectField' from incompatible pointer type [-Wincompatible-pointer-types] (*env)->SetObjectField(env, SipMsgInstance, fid, jStrParam); ^~~~~~~~~~~~~~ java_msgobj.c:313:33: note: expected 'jobject {aka struct _jobject *}' but argument is of type 'struct _jobject **' ``` ``` mongodb_dbase.c: In function 'db_mongodb_query': mongodb_dbase.c:922:2: warning: 'mongoc_collection_find' is deprecated: Use mongoc_collection_find_with_opts instead [-Wdeprecated-declarations] mgcon->cursor = mongoc_collection_find (mgcon->collection, ^~~~~ In file included from /usr/include/libmongoc-1.0/mongoc-client.h:28:0, from /usr/include/libmongoc-1.0/mongoc.h:28, from mongodb_connection.h:26, from mongodb_dbase.c:27: /usr/include/libmongoc-1.0/mongoc-collection.h:145:1: note: declared here mongoc_collection_find (mongoc_collection_t *collection, ^~~~~~~~~~~~~~~~~~~~~~ ``` ``` mongodb_client.c: In function 'mongodbc_exec_cmd': mongodb_client.c:290:4: warning: 'mongoc_collection_find' is deprecated: Use mongoc_collection_find_with_opts instead [-Wdeprecated-declarations] rpl->cursor = mongoc_collection_find (rpl->collection, ^~~ In file included from /usr/include/libmongoc-1.0/mongoc-client.h:28:0, from /usr/include/libmongoc-1.0/mongoc.h:28, from mongodb_client.h:25, from mongodb_client.c:34: /usr/include/libmongoc-1.0/mongoc-collection.h:145:1: note: declared here mongoc_collection_find (mongoc_collection_t *collection, ^~~~~~~~~~~~~~~~~~~~~~ ``` ``` subscribe.c: In function 'reply_200': subscribe.c:340:6: warning: unused variable 'len' [-Wunused-variable] int len; ^~~ ``` ``` In file included from /usr/include/python2.7/pyconfig.h:6:0, from /usr/include/python2.7/Python.h:8, from apy_kemi_export.c:30: /usr/include/python2.7/pyconfig-64.h:1202:0: warning: "_POSIX_C_SOURCE" redefined #define _POSIX_C_SOURCE 200112L In file included from /usr/include/bits/libc-header-start.h:33:0, from /usr/include/stdio.h:27, from apy_kemi_export.c:26: /usr/include/features.h:260:0: note: this is the location of the previous definition # define _POSIX_C_SOURCE 200809L ``` ``` In file included from /usr/include/python2.7/pyconfig.h:6:0, from /usr/include/python2.7/Python.h:8, from apy_kemi.c:25: /usr/include/python2.7/pyconfig-64.h:1202:0: warning: "_POSIX_C_SOURCE" redefined #define _POSIX_C_SOURCE 200112L In file included from /usr/include/bits/libc-header-start.h:33:0, from /usr/include/stdio.h:27, from apy_kemi.c:21: /usr/include/features.h:260:0: note: this is the location of the previous definition # define _POSIX_C_SOURCE 200809L ``` ``` sterman.c: In function 'extract_avp': sterman.c:77:60: warning: comparison between pointer and zero character constant [-Wpointer-compare] if (!q && p == vp->strvalue && vp->strvalue+sizeof(char) != '\0' ) { ^~ sterman.c:77:34: note: did you mean to dereference the pointer? if (!q && p == vp->strvalue && vp->strvalue+sizeof(char) != '\0' ) { ``` ``` xhttp_pi_fnc.c:358:18: warning: 'XHTTP_PI_CODE_2' defined but not used [-Wunused-const-variable=] static const str XHTTP_PI_CODE_2 = str_init("</pre>"); ^~~~~~~~~~~~~~~ xhttp_pi_fnc.c:357:18: warning: 'XHTTP_PI_CODE_1' defined but not used [-Wunused-const-variable=] static const str XHTTP_PI_CODE_1 = str_init("<pre>"); ^~~~~~~~~~~~~~~ xhttp_pi_fnc.c:356:18: warning: 'XHTTP_PI_BREAK' defined but not used [-Wunused-const-variable=] static const str XHTTP_PI_BREAK = str_init("<br/>"); ^~~~~~~~~~~~~~ xhttp_pi_fnc.c:352:18: warning: 'XHTTP_PI_NODE_SEPARATOR' defined but not used [-Wunused-const-variable=] static const str XHTTP_PI_NODE_SEPARATOR = str_init(":: "); ^~~~~~~~~~~~~~~~~~~~~~~ xhttp_pi_fnc.c:351:18: warning: 'XHTTP_PI_NODE_INDENT' defined but not used [-Wunused-const-variable=] static const str XHTTP_PI_NODE_INDENT = str_init("\t"); ^~~~~~~~~~~~~~~~~~~~ xhttp_pi_fnc.c:348:18: warning: 'XHTTP_PI_SEMICOLON' defined but not used [-Wunused-const-variable=] static const str XHTTP_PI_SEMICOLON = str_init(" : "); ^~~~~~~~~~~~~~~~~~ ``` ``` xode.c: In function 'xode_get_tag': xode.c:346:77: warning: comparison between pointer and zero character constant [-Wpointer-compare] if(parent == NULL || parent->firstchild == NULL || name == NULL || name == '\0') return NULL; ^~ xode.c:346:72: note: did you mean to dereference the pointer? if(parent == NULL || parent->firstchild == NULL || name == NULL || name == '\0') return NULL; ^ ``` ``` xstream.c: In function '_xode_put_expatattribs': xstream.c:34:20: warning: comparison between pointer and zero character constant [-Wpointer-compare] while (atts[i] != '\0') ^~ xstream.c:34:12: note: did you mean to dereference the pointer? while (atts[i] != '\0') ^ xode_from.c: In function '_xode_put_expatattribs': xode_from.c:35:20: warning: comparison between pointer and zero character constant [-Wpointer-compare] while (atts[i] != '\0') ^~ xode_from.c:35:12: note: did you mean to dereference the pointer? while (atts[i] != '\0') ^ ``` -- 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/issues/1325

7 years

[kamailio/kamailio] Let the partition column be configurable. (#1371)

by oyvindkolbu

#### Type Of Change - [X] 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: - [X ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) When using xDB Replication Server with PostgreSQL, "partition" is a reserved name and breaks replication. Therefore let the column name be configurable. An even better fix would be to also change the default name, as "partition" is a SQL key word which is reserved by SQL:2011. See https://www.postgresql.org/docs/current/static/sql-keywords-appendix.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1371 -- Commit Summary -- * Let the partition column be configurable. -- File Changes -- M src/modules/usrloc/doc/usrloc_admin.xml (20) M src/modules/usrloc/usrloc_mod.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1371.patch https://github.com/kamailio/kamailio/pull/1371.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/1371

7 years

git:5.1:578e6022: db_mongodb: fix deprecation warning

by Victor Seva

Module: kamailio Branch: 5.1 Commit: 578e60227859eaead7828924c08d40ae62f6228d URL: https://github.com/kamailio/kamailio/commit/578e60227859eaead7828924c08d40a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-15T11:51:41+01:00 db_mongodb: fix deprecation warning Since 1.5.0 mongoc_collection_find() is deprecated > http://mongoc.org/libmongoc/1.5.0/mongoc_collection_find.html (cherry picked from commit 0ea71ce3cdfb1bcd837f96d8e36e1b296f24a9d6) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/578e60227859eaead7828924c08d40a… Patch: https://github.com/kamailio/kamailio/commit/578e60227859eaead7828924c08d40a… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 048d71cdd4..57f11dc930 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -919,10 +919,14 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op } mgcon->nrcols = _nc; } + #if MONGOC_CHECK_VERSION(1, 5, 0) + mgcon->cursor = mongoc_collection_find_with_opts (mgcon->collection, + seldoc, mgcon->colsdoc, NULL); + #else mgcon->cursor = mongoc_collection_find (mgcon->collection, MONGOC_QUERY_NONE, 0, 0, 0, seldoc, mgcon->colsdoc, NULL); - + #endif if(!_r) { goto done; }

7 years

git:5.1:788f220c: xmpp: fix gcc 7 warnings

by Victor Seva

Module: kamailio Branch: 5.1 Commit: 788f220cd9673ed662399b610e8613478ec8a9ec URL: https://github.com/kamailio/kamailio/commit/788f220cd9673ed662399b610e86134… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-15T11:51:41+01:00 xmpp: fix gcc 7 warnings > CC (gcc) [M xmpp.so] xode.o > xode.c: In function 'xode_get_tag': > xode.c:346:77: warning: comparison between pointer and zero character constant [-Wpointer-compare] > if(parent == NULL || parent->firstchild == NULL || name == NULL || name == '\0') return NULL; > ^~ > xode.c:346:72: note: did you mean to dereference the pointer? > if(parent == NULL || parent->firstchild == NULL || name == NULL || name == '\0') return NULL; > ^ > CC (gcc) [M xmpp.so] xstream.o > xstream.c: In function '_xode_put_expatattribs': > xstream.c:34:20: warning: comparison between pointer and zero character constant [-Wpointer-compare] > while (atts[i] != '\0') > ^~ > xstream.c:34:12: note: did you mean to dereference the pointer? > while (atts[i] != '\0') > ^ > CC (gcc) [M xmpp.so] xode_from.o > xode_from.c: In function '_xode_put_expatattribs': > xode_from.c:35:20: warning: comparison between pointer and zero character constant [-Wpointer-compare] > while (atts[i] != '\0') > ^~ > xode_from.c:35:12: note: did you mean to dereference the pointer? > while (atts[i] != '\0') > ^ (cherry picked from commit 8994daba2b60bf020f982f108ab560f9aa68723f) --- Modified: src/modules/xmpp/xode.c Modified: src/modules/xmpp/xode_from.c Modified: src/modules/xmpp/xstream.c --- Diff: https://github.com/kamailio/kamailio/commit/788f220cd9673ed662399b610e86134… Patch: https://github.com/kamailio/kamailio/commit/788f220cd9673ed662399b610e86134… --- diff --git a/src/modules/xmpp/xode.c b/src/modules/xmpp/xode.c index 4909f6345e..8cc086aa3f 100644 --- a/src/modules/xmpp/xode.c +++ b/src/modules/xmpp/xode.c @@ -343,7 +343,7 @@ xode xode_get_tag(xode parent, const char* name) char *str, *slash, *qmark, *equals; xode step, ret; - if(parent == NULL || parent->firstchild == NULL || name == NULL || name == '\0') return NULL; + if(parent == NULL || parent->firstchild == NULL || name == NULL || *name == '\0') return NULL; if(strstr(name, "/") == NULL && strstr(name,"?") == NULL) return _xode_search(parent->firstchild, name, XODE_TYPE_TAG); diff --git a/src/modules/xmpp/xode_from.c b/src/modules/xmpp/xode_from.c index 8a78f4ba4d..60d49fa0ca 100644 --- a/src/modules/xmpp/xode_from.c +++ b/src/modules/xmpp/xode_from.c @@ -32,7 +32,7 @@ static void _xode_put_expatattribs(xode current, const char **atts) { int i = 0; if (atts == NULL) return; - while (atts[i] != '\0') + while (*(atts[i]) != '\0') { xode_put_attrib(current, atts[i], atts[i+1]); i += 2; diff --git a/src/modules/xmpp/xstream.c b/src/modules/xmpp/xstream.c index b4367b3aa1..41a6c1e386 100644 --- a/src/modules/xmpp/xstream.c +++ b/src/modules/xmpp/xstream.c @@ -31,7 +31,7 @@ static void _xode_put_expatattribs(xode owner, const char** atts) { int i = 0; if (atts == NULL) return; - while (atts[i] != '\0') + while (*(atts[i]) != '\0') { xode_put_attrib(owner, atts[i], atts[i+1]); i += 2;

7 years

git:5.1:2b5c88ed: auth_radius: fix gcc 7 warning

by Victor Seva

Module: kamailio Branch: 5.1 Commit: 2b5c88eda48fc50a582318d8ccdfa7c121806ee6 URL: https://github.com/kamailio/kamailio/commit/2b5c88eda48fc50a582318d8ccdfa7c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-15T11:51:41+01:00 auth_radius: fix gcc 7 warning > CC (gcc) [M auth_radius.so] sterman.o > sterman.c: In function 'extract_avp': > sterman.c:78:61: warning: comparison between pointer and zero character constant [-Wpointer-compare] > if(!q && p == vp->strvalue && vp->strvalue + sizeof(char) != '\0') { > ^~ > sterman.c:78:33: note: did you mean to dereference the pointer? > if(!q && p == vp->strvalue && vp->strvalue + sizeof(char) != '\0') { > ^ (cherry picked from commit 35b3d3c32d775ccea28f36d81a0b84e4a168db89) --- Modified: src/modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/2b5c88eda48fc50a582318d8ccdfa7c… Patch: https://github.com/kamailio/kamailio/commit/2b5c88eda48fc50a582318d8ccdfa7c… --- diff --git a/src/modules/auth_radius/sterman.c b/src/modules/auth_radius/sterman.c index db50b39df6..25eac9c9f5 100644 --- a/src/modules/auth_radius/sterman.c +++ b/src/modules/auth_radius/sterman.c @@ -75,7 +75,7 @@ static inline int extract_avp( if(vp->attribute == attrs[A_SIP_AVP].v && vp->type == PW_TYPE_STRING) { p = strchr(vp->strvalue, '#'); q = strchr(vp->strvalue, ':'); - if(!q && p == vp->strvalue && vp->strvalue + sizeof(char) != '\0') { + if(!q && p == vp->strvalue && *(vp->strvalue + sizeof(char)) != '\0') { r = p; r = strchr(r++, '#'); } else

7 years

git:5.1:0ed48941: uac: fix gcc 7 warning

by Victor Seva

Module: kamailio Branch: 5.1 Commit: 0ed489410b0cd3f34cb030af9ac434bb494fe3ba URL: https://github.com/kamailio/kamailio/commit/0ed489410b0cd3f34cb030af9ac434b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-15T11:51:41+01:00 uac: fix gcc 7 warning > CC (gcc) [M uac.so] uac_reg.o > uac_reg.c: In function 'reg_ht_add': > uac_reg.c:558:81: warning: ?: using integer constants in boolean context [-Wint-in-bool-context] > uac_reg.c:502:13: > p = p + ((bsize)?(bsize):(dst)->len) + 1; \ > ~~~~~~~ > uac_reg.c:558:81: > reg_copy_shm(&nr->callid, &str_empty, reg_keep_callid ? UAC_REG_TM_CALLID_SIZE : 0); > uac_reg.c:502:14: note: in definition of macro 'reg_copy_shm' > p = p + ((bsize)?(bsize):(dst)->len) + 1; \ > ^~~~~ (cherry picked from commit ea056fe4cc4c7b0dce9aaa1423d2fa3d89804b69) --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/0ed489410b0cd3f34cb030af9ac434b… Patch: https://github.com/kamailio/kamailio/commit/0ed489410b0cd3f34cb030af9ac434b… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index d85d51c6a0..4b636a5891 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -499,7 +499,7 @@ int reg_ht_add_byuser(reg_uac_t *reg) strncpy((dst)->s, (src)->s, (src)->len); \ (dst)->len = (src)->len; \ (dst)->s[(dst)->len] = '\0'; \ - p = p + ((bsize)?(bsize):(dst)->len) + 1; \ + p = p + ((bsize)!=0?(bsize):(dst)->len) + 1; \ } \ } while(0);

7 years

git:5.1:37d56a80: sms: fix gcc 7 warning #1369

by Victor Seva

Module: kamailio Branch: 5.1 Commit: 37d56a80ac28acb35190016f3459c4f85c4fdc81 URL: https://github.com/kamailio/kamailio/commit/37d56a80ac28acb35190016f3459c4f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-12-15T11:51:41+01:00 sms: fix gcc 7 warning #1369 > CC (gcc) [M sms.so] libsms_modem.o > libsms_modem.c: In function 'initmodem': > libsms_modem.c:230:36: warning: '%s' directive writing up to 128 bytes into a region of size 91 [-Wformat-overflow=] > clen=sprintf(command,"AT+CPIN=\"%s\"\r",mdm->pin); > ^~ > libsms_modem.c:230:8: note: 'sprintf' output between 12 and 140 bytes into a destination of size 100 > clen=sprintf(command,"AT+CPIN=\"%s\"\r",mdm->pin); > ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ (cherry picked from commit 537a40b4745099f3265242377c39057a680fc3ee) --- Modified: src/modules/sms/libsms_modem.c --- Diff: https://github.com/kamailio/kamailio/commit/37d56a80ac28acb35190016f3459c4f… Patch: https://github.com/kamailio/kamailio/commit/37d56a80ac28acb35190016f3459c4f… --- diff --git a/src/modules/sms/libsms_modem.c b/src/modules/sms/libsms_modem.c index 7bf702f6c7..5093d28ee2 100644 --- a/src/modules/sms/libsms_modem.c +++ b/src/modules/sms/libsms_modem.c @@ -213,7 +213,7 @@ int setmodemparams( struct modem *mdm ) int initmodem(struct modem *mdm, cds_report cds_report_f) { - char command[100]; + char command[MAX_CHAR_BUF+12]; char answer[100]; int retries=0; int success=0;

7 years

← Newer
1
...
17
18
19
20
21
22
23
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2017