sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
431 discussions

git:master:40657062: sanity: fixed module name for kemi exports
by Daniel-Constantin Mierla 25 Apr '16

25 Apr '16

Module: kamailio Branch: master Commit: 4065706231c4f8c5a944c33fbb8fa7d07691cee9 URL: https://github.com/kamailio/kamailio/commit/4065706231c4f8c5a944c33fbb8fa7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-25T15:05:35+02:00 sanity: fixed module name for kemi exports --- Modified: modules/sanity/mod_sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/4065706231c4f8c5a944c33fbb8fa7d… Patch: https://github.com/kamailio/kamailio/commit/4065706231c4f8c5a944c33fbb8fa7d… --- diff --git a/modules/sanity/mod_sanity.c b/modules/sanity/mod_sanity.c index c8e2762..f5e0f2b 100644 --- a/modules/sanity/mod_sanity.c +++ b/modules/sanity/mod_sanity.c @@ -291,12 +291,12 @@ static int bind_sanity(sanity_api_t* api) * */ static sr_kemi_t sr_kemi_sanity_exports[] = { - { str_init("maxfwd"), str_init("sanity_check"), + { str_init("sanity"), str_init("sanity_check"), SR_KEMIP_INT, ki_sanity_check, { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("maxfwd"), str_init("sanity_check_defaults"), + { str_init("sanity"), str_init("sanity_check_defaults"), SR_KEMIP_INT, ki_sanity_check_defaults, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

1 0

