sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:master:988c1245: gitignore: updated the path to protoshoot
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: 988c12456f3c0b671b1bcb8f30bebbb11db769c7 URL: https://github.com/kamailio/kamailio/commit/988c12456f3c0b671b1bcb8f30bebbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T18:35:59+01:00 gitignore: updated the path to protoshoot --- Modified: .gitignore --- Diff: https://github.com/kamailio/kamailio/commit/988c12456f3c0b671b1bcb8f30bebbb… Patch: https://github.com/kamailio/kamailio/commit/988c12456f3c0b671b1bcb8f30bebbb… --- diff --git a/.gitignore b/.gitignore index 4c75ee2..dcb043b 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ utils/gen_ha1/gen_ha1 utils/kamcmd/kamcmd utils/sercmd/sercmd utils/sercmd/kamcmd -utils/protoshoot/protoshoot +misc/tools/protoshoot/protoshoot # Emacs backup files *~ # Emacs file locks

1 0

git:master:e9cfbfd6: Makefile: root - remove src/ if provided in the value of modules variable
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: e9cfbfd6d9e4f529235e76f0cb778eca52f1b732 URL: https://github.com/kamailio/kamailio/commit/e9cfbfd6d9e4f529235e76f0cb778ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T18:34:38+01:00 Makefile: root - remove src/ if provided in the value of modules variable --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/e9cfbfd6d9e4f529235e76f0cb778ec… Patch: https://github.com/kamailio/kamailio/commit/e9cfbfd6d9e4f529235e76f0cb778ec… --- diff --git a/Makefile b/Makefile index 05b9570..ca371a9 100644 --- a/Makefile +++ b/Makefile @@ -3,20 +3,32 @@ # - forward all commands to the Makefile in the src/ subfolder # + # path to the source code folder KSR_DIR ?= src/ # default target for makefile .DEFAULT_GOAL := default + +# strip the src/ from the path to modules +SMODPARAM= +ifneq ($(modules),) +ifneq (,$(findstring src/,$(modules))) +smodules=$(subst src/,,$(modules)) +SMODPARAM=modules=$(smodules) +endif +endif + # forward all named targets %: - $(MAKE) -C $(KSR_DIR) $@ + $(MAKE) -C $(KSR_DIR) $@ $(SMODPARAM) # forward the default target default: $(MAKE) -C $(KSR_DIR) +# forward the install target .PHONY: install install: - $(MAKE) -C $(KSR_DIR) $@ + $(MAKE) -C $(KSR_DIR) $@ $(SMODPARAM)

1 0

git:master:df6be9e3: Makefile.utils: updated the path to core folder
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: df6be9e375cdbe95007ca648f94bb9fb02652dba URL: https://github.com/kamailio/kamailio/commit/df6be9e375cdbe95007ca648f94bb9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T18:34:17+01:00 Makefile.utils: updated the path to core folder --- Modified: src/Makefile.utils --- Diff: https://github.com/kamailio/kamailio/commit/df6be9e375cdbe95007ca648f94bb9f… Patch: https://github.com/kamailio/kamailio/commit/df6be9e375cdbe95007ca648f94bb9f… --- diff --git a/src/Makefile.utils b/src/Makefile.utils index c0f7232..f7ce508 100644 --- a/src/Makefile.utils +++ b/src/Makefile.utils @@ -25,7 +25,7 @@ UTIL_NAME=$(NAME) # default path to the core makefiles -COREPATH ?=../.. +COREPATH ?=../../src ALLDEP=Makefile $(COREPATH)/Makefile.sources $(COREPATH)/Makefile.rules \ $(COREPATH)/Makefile.utils $(COREPATH)/Makefile.dirs $(COREPATH)/config.mak

1 0

