sr-dev December 2013

sr-dev@lists.kamailio.org

30 participants
318 discussions

[tracker] Comment added: Crash in TCP Read on Kamailio 4.0.1

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#364 - Crash in TCP Read on Kamailio 4.0.1 User who did this - Hugh Waite (hugh.waite) ---------- I have commited a patch to solve the websocket double free issue. Pointers are now set to NULL after being freed. I haven't been able to reproduce the original crash, but I can log in and out OK on our system without issues. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=364#comment1196 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

[tracker] Comment added: Database location table not updated correctly?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#374 - Database location table not updated correctly? User who did this - Morten Tryfoss (mtryfoss) ---------- I wonder if the problem will be solved by just updating the location table with the new callid too, when instance is being used. Testing right now. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=374#comment1195 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

git:master: websocket: Set pointers to NULL when freeing ws connection structures

by Hugh Waite

Module: sip-router Branch: master Commit: e6758e35c99aded27ca1e1842b70265b52f44823 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6758e3… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Dec 3 13:06:37 2013 +0000 websocket: Set pointers to NULL when freeing ws connection structures - Fixes double free crash FS#364 - Reported by Vitaliy Aleksandrov --- modules/websocket/ws_conn.c | 1 - modules/websocket/ws_frame.c | 51 +++++++++++++++++++++++++------------ modules/websocket/ws_handshake.c | 2 +- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 263b49f..613f14e 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -138,7 +138,6 @@ static inline void _wsconn_rm(ws_connection_t *wsc) update_stat(ws_msrp_current_connections, -1); shm_free(wsc); - wsc = NULL; } void wsconn_destroy(void) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 503722e..a3a4cef 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -232,6 +232,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) pkg_free(send_buf); if (wsconn_rm(frame->wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); + frame->wsc = NULL; return -1; } init_dst_from_rcv(&dst, &con->rcv); @@ -243,8 +244,10 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) LM_ERR("removing WebSocket connection\n"); tcpconn_put(con); pkg_free(send_buf); + frame->wsc = NULL; return -1; } + frame->wsc = NULL; } if (dst.proto == PROTO_WS) @@ -297,6 +300,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) update_stat(ws_msrp_failed_connections, 1); if (wsconn_rm(frame->wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); + frame->wsc = NULL; tcpconn_put(con); return -1; } @@ -317,11 +321,19 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) return 0; } -static int close_connection(ws_connection_t *wsc, ws_close_type_t type, +static int close_connection(ws_connection_t **p_wsc, ws_close_type_t type, short int status, str reason) { char *data; ws_frame_t frame; + ws_connection_t * wsc = NULL; + int sub_proto = -1; + if (!p_wsc || !(*p_wsc)) + { + LM_ERR("Invalid parameters\n"); + return -1; + } + wsc = *p_wsc; if (wsc->state == WS_S_OPEN) { @@ -342,6 +354,7 @@ static int close_connection(ws_connection_t *wsc, ws_close_type_t type, frame.payload_len = reason.len + 2; frame.payload_data = data; frame.wsc = wsc; + sub_proto = wsc->sub_protocol; if (encode_and_send_ws_frame(&frame, type == @@ -367,16 +380,20 @@ static int close_connection(ws_connection_t *wsc, ws_close_type_t type, else { update_stat(ws_remote_closed_connections, 1); - if (frame.wsc->sub_protocol == SUB_PROTOCOL_SIP) + if (sub_proto == SUB_PROTOCOL_SIP) update_stat(ws_sip_remote_closed_connections, 1); - else if (frame.wsc->sub_protocol == SUB_PROTOCOL_MSRP) + else if (sub_proto == SUB_PROTOCOL_MSRP) update_stat(ws_msrp_remote_closed_connections, 1); + *p_wsc = NULL; } } else /* if (frame->wsc->state == WS_S_CLOSING) */ + { wsconn_close_now(wsc); + *p_wsc = NULL; + } return 0; } @@ -402,7 +419,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, if (len < 2) { LM_WARN("message is too short\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -418,7 +435,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, { LM_WARN("WebSocket fragmentation not supported in the sip " "sub-protocol\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -427,7 +444,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, if (frame->rsv1 || frame->rsv2 || frame->rsv3) { LM_WARN("WebSocket reserved fields with non-zero values\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -451,7 +468,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, default: LM_WARN("unsupported opcode: 0x%x\n", (unsigned char) frame->opcode); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1008, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1008, str_status_unsupported_opcode) < 0) LM_ERR("closing connection\n"); return -1; @@ -461,7 +478,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, { LM_WARN("this is a server - all received messages must be " "masked\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -474,7 +491,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, if (len < 4) { LM_WARN("message is too short\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -489,7 +506,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, if (len < 10) { LM_WARN("message is too short\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -500,7 +517,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, || (buf[4] & 0xff) != 0 || (buf[5] & 0xff) != 0) { LM_WARN("message is too long\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1009, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1009, str_status_message_too_big) < 0) LM_ERR("closing connection\n"); return -1; @@ -528,7 +545,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, { LM_WARN("message not complete frame size %u but received %u\n", frame->payload_len + mask_start + 4, len); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -564,7 +581,7 @@ static int handle_close(ws_frame_t *frame) LM_DBG("Rx Close: %hu %.*s\n", code, reason.len, reason.s); - if (close_connection(frame->wsc, + if (close_connection(&frame->wsc, frame->wsc->state == WS_S_OPEN ? REMOTE_CLOSE : LOCAL_CLOSE, 1000, str_status_normal_closure) < 0) { @@ -758,7 +775,7 @@ struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) str_status_bad_param.len); } - if (close_connection(wsc, LOCAL_CLOSE, 1000, + if (close_connection(&wsc, LOCAL_CLOSE, 1000, str_status_normal_closure) < 0) { LM_WARN("closing connection\n"); @@ -861,7 +878,7 @@ int ws_close(sip_msg_t *msg) return -1; } - return (close_connection(wsc, LOCAL_CLOSE, 1000, + return (close_connection(&wsc, LOCAL_CLOSE, 1000, str_status_normal_closure) == 0) ? 1: 0; } @@ -886,7 +903,7 @@ int ws_close2(sip_msg_t *msg, char *_status, char *_reason) return -1; } - return (close_connection(wsc, LOCAL_CLOSE, status, reason) == 0) ? 1: 0; + return (close_connection(&wsc, LOCAL_CLOSE, status, reason) == 0) ? 1: 0; } int ws_close3(sip_msg_t *msg, char *_status, char *_reason, char *_con) @@ -916,5 +933,5 @@ int ws_close3(sip_msg_t *msg, char *_status, char *_reason, char *_con) return -1; } - return (close_connection(wsc, LOCAL_CLOSE, status, reason) == 0) ? 1: 0; + return (close_connection(&wsc, LOCAL_CLOSE, status, reason) == 0) ? 1: 0; } diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 1ca6fe1..c4e3143 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -122,7 +122,7 @@ int ws_handle_handshake(struct sip_msg *msg) str key = {0, 0}, headers = {0, 0}, reply_key = {0, 0}, origin = {0, 0}; unsigned char sha1[SHA_DIGEST_LENGTH]; unsigned int hdr_flags = 0, sub_protocol = 0; - int version; + int version = 0; struct hdr_field *hdr = msg->headers; struct tcp_connection *con; ws_connection_t *wsc;