[kamailio/kamailio] 4.4.0: build errors on Debian kfreebsd (#576)
by Victor Seva 25 Apr '16

25 Apr '16

>From https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=kfreebsd-amd64… and https://buildd.debian.org/status/fetch.php?pkg=kamailio&arch=kfreebsd-i386&… ``` gcc -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"kamailio"' -DVERSION='"4.4.0"' -DARCH='"x86_64"' -DOS='gnu/kfreebsd_' -DOS_QUOTED='"gnu/kfreebsd"' -DCOMPILER='"gcc 5.3.1"' -D__CPU_x86_64 -D__OS_gnu/kfreebsd -DSER_VER=4004000 -DCFG_DIR='"/etc/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -c msg_translator.c -o msg_translator.o -MMD -MP <command-line>:0:9: warning: ISO C99 requires whitespace after the macro name In file included from parser/../mem/../fastlock.h:36:0, from parser/../mem/../lock_ops.h:92, from parser/../mem/shm.h:39, from parser/../mem/shm_mem.h:34, from parser/../ut.h:45, from parser/../ip_addr.h:40, from parser/msg_parser.h:37, from msg_translator.h:54, from msg_translator.c:88: parser/../mem/../sched_yield.h:34:20: warning: extra tokens at end of #ifndef directive #ifndef sched_yield() ^ In file included from msg_translator.c:98:0: resolve.h: In function '_resolvehost': resolve.h:432:4: error: #error neither gethostbyname2 or getipnodebyname present #error neither gethostbyname2 or getipnodebyname present ^ Makefile.rules:97: recipe for target 'msg_translator.o' failed make[1]: *** [msg_translator.o] Error 1 ``` --- 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/576

2 9

git:4.4:615b2525: Makefile.defs: detect kfreebsd OS and set its default compile flags
by Daniel-Constantin Mierla 25 Apr '16

25 Apr '16

Module: kamailio Branch: 4.4 Commit: 615b252510cee01dc6f24ac7d12f07dcb6b50366 URL: https://github.com/kamailio/kamailio/commit/615b252510cee01dc6f24ac7d12f07d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-25T09:18:42+02:00 Makefile.defs: detect kfreebsd OS and set its default compile flags - combine the options of Linux with FreeBSD to use kqueue if available - reported by Victor Seva, GH #576 (cherry picked from commit 4c6f879563adbbdee7c730549533a0d852e6cbef) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/615b252510cee01dc6f24ac7d12f07d… Patch: https://github.com/kamailio/kamailio/commit/615b252510cee01dc6f24ac7d12f07d… --- diff --git a/Makefile.defs b/Makefile.defs index 245f9b4..1814caf 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -113,7 +113,7 @@ SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) ) RELEASE:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) OS := $(shell uname -s | sed -e s/SunOS/solaris/ -e s/CYGWIN.*/cygwin/ \ - | tr "[A-Z]" "[a-z]") + | tr "[A-Z]" "[a-z]" | tr "/" "_") ifeq ($(OS),solaris) GETARCH=isainfo -n @@ -392,6 +392,13 @@ ifeq ($(OS), linux) LOCALBASE ?= /usr/local endif +ifeq ($(OS), gnu_kfreebsd) + doc_dir = share/doc/$(MAIN_NAME)/ + man_dir = share/man/ + data_dir = share/$(MAIN_NAME)/ + LOCALBASE ?= /usr/local +endif + ifeq ($(OS), freebsd) doc_dir = share/doc/$(MAIN_NAME)/ man_dir = man/ @@ -1745,6 +1752,38 @@ ifeq ($(OS), linux) endif endif +ifeq ($(OS), gnu_kfreebsd) +# by default use futexes if available + use_futex= yes + C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ + -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ + -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DUSE_RAW_SOCKS + ifneq ($(found_lock_method), yes) + #C_DEFS+= -DUSE_POSIX_SEM + C_DEFS+=-DUSE_PTHREAD_MUTEX + LIBS+= -lpthread + #C_DEFS+= -DUSE_SYSV_SEM # try posix sems + found_lock_method=yes + else + ifneq (,$(findstring -DUSE_POSIX_SEM, $(C_DEFS))) + LIBS+=-lpthread + endif + ifneq (,$(findstring -DUSE_PTHREAD_MUTEX, $(C_DEFS))) + LIBS+=-lpthread + endif + endif + + # check for ver >= 4.1 + ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) + ifeq ($(NO_KQUEUE),) + C_DEFS+=-DHAVE_KQUEUE + endif + endif + ifeq ($(NO_SELECT),) + C_DEFS+=-DHAVE_SELECT + endif +endif + ifeq ($(OS), solaris) C_DEFS+= -DHAVE_GETIPNODEBYNAME -DHAVE_SYS_SOCKIO_H -DHAVE_SCHED_YIELD \ -DHAVE_ALLOCA_H -DUSE_SIGACTION

1 0

git:4.4:71f329c9: core: remove ending parenthesis in ifdef condition
by Daniel-Constantin Mierla 25 Apr '16

25 Apr '16

Module: kamailio Branch: 4.4 Commit: 71f329c971d6ad18f7eda16a2b50b25e9efd3236 URL: https://github.com/kamailio/kamailio/commit/71f329c971d6ad18f7eda16a2b50b25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-25T09:18:14+02:00 core: remove ending parenthesis in ifdef condition warning: ISO C99 requires whitespace after the macro name sched_yield.h:34:20: warning: extra tokens at end of #ifndef directive #ifndef sched_yield() - reported by Victore Seva, GH #576 (cherry picked from commit 34b67125424da7ce86b5cac77e30af0711fafac1) --- Modified: sched_yield.h --- Diff: https://github.com/kamailio/kamailio/commit/71f329c971d6ad18f7eda16a2b50b25… Patch: https://github.com/kamailio/kamailio/commit/71f329c971d6ad18f7eda16a2b50b25… --- diff --git a/sched_yield.h b/sched_yield.h index 1f8546d..b63f90e 100644 --- a/sched_yield.h +++ b/sched_yield.h @@ -31,7 +31,7 @@ #else #include <unistd.h> /* fake sched_yield */ -#ifndef sched_yield() +#ifndef sched_yield #define sched_yield() sleep(0) #endif #endif

1 0

[kamailio] dialog: Enabling track_cseq_updates causes message parsing to fail (#526)
by Erik Davidson 25 Apr '16

25 Apr '16

With the config that we use for Kamailio, when we enable the track_cseq_updates option on the dialog module (for use with uac_auth()) it causes Kamailio to start failing on parse_first_line() with the following error: 2(6160) INFO: <core> [parser/parse_fline.c:144]: parse_first_line(): ERROR:parse_first_line: method not followed by SP 2(6160) ERROR: <core> [parser/parse_fline.c:257]: parse_first_line(): parse_first_line: bad message (offset: 0) 2(6160) ERROR: <core> [parser/msg_parser.c:690]: parse_msg(): ERROR: parse_msg: message=<ÄÜ s2¬> If you look at the 3rd line of the error it looks like the pointer to the message or the message itself somehow gets corrupted. If I simply switch off the track_cseq_updates option it starts to function normally again. I'm sorry I don't have a config file I can give as an example because the minimalist config I tried creating with that option on worked fine, so there must be something in our config that's leading to this issue but I'm unable to include our config. =/ I'm working on tracking down the issue myself but I wanted to create this issue in case anyone has run into this before or has any pointers on where I should look to reduce the amount of code I need to look through. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/526

2 10

[kamailio/kamailio] json module uses deprecated functions (trunk) (#579)
by Olle E. Johansson 25 Apr '16

25 Apr '16

``` CC (gcc) [M json.so] json_funcs.o json_funcs.c:64:44: warning: 'json_object_object_get' is deprecated [-Wdeprecated-declarations] value = (char*)json_object_to_json_string(json_object_object_get(j, field_s.s)); ^ /usr/local/include/json-c/json_object.h:290:56: note: 'json_object_object_get' has been explicitly marked deprecated here THIS_FUNCTION_IS_DEPRECATED(extern struct json_object* json_object_object_get(struct json_object* obj, ``` On os/X using clang compiler --- 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/579

2 2

git:4.4:528842d4: jsonrpc-c: replaced use of obsolete function json_object_object_get()
by Daniel-Constantin Mierla 25 Apr '16

25 Apr '16

Module: kamailio Branch: 4.4 Commit: 528842d4dfea3d6785e6cee0cd3fb6411ee3dc7d URL: https://github.com/kamailio/kamailio/commit/528842d4dfea3d6785e6cee0cd3fb64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-25T08:58:30+02:00 jsonrpc-c: replaced use of obsolete function json_object_object_get() (cherry picked from commit be02b3f11c269d3eeeb52e1cd0056d7d77be2e4c) --- Modified: modules/jsonrpc-c/jsonrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/528842d4dfea3d6785e6cee0cd3fb64… Patch: https://github.com/kamailio/kamailio/commit/528842d4dfea3d6785e6cee0cd3fb64… --- diff --git a/modules/jsonrpc-c/jsonrpc.c b/modules/jsonrpc-c/jsonrpc.c index 7baed54..834a7dd 100644 --- a/modules/jsonrpc-c/jsonrpc.c +++ b/modules/jsonrpc-c/jsonrpc.c @@ -70,34 +70,38 @@ jsonrpc_request_t* build_jsonrpc_request(char *method, json_object *params, char return req; } -json_object* build_jsonrpc_notification(char *method, json_object *params) +json_object* build_jsonrpc_notification(char *method, json_object *params) { json_object *req = json_object_new_object(); json_object_object_add(req, "jsonrpc", json_object_new_string("2.0")); json_object_object_add(req, "method", json_object_new_string(method)); json_object_object_add(req, "params", params); - return req; + return req; } int handle_jsonrpc_response(json_object *response) { - jsonrpc_request_t *req; - json_object *_id = json_object_object_get(response, "id"); - int id = json_object_get_int(_id); - + jsonrpc_request_t *req; + json_object *_id = NULL; + int id = 0; + json_object *result = NULL; + + json_object_object_get_ex(response, "id", &_id); + id = json_object_get_int(_id); if (!(req = get_request(id))) { json_object_put(response); return -1; } - json_object *result = json_object_object_get(response, "result"); - + json_object_object_get_ex(response, "result", &result); + if (result) { req->cbfunc(result, req->cbdata, 0); } else { - json_object *error = json_object_object_get(response, "error"); + json_object *error = NULL; + json_object_object_get_ex(response, "error", &error); if (error) { req->cbfunc(error, req->cbdata, 1); } else { @@ -105,7 +109,7 @@ int handle_jsonrpc_response(json_object *response) return -1; } } - + if (req->timer_ev) { close(req->timerfd); event_del(req->timer_ev); @@ -125,14 +129,14 @@ jsonrpc_request_t* get_request(int id) { int key = id_hash(id); jsonrpc_request_t *req, *prev_req = NULL; req = request_table[key]; - + while (req && req->id != id) { prev_req = req; if (!(req = req->next)) { break; }; } - + if (req && req->id == id) { if (prev_req != NULL) { prev_req-> next = req->next;

1 0

git:4.4:2700d7b8: json: replaced use of obsolete function json_object_object_get()
by Daniel-Constantin Mierla 25 Apr '16

25 Apr '16

Module: kamailio Branch: 4.4 Commit: 2700d7b8df738f9e5db82dca87cbab5549f2e0d1 URL: https://github.com/kamailio/kamailio/commit/2700d7b8df738f9e5db82dca87cbab5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-25T08:58:12+02:00 json: replaced use of obsolete function json_object_object_get() - reported by Olle E. Johansson, GH #579 (cherry picked from commit 8b9fd4fa40abfc40ecd537948036aa91b908615d) --- Modified: modules/json/json_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/2700d7b8df738f9e5db82dca87cbab5… Patch: https://github.com/kamailio/kamailio/commit/2700d7b8df738f9e5db82dca87cbab5… --- diff --git a/modules/json/json_funcs.c b/modules/json/json_funcs.c index 106eef1..4d73c73 100644 --- a/modules/json/json_funcs.c +++ b/modules/json/json_funcs.c @@ -39,6 +39,8 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) pv_value_t dst_val; char *value; struct json_object *j = NULL; + struct json_object *oj = NULL; + int ret; if (fixup_get_svalue(msg, (gparam_p)json, &json_s) != 0) { LM_ERR("cannot get json string value\n"); @@ -61,13 +63,18 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) return -1; } - value = (char*)json_object_to_json_string(json_object_object_get(j, field_s.s)); - - dst_val.rs.s = value; - dst_val.rs.len = strlen(value); - dst_val.flags = PV_VAL_STR; - dst_pv->setf(msg, &dst_pv->pvp, (int)EQ_T, &dst_val); + json_object_object_get_ex(j, field_s.s, &oj); + if(oj!=NULL) { + value = (char*)json_object_to_json_string(oj); + dst_val.rs.s = value; + dst_val.rs.len = strlen(value); + dst_val.flags = PV_VAL_STR; + dst_pv->setf(msg, &dst_pv->pvp, (int)EQ_T, &dst_val); + ret = 1; + } else { + ret = -1; + } if(j!=NULL) json_object_put(j); - return 1; + return ret; }

1 0

git:master:be02b3f1: jsonrpc-c: replaced use of obsolete function json_object_object_get()
by Daniel-Constantin Mierla 25 Apr '16

25 Apr '16

Module: kamailio Branch: master Commit: be02b3f11c269d3eeeb52e1cd0056d7d77be2e4c URL: https://github.com/kamailio/kamailio/commit/be02b3f11c269d3eeeb52e1cd0056d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-25T08:56:00+02:00 jsonrpc-c: replaced use of obsolete function json_object_object_get() --- Modified: modules/jsonrpc-c/jsonrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/be02b3f11c269d3eeeb52e1cd0056d7… Patch: https://github.com/kamailio/kamailio/commit/be02b3f11c269d3eeeb52e1cd0056d7… --- diff --git a/modules/jsonrpc-c/jsonrpc.c b/modules/jsonrpc-c/jsonrpc.c index 7baed54..834a7dd 100644 --- a/modules/jsonrpc-c/jsonrpc.c +++ b/modules/jsonrpc-c/jsonrpc.c @@ -70,34 +70,38 @@ jsonrpc_request_t* build_jsonrpc_request(char *method, json_object *params, char return req; } -json_object* build_jsonrpc_notification(char *method, json_object *params) +json_object* build_jsonrpc_notification(char *method, json_object *params) { json_object *req = json_object_new_object(); json_object_object_add(req, "jsonrpc", json_object_new_string("2.0")); json_object_object_add(req, "method", json_object_new_string(method)); json_object_object_add(req, "params", params); - return req; + return req; } int handle_jsonrpc_response(json_object *response) { - jsonrpc_request_t *req; - json_object *_id = json_object_object_get(response, "id"); - int id = json_object_get_int(_id); - + jsonrpc_request_t *req; + json_object *_id = NULL; + int id = 0; + json_object *result = NULL; + + json_object_object_get_ex(response, "id", &_id); + id = json_object_get_int(_id); if (!(req = get_request(id))) { json_object_put(response); return -1; } - json_object *result = json_object_object_get(response, "result"); - + json_object_object_get_ex(response, "result", &result); + if (result) { req->cbfunc(result, req->cbdata, 0); } else { - json_object *error = json_object_object_get(response, "error"); + json_object *error = NULL; + json_object_object_get_ex(response, "error", &error); if (error) { req->cbfunc(error, req->cbdata, 1); } else { @@ -105,7 +109,7 @@ int handle_jsonrpc_response(json_object *response) return -1; } } - + if (req->timer_ev) { close(req->timerfd); event_del(req->timer_ev); @@ -125,14 +129,14 @@ jsonrpc_request_t* get_request(int id) { int key = id_hash(id); jsonrpc_request_t *req, *prev_req = NULL; req = request_table[key]; - + while (req && req->id != id) { prev_req = req; if (!(req = req->next)) { break; }; } - + if (req && req->id == id) { if (prev_req != NULL) { prev_req-> next = req->next;

1 0

git:master:8b9fd4fa: json: replaced use of obsolete function json_object_object_get()
by Daniel-Constantin Mierla 25 Apr '16

25 Apr '16

Module: kamailio Branch: master Commit: 8b9fd4fa40abfc40ecd537948036aa91b908615d URL: https://github.com/kamailio/kamailio/commit/8b9fd4fa40abfc40ecd537948036aa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-25T08:54:45+02:00 json: replaced use of obsolete function json_object_object_get() - reported by Olle E. Johansson, GH #579 --- Modified: modules/json/json_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/8b9fd4fa40abfc40ecd537948036aa9… Patch: https://github.com/kamailio/kamailio/commit/8b9fd4fa40abfc40ecd537948036aa9… --- diff --git a/modules/json/json_funcs.c b/modules/json/json_funcs.c index 106eef1..4d73c73 100644 --- a/modules/json/json_funcs.c +++ b/modules/json/json_funcs.c @@ -39,6 +39,8 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) pv_value_t dst_val; char *value; struct json_object *j = NULL; + struct json_object *oj = NULL; + int ret; if (fixup_get_svalue(msg, (gparam_p)json, &json_s) != 0) { LM_ERR("cannot get json string value\n"); @@ -61,13 +63,18 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) return -1; } - value = (char*)json_object_to_json_string(json_object_object_get(j, field_s.s)); - - dst_val.rs.s = value; - dst_val.rs.len = strlen(value); - dst_val.flags = PV_VAL_STR; - dst_pv->setf(msg, &dst_pv->pvp, (int)EQ_T, &dst_val); + json_object_object_get_ex(j, field_s.s, &oj); + if(oj!=NULL) { + value = (char*)json_object_to_json_string(oj); + dst_val.rs.s = value; + dst_val.rs.len = strlen(value); + dst_val.flags = PV_VAL_STR; + dst_pv->setf(msg, &dst_pv->pvp, (int)EQ_T, &dst_val); + ret = 1; + } else { + ret = -1; + } if(j!=NULL) json_object_put(j); - return 1; + return ret; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016