sr-dev July 2012

sr-dev@lists.kamailio.org

24 participants
172 discussions

git:pd/websocket: core: Updated Via and Record-Route generation for WebSockets

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: ba0ff3123a223365c07a0d2ffa85d2d150f86bce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba0ff31… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jul 1 22:20:36 2012 +0100 core: Updated Via and Record-Route generation for WebSockets --- msg_translator.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index 2c38000..4793e64 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -648,7 +648,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, break; \ case SUBST_RCV_PROTO: \ if (msg->rcv.bind_address){ \ - switch(msg->rcv.bind_address->proto){ \ + switch(msg->rcv.proto){ \ case PROTO_NONE: \ case PROTO_UDP: \ case PROTO_TCP: \ @@ -681,7 +681,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, new_len+=1+recv_port_str->len; \ }\ /*add;transport=xxx*/ \ - switch(msg->rcv.bind_address->proto){ \ + switch(msg->rcv.proto){ \ case PROTO_NONE: \ case PROTO_UDP: \ break; /* udp is the default */ \ @@ -727,7 +727,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, break; \ case SUBST_SND_PROTO: \ if (send_sock){ \ - switch(send_sock->proto){ \ + switch(send_info->proto){ \ case PROTO_NONE: \ case PROTO_UDP: \ case PROTO_TCP: \ @@ -762,7 +762,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, new_len+=1+send_port_str->len; \ }\ /*add;transport=xxx*/ \ - switch(send_sock->proto){ \ + switch(send_info->proto){ \ case PROTO_NONE: \ case PROTO_UDP: \ break; /* udp is the default */ \ @@ -1042,7 +1042,7 @@ static inline void process_lumps( struct sip_msg* msg, recv_port_str->len); \ offset+=recv_port_str->len; \ }\ - switch(msg->rcv.bind_address->proto){ \ + switch(msg->rcv.proto){ \ case PROTO_NONE: \ case PROTO_UDP: \ break; /* nothing to do, udp is default*/ \ @@ -1137,7 +1137,7 @@ static inline void process_lumps( struct sip_msg* msg, send_port_str->len); \ offset+=send_port_str->len; \ }\ - switch(send_sock->proto){ \ + switch(send_info->proto){ \ case PROTO_NONE: \ case PROTO_UDP: \ break; /* nothing to do, udp is default*/ \ @@ -1182,7 +1182,7 @@ static inline void process_lumps( struct sip_msg* msg, break; \ case SUBST_RCV_PROTO: \ if (msg->rcv.bind_address){ \ - switch(msg->rcv.bind_address->proto){ \ + switch(msg->rcv.proto){ \ case PROTO_NONE: \ case PROTO_UDP: \ memcpy(new_buf+offset, "udp", 3); \ @@ -1217,7 +1217,7 @@ static inline void process_lumps( struct sip_msg* msg, break; \ case SUBST_SND_PROTO: \ if (send_sock){ \ - switch(send_sock->proto){ \ + switch(send_info->proto){ \ case PROTO_NONE: \ case PROTO_UDP: \ memcpy(new_buf+offset, "udp", 3); \ @@ -2437,7 +2437,9 @@ char* via_builder( unsigned int *len, }else if (send_info->proto==PROTO_SCTP){ memcpy(line_buf+MY_VIA_LEN-4, "SCTP ", 5); }else if (send_info->proto==PROTO_WS){ - memcpy(line_buf+MY_VIA_LEN-4, "WS ", 2); + memcpy(line_buf+MY_VIA_LEN-4, "WS ", 3); + }else if (send_info->proto==PROTO_WSS){ + memcpy(line_buf+MY_VIA_LEN-4, "WSS ", 4); }else{ LOG(L_CRIT, "BUG: via_builder: unknown proto %d\n", send_info->proto); return 0;

12 years, 4 months

git:pd/websocket: modules/websockets: Added some extra debug/diagnostics

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: b66cd6508d9bff106a88fbbd1c649e492b6d742c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b66cd65… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jul 1 22:21:38 2012 +0100 modules/websockets: Added some extra debug/diagnostics --- modules/websocket/ws_frame.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index ca66582..31754a5 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -556,7 +556,7 @@ static int handle_pong(ws_frame_t *frame) int ws_frame_receive(void *data) { - ws_frame_t ws_frame; + ws_frame_t frame; tcp_event_info_t *tcpinfo = (tcp_event_info_t *) data; update_stat(ws_received_frames, 1); @@ -567,21 +567,23 @@ int ws_frame_receive(void *data) return -1; } - switch(decode_and_validate_ws_frame(&ws_frame, tcpinfo)) + switch(decode_and_validate_ws_frame(&frame, tcpinfo)) { case OPCODE_TEXT_FRAME: case OPCODE_BINARY_FRAME: - return receive_msg(ws_frame.payload_data, ws_frame.payload_len, + LM_DBG("Rx SIP message:\n%.*s\n", frame.payload_len, + frame.payload_data); + return receive_msg(frame.payload_data, frame.payload_len, tcpinfo->rcv); case OPCODE_CLOSE: - return handle_close(&ws_frame); + return handle_close(&frame); case OPCODE_PING: - return handle_ping(&ws_frame); + return handle_ping(&frame); case OPCODE_PONG: - return handle_pong(&ws_frame); + return handle_pong(&frame); default: LM_WARN("received bad frame\n"); @@ -606,6 +608,9 @@ int ws_frame_transmit(void *data) frame.payload_data = wsev->buf; frame.wsc = wsconn_get(wsev->id); + LM_DBG("Tx SIP message:\n%.*s\n", frame.payload_len, + frame.payload_data); + if (encode_and_send_ws_frame(&frame, CONN_CLOSE_DONT) < 0) { LM_ERR("sending SIP message\n");

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2012