sr-dev February 2017

sr-dev@lists.kamailio.org

29 participants
364 discussions

[kamailio/kamailio] Change to Makefiles.def to support building on recent versions of Solaris (#963)

by Henry Unger

### Description The version of yacc on Solaris is ancient and fails to process cfg.lex. #### Reproduction Run gmake ### Possible Solutions Based on kamailio-4.4.5, change Makefiles.defs to comment out "YACC=yacc" on line 1838 for the block beginning "ifeq ($(OS), solaris)" on line 1804. $ diff -c Makefile.defs~ Makefile.defs *** Makefile.defs~ Wed Jan 18 07:00:21 2017 --- Makefile.defs Wed Feb 1 07:58:49 2017 *************** *** 1835,1841 **** #LDFLAGS=-g $(PROFILE) #MOD_LDFLAGS=-g -G endif ! YACC=yacc ifeq ($(CC_NAME), suncc) LIBS= -ldl -lresolv --- 1835,1841 ---- #LDFLAGS=-g $(PROFILE) #MOD_LDFLAGS=-g -G endif ! # YACC=yacc ifeq ($(CC_NAME), suncc) LIBS= -ldl -lresolv * **Operating System**: Solaris 11.3 -- 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/963

7 years, 7 months

git:master:19121e75: Makefile.defs: version set to 5.0.0-pre2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 19121e75c90784c1890e87a96e07bf32a31b2f0d URL: https://github.com/kamailio/kamailio/commit/19121e75c90784c1890e87a96e07bf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-08T08:14:17+01:00 Makefile.defs: version set to 5.0.0-pre2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/19121e75c90784c1890e87a96e07bf3… Patch: https://github.com/kamailio/kamailio/commit/19121e75c90784c1890e87a96e07bf3… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index e2acbd2..b1b5fd8 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -pre2 # memory manager switcher # 0 - f_malloc (fast malloc)

7 years, 7 months

git:master:47590ddf: Makefile.defs: don't enforce yacc on solaris

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47590ddf1819a8df1f580ea1fb64bfdc712f6771 URL: https://github.com/kamailio/kamailio/commit/47590ddf1819a8df1f580ea1fb64bfd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-08T08:12:17+01:00 Makefile.defs: don't enforce yacc on solaris - it's old and fails to parse the cfg - reported by GH #963 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/47590ddf1819a8df1f580ea1fb64bfd… Patch: https://github.com/kamailio/kamailio/commit/47590ddf1819a8df1f580ea1fb64bfd… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3fa6d76..e2acbd2 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1841,7 +1841,7 @@ ifeq ($(OS), solaris) #LDFLAGS=-g $(PROFILE) #MOD_LDFLAGS=-g -G endif - YACC=yacc + #YACC=yacc ifeq ($(CC_NAME), suncc) LIBS= -ldl -lresolv

7 years, 7 months

git:4.4:8a6c0e21: kazoo: set proper ranking for consumer workers

by Luis Azedo

Module: kamailio Branch: 4.4 Commit: 8a6c0e21f52af0efa39a3585d53e2f97b2cb90cf URL: https://github.com/kamailio/kamailio/commit/8a6c0e21f52af0efa39a3585d53e2f9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-02-07T15:57:36Z kazoo: set proper ranking for consumer workers (cherry picked from commit 744e898189fa84b5aa3d19958b348f9b99d48b41) --- Modified: modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/8a6c0e21f52af0efa39a3585d53e2f9… Patch: https://github.com/kamailio/kamailio/commit/8a6c0e21f52af0efa39a3585d53e2f9… --- diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index 060242d..1401b24 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -389,7 +389,7 @@ static int mod_child_init(int rank) */ for(i=0; i < dbk_consumer_workers; i++) { - pid=fork_process(i+1, "AMQP Consumer Worker", 1); + pid=fork_process(PROC_NOCHLDINIT, "AMQP Consumer Worker", 1); if (pid<0) return -1; /* error */ if(pid==0){

7 years, 7 months

git:master:744e8981: kazoo: set proper ranking for consumer workers

by GitHub

Module: kamailio Branch: master Commit: 744e898189fa84b5aa3d19958b348f9b99d48b41 URL: https://github.com/kamailio/kamailio/commit/744e898189fa84b5aa3d19958b348f9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-02-07T15:55:53Z kazoo: set proper ranking for consumer workers --- Modified: src/modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/744e898189fa84b5aa3d19958b348f9… Patch: https://github.com/kamailio/kamailio/commit/744e898189fa84b5aa3d19958b348f9… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 8c44391..963fae3 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -369,7 +369,7 @@ static int mod_child_init(int rank) */ for(i=0; i < dbk_consumer_workers; i++) { - pid=fork_process(i+1, "AMQP Consumer Worker", 1); + pid=fork_process(PROC_NOCHLDINIT, "AMQP Consumer Worker", 1); if (pid<0) return -1; /* error */ if(pid==0){

7 years, 7 months

git:master:a032d400: rtpengine: fix potential segfault when enabling a proxy

by Richard Fuchs

Module: kamailio Branch: master Commit: a032d400a43698468bc3a2b6c3c9b25fe1b514c7 URL: https://github.com/kamailio/kamailio/commit/a032d400a43698468bc3a2b6c3c9b25… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2017-02-07T09:14:25-05:00 rtpengine: fix potential segfault when enabling a proxy --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a032d400a43698468bc3a2b6c3c9b25… Patch: https://github.com/kamailio/kamailio/commit/a032d400a43698468bc3a2b6c3c9b25… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 9312eb2..82717f8 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -145,7 +145,7 @@ static struct rtpp_node *select_rtpp_node_new(str, str, int, struct rtpp_node ** static struct rtpp_node *select_rtpp_node_old(str, str, int, enum rtpe_operation); static struct rtpp_node *select_rtpp_node(str, str, int, struct rtpp_node **, int, enum rtpe_operation); static int is_queried_node(struct rtpp_node *, struct rtpp_node **, int); -static int build_rtpp_socks(unsigned int current_rtpp_no); +static int build_rtpp_socks(); static char *send_rtpp_command(struct rtpp_node *, bencode_item_t *, int *); static int get_extra_id(struct sip_msg* msg, str *id_str); @@ -988,8 +988,6 @@ static int rtpp_test_ping(struct rtpp_node *node) static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) { - unsigned int current_rtpp_no; - if (rtpp_db_url.s == NULL) { // no database rpc->fault(ctx, 500, "No Database URL"); @@ -1002,12 +1000,9 @@ static void rtpengine_rpc_reload(rpc_t* rpc, void* ctx) return; } - lock_get(rtpp_no_lock); - current_rtpp_no = *rtpp_no; - lock_release(rtpp_no_lock); - - if (rtpp_socks_size != current_rtpp_no) { - build_rtpp_socks(current_rtpp_no); + if (build_rtpp_socks()) { + rpc->fault(ctx, 500, "Out of memory"); + return; } } @@ -1019,6 +1014,11 @@ static int rtpengine_rpc_iterate(rpc_t* rpc, void* ctx, const str *rtpp_url, int found = RPC_FOUND_NONE, err = 0; int ret; + if (build_rtpp_socks()) { + rpc->fault(ctx, 500, "Out of memory"); + return -1; + } + if (!rtpp_set_list) { rpc->fault(ctx, 404, "Instance not found (no sets loaded)"); return -1; @@ -1456,16 +1456,24 @@ mod_init(void) return 0; } -static int build_rtpp_socks(unsigned int current_rtpp_no) { +static int build_rtpp_socks() { int n, i; char *cp; struct addrinfo hints, *res; struct rtpp_set *rtpp_list; struct rtpp_node *pnode; + unsigned int current_rtpp_no; #ifdef IP_MTU_DISCOVER int ip_mtu_discover = IP_PMTUDISC_DONT; #endif + lock_get(rtpp_no_lock); + current_rtpp_no = *rtpp_no; + lock_release(rtpp_no_lock); + + if (current_rtpp_no == rtpp_socks_size) + return 0; + // close current sockets for (i = 0; i < rtpp_socks_size; i++) { if (rtpp_socks[i] >= 0) { @@ -1581,16 +1589,6 @@ child_init(int rank) mypid = getpid(); - lock_get(rtpp_no_lock); - rtpp_socks_size = *rtpp_no; - lock_release(rtpp_no_lock); - - rtpp_socks = (int*)pkg_malloc(sizeof(int)*(rtpp_socks_size)); - if (!rtpp_socks) { - return -1; - } - memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); - // vector of pointers to queried nodes queried_nodes_ptr = (struct rtpp_node**)pkg_malloc(MAX_RTPP_TRIED_NODES * sizeof(struct rtpp_node*)); if (!queried_nodes_ptr) { @@ -1600,9 +1598,8 @@ child_init(int rank) memset(queried_nodes_ptr, 0, MAX_RTPP_TRIED_NODES * sizeof(struct rtpp_node*)); /* Iterate known RTP proxies - create sockets */ - if (rtpp_socks_size) { - build_rtpp_socks(rtpp_socks_size); - } + if (build_rtpp_socks()) + return -1; return 0; } @@ -2508,14 +2505,10 @@ static struct rtpp_node * select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **queried_nodes_ptr, int queried_nodes, enum rtpe_operation op) { struct rtpp_node *node = NULL; - unsigned int current_rtpp_no; - - lock_get(rtpp_no_lock); - current_rtpp_no = *rtpp_no; - lock_release(rtpp_no_lock); - if (rtpp_socks_size != current_rtpp_no) { - build_rtpp_socks(current_rtpp_no); + if (build_rtpp_socks()) { + LM_ERR("out of memory\n"); + return NULL; } if (!active_rtpp_set) {

7 years, 7 months

git:4.4:a3210259: rtpengine: fix segfault when enabling a proxy

by Richard Fuchs

Module: kamailio Branch: 4.4 Commit: a321025984d183f9c727fa4c9fcdc1e2e87010bf URL: https://github.com/kamailio/kamailio/commit/a321025984d183f9c727fa4c9fcdc1e… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2017-02-07T08:55:52-05:00 rtpengine: fix segfault when enabling a proxy --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a321025984d183f9c727fa4c9fcdc1e… Patch: https://github.com/kamailio/kamailio/commit/a321025984d183f9c727fa4c9fcdc1e… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 6b46074..01f1606 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -194,7 +194,7 @@ static struct rtpp_node *select_rtpp_node_new(str, str, int, struct rtpp_node ** static struct rtpp_node *select_rtpp_node_old(str, str, int, enum rtpe_operation); static struct rtpp_node *select_rtpp_node(str, str, int, struct rtpp_node **, int, enum rtpe_operation); static int is_queried_node(struct rtpp_node *, struct rtpp_node **, int); -static int build_rtpp_socks(unsigned int current_rtpp_no); +static int build_rtpp_socks(); static char *send_rtpp_command(struct rtpp_node *, bencode_item_t *, int *); static int get_extra_id(struct sip_msg* msg, str *id_str); @@ -1068,6 +1068,9 @@ static struct mi_root* mi_enable_rtp_proxy(struct mi_root *cmd_tree, void *param str rtpp_url; str snode, sattr, svalue; + if (build_rtpp_socks()) + return init_mi_tree(400, MI_DB_ERR, MI_DB_ERR_LEN); + found = MI_FOUND_NONE; found_rtpp_disabled = 0; found_rtpp = NULL; @@ -1412,6 +1415,9 @@ static struct mi_root* mi_ping_rtp_proxy(struct mi_root* cmd_tree, void* param) str rtpp_url; str snode, sattr, svalue; + if (build_rtpp_socks()) + return init_mi_tree(400, MI_DB_ERR, MI_DB_ERR_LEN); + found = 0; found_rtpp_disabled = 0; found_rtpp = NULL; @@ -1576,7 +1582,6 @@ static struct mi_root* mi_reload_rtp_proxy(struct mi_root* cmd_tree, void* param) { struct mi_root *root = NULL; - unsigned int current_rtpp_no; if (rtpp_db_url.s == NULL) { // no database @@ -1594,13 +1599,7 @@ mi_reload_rtp_proxy(struct mi_root* cmd_tree, void* param) return 0; } } else { - lock_get(rtpp_no_lock); - current_rtpp_no = *rtpp_no; - lock_release(rtpp_no_lock); - - if (rtpp_socks_size != current_rtpp_no) { - build_rtpp_socks(current_rtpp_no); - } + build_rtpp_socks(); // success reloading from database root = init_mi_tree(200, MI_DB_OK, MI_DB_OK_LEN); @@ -1795,16 +1794,24 @@ mod_init(void) return 0; } -static int build_rtpp_socks(unsigned int current_rtpp_no) { +static int build_rtpp_socks() { int n, i; char *cp; struct addrinfo hints, *res; struct rtpp_set *rtpp_list; struct rtpp_node *pnode; + unsigned int current_rtpp_no; #ifdef IP_MTU_DISCOVER int ip_mtu_discover = IP_PMTUDISC_DONT; #endif + lock_get(rtpp_no_lock); + current_rtpp_no = *rtpp_no; + lock_release(rtpp_no_lock); + + if (current_rtpp_no == rtpp_socks_size) + return 0; + // close current sockets for (i = 0; i < rtpp_socks_size; i++) { if (rtpp_socks[i] >= 0) { @@ -1920,16 +1927,6 @@ child_init(int rank) mypid = getpid(); - lock_get(rtpp_no_lock); - rtpp_socks_size = *rtpp_no; - lock_release(rtpp_no_lock); - - rtpp_socks = (int*)pkg_malloc(sizeof(int)*(rtpp_socks_size)); - if (!rtpp_socks) { - return -1; - } - memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); - // vector of pointers to queried nodes queried_nodes_ptr = (struct rtpp_node**)pkg_malloc(queried_nodes_limit * sizeof(struct rtpp_node*)); if (!queried_nodes_ptr) { @@ -1939,9 +1936,8 @@ child_init(int rank) memset(queried_nodes_ptr, 0, queried_nodes_limit * sizeof(struct rtpp_node*)); /* Iterate known RTP proxies - create sockets */ - if (rtpp_socks_size) { - build_rtpp_socks(rtpp_socks_size); - } + if (build_rtpp_socks()) + return -1; return 0; } @@ -2844,15 +2840,8 @@ static struct rtpp_node * select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **queried_nodes_ptr, int queried_nodes, enum rtpe_operation op) { struct rtpp_node *node = NULL; - unsigned int current_rtpp_no; - lock_get(rtpp_no_lock); - current_rtpp_no = *rtpp_no; - lock_release(rtpp_no_lock); - - if (rtpp_socks_size != current_rtpp_no) { - build_rtpp_socks(current_rtpp_no); - } + build_rtpp_socks(); if (!active_rtpp_set) { default_rtpp_set = select_rtpp_set(setid_default);

7 years, 7 months