git:master:7e75b000: Makefile.rules: print error message if path to modules is given wrong
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: 7e75b000d344bf42c1221bc92f67407582d3b882 URL: https://github.com/kamailio/kamailio/commit/7e75b000d344bf42c1221bc92f67407… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T18:33:29+01:00 Makefile.rules: print error message if path to modules is given wrong --- Modified: src/Makefile.rules --- Diff: https://github.com/kamailio/kamailio/commit/7e75b000d344bf42c1221bc92f67407… Patch: https://github.com/kamailio/kamailio/commit/7e75b000d344bf42c1221bc92f67407… --- diff --git a/src/Makefile.rules b/src/Makefile.rules index 2cdffa1..4d73a68 100644 --- a/src/Makefile.rules +++ b/src/Makefile.rules @@ -85,6 +85,9 @@ module_make= if [ -n "$(1)" -a -r "$(1)/Makefile" ]; then \ else \ exit 1; \ fi ; \ + else \ + echo module not found: $(1) ; \ + exit 1; \ fi ; quote:= "

1 0

git:master:0475310a: misc/protoshoot: option to disable sctp with SCTP=0 in make command
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: 0475310ae96217809acd5120bf25ccc6c44119f4 URL: https://github.com/kamailio/kamailio/commit/0475310ae96217809acd5120bf25ccc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T18:32:19+01:00 misc/protoshoot: option to disable sctp with SCTP=0 in make command --- Modified: misc/tools/protoshoot/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/0475310ae96217809acd5120bf25ccc… Patch: https://github.com/kamailio/kamailio/commit/0475310ae96217809acd5120bf25ccc… --- diff --git a/misc/tools/protoshoot/Makefile b/misc/tools/protoshoot/Makefile index d4a8757..a37776b 100644 --- a/misc/tools/protoshoot/Makefile +++ b/misc/tools/protoshoot/Makefile @@ -1,6 +1,6 @@ # -COREPATH=../../src +COREPATH=../../../src include $(COREPATH)/Makefile.defs include $(COREPATH)/Makefile.targets @@ -8,8 +8,12 @@ auto_gen= NAME=protoshoot RELEASE=0.2 +ifeq ($(SCTP),0) +C_DEFS:=$(filter-out -DUSE_SCTP, $(C_DEFS)) +else ifneq (,$(findstring -DUSE_SCTP,$(C_DEFS))) -SCTP=1 +SCTP?=1 +endif endif ifeq ($(SCTP),1)

1 0

git:master:e8eb76f9: misc/protoshoot: updated the path to core in makefile
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: e8eb76f95336f6d2d69e57ebc469a9d28fdf67fd URL: https://github.com/kamailio/kamailio/commit/e8eb76f95336f6d2d69e57ebc469a9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T18:23:57+01:00 misc/protoshoot: updated the path to core in makefile --- Modified: misc/tools/protoshoot/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/e8eb76f95336f6d2d69e57ebc469a9d… Patch: https://github.com/kamailio/kamailio/commit/e8eb76f95336f6d2d69e57ebc469a9d… --- diff --git a/misc/tools/protoshoot/Makefile b/misc/tools/protoshoot/Makefile index 9f6efd4..d4a8757 100644 --- a/misc/tools/protoshoot/Makefile +++ b/misc/tools/protoshoot/Makefile @@ -1,6 +1,6 @@ # -COREPATH=../.. +COREPATH=../../src include $(COREPATH)/Makefile.defs include $(COREPATH)/Makefile.targets

1 0

git:master:9da4b45f: Makefile: root forwarding of target without enclosing in double quotes
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: 9da4b45f4e56962e202042600f51ba11e4606760 URL: https://github.com/kamailio/kamailio/commit/9da4b45f4e56962e202042600f51ba1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T16:01:54+01:00 Makefile: root forwarding of target without enclosing in double quotes --- Modified: Makefile --- Diff: https://github.com/kamailio/kamailio/commit/9da4b45f4e56962e202042600f51ba1… Patch: https://github.com/kamailio/kamailio/commit/9da4b45f4e56962e202042600f51ba1… --- diff --git a/Makefile b/Makefile index 1a4f4bd..05b9570 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ KSR_DIR ?= src/ # forward all named targets %: - $(MAKE) -C $(KSR_DIR) "$@" + $(MAKE) -C $(KSR_DIR) $@ # forward the default target default: @@ -19,4 +19,4 @@ default: .PHONY: install install: - $(MAKE) -C $(KSR_DIR) "$@" + $(MAKE) -C $(KSR_DIR) $@

