sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
250 discussions

[tracker] Comment added: ACK not in transaction when t_relay or t_check_trans (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#229 - ACK not in transaction when t_relay or t_check_trans User who did this - Vlad (Vlad1983) ---------- Hi. After a T.38 reINVITE misses the verification t_check_trans in section WITHINDLG standard configuration file. ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=229#comment692 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.

12 years, 6 months

[tracker] Comment added: Kamailio crash when about 300, 000 tls connections opened.

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#236 - Kamailio crash when about 300,000 tls connections opened. User who did this - Shaobin.Feng (saxon_leo) ---------- Well,come again. first of all ,thank you guys for your attention. 1,for suggestion 1(Klaus Darilion) ===========================================================result of {echo "2" > /proc/sys/vm/overcommit_memory} kamailio couldn't start as normal ===============================log info /usr/local/sbin/kamailio[1018]: ERROR: <core> [tcp_main.c:4822]: ERROR: tcp_main: fork failed: Cannot allocate memory ===============================info the config just as above 2,for suggestion 2(Andrei Pelinescu-Onciul) ===========================================================result of {shm_force_alloc = yes and mlock_pages = yes in the .cfg} a,the connection accept very slow, almost 10~30/s at the very beginning b,the server could not be sshed c,also crash as above when connection achieve almost 90,000 connections 3,I use kamailio as sip-server with almost 100,000 users(via tls) per machine. And the num of users grow up every day. So,any idea of this? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=236#comment691 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.

12 years, 6 months

git:pd/websocket: modules/websocket: Filled in MI commands to dump WebSocket connection details and Close a WebSocket

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: f457ec98c2208d181bb94ace50b82faed6d707e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f457ec9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 21:31:29 2012 +0100 modules/websocket: Filled in MI commands to dump WebSocket connection details and Close a WebSocket --- modules/websocket/ws_frame.c | 177 +++++++++++++++++++++++++++++++++++++++--- modules/websocket/ws_mod.c | 48 +++++++++++- 2 files changed, 212 insertions(+), 13 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 0b0b474..fba01f5 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -21,7 +21,9 @@ * */ +#include <limits.h> #include "../../tcp_conn.h" +#include "../../tcp_server.h" #include "../../lib/kcore/kstats_wrapper.h" #include "../../lib/kmi/tree.h" #include "ws_frame.h" @@ -83,6 +85,8 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame) int mask_start, j; char *buf = frame->tcpinfo->buf; + LM_INFO("decoding WebSocket frame\n"); + /* Decode and validate first 9 bits */ if (len < 2) { @@ -200,11 +204,104 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame) static int encode_and_send_ws_frame(ws_frame_t *frame) { - /* TODO: convert ws_frame_t into a binary WebSocket frame and send over - TCP/TLS */ + int pos = 0, extended_length; + unsigned int frame_length; + char *send_buf; + struct dest_info dst; + + LM_INFO("encoding WebSocket frame\n"); + + /* Validate the first byte */ + if (!frame->fin) + { + LM_ERR("WebSocket fragmentation not supported in the sip " + "sub-protocol\n"); + return -1; + } + + if (frame->rsv1 || frame->rsv2 || frame->rsv3) + { + LM_ERR("WebSocket reserved fields with non-zero values\n"); + return -1; + } + switch(frame->opcode) + { + case OPCODE_TEXT_FRAME: + case OPCODE_BINARY_FRAME: + LM_INFO("supported non-control frame: 0x%x\n", + (unsigned char) frame->opcode); + break; + case OPCODE_CLOSE: + case OPCODE_PING: + case OPCODE_PONG: + LM_INFO("supported control frame: 0x%x\n", + (unsigned char) frame->opcode); + break; + default: + LM_ERR("unsupported opcode: 0x%x\n", + (unsigned char) frame->opcode); + return -1; + } + + /* validate the second byte */ + if (frame->mask) + { + LM_ERR("this is a server - all messages sent will be " + "unmasked\n"); + return -1; + } + + if (frame->payload_len < 126) extended_length = 0; + else if (frame->payload_len <= USHRT_MAX ) extended_length = 2; + else if (frame->payload_len <= UINT_MAX) extended_length = 4; + else + { + LM_ERR("Kamailio only supports WebSocket frames with payload " + "<= %u\n", UINT_MAX); + return -1; + } + + /* Allocate send buffer and build frame */ + frame_length = frame->payload_len + extended_length + 2; + if ((send_buf = pkg_malloc(sizeof(unsigned char) * frame_length)) + == NULL) + { + LM_ERR("allocating send buffer from pkg memory\n"); + return -1; + } + memset(send_buf, 0, frame_length); + send_buf[pos++] = 0x80 | (frame->opcode & 0xff); + if (extended_length == 0) + send_buf[pos++] = (frame->payload_len & 0xff); + else if (extended_length == 2) + { + send_buf[pos++] = 126; + send_buf[pos++] = (frame->payload_len & 0xff00) >> 8; + send_buf[pos++] = (frame->payload_len & 0x00ff) >> 0; + } + else + { + send_buf[pos++] = 127; + send_buf[pos++] = (frame->payload_len & 0xff000000) >> 24; + send_buf[pos++] = (frame->payload_len & 0x00ff0000) >> 16; + send_buf[pos++] = (frame->payload_len & 0x0000ff00) >> 8; + send_buf[pos++] = (frame->payload_len & 0x000000ff) >> 0; + } + memcpy(&send_buf[pos], frame->payload_data, frame->payload_len); + + init_dst_from_rcv(&dst, &frame->tcpinfo->con->rcv); + if (tcp_send(&dst, NULL, send_buf, frame_length) < 0) + { + LM_ERR("sending WebSocket frame\n"); + pkg_free(send_buf); + update_stat(ws_failed_connections, 1); + return -1; + } + update_stat(ws_transmitted_frames, 1); + pkg_free(send_buf); return 0; } @@ -245,18 +342,12 @@ static int handle_close(ws_frame_t *frame) static int handle_ping(ws_frame_t *frame) { - ws_frame_t ws_frame; - LM_INFO("Received Ping\n"); - memset(&ws_frame, 0, sizeof(ws_frame_t)); - ws_frame.fin = 1; - ws_frame.opcode = OPCODE_PONG; - ws_frame.payload_len = frame->payload_len; - ws_frame.payload_data = frame->payload_data; - ws_frame.tcpinfo = frame->tcpinfo; + frame->opcode = OPCODE_PONG; + frame->mask = 0; - encode_and_send_ws_frame(&ws_frame); + encode_and_send_ws_frame(frame); return 0; } @@ -329,7 +420,69 @@ int ws_frame_received(void *data) struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) { - /* TODO Close specified or all connections */ + unsigned int id; + struct mi_node *node = NULL; + ws_frame_t frame; + tcp_event_info_t tcpinfo; + short int code = 1000; + str reason = str_init("Normal Closure"); + char *data; + + node = cmd->node.kids; + if (node == NULL) + return 0; + if (node->value.s == NULL || node->value.len == 0) + { + LM_ERR("empty connection ID parameter\n"); + return init_mi_tree(400, "Empty connection ID parameter", 29); + } + if (str2int(&node->value, &id) < 0) + { + LM_ERR("converting string to int\n"); + return 0; + } + if (node->next != NULL) + { + LM_ERR("too many parameters\n"); + return init_mi_tree(400, "Too many parameters", 19); + } + + if ((tcpinfo.con = tcpconn_get(id, 0, 0, 0, 0)) == NULL) + { + LM_ERR("bad connection ID parameter\n"); + return init_mi_tree(400, "Bad connection ID parameter", 27); + } + + if ((data = pkg_malloc(sizeof(char) * (reason.len + 2))) == NULL) + { + LM_ERR("allocating pkg memory\n"); + return 0; + } + + data[0] = (code & 0xff00) >> 8; + data[1] = (code & 0x00ff) >> 0; + memcpy(&data[2], reason.s, reason.len); + + memset(&frame, 0, sizeof(frame)); + frame.fin = 1; + frame.opcode = OPCODE_CLOSE; + frame.payload_len = reason.len + 2; + frame.payload_data = data; + frame.tcpinfo = &tcpinfo; + + if (encode_and_send_ws_frame(&frame) < 0) + { + LM_ERR("sending WebSocket close\n"); + pkg_free(data); + return init_mi_tree(500,"Sending WebSocket close", 23); + } + + /* TODO: cleanly close TCP/TLS connection */ + + update_stat(ws_local_closed_connections, 1); + update_stat(ws_current_connections, -1); + + pkg_free(data); return init_mi_tree(200, MI_OK_S, MI_OK_LEN); } diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 302e0db..1bf1dc0 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -23,8 +23,10 @@ #include "../../dprint.h" #include "../../events.h" +#include "../../ip_addr.h" #include "../../locking.h" #include "../../sr_module.h" +#include "../../tcp_conn.h" #include "../../lib/kcore/kstats_wrapper.h" #include "../../lib/kmi/mi.h" #include "../../lib/kmi/tree.h" @@ -35,6 +37,9 @@ MODULE_VERSION +extern gen_lock_t *tcpconn_lock; +extern struct tcp_connection **tcpconn_id_hash; + static int mod_init(void); static void destroy(void); @@ -172,6 +177,47 @@ static void destroy(void) static struct mi_root *mi_dump(struct mi_root *cmd, void *param) { - /* TODO: output all open websocket connections */ + int h, connections = 0; + char *src_proto, *dst_proto; + char src_ip[IP6_MAX_STR_SIZE + 1], dst_ip[IP6_MAX_STR_SIZE + 1]; + struct tcp_connection *c; + + TCPCONN_LOCK; + for (h = 0; h < TCP_ID_HASH_SIZE; h++) + { + c = tcpconn_id_hash[h]; + while(c) + { + if (c->flags & F_CONN_WS) + { + src_proto = (c->rcv.proto== PROTO_TCP) + ? "tcp" : "tls"; + memset(src_ip, 0, IP6_MAX_STR_SIZE + 1); + ip_addr2sbuf(&c->rcv.src_ip, src_ip, + IP6_MAX_STR_SIZE); + + dst_proto = (c->rcv.proto == PROTO_TCP) + ? "tcp" : "tls"; + memset(dst_ip, 0, IP6_MAX_STR_SIZE + 1); + ip_addr2sbuf(&c->rcv.dst_ip, src_ip, + IP6_MAX_STR_SIZE); + + LM_ERR("id - %d, " + "src - %s:%s:%hu, " + "dst - %s:%s:%hu\n", + c->id, + src_proto, src_ip, c->rcv.src_port, + dst_proto, dst_ip, c->rcv.dst_port); + + connections++; + } + + c = c->id_next; + } + } + TCPCONN_UNLOCK; + + LM_ERR("%d WebSocket connections found\n", connections); + return init_mi_tree(200, MI_OK_S, MI_OK_LEN); }

12 years, 6 months

git:pd/websocket: core: Fixed a problem with receiving WebSocket frames

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 69c264b19f8b42e4700f9f8523912cf29eeadde5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69c264b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 21:30:33 2012 +0100 core: Fixed a problem with receiving WebSocket frames - If two frames were pulled from the buffer at the same time the second wasn't being processed. --- tcp_read.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index 5c45469..d8b4653 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -1018,14 +1018,18 @@ int msrp_process_msg(char* tcpbuf, unsigned int len, #ifdef READ_WS static int tcp_read_ws(struct tcp_connection *c, int* read_flags) { - int bytes, pos, mask_present; + int bytes, size, pos, mask_present; unsigned int len; char *p; struct tcp_req *r; r=&c->req; if (unlikely(r->parsed < r->pos)) + { + LM_ERR("next frame...\n"); bytes = 0; + size = r->pos - r->parsed; + } else { #ifdef USE_TLS @@ -1035,10 +1039,10 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) #endif bytes = tcp_read(c, read_flags); - LM_INFO("read %d bytes\n", bytes); - if (bytes <= 0) return 0; + + size = bytes; } p = r->parsed; @@ -1069,7 +1073,7 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) */ /* Process first two bytes */ - if (bytes < pos + 2) + if (size < pos + 2) goto skip; pos++; mask_present = p[pos] & 0x80; @@ -1078,7 +1082,7 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) /* Work out real length */ if (len == 126) { - if (bytes < pos + 2) + if (size < pos + 2) goto skip; len = ((p[pos + 0] & 0xff) << 8) @@ -1087,7 +1091,7 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) } else if (len == 127) { - if (bytes < pos + 8) + if (size < pos + 8) goto skip; /* Only decoding the last four bytes of the length... @@ -1103,17 +1107,16 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) /* Skip mask */ if (mask_present) { - if (bytes < pos + 4) + if (size < pos + 4) goto skip; pos += 4; } /* Now check the whole message has been received */ - if (bytes < pos + len) + if (size < pos + len) goto skip; pos += len; - r->bytes_to_go = bytes - pos; r->flags |= F_TCP_REQ_COMPLETE; r->parsed = &p[pos];

12 years, 6 months

Re: [sr-dev] New developer - Vicente Hernando

by Javier Gallart

Hello for us Redis was a great solution for this problem: we run a kamailio based routing server that needs to handle millions of entries. mtree module worked great but it had a problem: after every change in the DB you need to perform a reload in order for the data to be in memory. For several million entires the reload took more than 3 minutes. That means that we needed to batch many changes and do a reload every few minutes (it made no sense to do a full reload for a single change). We moved to redis an soon as the ndb_redis module was released. With redis we have these advantages: -No reload needed, any change is instanly available (no batch either) -We can access the same redis instance from several servers -Using redis pipelining and unix sockets (Vicente provided a patch for using them in ndb_redis module), the performance is really astonishing. The disadvantage is that you no longer have a mt_match funcion, you have to build it yourself. The same logic can be applied to other modules that rely on a db backend but need to be loaded into memory for speed. For small size data the reload is very fast, but when it starts growing it may take a while. Regards Javi > Date: Fri, 15 Jun 2012 14:26:48 +0200 > From: Vicente Hernando <vhernando(a)systemonenoc.com> > Subject: Re: [sr-dev] [SR-Users] New developer - Vicente Hernando > To: "Olle E. Johansson" <oej(a)edvina.net> > Cc: Development mailing list of the sip-router project > <sr-dev(a)lists.sip-router.org> > Message-ID: <4FDB2A08.4090902(a)systemonenoc.com> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > On 06/15/2012 02:12 PM, Olle E. Johansson wrote: > > 15 jun 2012 kl. 13:45 skrev Vicente Hernando: > > > >> Hello Olle, > >> > >> http://redis.io > >> http://en.wikipedia.org/wiki/Redis > >> #redis in irc.freenode.org > >> > >> Redis is a non-SQL opensource network data store. It uses a key-value > structure like a dictionary. Stores strings, and complex data tipes like > sets, lists, etc. > >> > >> It is written in C. Using hiredis library we can connect from kamailio > to a running redis server. Kamailio module dealing with redis is named > ndb_redis. > >> > >> Redis data is stored in RAM, and its goal is being very fast. > >> > >> > > Ok. Thanks. But are there things you can do in Redis that can't be done > in other databases? > > > > /O > Actually, Redis is simpler than other databases. Its goal is speed. It > tries to achieve high write and read speed. > > http://redis.io/topics/faq > http://redis.io/documentation > > Regards, > Vicente. > > >> Regards, > >> Vicente. > >> > >> > >> > >> On 06/15/2012 12:34 PM, Olle E. Johansson wrote: > >>> Vicente, > >>> Maybe you can take a moment or two and tell us old people about REDIS. > What is it good for, how can it change how we use Kamailio? > >>> > >>> I'm curious. > >>> > >>> Thanks! > >>> > >>> /O > > --- > > * Olle E Johansson - oej(a)edvina.net > > * Cell phone +46 70 593 68 51, Office +46 8 96 40 20, Sweden > > > > > > > > > > > > >

12 years, 6 months

git:pd/websocket: modules/websocket: more work on WebSocket framing and base-protocol

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: d3e770533b908acf73b359ba556a972c1330a118 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3e7705… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 14:29:44 2012 +0100 modules/websocket: more work on WebSocket framing and base-protocol --- modules/websocket/ws_frame.c | 75 +++++++++++++++++++++++++++++++++++++----- modules/websocket/ws_frame.h | 1 + modules/websocket/ws_mod.c | 45 +++++++++++++------------ 3 files changed, 90 insertions(+), 31 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index bce0a09..0b0b474 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -22,6 +22,7 @@ */ #include "../../tcp_conn.h" +#include "../../lib/kcore/kstats_wrapper.h" #include "../../lib/kmi/tree.h" #include "ws_frame.h" #include "ws_mod.h" @@ -177,10 +178,10 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame) frame->masking_key[3] = (buf[mask_start + 3] & 0xff); /* Decode and unmask payload */ - if (len < frame->payload_len + mask_start) + if (len != frame->payload_len + mask_start + 4) { - LM_WARN("message not complete payload_len = %u but only " - "received %u\n", frame->payload_len, len); + LM_WARN("message not complete frame size %u but received %u\n", + frame->payload_len + mask_start + 4, len); return -1; } frame->payload_data = &buf[mask_start + 4]; @@ -197,27 +198,75 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame) return frame->opcode; } -static int handle_sip_message(ws_frame_t *msg) +static int encode_and_send_ws_frame(ws_frame_t *frame) +{ + /* TODO: convert ws_frame_t into a binary WebSocket frame and send over + TCP/TLS */ + + update_stat(ws_transmitted_frames, 1); + + return 0; +} + +static int handle_sip_message(ws_frame_t *frame) { LM_INFO("Received SIP message\n"); + + /* TODO: drop SIP message into route {} for processing */ + return 0; } -static int handle_close(ws_frame_t *msg) +static int handle_close(ws_frame_t *frame) { + unsigned short code = 0; + str reason = {0, 0}; + + update_stat(ws_remote_closed_connections, 1); + update_stat(ws_current_connections, -1); LM_INFO("Received Close\n"); + + if (frame->payload_len >= 2) + code = ((frame->payload_data[0] & 0xff) << 8) + | ((frame->payload_data[1] & 0xff) << 0); + + if (frame->payload_len > 2) + { + reason.s = &frame->payload_data[2]; + reason.len = frame->payload_len - 2; + } + + LM_INFO("Close: %hu %.*s\n", code, reason.len, reason.s); + + /* TODO: cleanly close TCP/TLS connection */ + return 0; } -static int handle_ping(ws_frame_t *msg) +static int handle_ping(ws_frame_t *frame) { + ws_frame_t ws_frame; + LM_INFO("Received Ping\n"); + + memset(&ws_frame, 0, sizeof(ws_frame_t)); + ws_frame.fin = 1; + ws_frame.opcode = OPCODE_PONG; + ws_frame.payload_len = frame->payload_len; + ws_frame.payload_data = frame->payload_data; + ws_frame.tcpinfo = frame->tcpinfo; + + encode_and_send_ws_frame(&ws_frame); + return 0; } -static int handle_pong(ws_frame_t *msg) +static int handle_pong(ws_frame_t *frame) { LM_INFO("Received Pong\n"); + + LM_INFO("Pong: %.*s\n", frame->payload_len, frame->payload_data); + return 0; } @@ -226,6 +275,8 @@ int ws_frame_received(void *data) ws_frame_t ws_frame; tcp_event_info_t *tev = (tcp_event_info_t *) data; + update_stat(ws_received_frames, 1); + if (tev == NULL || tev->buf == NULL || tev->len <= 0) { LM_WARN("received bad frame\n"); @@ -278,12 +329,18 @@ int ws_frame_received(void *data) struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) { - /* TODO close specified or all connections */ + /* TODO Close specified or all connections */ return init_mi_tree(200, MI_OK_S, MI_OK_LEN); } struct mi_root *ws_mi_ping(struct mi_root *cmd, void *param) { - /* TODO ping specified connection */ + /* TODO Ping specified connection */ + return init_mi_tree(200, MI_OK_S, MI_OK_LEN); +} + +struct mi_root *ws_mi_pong(struct mi_root *cmd, void *param) +{ + /* TODO Pong specified connection */ return init_mi_tree(200, MI_OK_S, MI_OK_LEN); } diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h index 782367f..aef04e0 100644 --- a/modules/websocket/ws_frame.h +++ b/modules/websocket/ws_frame.h @@ -30,5 +30,6 @@ int ws_frame_received(void *data); struct mi_root *ws_mi_close(struct mi_root *cmd, void *param); struct mi_root *ws_mi_ping(struct mi_root *cmd, void *param); +struct mi_root *ws_mi_pong(struct mi_root *cmd, void *param); #endif /* _WS_FRAME_H */ diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 4ca1758..302e0db 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -58,40 +58,41 @@ static struct mi_root *mi_dump(struct mi_root *cmd, void *param); static cmd_export_t cmds[]= { - {"ws_handle_handshake", (cmd_function)ws_handle_handshake, 0, - 0, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0} + { "ws_handle_handshake", (cmd_function)ws_handle_handshake, + 0, 0, 0, + ANY_ROUTE }, + { 0, 0, 0, 0, 0, 0 } }; static param_export_t params[]= { - {"ping_interval", INT_PARAM, &ws_ping_interval}, - {0, 0} + { "ping_interval", INT_PARAM, &ws_ping_interval }, + { 0, 0 } }; static stat_export_t stats[] = { - {"ws_current_connections", 0, &ws_current_connections }, - {"ws_failed_connections", 0, &ws_failed_connections }, - {"ws_failed_handshakes", 0, &ws_failed_handshakes }, - {"ws_local_closed_connections", 0, &ws_local_closed_connections }, - {"ws_max_concurrent_connections",0, &ws_max_concurrent_connections }, - {"ws_received_frames", 0, &ws_received_frames }, - {"ws_remote_closed_connections", 0, &ws_remote_closed_connections }, - {"ws_successful_handshakes", 0, &ws_successful_handshakes }, - {"ws_transmitted_frames", 0, &ws_transmitted_frames }, - {0, 0, 0} + { "ws_current_connections", 0, &ws_current_connections }, + { "ws_failed_connections", 0, &ws_failed_connections }, + { "ws_failed_handshakes", 0, &ws_failed_handshakes }, + { "ws_local_closed_connections", 0, &ws_local_closed_connections }, + { "ws_max_concurrent_connections",0, &ws_max_concurrent_connections }, + { "ws_received_frames", 0, &ws_received_frames }, + { "ws_remote_closed_connections", 0, &ws_remote_closed_connections }, + { "ws_successful_handshakes", 0, &ws_successful_handshakes }, + { "ws_transmitted_frames", 0, &ws_transmitted_frames }, + { 0, 0, 0 } }; static mi_export_t mi_cmds[] = { - { "ws_close", ws_mi_close, 0, 0, 0}, - { "ws_disable", ws_mi_disable, 0, 0, 0}, - { "ws_dump", mi_dump, 0, 0, 0}, - { "ws_enable", ws_mi_enable, 0, 0, 0}, - { "ws_ping", ws_mi_ping, 0, 0, 0}, - { 0, 0, 0, 0, 0} + { "ws_close", ws_mi_close, 0, 0, 0 }, + { "ws_disable", ws_mi_disable, 0, 0, 0 }, + { "ws_dump", mi_dump, 0, 0, 0 }, + { "ws_enable", ws_mi_enable, 0, 0, 0 }, + { "ws_ping", ws_mi_ping, 0, 0, 0 }, + { "ws_pong", ws_mi_pong, 0, 0, 0 }, + { 0, 0, 0, 0, 0 } }; struct module_exports exports=

12 years, 6 months

git:pd/websocket: core: added clone buf support for WebSocket connections

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: c04689c5f5017456a9a5c0f6b617e13ee6f7a1d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c04689c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 14:28:20 2012 +0100 core: added clone buf support for WebSocket connections --- tcp_read.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index 187e9a1..5c45469 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -1035,6 +1035,8 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) #endif bytes = tcp_read(c, read_flags); + LM_INFO("read %d bytes\n", bytes); + if (bytes <= 0) return 0; } @@ -1168,6 +1170,11 @@ int receive_tcp_msg(char* tcpbuf, unsigned int len, if(unlikely(con->req.flags&F_TCP_REQ_MSRP_FRAME)) return msrp_process_msg(tcpbuf, len, rcv_info, con); #endif +#ifdef READ_WS + if(unlikely(con->flags & F_CONN_WS)) + return ws_process_msg(tcpbuf, len, rcv_info, con); +#endif + return receive_msg(tcpbuf, len, rcv_info); } @@ -1211,12 +1218,20 @@ int receive_tcp_msg(char* tcpbuf, unsigned int len, if(unlikely(con->req.flags&F_TCP_REQ_MSRP_FRAME)) return msrp_process_msg(buf, len, rcv_info, con); #endif +#ifdef READ_WS + if(unlikely(con->flags & F_CONN_WS)) + return ws_process_msg(buf, len, rcv_info, con); +#endif return receive_msg(buf, len, rcv_info); #else /* TCP_CLONE_RCVBUF */ #ifdef READ_MSRP if(unlikely(con->req.flags&F_TCP_REQ_MSRP_FRAME)) return msrp_process_msg(tcpbuf, len, rcv_info, con); #endif +#ifdef READ_WS + if(unlikely(con->flags & F_CONN_WS)) + return ws_process_msg(tcpbuf, len, rcv_info, con); +#endif return receive_msg(tcpbuf, len, rcv_info); #endif /* TCP_CLONE_RCVBUF */ } @@ -1361,7 +1376,7 @@ again: #endif #ifdef READ_WS if (unlikely(con->flags&F_CONN_WS)){ - ret = ws_process_msg(req->start, req->parsed-req->start, + ret = receive_tcp_msg(req->start, req->parsed-req->start, &con->rcv, con); }else #endif

