sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:5.0:72330a60: xhttp: more debug messages for sending the response

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 72330a606ecca7dc0cf9bde0b6939ad67c0751d2 URL: https://github.com/kamailio/kamailio/commit/72330a606ecca7dc0cf9bde0b6939ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-16T11:00:56+01:00 xhttp: more debug messages for sending the response (cherry picked from commit 0350885c076fa691de6106eb821ec5890572cee6) --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/72330a606ecca7dc0cf9bde0b6939ad… Patch: https://github.com/kamailio/kamailio/commit/72330a606ecca7dc0cf9bde0b6939ad… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index ca8ab32..2443de1 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -399,6 +399,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str *reason, return -1; } pkg_free(tbuf.s); + LM_DBG("response with content-type: %.*s\n", ctype->len, ctype->s); } if(body!=NULL && body->len>0) @@ -408,7 +409,9 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str *reason, LM_ERR("Error while adding reply lump\n"); return -1; } + 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) { LM_ERR("Error while sending reply\n");

7 years, 9 months

git:master:7ae5210a: jsonrpcs: safety check to see if xhttp transport was initialized

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7ae5210a7b9fb2d9a61cef496e9abe0da9860bee URL: https://github.com/kamailio/kamailio/commit/7ae5210a7b9fb2d9a61cef496e9abe0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-17T07:52:57+01:00 jsonrpcs: safety check to see if xhttp transport was initialized - reported by GH #1030 --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7ae5210a7b9fb2d9a61cef496e9abe0… Patch: https://github.com/kamailio/kamailio/commit/7ae5210a7b9fb2d9a61cef496e9abe0… --- 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, 9 months

git:master:6fcd9f22: Merge pull request #1024 from grumvalski/tcp_reuseport

by GitHub

Module: kamailio Branch: master Commit: 6fcd9f2200e218239492f387e9054e9414fe498a URL: https://github.com/kamailio/kamailio/commit/6fcd9f2200e218239492f387e9054e9… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-16T16:44:08+01:00 Merge pull request #1024 from grumvalski/tcp_reuseport core: enable reuse of tcp sockets --- Modified: src/Makefile.defs Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/forward.h Modified: src/core/tcp_main.c Modified: src/core/tcp_options.c Modified: src/core/tcp_options.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/6fcd9f2200e218239492f387e9054e9… Patch: https://github.com/kamailio/kamailio/commit/6fcd9f2200e218239492f387e9054e9…

7 years, 9 months

git:master:b186dc66: core: enable reuse of tcp sockets

by grumvalski

Module: kamailio Branch: master Commit: b186dc66b3c0fc7ba2cbbc88a1fd3112d4d7a492 URL: https://github.com/kamailio/kamailio/commit/b186dc66b3c0fc7ba2cbbc88a1fd311… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-03-16T16:36:04+01:00 core: enable reuse of tcp sockets - credits to Marco Sinibaldi for the original implementation --- Modified: src/Makefile.defs Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/forward.h Modified: src/core/tcp_main.c Modified: src/core/tcp_options.c Modified: src/core/tcp_options.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/b186dc66b3c0fc7ba2cbbc88a1fd311… Patch: https://github.com/kamailio/kamailio/commit/b186dc66b3c0fc7ba2cbbc88a1fd311…

7 years, 9 months

[kamailio/kamailio] core: enable reuse of tcp sockets (#1024)

by Federico Cabiddu

As discussed on the mailing list and at FOSDEM this is a PR to start the discussion on the support of SO_REUSEPORT. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1024 -- Commit Summary -- * core: enable reuse of tcp sockets -- File Changes -- M src/Makefile.defs (3) M src/core/cfg.lex (2) M src/core/cfg.y (13) M src/core/forward.h (40) M src/core/tcp_main.c (20) M src/core/tcp_options.c (3) M src/core/tcp_options.h (1) M src/modules/tm/uac.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1024.patch https://github.com/kamailio/kamailio/pull/1024.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/1024

7 years, 9 months

about presence expires_offset

by Luis Azedo

Hi, the description of "expires_offset" says "The value in seconds that should be subtracted from the expires value when sending a 200OK for a publish" but this value is used for subscriptions and AFAICT its behaviour is not correct. when checking expired subscriptions it subtracts the offset from current time instead of adding it. in update_db_subs_timer_dbonly ... qcols[0]= &str_expires_col; qvals[0].type = DB1_INT; qvals[0].nul = 0; qvals[0].val.int_val= (int)time(NULL) - expires_offset; qops[0]= OP_LT; ... i think the behavior should be to subtract the value when sending the NOTIFY but add (or not use it) when checking for expired records. if anyone thinks this shouldn't be like this, please comment. i'll try to create a PR for this if no comments against this. Thanks

7 years, 9 months

git:master:a9770157: xhttp: use stateless reply for sending http response

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a97701575863993f8a19f9dd611156b37ffca247 URL: https://github.com/kamailio/kamailio/commit/a97701575863993f8a19f9dd611156b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-16T10:58:14+01:00 xhttp: use stateless reply for sending http response --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a97701575863993f8a19f9dd611156b… Patch: https://github.com/kamailio/kamailio/commit/a97701575863993f8a19f9dd611156b… --- 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, 9 months

git:master:fa50c85a: jsonrpcs: extra debug messages when rpc response is sent

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fa50c85a9e61dd6b91ce88f3f74c433af5d414e2 URL: https://github.com/kamailio/kamailio/commit/fa50c85a9e61dd6b91ce88f3f74c433… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-16T10:54:25+01:00 jsonrpcs: extra debug messages when rpc response is sent --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fa50c85a9e61dd6b91ce88f3f74c433… Patch: https://github.com/kamailio/kamailio/commit/fa50c85a9e61dd6b91ce88f3f74c433… --- 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, 9 months

git:master:0350885c: xhttp: more debug messages for sending the response

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0350885c076fa691de6106eb821ec5890572cee6 URL: https://github.com/kamailio/kamailio/commit/0350885c076fa691de6106eb821ec58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-16T10:53:51+01:00 xhttp: more debug messages for sending the response --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0350885c076fa691de6106eb821ec58… Patch: https://github.com/kamailio/kamailio/commit/0350885c076fa691de6106eb821ec58… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index ca8ab32..2443de1 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -399,6 +399,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str *reason, return -1; } pkg_free(tbuf.s); + LM_DBG("response with content-type: %.*s\n", ctype->len, ctype->s); } if(body!=NULL && body->len>0) @@ -408,7 +409,9 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str *reason, LM_ERR("Error while adding reply lump\n"); return -1; } + 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) { LM_ERR("Error while sending reply\n");

7 years, 9 months

git:4.4:65891fa1: Makefile.defs: override the ARCH for amd64 to x86_64

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 65891fa1051a08a261846db8926937dfcad9f518 URL: https://github.com/kamailio/kamailio/commit/65891fa1051a08a261846db8926937d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-16T08:51:55+01:00 Makefile.defs: override the ARCH for amd64 to x86_64 (cherry picked from commit 1adf88e7211400b8d56a6dc7c463e60a2b697b80) (cherry picked from commit f5889fcc9e42cae01c58357a622d2270f994b8d7) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/65891fa1051a08a261846db8926937d… Patch: https://github.com/kamailio/kamailio/commit/65891fa1051a08a261846db8926937d… --- diff --git a/Makefile.defs b/Makefile.defs index 80ebf6ea..cb49ad1 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -372,7 +372,7 @@ endif # retarget amd64 to x86_64 ifeq ($(ARCH), amd64) - ARCH=x86_64 + override ARCH=x86_64 endif $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>)

7 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
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