1 0

git:master:2b39d70d: jsonrpc-s: fixed compile warnings
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: 2b39d70d19df60a9ad1fc05f8a9d623c46c8caa2 URL: https://github.com/kamailio/kamailio/commit/2b39d70d19df60a9ad1fc05f8a9d623… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T10:32:03+01:00 jsonrpc-s: fixed compile warnings - unused variable and static declaration of function --- Modified: src/modules/jsonrpc-s/jsonrpc-s_mod.c Modified: src/modules/jsonrpc-s/jsonrpcs_fifo.c Modified: src/modules/jsonrpc-s/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/2b39d70d19df60a9ad1fc05f8a9d623… Patch: https://github.com/kamailio/kamailio/commit/2b39d70d19df60a9ad1fc05f8a9d623… --- diff --git a/src/modules/jsonrpc-s/jsonrpc-s_mod.c b/src/modules/jsonrpc-s/jsonrpc-s_mod.c index 9446384..7e112ee 100644 --- a/src/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/src/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -82,9 +82,6 @@ static void mod_destroy(void); static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2); static int jsonrpc_exec(sip_msg_t* msg, char* cmd, char* s2); -static int jsonrpc_init_fifo_file(void); -static void jsonrpc_fifo_process(int rank); - /* FIFO server parameters */ extern char *jsonrpc_fifo; /*!< FIFO file name */ extern char *jsonrpc_fifo_reply_dir; /*!< dir where reply fifos are allowed */ @@ -94,6 +91,7 @@ extern int jsonrpc_fifo_gid; /*!< Fifo default Group ID */ extern char *jsonrpc_fifo_gid_s; /*!< Fifo default Group ID name */ extern int jsonrpc_fifo_mode; /* Default file mode rw-rw---- */ /* fifo function prototypes */ +extern int jsonrpc_init_fifo_file(void); extern int jsonrpc_fifo_mod_init(void); extern int jsonrpc_fifo_child_init(int rank); extern int jsonrpc_fifo_destroy(void); diff --git a/src/modules/jsonrpc-s/jsonrpcs_fifo.c b/src/modules/jsonrpc-s/jsonrpcs_fifo.c index 87123a1..2e56913 100644 --- a/src/modules/jsonrpc-s/jsonrpcs_fifo.c +++ b/src/modules/jsonrpc-s/jsonrpcs_fifo.c @@ -50,7 +50,7 @@ int jsonrpc_fifo_mode = S_IRUSR| S_IWUSR| S_IRGRP| S_IWGRP; /* Default file mod /* FIFO TRANSPORT */ /*! \brief Initialize fifo transport */ -static int jsonrpc_init_fifo_file(void) +int jsonrpc_init_fifo_file(void) { int n; struct stat filestat; diff --git a/src/modules/jsonrpc-s/jsonrpcs_sock.c b/src/modules/jsonrpc-s/jsonrpcs_sock.c index e1c2640..e47806f 100644 --- a/src/modules/jsonrpc-s/jsonrpcs_sock.c +++ b/src/modules/jsonrpc-s/jsonrpcs_sock.c @@ -549,7 +549,6 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, void jsonrpc_dgram_server(int rx_sock, int tx_sock) { int ret; - int len; str scmd; jsonrpc_plain_reply_t* jr = NULL;

1 0

