sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:master:0d83c02f: erlang: allow user to set ERLANG_xxxDIR

by Fabrice Fontaine

Module: kamailio Branch: master Commit: 0d83c02f6389bf0adf9cc8afd5e19e2d0e94cd1a URL: https://github.com/kamailio/kamailio/commit/0d83c02f6389bf0adf9cc8afd5e19e2… Author: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Committer: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> Date: 2017-03-17T17:29:52+01:00 erlang: allow user to set ERLANG_xxxDIR If erl is not installed on the system or can not be used (for example when cross-compiling), then erlang module will use the values set by the user in ERLANG_INCDIR and ERLANG_LIBDIR instead of returning en error Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> --- Modified: src/modules/erlang/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/0d83c02f6389bf0adf9cc8afd5e19e2… Patch: https://github.com/kamailio/kamailio/commit/0d83c02f6389bf0adf9cc8afd5e19e2… --- diff --git a/src/modules/erlang/Makefile b/src/modules/erlang/Makefile index e75176c..1886bd0 100644 --- a/src/modules/erlang/Makefile +++ b/src/modules/erlang/Makefile @@ -10,9 +10,12 @@ ERLANG=$(shell which erl) ifneq ($(ERLANG),) ERLANG_LIBDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1) ERLANG_INCDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1) -else +endif + +ifeq ($(ERLANG_LIBDIR)$(ERLANG_INCDIR),) $(error Not found Erlang) endif + LIBS=-L$(ERLANG_LIBDIR) -lei -lpthread DEFS+=-I$(ERLANG_INCDIR)

7 years, 8 months

git:master:3f3cdf71: Merge pull request #1037 from ffontaine/master

by GitHub

Module: kamailio Branch: master Commit: 3f3cdf712c0cd8c8d35f0126cd132a392ff0b2ca URL: https://github.com/kamailio/kamailio/commit/3f3cdf712c0cd8c8d35f0126cd132a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-19T14:57:43+01:00 Merge pull request #1037 from ffontaine/master erlang: allow user to set ERLANG_xxxDIR --- Modified: src/modules/erlang/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3f3cdf712c0cd8c8d35f0126cd132a3… Patch: https://github.com/kamailio/kamailio/commit/3f3cdf712c0cd8c8d35f0126cd132a3… --- diff --git a/src/modules/erlang/Makefile b/src/modules/erlang/Makefile index e75176c..1886bd0 100644 --- a/src/modules/erlang/Makefile +++ b/src/modules/erlang/Makefile @@ -10,9 +10,12 @@ ERLANG=$(shell which erl) ifneq ($(ERLANG),) ERLANG_LIBDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1) ERLANG_INCDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1) -else +endif + +ifeq ($(ERLANG_LIBDIR)$(ERLANG_INCDIR),) $(error Not found Erlang) endif + LIBS=-L$(ERLANG_LIBDIR) -lei -lpthread DEFS+=-I$(ERLANG_INCDIR)

7 years, 8 months

