Skip to content

Commit 164e055

Browse files
jeremyhahnjeremyhahn
committed
Created 'RPi Debug' build profile. Fix remaining bugs on RPi.
1 parent d0f3843 commit 164e055

File tree

16 files changed

+17
-190
lines changed

16 files changed

+17
-190
lines changed

‎.cproject

+1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@
154154
<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.2066393033" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
155155
<option id="gnu.c.link.option.libs.2024790092" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">
156156
<listOptionValue builtIn="false" value="crypto"/>
157+
<listOptionValue builtIn="false" value="z"/>
157158
<listOptionValue builtIn="false" value="pthread"/>
158159
<listOptionValue builtIn="false" value="ev"/>
159160
</option>

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/Release
2+
/Debug
3+
/RPI\ Debug

‎.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
2222
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
2323
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
24-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1042685995744065432" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
24+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-188848785018164589" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
2525
<language-scope id="org.eclipse.cdt.core.gcc"/>
2626
<language-scope id="org.eclipse.cdt.core.g++"/>
2727
</provider>

‎Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ so:
2121
gcc -shared -fPIC $(ECHO_SERVER) $(WEBSOCKET_SERVER) -o libwsserver.so
2222

2323
clean:
24-
rm -rf ltmain.sh libtool config.sub config.guess libwsclient.* libwsserver.* .gitignore vgcore.* autoscan.log config.h.in config.h config.cache configure install-sh aclocal.m4 autom4te.cache/ config.log config.status Debug/ depcomp .deps/ m4/ Makefile Makefile.in missing stamp-h1 *.o src/*.o *~ websocket-client websocket-server websocket-testsuite
24+
rm -rf ltmain.sh libtool config.sub config.guess libwsclient.* libwsserver.* .gitignore vgcore.* autoscan.log config.h.in config.h config.cache configure install-sh aclocal.m4 autom4te.cache/ config.log config.status Debug/ RPI\ Debug Release depcomp .deps/ m4/ Makefile Makefile.in missing stamp-h1 *.o src/*.o *~ websocket-client websocket-server websocket-testsuite

‎RPI Debug/makefile

-46
This file was deleted.

‎RPI Debug/objects.mk

-8
This file was deleted.

‎RPI Debug/sources.mk

-20
This file was deleted.

‎RPI Debug/src/cwebsocket/subdir.mk

-33
This file was deleted.

‎RPI Debug/src/cwebsocket/subprotocol/echo/subdir.mk

-27
This file was deleted.

‎RPI Debug/src/subdir.mk

-24
This file was deleted.

‎RPI Debug/subdir.mk

-19
This file was deleted.

‎src/cwebsocket/client.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -605,12 +605,12 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
605605

606606
size_t utf8_code_points = 0;
607607
if(utf8_count_code_points((uint8_t *)payload, &utf8_code_points)) {
608-
syslog(LOG_ERR, "cwebsocket_client_read_data: received %zu byte malformed utf8 text payload: %s", payload_length, payload);
608+
syslog(LOG_ERR, "cwebsocket_client_read_data: received %lld byte malformed utf8 text payload: %s", payload_length, payload);
609609
cwebsocket_client_onerror(websocket, "received malformed utf8 payload");
610610
return -1;
611611
}
612612

613-
syslog(LOG_DEBUG, "cwebsocket_client_read_data: received %zu byte text payload: %s", payload_length, payload);
613+
syslog(LOG_DEBUG, "cwebsocket_client_read_data: received %lld byte text payload: %s", payload_length, payload);
614614

615615
if(websocket->subprotocol != NULL && websocket->subprotocol->onmessage != NULL) {
616616

@@ -656,7 +656,7 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
656656
}
657657
else if(frame.fin && frame.opcode == BINARY_FRAME) {
658658

659-
syslog(LOG_DEBUG, "cwebsocket_client_read_data: received BINARY payload. bytes=%zu", payload_length);
659+
syslog(LOG_DEBUG, "cwebsocket_client_read_data: received BINARY payload. bytes=%lld", payload_length);
660660

661661
char *payload = malloc(sizeof(char) * payload_length);
662662
if(payload == NULL) {
@@ -739,7 +739,7 @@ int cwebsocket_client_read_data(cwebsocket_client *websocket) {
739739
memcpy(payload, &data[header_length], (payload_length) * sizeof(uint8_t));
740740
payload[payload_length] = '\0';
741741
free(data);
742-
syslog(LOG_DEBUG, "cwebsocket_client_read_data: received CLOSE control frame. payload_length=%zu, code=%i, reason=%s", payload_length, code, payload);
742+
syslog(LOG_DEBUG, "cwebsocket_client_read_data: received CLOSE control frame. payload_length=%lld, code=%i, reason=%s", payload_length, code, payload);
743743
cwebsocket_client_close(websocket, code, NULL);
744744
return 0;
745745
}

‎src/cwebsocket/common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ char* cwebsocket_base64_encode(const unsigned char *input, int length) {
4141
}
4242

4343
void cwebsocket_print_frame(cwebsocket_frame *frame) {
44-
syslog(LOG_DEBUG, "cwebsocket_print_frame: fin=%i, rsv1=%i, rsv2=%i, rsv3=%i, opcode=%#04x, mask=%i, payload_len=%zu\n",
44+
syslog(LOG_DEBUG, "cwebsocket_print_frame: fin=%i, rsv1=%i, rsv2=%i, rsv3=%i, opcode=%#04x, mask=%i, payload_len=%lld\n",
4545
frame->fin, frame->rsv1, frame->rsv2, frame->rsv3, frame->opcode, frame->mask, frame->payload_len);
4646
}
4747

‎src/cwebsocket/server.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -448,12 +448,12 @@ int cwebsocket_server_read_data(cwebsocket_connection *connection) {
448448

449449
size_t utf8_code_points = 0;
450450
if(utf8_count_code_points((uint8_t *)payload, &utf8_code_points)) {
451-
syslog(LOG_ERR, "cwebsocket_server_read_data: received %zu byte malformed utf-8 text payload: %s\n", payload_length, payload);
451+
syslog(LOG_ERR, "cwebsocket_server_read_data: received %lld byte malformed utf-8 text payload: %s\n", payload_length, payload);
452452
cwebsocket_server_onerror(connection, "received malformed utf-8 payload");
453453
return -1;
454454
}
455455

456-
syslog(LOG_DEBUG, "cwebsocket_server_read_data: received %zu byte text payload: %s", payload_length, payload);
456+
syslog(LOG_DEBUG, "cwebsocket_server_read_data: received %lld byte text payload: %s", payload_length, payload);
457457

458458
if(connection->subprotocol != NULL && connection->subprotocol->onmessage != NULL) {
459459

@@ -496,7 +496,7 @@ int cwebsocket_server_read_data(cwebsocket_connection *connection) {
496496
}
497497
else if(frame.fin && frame.opcode == BINARY_FRAME) {
498498

499-
syslog(LOG_DEBUG, "cwebsocket_server_read_data: received BINARY payload. bytes=%zu", payload_length);
499+
syslog(LOG_DEBUG, "cwebsocket_server_read_data: received BINARY payload. bytes=%lld", payload_length);
500500

501501
char payload[payload_length];
502502
memcpy(payload, &data[header_length], payload_length);
@@ -564,7 +564,7 @@ int cwebsocket_server_read_data(cwebsocket_connection *connection) {
564564
for(i=0; i<payload_length; i++) {
565565
reason[i] = reason[i] ^ frame.masking_key[i%4];
566566
}
567-
syslog(LOG_DEBUG, "cwebsocket_server_read_data: received CLOSE control frame. payload_length=%zu, code=%i, reason=%s", payload_length, code, reason);
567+
syslog(LOG_DEBUG, "cwebsocket_server_read_data: received CLOSE control frame. payload_length=%lld, code=%i, reason=%s", payload_length, code, reason);
568568
cwebsocket_server_close_connection(connection, (uint32_t)code, (const char *) reason);
569569
return 0;
570570
}

‎src/cwebsocket/subprotocol/echo/echo_client.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void cwebsocket_subprotocol_echo_client_onopen(void *websocket) {
3131

3232
void cwebsocket_subprotocol_echo_client_onmessage(void *websocket, cwebsocket_message *message) {
3333
cwebsocket_client *client = (cwebsocket_client *)websocket;
34-
syslog(LOG_DEBUG, "cwebsocket_subprotocol_echo_client_onmessage: fd=%i, opcode=%#04x, payload_len=%zu, payload=%s\n",
34+
syslog(LOG_DEBUG, "cwebsocket_subprotocol_echo_client_onmessage: fd=%i, opcode=%#04x, payload_len=%lld, payload=%s\n",
3535
client->fd, message->opcode, message->payload_len, message->payload);
3636
}
3737

‎src/cwebsocket/subprotocol/echo/echo_server.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void cwebsocket_subprotocol_echo_server_onopen(void *websocket) {
3131

3232
void cwebsocket_subprotocol_echo_server_onmessage(void *websocket, cwebsocket_message *message) {
3333
cwebsocket_connection *connection = (cwebsocket_connection *)websocket;
34-
syslog(LOG_DEBUG, "cwebsocket_subprotocol_echo_server_onmessage: fd=%i, opcode=%#04x, payload_len=%zu, payload=%s\n",
34+
syslog(LOG_DEBUG, "cwebsocket_subprotocol_echo_server_onmessage: fd=%i, opcode=%#04x, payload_len=%lld, payload=%s\n",
3535
connection->fd, message->opcode, message->payload_len, message->payload);
3636
cwebsocket_server_write_data(connection, message->payload, strlen(message->payload), TEXT_FRAME);
3737
}

0 commit comments

Comments
 (0)