12 years, 6 months

git:master: ndb_redis: free _redisc_rpl_list.

by Vicente Hernando

Module: sip-router Branch: master Commit: d096e24b900856396332ebd61ae854fc044c8971 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d096e24… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Sun Jun 17 15:02:43 2012 +0200 ndb_redis: free _redisc_rpl_list. - Free pending redis data to close ndb_redis module in a cleaner way. --- modules/ndb_redis/redis_client.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 234bb3a..9066fda 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -107,8 +107,26 @@ err: */ int redisc_destroy(void) { + redisc_reply_t *rpl, *next_rpl; + redisc_server_t *rsrv=NULL; redisc_server_t *rsrv1=NULL; + + rpl = _redisc_rpl_list; + while(rpl != NULL) + { + next_rpl = rpl->next; + if(rpl->rplRedis) + freeReplyObject(rpl->rplRedis); + + if(rpl->rname.s != NULL) + pkg_free(rpl->rname.s); + + pkg_free(rpl); + rpl = next_rpl; + } + _redisc_rpl_list = NULL; + if(_redisc_srv_list==NULL) return -1; rsrv=_redisc_srv_list; @@ -121,6 +139,8 @@ int redisc_destroy(void) free_params(rsrv1->attrs); pkg_free(rsrv1); } + _redisc_srv_list = NULL; + return 0; }

