sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:master:1f220bde: tsilo: exported w_ts_append_to2() for ts_append_to() with uri param
by Daniel-Constantin Mierla 24 Sep '15

24 Sep '15

Module: kamailio Branch: master Commit: 1f220bde59b5e494a5837199d7da37e8455b9615 URL: https://github.com/kamailio/kamailio/commit/1f220bde59b5e494a5837199d7da37e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-24T16:37:03+02:00 tsilo: exported w_ts_append_to2() for ts_append_to() with uri param --- Modified: modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/1f220bde59b5e494a5837199d7da37e… Patch: https://github.com/kamailio/kamailio/commit/1f220bde59b5e494a5837199d7da37e… --- diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c index 84b172e..f25db8c 100644 --- a/modules/tsilo/tsilo.c +++ b/modules/tsilo/tsilo.c @@ -73,7 +73,7 @@ stat_var *added_branches; static cmd_export_t cmds[]={ {"ts_append_to", (cmd_function)w_ts_append_to, 3, fixup_ts_append_to, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"ts_append_to", (cmd_function)w_ts_append_to, 4, + {"ts_append_to", (cmd_function)w_ts_append_to2, 4, fixup_ts_append_to, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"ts_append", (cmd_function)w_ts_append, 2, fixup_ts_append, 0, REQUEST_ROUTE | FAILURE_ROUTE },

1 0