git:master:d2c82c2f: Makefile: detect path to core src folder
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: d2c82c2f8187bc2503ca39dc91ae691938b7014a URL: https://github.com/kamailio/kamailio/commit/d2c82c2f8187bc2503ca39dc91ae691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T10:26:00+01:00 Makefile: detect path to core src folder - it's different for modules and utils, after the files relocation --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d2c82c2f8187bc2503ca39dc91ae691… Patch: https://github.com/kamailio/kamailio/commit/d2c82c2f8187bc2503ca39dc91ae691… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3ec0026..4a8bb47 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -32,7 +32,12 @@ ifeq (,$(main_makefile)) # if not called from the main makefile (module, lib or ut): # include config.mak, but if not present or incomplete (makefile_defs!=1) # don't export the vars) -COREPATH?= ../../src/ +DEFCOREPATH = ../../src +ifneq ("$(wildcard $(DEFCOREPATH))","") +COREPATH?= ../../src +else +COREPATH?= ../.. +endif include $(COREPATH)/config.mak ifeq ($(quiet),verbose) $(info config.mak included)

1 0

git:master:f6f08b71: utils: updated Makefile for tools with path to core src
by Daniel-Constantin Mierla 08 Dec '16

08 Dec '16

Module: kamailio Branch: master Commit: f6f08b7196d2c7584977d205d316a667e2f5565d URL: https://github.com/kamailio/kamailio/commit/f6f08b7196d2c7584977d205d316a66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-08T10:06:20+01:00 utils: updated Makefile for tools with path to core src --- Modified: utils/db_berkeley/Makefile Modified: utils/db_oracle/Makefile Modified: utils/kamunix/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f6f08b7196d2c7584977d205d316a66… Patch: https://github.com/kamailio/kamailio/commit/f6f08b7196d2c7584977d205d316a66… --- diff --git a/utils/db_berkeley/Makefile b/utils/db_berkeley/Makefile index 60af050..73cec85 100644 --- a/utils/db_berkeley/Makefile +++ b/utils/db_berkeley/Makefile @@ -1,23 +1,22 @@ -# $Id: Makefile 882 2006-05-30 15:31:09Z miconda $ # # db_berkeley Makefile -# +# -include ../../Makefile.defs +include ../../src/Makefile.defs auto_gen= NAME=kambdb_recover -include ../../Makefile.sources +include ../../src/Makefile.sources # if you want to tune or reset flags #DEFS:=-DEXTRA_DEBUG -I$(LOCALBASE)/BerkeleyDB.4.6/include DEFS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \ -I$(LOCALBASE)/include/db4 -I$(SYSBASE)/include - + LIBS=-L$(LOCALBASE)/lib -L$(SYSBASE)/lib -L$(LOCALBASE)/BerkeleyDB.4.6/lib -ldb -include ../../Makefile.rules +include ../../src/Makefile.rules modules: diff --git a/utils/db_oracle/Makefile b/utils/db_oracle/Makefile index 1614e75..a530ec7 100644 --- a/utils/db_oracle/Makefile +++ b/utils/db_oracle/Makefile @@ -1,14 +1,13 @@ -# $Id$ # # db_orasel Makefile -# +# -include ../../Makefile.defs +include ../../src/Makefile.defs auto_gen= NAME=kamailio_orasel -include ../../Makefile.sources +include ../../src/Makefile.sources ORAPATH= @@ -61,6 +60,6 @@ ifneq ($(ORAPATH),) LIBS +=-Wl,-rpath $(ORAPATH) endif -include ../../Makefile.rules +include ../../src/Makefile.rules modules: diff --git a/utils/kamunix/Makefile b/utils/kamunix/Makefile index 5e463da..928d3fa 100644 --- a/utils/kamunix/Makefile +++ b/utils/kamunix/Makefile @@ -1,16 +1,15 @@ -# $Id$ # # kamunix Makefile # -include ../../Makefile.defs +include ../../src/Makefile.defs auto_gen= NAME=kamunix -include ../../Makefile.sources +include ../../src/Makefile.sources -include ../../Makefile.rules +include ../../src/Makefile.rules modules:

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016