Skip to content

Commit 0f66bf2

Browse files
committed
removing autobahn report. add required closing behavior to fragmented control messages
1 parent 04b2dbb commit 0f66bf2

File tree

1,048 files changed

+10
-232914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,048 files changed

+10
-232914
lines changed

src/cwebsocket/client.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,9 +703,12 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
703703
}
704704
else if(frame.opcode == CONTINUATION) {
705705
syslog(LOG_DEBUG, "cwebsocket_client_read_data: received CONTINUATION opcode");
706-
return -1; // continuations are accounted for in read loop
706+
return 0;
707707
}
708708
else if(frame.opcode == PING) {
709+
if(frame.fin == 0) {
710+
cwebsocket_client_close(websocket, 1002, "control message must not be fragmented");
711+
}
709712
if(frame.payload_len > 125) {
710713
cwebsocket_client_close(websocket, 1002, "control frames must not exceed 125 bytes");
711714
return -1;

src/websocket-server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void server_print_program_usage(const char *progname) {
6363
exit(0);
6464
}
6565

66-
int server_main(int argc, char **argv) {
66+
int main(int argc, char **argv) {
6767

6868
server_print_program_header();
6969

src/websocket-testsuite.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ cwebsocket_subprotocol* autobahn_testsuite_new() {
7878
return protocol;
7979
}
8080

81-
int testsuite_main_exit(int exit_status) {
81+
int main_exit(int exit_status) {
8282
syslog(LOG_DEBUG, "exiting cwebsocket");
8383
closelog();
8484
return exit_status;
8585
}
8686

87-
void testsuite_print_program_header() {
87+
void print_program_header() {
8888
printf("\n");
8989
printf(" ______ ______ _____ \n");
9090
printf(" _________ _________ /_______________________ /________ /_\n");
@@ -98,9 +98,9 @@ void testsuite_print_program_header() {
9898
printf("\n");
9999
}
100100

101-
int testsuite_main(int argc, char **argv) {
101+
int main(int argc, char **argv) {
102102

103-
testsuite_print_program_header();
103+
print_program_header();
104104

105105
setlogmask(LOG_UPTO(LOG_DEBUG));
106106
openlog("cwebsocket", LOG_CONS | LOG_PERROR, LOG_USER);

test/autobahn/fuzzingserver.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"outdir": "./reports/client",
66
"webport": 8080,
77

8-
"cases": ["*"],
8+
"cases": ["5.3"],
99
"exclude-cases": [],
1010
"exclude-agent-cases": {}
1111
}

test/autobahn/reports/client/cwebsocket_0_1a_case_10_1_1.html

Lines changed: 0 additions & 499 deletions
This file was deleted.

0 commit comments

Comments
 (0)