[kamailio] websocket: Add support for SIP message fragmentation (#344)
by Hugh Waite 24 Sep '15

24 Sep '15

- websocket connections are created with a BUF_SIZE (64K) buffer used for concatenating frames - continuation frames (fragments) are supported for the SIP sub-protocol You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/344 -- Commit Summary -- * websocket: Add support for SIP message fragmentation -- File Changes -- M modules/websocket/ws_conn.c (5) M modules/websocket/ws_conn.h (2) M modules/websocket/ws_frame.c (59) -- Patch Links -- https://github.com/kamailio/kamailio/pull/344.patch https://github.com/kamailio/kamailio/pull/344.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/344

2 4

git:master:bd179897: Merge pull request #344 from kamailio/hpw/websocket_fragmentation
by Hugh Waite 24 Sep '15

24 Sep '15

Module: kamailio Branch: master Commit: bd179897f8e38913bde17a9e5c27106506f04f26 URL: https://github.com/kamailio/kamailio/commit/bd179897f8e38913bde17a9e5c27106… Author: Hugh Waite <que273(a)users.noreply.github.com> Committer: Hugh Waite <que273(a)users.noreply.github.com> Date: 2015-09-24T14:43:20+01:00 Merge pull request #344 from kamailio/hpw/websocket_fragmentation websocket: Add support for SIP message fragmentation Thanks! For some features, I like to check with other devs that I'm not in conflict with the existing style or causing any unintended consequences! --- Modified: modules/websocket/ws_conn.c Modified: modules/websocket/ws_conn.h Modified: modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/bd179897f8e38913bde17a9e5c27106… Patch: https://github.com/kamailio/kamailio/commit/bd179897f8e38913bde17a9e5c27106… --- diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 87d593d..b8ede8b 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -201,19 +201,20 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) LM_DBG("wsconn_add id [%d]\n", id); /* Allocate and fill in new WebSocket connection */ - wsc = shm_malloc(sizeof(ws_connection_t)); + wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE); if (wsc == NULL) { LM_ERR("allocating shared memory\n"); return -1; } - memset(wsc, 0, sizeof(ws_connection_t)); + memset(wsc, 0, sizeof(ws_connection_t) + BUF_SIZE); wsc->id = id; wsc->id_hash = id_hash; wsc->state = WS_S_OPEN; wsc->rcv = rcv; wsc->sub_protocol = sub_protocol; wsc->run_event = 0; + wsc->frag_buf.s = ((char*)wsc) + sizeof(ws_connection_t); atomic_set(&wsc->refcnt, 0); LM_DBG("wsconn_add new wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); diff --git a/modules/websocket/ws_conn.h b/modules/websocket/ws_conn.h index 029d570..df6400a 100644 --- a/modules/websocket/ws_conn.h +++ b/modules/websocket/ws_conn.h @@ -60,6 +60,8 @@ typedef struct ws_connection atomic_t refcnt; int run_event; + + str frag_buf; } ws_connection_t; typedef struct diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index e890770..16f7901 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -431,15 +431,6 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, frame->opcode = (buf[0] & 0xff) & BYTE0_MASK_OPCODE; frame->mask = (buf[1] & 0xff) & BYTE1_MASK_MASK; - if (!frame->fin) - { - LM_WARN("WebSocket fragmentation not supported in the sip " - "sub-protocol\n"); - *err_code = 1002; - *err_text = str_status_protocol_error; - return -1; - } - if (frame->rsv1 || frame->rsv2 || frame->rsv3) { LM_WARN("WebSocket reserved fields with non-zero values\n"); @@ -450,6 +441,10 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, switch(frame->opcode) { + case OPCODE_CONTINUATION: + LM_DBG("supported continuation frame: 0x%x\n", + (unsigned char) frame->opcode); + break; case OPCODE_TEXT_FRAME: case OPCODE_BINARY_FRAME: LM_DBG("supported non-control frame: 0x%x\n", @@ -651,6 +646,36 @@ int ws_frame_receive(void *data) switch(opcode) { + case OPCODE_CONTINUATION: + if (likely(frame.wsc->sub_protocol == SUB_PROTOCOL_SIP)) + { + if (frame.wsc->frag_buf.len + frame.payload_len >= BUF_SIZE) + { + LM_ERR("Buffer overflow assembling websocket fragments %d + %d = %d\n", frame.wsc->frag_buf.len, frame.payload_len, frame.wsc->frag_buf.len + frame.payload_len); + wsconn_put(frame.wsc); + return -1; + } + memcpy(frame.wsc->frag_buf.s + frame.wsc->frag_buf.len, frame.payload_data, frame.payload_len); + frame.wsc->frag_buf.len += frame.payload_len; + frame.wsc->frag_buf.s[frame.wsc->frag_buf.len] = '\0'; + + if (frame.fin) + { + ret = receive_msg(frame.wsc->frag_buf.s, + frame.wsc->frag_buf.len, + tcpinfo->rcv); + wsconn_put(frame.wsc); + return ret; + } + wsconn_put(frame.wsc); + return 0; + } + else + { + LM_ERR("Unsupported fragmented sub-protocol"); + wsconn_put(frame.wsc); + return -1; + } case OPCODE_TEXT_FRAME: case OPCODE_BINARY_FRAME: if (likely(frame.wsc->sub_protocol == SUB_PROTOCOL_SIP)) @@ -659,11 +684,23 @@ int ws_frame_receive(void *data) frame.payload_data); update_stat(ws_sip_received_frames, 1); - wsconn_put(frame.wsc); + if (frame.fin) + { - return receive_msg(frame.payload_data, + wsconn_put(frame.wsc); + + return receive_msg(frame.payload_data, frame.payload_len, tcpinfo->rcv); + } + else + { + memcpy(frame.wsc->frag_buf.s, frame.payload_data, frame.payload_len); + frame.wsc->frag_buf.len = frame.payload_len; + frame.wsc->frag_buf.s[frame.wsc->frag_buf.len] = '\0'; + wsconn_put(frame.wsc); + return 0; + } } else if (frame.wsc->sub_protocol == SUB_PROTOCOL_MSRP) {

1 0

git:master:38a79cdc: websocket: Add support for SIP message fragmentation
by Hugh Waite 24 Sep '15

24 Sep '15

Module: kamailio Branch: master Commit: 38a79cdc42b952ac0291d249241ca6499fc269aa URL: https://github.com/kamailio/kamailio/commit/38a79cdc42b952ac0291d249241ca64… Author: Hugh Waite <hugh.waite(a)xura.com> Committer: Hugh Waite <hugh.waite(a)xura.com> Date: 2015-09-23T21:59:09+01:00 websocket: Add support for SIP message fragmentation - websocket connections are created with a BUF_SIZE (64K) buffer used for concatenating frames - continuation frames (fragments) are supported for the SIP sub-protocol --- Modified: modules/websocket/ws_conn.c Modified: modules/websocket/ws_conn.h Modified: modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/38a79cdc42b952ac0291d249241ca64… Patch: https://github.com/kamailio/kamailio/commit/38a79cdc42b952ac0291d249241ca64… --- diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 87d593d..b8ede8b 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -201,19 +201,20 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) LM_DBG("wsconn_add id [%d]\n", id); /* Allocate and fill in new WebSocket connection */ - wsc = shm_malloc(sizeof(ws_connection_t)); + wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE); if (wsc == NULL) { LM_ERR("allocating shared memory\n"); return -1; } - memset(wsc, 0, sizeof(ws_connection_t)); + memset(wsc, 0, sizeof(ws_connection_t) + BUF_SIZE); wsc->id = id; wsc->id_hash = id_hash; wsc->state = WS_S_OPEN; wsc->rcv = rcv; wsc->sub_protocol = sub_protocol; wsc->run_event = 0; + wsc->frag_buf.s = ((char*)wsc) + sizeof(ws_connection_t); atomic_set(&wsc->refcnt, 0); LM_DBG("wsconn_add new wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); diff --git a/modules/websocket/ws_conn.h b/modules/websocket/ws_conn.h index 029d570..df6400a 100644 --- a/modules/websocket/ws_conn.h +++ b/modules/websocket/ws_conn.h @@ -60,6 +60,8 @@ typedef struct ws_connection atomic_t refcnt; int run_event; + + str frag_buf; } ws_connection_t; typedef struct diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index e890770..16f7901 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -431,15 +431,6 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, frame->opcode = (buf[0] & 0xff) & BYTE0_MASK_OPCODE; frame->mask = (buf[1] & 0xff) & BYTE1_MASK_MASK; - if (!frame->fin) - { - LM_WARN("WebSocket fragmentation not supported in the sip " - "sub-protocol\n"); - *err_code = 1002; - *err_text = str_status_protocol_error; - return -1; - } - if (frame->rsv1 || frame->rsv2 || frame->rsv3) { LM_WARN("WebSocket reserved fields with non-zero values\n"); @@ -450,6 +441,10 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, switch(frame->opcode) { + case OPCODE_CONTINUATION: + LM_DBG("supported continuation frame: 0x%x\n", + (unsigned char) frame->opcode); + break; case OPCODE_TEXT_FRAME: case OPCODE_BINARY_FRAME: LM_DBG("supported non-control frame: 0x%x\n", @@ -651,6 +646,36 @@ int ws_frame_receive(void *data) switch(opcode) { + case OPCODE_CONTINUATION: + if (likely(frame.wsc->sub_protocol == SUB_PROTOCOL_SIP)) + { + if (frame.wsc->frag_buf.len + frame.payload_len >= BUF_SIZE) + { + LM_ERR("Buffer overflow assembling websocket fragments %d + %d = %d\n", frame.wsc->frag_buf.len, frame.payload_len, frame.wsc->frag_buf.len + frame.payload_len); + wsconn_put(frame.wsc); + return -1; + } + memcpy(frame.wsc->frag_buf.s + frame.wsc->frag_buf.len, frame.payload_data, frame.payload_len); + frame.wsc->frag_buf.len += frame.payload_len; + frame.wsc->frag_buf.s[frame.wsc->frag_buf.len] = '\0'; + + if (frame.fin) + { + ret = receive_msg(frame.wsc->frag_buf.s, + frame.wsc->frag_buf.len, + tcpinfo->rcv); + wsconn_put(frame.wsc); + return ret; + } + wsconn_put(frame.wsc); + return 0; + } + else + { + LM_ERR("Unsupported fragmented sub-protocol"); + wsconn_put(frame.wsc); + return -1; + } case OPCODE_TEXT_FRAME: case OPCODE_BINARY_FRAME: if (likely(frame.wsc->sub_protocol == SUB_PROTOCOL_SIP)) @@ -659,11 +684,23 @@ int ws_frame_receive(void *data) frame.payload_data); update_stat(ws_sip_received_frames, 1); - wsconn_put(frame.wsc); + if (frame.fin) + { - return receive_msg(frame.payload_data, + wsconn_put(frame.wsc); + + return receive_msg(frame.payload_data, frame.payload_len, tcpinfo->rcv); + } + else + { + memcpy(frame.wsc->frag_buf.s, frame.payload_data, frame.payload_len); + frame.wsc->frag_buf.len = frame.payload_len; + frame.wsc->frag_buf.s[frame.wsc->frag_buf.len] = '\0'; + wsconn_put(frame.wsc); + return 0; + } } else if (frame.wsc->sub_protocol == SUB_PROTOCOL_MSRP) {

1 0

git:master:7a4899bb: Merge pull request #329 from kamailio/vseva/registrar_xavp_rcd
by Victor Seva 24 Sep '15

24 Sep '15

Module: kamailio Branch: master Commit: 7a4899bbdf7f5b600811e3d4d99ddba0fd3cc776 URL: https://github.com/kamailio/kamailio/commit/7a4899bbdf7f5b600811e3d4d99ddba… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-09-24T13:38:34+02:00 Merge pull request #329 from kamailio/vseva/registrar_xavp_rcd registrar: add contact and received info to xavp_rcd --- Modified: modules/registrar/README Modified: modules/registrar/doc/registrar_admin.xml Modified: modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/7a4899bbdf7f5b600811e3d4d99ddba… Patch: https://github.com/kamailio/kamailio/commit/7a4899bbdf7f5b600811e3d4d99ddba…

1 0

git:master:bd08a9b3: registrar: refresh README
by Victor Seva 24 Sep '15

24 Sep '15

Module: kamailio Branch: master Commit: bd08a9b316835a6b5d3a739617803a550e861dd4 URL: https://github.com/kamailio/kamailio/commit/bd08a9b316835a6b5d3a739617803a5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-09-18T09:52:37+02:00 registrar: refresh README --- Modified: modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/bd08a9b316835a6b5d3a739617803a5… Patch: https://github.com/kamailio/kamailio/commit/bd08a9b316835a6b5d3a739617803a5…

1 0

git:master:be4f1a65: registrar: add contact and recieved values to xavp_rcd
by Victor Seva 24 Sep '15

24 Sep '15

Module: kamailio Branch: master Commit: be4f1a65d1e84795b1540e0ae720a765a6005561 URL: https://github.com/kamailio/kamailio/commit/be4f1a65d1e84795b1540e0ae720a76… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-09-18T09:51:52+02:00 registrar: add contact and recieved values to xavp_rcd set xavp_rcd at registered() too --- Modified: modules/registrar/doc/registrar_admin.xml Modified: modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/be4f1a65d1e84795b1540e0ae720a76… Patch: https://github.com/kamailio/kamailio/commit/be4f1a65d1e84795b1540e0ae720a76…

1 0

[kamailio] registrar: add contact and received info to xavp_rcd (#329)
by Victor Seva 24 Sep '15

24 Sep '15

set xavp_rcd at registered() too You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/329 -- Commit Summary -- * registrar: add contact and recieved values to xavp_rcd * registrar: refresh README -- File Changes -- M modules/registrar/README (89) M modules/registrar/doc/registrar_admin.xml (26) M modules/registrar/lookup.c (69) -- Patch Links -- https://github.com/kamailio/kamailio/pull/329.patch https://github.com/kamailio/kamailio/pull/329.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/329

2 2

Re: [sr-dev] a new master crash in tm module
by Daniel-Constantin Mierla 24 Sep '15

24 Sep '15

OK, got the logs and found the double free: Sep 23 15:24:24 lohi /usr/bin/sip-proxy[13512]: WARNING: tm [h_table.c:126]: free_cell_helper(): ===== freeing transaction 0x7f70387e6470 from timer.c:648 Sep 23 15:25:31 lohi /usr/bin/sip-proxy[13512]: WARNING: tm [h_table.c:126]: free_cell_helper(): ===== freeing transaction 0x7f70387e6470 from timer.c:648 I will try to figure out why timer gets fired two times for these free, it is more than 1min in between. Daniel On 23/09/15 14:48, Juha Heinanen wrote: > Daniel-Constantin Mierla writes: > >> > Can you send the log messages with: >> > >> > ===== freeing transaction > below, juha -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Book: SIP Routing With Kamailio - http://www.asipto.com Kamailio Advanced Training, Sep 28-30, 2015, in Berlin - http://asipto.com/u/kat

2 1

git:master:8cac4148: Merge pull request #343 from doublec/janssonrpc_double_free
by Daniel-Constantin Mierla 24 Sep '15

24 Sep '15

Module: kamailio Branch: master Commit: 8cac4148811a72385cdcbabf08be53390571cba2 URL: https://github.com/kamailio/kamailio/commit/8cac4148811a72385cdcbabf08be533… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-24T08:52:22+02:00 Merge pull request #343 from doublec/janssonrpc_double_free janssonrpc-c: Fix double free if retry timer add fails --- Modified: modules/janssonrpc-c/janssonrpc_request.c --- Diff: https://github.com/kamailio/kamailio/commit/8cac4148811a72385cdcbabf08be533… Patch: https://github.com/kamailio/kamailio/commit/8cac4148811a72385cdcbabf08be533… --- diff --git a/modules/janssonrpc-c/janssonrpc_request.c b/modules/janssonrpc-c/janssonrpc_request.c index 39c7f31..f0117d9 100644 --- a/modules/janssonrpc-c/janssonrpc_request.c +++ b/modules/janssonrpc-c/janssonrpc_request.c @@ -253,8 +253,6 @@ int schedule_retry(jsonrpc_request_t* req) new_req->ntries = req->ntries; - free_request(req); - const struct timeval tv = ms_to_tv(time); new_req->retry_ev = evtimer_new(global_ev_base, retry_cb, (void*)new_req); @@ -264,6 +262,8 @@ int schedule_retry(jsonrpc_request_t* req) goto error; } + free_request(req); + return 0; error: ERR("schedule_retry failed.\n");

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015