Diff: WebSocketServer.cpp

Revision:

8:6635ca3b5a5c

Parent:

7:6cfe0638b957

Child:

9:774f408b9740

--- a/WebSocketServer.cpp	Sat Mar 14 00:14:40 2015 +0900
+++ b/WebSocketServer.cpp	Sat Mar 14 07:52:50 2015 +0000
@@ -30,6 +30,7 @@
 
 	while (true) {
 		bool isWebSocket = false;
+		printf("accepting\r\n");
 		int ret = mTCPSocketServer.accept(mConnection);
 		if (ret != 0) {
 			continue;
@@ -56,6 +57,7 @@
 				}
 			} else {
 				if (!this->handleWebSocket(buf, ret)) {
+					printf("websocket closed\r\n");
 					break;
 				}
 			}
@@ -86,23 +88,23 @@
 			if (strlen(buf) <= 0) {
 				break;
 			}
-			printf("%s\r\n", line);
+			printf("[%s]\r\n", line);
 			if (line == &buf[0]) {
 				char* method = strtok(buf, " ");
 				char* path = strtok(NULL, " ");
 				char* version = strtok(NULL, " ");
-				printf("[%s] [%s] [%s]\r\n", method, path, version);
+//				printf("[%s] [%s] [%s]\r\n", method, path, version);
 
 			} else if (strncmp(line, UPGRADE_WEBSOCKET, strlen(UPGRADE_WEBSOCKET)) == 0) {
 				isUpgradeWebSocket = true;
-				printf("%s found\r\n", UPGRADE_WEBSOCKET);
+				printf("*** %s found\r\n", UPGRADE_WEBSOCKET);
 			} else if (strncmp(line, SEC_WEBSOCKET_KEY, strlen(SEC_WEBSOCKET_KEY)) == 0) {
-				printf("%s found\r\n", SEC_WEBSOCKET_KEY);
+				printf("*** %s found\r\n", SEC_WEBSOCKET_KEY);
 				isSecWebSocketKeyFound = true;
 				char* ptr = line + strlen(SEC_WEBSOCKET_KEY);
 				while (*ptr == ' ') ++ptr;
 				strcpy(key, ptr);
-				printf("key=%s\r\n", key);
+				printf("*** key=%s\r\n", key);
 			}
 			i += 2;
 			line = &buf[i];
@@ -111,6 +113,7 @@
 
 	if (isUpgradeWebSocket && isSecWebSocketKeyFound) {
 		this->sendUpgradeResponse(key);
+		mPrevFin = true;
 		return true;
 	}
 
@@ -129,8 +132,11 @@
 
 	bool fin = (*ptr & 0x80) == 0x80;
 	uint8_t opcode = *ptr & 0xF;
+//	printf("Byte1: %02X\r\n", *ptr);
 
+//	printf("fin=%d\r\n", fin);
 	printf("opcode=%d\r\n", opcode);
+
 	if (opcode == OP_PING) {
 		*ptr = ((*ptr & 0xF0) | OP_PONG);
 		mConnection.send_all(buf, size);
@@ -140,17 +146,22 @@
 		return false;
 	}
 	ptr++;
+//	printf("Byte2: %02X\r\n", *ptr);
 
-	mPrevFin = fin;
-	if (!fin || !mPrevFin) {
+	if (!fin || !mPrevFin) {	
 		printf("WARN: Data consists of multiple frame not supported\r\n");
+		mPrevFin = fin;
 		return true; // not an error, just discard it
 	}
+	mPrevFin = fin;
 
-	bool mask = (*ptr & 0x80) == 1;
+	bool mask = (*ptr & 0x80) == 0x80;
 	uint8_t len = *ptr & 0x7F;
 	ptr++;
-
+	
+//	printf("mask=%d\r\n", mask);
+//	printf("length=%d\r\n", len);
+	
 	if (len > 125) {
 		printf("WARN: Extended payload lenght not supported\r\n");
 		return true; // not an error, just discard it
@@ -168,12 +179,15 @@
 	}
 	if (mHandler) {
 		if (opcode == OP_TEXT) {
+//			printf("OP_TEXT\r\n");
 			data[len] = '\0';
 			mHandler->onMessage(data);
 		} else if (opcode == OP_BINARY) {
+//			printf("OP_BINARY %d\r\n", len);
 			mHandler->onMessage(data, len);
 		}
 	}
+//	printf("return true\r\n");
 	return true;
 }