12 years, 6 months

git:3.3: pkg/kamailio/fedora: Updated rel number in . spec in preparation for release

by Peter Dunkley

Module: sip-router Branch: 3.3 Commit: 92c19a67c3e717d57e26a3417ceeeeab56134cbd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92c19a6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 12:03:08 2012 +0100 pkg/kamailio/fedora: Updated rel number in .spec in preparation for release --- pkg/kamailio/fedora/16/kamailio.spec | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 98ed341..64dee0b 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 3.3.0 -%define rel rc0%{dist} +%define rel 0%{dist} %define _sharedir %{_prefix}/share @@ -941,6 +941,8 @@ fi %changelog +* Mon Jun 17 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Updated rel to 0 in preparation for 3.3.0 release * Mon Jun 11 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Updated rel to rc0 * Mon Jun 4 2012 Peter Dunkley <peter(a)dunkley.me.uk>

12 years, 6 months

git:pd/websocket: core: tidied up websocket frame length code

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 62691a52ffd48e4dc674027cfe9b984620a55b88 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62691a5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 00:43:44 2012 +0100 core: tidied up websocket frame length code --- tcp_read.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index ccb5481..187e9a1 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -1019,7 +1019,7 @@ int msrp_process_msg(char* tcpbuf, unsigned int len, static int tcp_read_ws(struct tcp_connection *c, int* read_flags) { int bytes, pos, mask_present; - unsigned long len; + unsigned int len; char *p; struct tcp_req *r; @@ -1079,9 +1079,9 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) if (bytes < pos + 2) goto skip; - len = 0; - len |= (p[pos++] & 0xff) << 8; - len |= (p[pos++] & 0xff) << 0; + len = ((p[pos + 0] & 0xff) << 8) + | ((p[pos + 1] & 0xff) << 0); + pos += 2; } else if (len == 127) { @@ -1091,12 +1091,11 @@ static int tcp_read_ws(struct tcp_connection *c, int* read_flags) /* Only decoding the last four bytes of the length... This limits the size of WebSocket messages that can be handled to 2^32 - which should be plenty for SIP! */ - len = 0; - pos += 4; - len |= (p[pos++] & 0xff) << 24; - len |= (p[pos++] & 0xff) << 16; - len |= (p[pos++] & 0xff) << 8; - len |= (p[pos++] & 0xff) << 0; + len = ((p[pos + 4] & 0xff) << 24) + | ((p[pos + 5] & 0xff) << 16) + | ((p[pos + 6] & 0xff) << 8) + | ((p[pos + 7] & 0xff) << 0); + pos += 8; } /* Skip mask */

12 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012