11 years

[tracker] Comment added: Database location table not updated correctly?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#374 - Database location table not updated correctly? User who did this - Morten Tryfoss (mtryfoss) ---------- I'm using the default value. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=374#comment1194 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

[tracker] Comment added: Database location table not updated correctly?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#374 - Database location table not updated correctly? User who did this - Víctor Seva (linuxmaniac) ---------- http://kamailio.org/docs/modules/3.3.x/modules_k/usrloc.html#matching-mode what matching mode are you using? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=374#comment1193 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

git:4.1: stun: refreshed readme file

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: a31988d657edef079525fa68096dc537e78708c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a31988d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 3 12:54:00 2013 +0100 stun: refreshed readme file --- modules/stun/README | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/stun/README b/modules/stun/README index 8121c9d..d572a2f 100644 --- a/modules/stun/README +++ b/modules/stun/README @@ -4,9 +4,9 @@ Peter Dunkley Crocodile RCS Ltd - Copyright © 2013 Crocodile RCS Ltd + Copyright � 2013 Crocodile RCS Ltd - Copyright © 2001-2003 FhG Fokus + Copyright � 2001-2003 FhG Fokus __________________________________________________________________ Table of Contents @@ -57,7 +57,7 @@ Chapter 1. Admin Guide The following libraries must be installed before running Kamailio with this module loaded: - * OpenSSL. + * none. 3. Parameters