[kamailio/kamailio] erlang: allow user to set ERLANG_xxxDIR (#1037)

by Fabrice Fontaine

If erl is not installed on the system or can not be used (for example when cross-compiling), then erlang module will use the values set by the user in ERLANG_INCDIR and ERLANG_LIBDIR instead of returning en error Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1037 -- Commit Summary -- * erlang: allow user to set ERLANG_xxxDIR -- File Changes -- M src/modules/erlang/Makefile (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1037.patch https://github.com/kamailio/kamailio/pull/1037.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/1037

7 years, 8 months

git:master:b2e8a193: modules/lcr: added lcr.load_gws rpc function

by Juha Heinanen

Module: kamailio Branch: master Commit: b2e8a193d086df58437c5b4d4df5dce684d88c61 URL: https://github.com/kamailio/kamailio/commit/b2e8a193d086df58437c5b4d4df5dce… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-03-18T11:40:56+02:00 modules/lcr: added lcr.load_gws rpc function --- Modified: src/modules/lcr/README Modified: src/modules/lcr/doc/lcr_admin.xml Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h Modified: src/modules/lcr/lcr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b2e8a193d086df58437c5b4d4df5dce… Patch: https://github.com/kamailio/kamailio/commit/b2e8a193d086df58437c5b4d4df5dce…

7 years, 8 months

availability of commits in master

by Luis Azedo

Hi, when is it expected that recent commits to master will go into stable ? there are 162 commits to master since 5.0.0 mostly fixes Thanks

7 years, 8 months

Forking and Call-ID Hiding in TOPOS

by Carsten Bock

Hi, quick question (most likely to Daniel) about Topos. The documentation on topos says about masking Call-ID: "Note: this functionality is not implemented yet - the parameter is present in order to be in pair with topoh module." Two questions: - Is there a timeline, when masking Call-ID's will be added? - will it also work for forking scenarios? Is it possible, to get a different Call-ID per branch? I'm considering replacing SEMS with FreeSwitch in one of our IMS deployments, so as soon as I have forking, I may have different Requests with the same Call-ID but different Request-URI's. Unfortunately, Forked requests are currently not properly supported on FreeSwitch... :-( When using Topoh, it would change the Call-ID, but with the same input parameter (old Call-ID) it would always result in the same new call-id. Thanks, Carsten -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Millerntorplatz 1 20359 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 5247593-40 Fax +49 40 5247593-99 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

7 years, 8 months

[kamailio/kamailio] Kamailio 5 coredump 11 (SEGV) upcon receiving MESSAGE via jsonrpcs (#1030)

by Anthony Messina

Using python-requests to generate a MESSAGE injected via jsonrpcs, Kamailio (built from the 5.0 branch @ 49bafac) dumps core. This did not occur in 4.4.5. See attached gdb output. [kamailio-coredump-jsonrpcs-message.txt](https://github.com/kamailio/kamaili… ``` """ Generate a SIP MESSAGE via Kamailio's jsonrpcs module """ headers = ("From: <{0}>\r\n" "To: <{1}>\r\n" "Max-Forwards: 1\r\n" "X-Kamailio-Message: noreply\r\n" "Content-Type: text/plain; " "charset=utf-8\r\n").format(self.sender, self.recipient) content = { 'id': 1, 'jsonrpc': '2.0', 'method': 'tm.t_uac_start', 'params': [ 'MESSAGE', self.recipient, SIP_NEXTHOP, '.', headers, self.body ] } # http://docs.python-requests.org/en/latest/user/quickstart/ try: r = requests.post(KAMAILIO_RPC_URL, allow_redirects=False, json=content, timeout=5) ``` -- 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/1030

7 years, 8 months

git:5.0:f81c128d: jsonrpcs: safety check to see if xhttp transport was initialized

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: f81c128dd3bf11fc52af308f36dabc926cc8ad70 URL: https://github.com/kamailio/kamailio/commit/f81c128dd3bf11fc52af308f36dabc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-17T07:55:30+01:00 jsonrpcs: safety check to see if xhttp transport was initialized - reported by GH #1030 (cherry picked from commit 7ae5210a7b9fb2d9a61cef496e9abe0da9860bee) --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f81c128dd3bf11fc52af308f36dabc9… Patch: https://github.com/kamailio/kamailio/commit/f81c128dd3bf11fc52af308f36dabc9… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index e639ab9..34f5f64 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1050,11 +1050,12 @@ static void jsonrpc_delayed_ctx_close(struct rpc_delayed_ctx* dctx) static int mod_init(void) { + memset(&xhttp_api, 0, sizeof(xhttp_api_t)); /* bind the XHTTP API */ if(jsonrpc_transport==0 || (jsonrpc_transport&1)) { if (xhttp_load_api(&xhttp_api) < 0) { - if(jsonrpc_transport==1) { + if(jsonrpc_transport&1) { LM_ERR("cannot bind to XHTTP API\n"); return -1; } else { @@ -1169,6 +1170,11 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) return NONSIP_MSG_PASS; } + if(xhttp_api.reply==NULL) { + LM_ERR("jsonrpc over http not initialized - check transport param\n"); + return NONSIP_MSG_ERROR; + } + /* initialize jsonrpc context */ ctx = &_jsonrpc_ctx; memset(ctx, 0, sizeof(jsonrpc_ctx_t));

7 years, 8 months

git:5.0:76176130: xhttp: use stateless reply for sending http response

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 76176130ee60ee819cd7850b7a7e433dc5c4f8cc URL: https://github.com/kamailio/kamailio/commit/76176130ee60ee819cd7850b7a7e433… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-16T11:01:17+01:00 xhttp: use stateless reply for sending http response (cherry picked from commit a97701575863993f8a19f9dd611156b37ffca247) --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/76176130ee60ee819cd7850b7a7e433… Patch: https://github.com/kamailio/kamailio/commit/76176130ee60ee819cd7850b7a7e433… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index 2443de1..05b45c3 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -412,7 +412,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str *reason, LM_DBG("response with body: %.*s\n", body->len, body->s); } LM_DBG("sending out response: %d %.*s\n", code, reason->len, reason->s); - if (slb.freply(msg, code, reason) < 0) + if (slb.sreply(msg, code, reason) < 0) { LM_ERR("Error while sending reply\n"); return -1;

7 years, 8 months

git:5.0:74978801: jsonrpcs: extra debug messages when rpc response is sent

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 74978801e2687dc43f4a017f1669360fd2c7f318 URL: https://github.com/kamailio/kamailio/commit/74978801e2687dc43f4a017f1669360… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-16T11:01:07+01:00 jsonrpcs: extra debug messages when rpc response is sent (cherry picked from commit fa50c85a9e61dd6b91ce88f3f74c433af5d414e2) --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/74978801e2687dc43f4a017f1669360… Patch: https://github.com/kamailio/kamailio/commit/74978801e2687dc43f4a017f1669360… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index f44fb9e..e639ab9 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -391,6 +391,8 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx) rbuf.len = strlen(rbuf.s); } if (rbuf.s!=NULL) { + LM_DBG("sending response with body: %p - %d %.*s\n", ctx->msg, + ctx->http_code, ctx->http_text.len, ctx->http_text.s); if(ctx->msg) { xhttp_api.reply(ctx->msg, ctx->http_code, &ctx->http_text, &JSONRPC_CONTENT_TYPE_HTML, &rbuf); @@ -400,6 +402,8 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx) rbuf.s=NULL; } } else { + LM_DBG("sending response without body: %p - %d %.*s\n", ctx->msg, + ctx->http_code, ctx->http_text.len, ctx->http_text.s); if(ctx->msg) { xhttp_api.reply(ctx->msg, ctx->http_code, &ctx->http_text, NULL, NULL);

7 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2017