fixed malformed close frames

Author: jeremyhahn

.cproject

@@ -30,8 +30,9 @@
 								<option id="gnu.c.compiler.option.misc.other.835723838" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0" valueType="string"/>
 								<option id="gnu.c.compiler.option.misc.verbose.1371801120" name="Verbose (-v)" superClass="gnu.c.compiler.option.misc.verbose" value="true" valueType="boolean"/>
 								<option id="gnu.c.compiler.option.misc.ansi.183199256" name="Support ANSI programs (-ansi)" superClass="gnu.c.compiler.option.misc.ansi" value="false" valueType="boolean"/>
-								<option id="gnu.c.compiler.option.include.paths.224587811" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"/>
+								<option id="gnu.c.compiler.option.include.paths.224587811" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths"/>
 								<option id="gnu.c.compiler.option.include.files.1297155078" name="Include files (-include)" superClass="gnu.c.compiler.option.include.files"/>
+								<option id="gnu.c.compiler.option.dialect.std.981082959" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.671860280" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.928242729" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug">

src/cwebsocket/client.c

@@ -429,7 +429,7 @@ void cwebsocket_client_listen(cwebsocket_client *websocket) {
 void *cwebsocket_client_onmessage_thread(void *ptr) {
 	cwebsocket_client_thread_args *args = (cwebsocket_client_thread_args *)ptr;
 	cwebsocket_client_onmessage(args->socket, args->message);
-	free(args->message->payload);
+	//free(args->message->payload);
 	free(args->message);
 	free(ptr);
 	return NULL;
@@ -452,26 +452,24 @@ int cwebsocket_client_send_control_frame(cwebsocket_client *websocket, opcode co
 	control_frame[4] = masking_key[2];
 	control_frame[5] = masking_key[3];
 	if(code & CLOSE) {
-		uint16_t close_code = 0;
+		uint16_t close_code = 1000;
 		if(payload_len >= 2) {
-		   control_frame[6] = payload[0];
-		   control_frame[7] = payload[1];
-		   close_code = (control_frame[6] << 8) + control_frame[7];
 		   if(payload_len > 2) {
-			  char parsed_payload[payload_len-2];
-			  memcpy(parsed_payload, &payload[2], payload_len-2);
-			  parsed_payload[payload_len-2] = '\0';
+			  char parsed_payload[payload_len];
+			  memcpy(parsed_payload, &payload[0], payload_len);
+			  parsed_payload[payload_len] = '\0';
+			  close_code = (control_frame[6] << 8) + control_frame[7];
 			  int i;
 			  for(i=0; i<payload_len; i++) {
-				  control_frame[8+i] = (parsed_payload[i] ^ masking_key[i % 4]) & 0xff;
+				  control_frame[6+i] = (parsed_payload[i] ^ masking_key[i % 4]) & 0xff;
 			  }
 			  syslog(LOG_DEBUG, "cwebsocket_client_send_control_frame: opcode=%#04x, frame_type=%s, payload_len=%i, code=%i, payload=%s",
 					  code, frame_type, payload_len, close_code, parsed_payload);
 		   }
 		   else {
 				syslog(LOG_DEBUG, "cwebsocket_client_send_control_frame: opcode=%#04x, frame_type=%s, payload_len=%i, code=%i, payload=(null)",
 						code, frame_type, payload_len, close_code);
-			}
+		   }
 		}
 		else {
 			syslog(LOG_DEBUG, "cwebsocket_client_send_control_frame: opcode=%#04x, frame_type=%s, payload_len=%i, code=%i, payload=(null)",
@@ -522,10 +520,10 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
 	while(bytes_read < frame_size && (websocket->state & WEBSOCKET_STATE_OPEN)) {
 
 		if(bytes_read >= CWS_DATA_BUFFER_MAX) {
-				syslog(LOG_ERR, "cwebsocket_client_read_data: frame too large. RECEIVE_BUFFER_MAX = %i bytes. bytes_read=%i, header_length=%i",
-						CWS_DATA_BUFFER_MAX, bytes_read, header_length);
-				cwebsocket_client_close(websocket, 1009, "frame too large");
-				return -1;
+			syslog(LOG_ERR, "cwebsocket_client_read_data: frame too large. RECEIVE_BUFFER_MAX = %i bytes. bytes_read=%i, header_length=%i",
+					CWS_DATA_BUFFER_MAX, bytes_read, header_length);
+			cwebsocket_client_close(websocket, 1009, "frame too large");
+			return -1;
 		}
 
 		ssize_t byte = cwebsocket_client_read(websocket, data+bytes_read, 1);
@@ -596,7 +594,7 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
 
 	if(frame.fin && frame.opcode == TEXT_FRAME) {
 
-		char *payload = malloc(sizeof(char) * payload_length);
+		char *payload = malloc(sizeof(char) * payload_length+1);
 		if(payload == NULL) {
 			perror("out of memory");
 			exit(-1);
@@ -625,13 +623,7 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
 			memset(message, 0, sizeof(cwebsocket_message));
 			message->opcode = frame.opcode;
 			message->payload_len = frame.payload_len;
-			message->payload = malloc(sizeof(char) * (payload_length+1));
-			if(message->payload == NULL) {
-				perror("out of memory");
-				exit(-1);
-			}
-			strncpy(message->payload, payload, payload_length+1);
-			free(payload);
+			message->payload = payload;
 
 		    cwebsocket_client_thread_args *args = malloc(sizeof(cwebsocket_client_thread_args));
 		    if(args == NULL) {
@@ -652,15 +644,9 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
 		    cwebsocket_message message = {0};
 			message.opcode = frame.opcode;
 			message.payload_len = frame.payload_len;
-			message.payload = malloc(sizeof(char) * (payload_length+1));
-			if(message.payload == NULL) {
-				perror("out of memory");
-				exit(-1);
-			}
-			strncpy(message.payload, payload, payload_length+1);
+			message.payload = payload;
 		    cwebsocket_client_onmessage(websocket, &message);
-			free(payload);
-		    free(message.payload);
+			//free(payload);
 		    return bytes_read;
 #endif
 		}
@@ -672,18 +658,25 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
 
 		syslog(LOG_DEBUG, "cwebsocket_client_read_data: received BINARY payload. bytes=%zu", payload_length);
 
-		char payload[payload_length];
+		char *payload = malloc(sizeof(char) * payload_length);
+		if(payload == NULL) {
+			perror("out of memory");
+			exit(-1);
+		}
 		memcpy(payload, &data[header_length], payload_length);
 		free(data);
 
 		if(websocket->subprotocol->onmessage != NULL) {
 
 #ifdef ENABLE_THREADS
 			cwebsocket_message *message = malloc(sizeof(cwebsocket_message));
+			if(message == NULL) {
+				perror("out of memory");
+				exit(-1);
+			}
 			message->opcode = frame.opcode;
 			message->payload_len = frame.payload_len;
-			message->payload = malloc(sizeof(char) * payload_length);
-			memcpy(message->payload, payload, payload_length);
+			message->payload = payload;
 
 			cwebsocket_client_thread_args *args = malloc(sizeof(cwebsocket_client_thread_args));
 			args->socket = websocket;
@@ -701,6 +694,7 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
 			message.payload_len = frame.payload_len;
 			message.payload = payload;
 			websocket->subprotocol->onmessage(websocket, &message);
+			free(payload);
 			return bytes_read;
 #endif
 		}

src/cwebsocket/subprotocol/echo/echo_client.c

@@ -31,8 +31,8 @@ void cwebsocket_subprotocol_echo_client_onopen(void *websocket) {
 
 void cwebsocket_subprotocol_echo_client_onmessage(void *websocket, cwebsocket_message *message) {
 	cwebsocket_client *client = (cwebsocket_client *)websocket;
-	syslog(LOG_DEBUG, "cwebsocket_subprotocol_echo_client_onmessage: fd=%i, opcode=%#04x, payload_len=%zu, actual_payload_len=%zd, payload=%s\n",
-			client->fd, message->opcode, message->payload_len, strlen(message->payload), message->payload);
+	syslog(LOG_DEBUG, "cwebsocket_subprotocol_echo_client_onmessage: fd=%i, opcode=%#04x, payload_len=%zu, payload=%s\n",
+			client->fd, message->opcode, message->payload_len, message->payload);
 }
 
 void cwebsocket_subprotocol_echo_client_onclose(void *websocket, int code, const char *reason) {

src/cwebsocket/utf8.c

@@ -12,7 +12,7 @@ int utf8_count_code_points(uint8_t* s, size_t* count) {
 	return state != UTF8_ACCEPT;
 }
 
-uint32_t inline utf8_decode(uint32_t* state, uint32_t* codep, uint32_t byte) {
+uint32_t utf8_decode(uint32_t* state, uint32_t* codep, uint32_t byte) {
 
 	uint32_t type = utf8d[byte];
 	*codep = (*state != UTF8_ACCEPT) ?

src/cwebsocket/utf8.h

@@ -32,7 +32,7 @@ static const uint8_t utf8d[] = {
 };
 
 int utf8_count_code_points(uint8_t* s, size_t* count);
-uint32_t inline utf8_decode(uint32_t* state, uint32_t* codep, uint32_t byte);
+uint32_t utf8_decode(uint32_t* state, uint32_t* codep, uint32_t byte);
 
 #ifdef __cplusplus
 }

src/websocket-server.c

@@ -26,7 +26,7 @@
 #include "cwebsocket/server.h"
 #include "cwebsocket/subprotocol/echo/echo_server.h"
 
-void signal_handler(int sig) {
+void server_signal_handler(int sig) {
 	switch(sig) {
 		case SIGHUP:
 			syslog(LOG_DEBUG, "Received SIGHUP signal");
@@ -44,7 +44,7 @@ void signal_handler(int sig) {
 	}
 }
 
-void print_program_header() {
+void server_print_program_header() {
 	printf("\n");
 	printf("                      ______                    ______      _____ \n");
     printf(" _________      _________  /_______________________  /________  /_\n");
@@ -58,14 +58,14 @@ void print_program_header() {
 	printf("\n");
 }
 
-void print_program_usage(const char *progname) {
+void server_print_program_usage(const char *progname) {
 	fprintf(stderr, "usage: %s -p 8080\n\n", progname);
 	exit(0);
 }
 
-int main(int argc, char **argv) {
+int server_main(int argc, char **argv) {
 
-	print_program_header();
+	server_print_program_header();
 
 	int cores = 1;
 	int port = 8080;
@@ -108,7 +108,7 @@ int main(int argc, char **argv) {
 	sigprocmask(SIG_BLOCK, &newSigSet, NULL);   /* Block the above specified signals */
 
 	// Set up a signal handler
-	newSigAction.sa_handler = signal_handler;
+	newSigAction.sa_handler = server_signal_handler;
 	sigemptyset(&newSigAction.sa_mask);
 	newSigAction.sa_flags = 0;
 

src/websocket-testsuite.c

@@ -78,13 +78,13 @@ cwebsocket_subprotocol* autobahn_testsuite_new() {
 	return protocol;
 }
 
-int main_exit(int exit_status) {
+int testsuite_main_exit(int exit_status) {
 	syslog(LOG_DEBUG, "exiting cwebsocket");
 	closelog();
 	return exit_status;
 }
 
-void print_program_header() {
+void testsuite_print_program_header() {
 	printf("\n");
 	printf("                      ______                    ______      _____ \n");
     printf(" _________      _________  /_______________________  /________  /_\n");
@@ -98,9 +98,9 @@ void print_program_header() {
 	printf("\n");
 }
 
-int main(int argc, char **argv) {
+int testsuite_main(int argc, char **argv) {
 
-	print_program_header();
+	testsuite_print_program_header();
 
 	setlogmask(LOG_UPTO(LOG_DEBUG));
 	openlog("cwebsocket", LOG_CONS | LOG_PERROR, LOG_USER);

test/autobahn/reports/client/cwebsocket_0_1a_case_10_1_1.html

@@ -202,7 +202,7 @@
       <center><a href="http://autobahn.ws/testsuite" title="Autobahn WebSockets Testsuite"><img src="http://autobahn.ws/static/img/ws_protocol_test_report.png"          border="0" width="820" height="46" alt="Autobahn WebSockets Testsuite Report"></img></a></center>
       <center><a href="http://autobahn.ws"           title="Autobahn WebSockets">          <img src="http://autobahn.ws/static/img/ws_protocol_test_report_autobahn.png" border="0" width="300" height="68" alt="Autobahn WebSockets">                 </img></a></center>
       <br/>
-      <p class="case case_failed">cwebsocket/0.1a - <span style="font-size: 1.3em;"><b>Case 10.1.1</b></span> : Fail - <span style="font-size: 0.9em;"><b>5</b> ms @ 2014-02-27T23:03:58Z</a></p>
+      <p class="case case_failed">cwebsocket/0.1a - <span style="font-size: 1.3em;"><b>Case 10.1.1</b></span> : Fail - <span style="font-size: 0.9em;"><b>4</b> ms @ 2014-03-31T00:42:24Z</a></p>
       <p class="case_text_block case_desc"><b>Case Description</b><br/><br/>Send text message with payload of length 65536 auto-fragmented with <b>autoFragmentSize = 1300</b>.</p>
       <p class="case_text_block case_expect"><b>Case Expectation</b><br/><br/>Receive echo'ed text message (with payload as sent and transmitted frame counts as expected). Clean close with normal code.</p>
 
@@ -211,20 +211,20 @@
          <i>Expected:</i><br/><span class="case_pickle">{'OK': [('message', u'**************************************************************** ...', False)]}</span><br/><br/>
          <i>Observed:</i><br><span class="case_pickle">[]</span>
       </p>
-      <p class="case_text_block case_closing_beh"><b>Case Closing Behavior</b><br/><br/>The close code should have been 1000 or empty (WRONG CODE)</p>
+      <p class="case_text_block case_closing_beh"><b>Case Closing Behavior</b><br/><br/>The spec requires the connection to be failed cleanly here (UNCLEAN)</p>
       <br/><hr/>
       <h2>Opening Handshake</h2>
       <pre class="http_dump">GET /runCase?case=305&agent=cwebsocket/0.1a HTTP/1.1
 Host: localhost:9001
 Upgrade: WebSocket
 Connection: Upgrade
-Sec-WebSocket-Key: MmpHQlpqU2NsRWpCVUlNcw==
+Sec-WebSocket-Key: WkdBVGF5YW9icjFiN3hTMQ==
 Sec-WebSocket-Version: 13</pre>
       <pre class="http_dump">HTTP/1.1 101 Switching Protocols
-Server: AutobahnTestSuite/0.6.0-0.8.1
+Server: AutobahnTestSuite/0.6.1-0.8.6
 Upgrade: WebSocket
 Connection: Upgrade
-Sec-WebSocket-Accept: ZbN2arqgIdQ8N8gsKRSpDce44yw=</pre>
+Sec-WebSocket-Accept: EN7kZS9++YEYwZvTTaz8P9C9raM=</pre>
       <br/><hr/>
       <h2>Closing Behavior</h2>
       <table>
@@ -233,15 +233,15 @@ <h2>Closing Behavior</h2>
          <tr class="stats_row"><td>closedByMe</td><td class="left">True</td><td class="left">True, iff I have initiated closing handshake (that is, did send close first).</td></tr>
          <tr class="stats_row"><td>failedByMe</td><td class="left">True</td><td class="left">True, iff I have failed the WS connection (i.e. due to protocol error). Failing can be either by initiating closing handshake or brutal drop TCP.</td></tr>
          <tr class="stats_row"><td>droppedByMe</td><td class="left">True</td><td class="left">True, iff I dropped the TCP connection.</td></tr>
-         <tr class="stats_row"><td>wasClean</td><td class="left">True</td><td class="left">True, iff full WebSockets closing handshake was performed (close frame sent and received) _and_ the server dropped the TCP (which is its responsibility).</td></tr>
+         <tr class="stats_row"><td>wasClean</td><td class="left">False</td><td class="left">True, iff full WebSockets closing handshake was performed (close frame sent and received) _and_ the server dropped the TCP (which is its responsibility).</td></tr>
          <tr class="stats_row"><td>wasNotCleanReason</td><td class="left">None</td><td class="left">When wasClean == False, the reason what happened.</td></tr>
          <tr class="stats_row"><td>wasServerConnectionDropTimeout</td><td class="left">False</td><td class="left">When we are a client, and we expected the server to drop the TCP, but that didn't happen in time, this gets True.</td></tr>
          <tr class="stats_row"><td>wasOpenHandshakeTimeout</td><td class="left">False</td><td class="left">When performing the opening handshake, but the peer did not finish in time, this gets True.</td></tr>
          <tr class="stats_row"><td>wasCloseHandshakeTimeout</td><td class="left">False</td><td class="left">When we initiated a closing handshake, but the peer did not respond in time, this gets True.</td></tr>
          <tr class="stats_row"><td>localCloseCode</td><td class="left">1002</td><td class="left">The close code I sent in close frame (if any).</td></tr>
-         <tr class="stats_row"><td>localCloseReason</td><td class="left">invalid close code 34484</td><td class="left">The close reason I sent in close frame (if any).</td></tr>
-         <tr class="stats_row"><td>remoteCloseCode</td><td class="left">34484</td><td class="left">The close code the peer sent me in close frame (if any).</td></tr>
-         <tr class="stats_row"><td>remoteCloseReason</td><td class="left">34"4('$5a$/"4!1>3%$5a>12.5$kaa9ap</td><td class="left">The close reason the peer sent me in close frame (if any).</td></tr>
+         <tr class="stats_row"><td>localCloseReason</td><td class="left">invalid close code 27418</td><td class="left">The close reason I sent in close frame (if any).</td></tr>
+         <tr class="stats_row"><td>remoteCloseCode</td><td class="left">27418</td><td class="left">The close code the peer sent me in close frame (if any).</td></tr>
+         <tr class="stats_row"><td>remoteCloseReason</td><td class="left">None</td><td class="left">The close reason the peer sent me in close frame (if any).</td></tr>
       </table>      <br/><hr/>
       <h2>Wire Statistics</h2>
       <h3>Octets Received by Chop Size</h3>
@@ -486,12 +486,12 @@ <h2>Wire Log</h2>
          <pre class="wirelog_tx_octets">103 TX OCTETS: 807e02182a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a</pre>
          <pre class="wirelog_tx_octets">               2a2a2a2a2a2a2a2a2a2a2a2a2a2a ...</pre>
          <pre class="wirelog_kill_after">104 FAIL CONNECTION AFTER 10.000000 sec</pre>
-         <pre class="wirelog_rx_octets">105 RX OCTETS: 88a3855ec40f03eaf73ba76aec28a16ba52baa7cf02eb460f72aa16ba531b46cea3aa135a56ebc3fb4</pre>
-         <pre class="wirelog_rx_frame">106 RX FRAME : OPCODE=8, FIN=True, RSV=0, PAYLOAD-LEN=35, MASKED=True, MASK=3835356563343066</pre>
-         <pre class="wirelog_rx_frame">               0x86b4333422342827243561242f223421313e33252435613e31322e35246b6161396170</pre>
+         <pre class="wirelog_rx_octets">105 RX OCTETS: 88a368f0b93803ea1a95da5d0186dc5c4885d74b1d80c9571a84dc5c489fc95b0794dc0248c0c10859</pre>
+         <pre class="wirelog_rx_frame">106 RX FRAME : OPCODE=8, FIN=True, RSV=0, PAYLOAD-LEN=35, MASKED=True, MASK=3638663062393338</pre>
+         <pre class="wirelog_rx_frame">               0x6b1aa3adb2adb8beb4acf1bdbfbba4b8a1a7a3bcb4acf1a7a1abbeacb4f2f1f8a9f8e0</pre>
          <pre class="wirelog_tx_frame">107 TX FRAME : OPCODE=8, FIN=True, RSV=0, PAYLOAD-LEN=26, MASK=None, PAYLOAD-REPEAT-LEN=None, CHOPSIZE=None, SYNC=False</pre>
-         <pre class="wirelog_tx_frame">               0x03ea696e76616c696420636c6f736520636f6465203334343834</pre>
-         <pre class="wirelog_tx_octets">108 TX OCTETS: 881a03ea696e76616c696420636c6f736520636f6465203334343834</pre>
+         <pre class="wirelog_tx_frame">               0x03ea696e76616c696420636c6f736520636f6465203237343138</pre>
+         <pre class="wirelog_tx_octets">108 TX OCTETS: 881a03ea696e76616c696420636c6f736520636f6465203237343138</pre>
          <pre class="wirelog_tcp_closed_by_me">109 TCP DROPPED BY ME</pre>
       </div>
       <br/><hr/>