11 years

git:4.1: stun: updated docs to reflect that it no longer depends on external libs

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 41cc8aa248ea1e736bb3d069b32430cc1e54c0af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41cc8aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 3 12:50:29 2013 +0100 stun: updated docs to reflect that it no longer depends on external libs (cherry picked from commit 305e7b5693e71d2027f8e6462129f8c9f01ad76d) --- modules/stun/doc/stun_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/stun/doc/stun_admin.xml b/modules/stun/doc/stun_admin.xml index d08194c..4ab4a70 100644 --- a/modules/stun/doc/stun_admin.xml +++ b/modules/stun/doc/stun_admin.xml @@ -41,7 +41,7 @@ &kamailio; with this module loaded: <itemizedlist> <listitem> - <para><emphasis>OpenSSL</emphasis>.</para> + <para><emphasis>none</emphasis>.</para> </listitem> </itemizedlist> </para>

11 years

git:master: stun: refreshed the readme

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dbb4e81f27156c350c89674ad598e002fa6e4e54 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dbb4e81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 3 12:51:15 2013 +0100 stun: refreshed the readme --- modules/stun/README | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/stun/README b/modules/stun/README index 8121c9d..d572a2f 100644 --- a/modules/stun/README +++ b/modules/stun/README @@ -4,9 +4,9 @@ Peter Dunkley Crocodile RCS Ltd - Copyright © 2013 Crocodile RCS Ltd + Copyright � 2013 Crocodile RCS Ltd - Copyright © 2001-2003 FhG Fokus + Copyright � 2001-2003 FhG Fokus __________________________________________________________________ Table of Contents @@ -57,7 +57,7 @@ Chapter 1. Admin Guide The following libraries must be installed before running Kamailio with this module loaded: - * OpenSSL. + * none. 3. Parameters

11 years

git:master: stun: updated docs to reflect that it no longer depends on external libs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 305e7b5693e71d2027f8e6462129f8c9f01ad76d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=305e7b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 3 12:50:29 2013 +0100 stun: updated docs to reflect that it no longer depends on external libs --- modules/stun/doc/stun_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/stun/doc/stun_admin.xml b/modules/stun/doc/stun_admin.xml index d08194c..4ab4a70 100644 --- a/modules/stun/doc/stun_admin.xml +++ b/modules/stun/doc/stun_admin.xml @@ -41,7 +41,7 @@ &kamailio; with this module loaded: <itemizedlist> <listitem> - <para><emphasis>OpenSSL</emphasis>.</para> + <para><emphasis>none</emphasis>.</para> </listitem> </itemizedlist> </para>

11 years

[tracker] Comment added: Database location table not updated correctly?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#374 - Database location table not updated correctly? User who did this - Morten Tryfoss (mtryfoss) ---------- There are still issues related to this. Now the contact is beeing updated based on instance, but when callid changes a new row is inserted and both are updated using instance and reg_id. If instance is being used, we should first check if a row already exists and update that instead? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=374#comment1192 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2013