dunkelstern/libmqtt
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bugfix: WSACleanup destroys ability to create a new socket

Browse source
This commit is contained in:
Johannes Schriewer 2018-08-05 23:56:55 +02:00
parent 414bf7238d
commit ec578f0dbd
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
platform/windows.c
View file

@ -67,11 +67,6 @@ PlatformStatusCode platform_init(MQTTHandle *handle) {
return PlatformStatusError; return PlatformStatusError;
} }
if (WSAStartup(MAKEWORD(2,2),&handle->platform->wsa) != 0) {
DEBUG_LOG("Winsock init failed. Error Code : %d", WSAGetLastError());
return PlatformStatusError;
}
return PlatformStatusOk; return PlatformStatusOk;
} }
@ -92,7 +87,7 @@ PlatformStatusCode platform_release(MQTTHandle *handle) {
// check if there are tasks running // check if there are tasks running
for (uint8_t free_task = 0; free_task < MAX_TASKS; free_task++) { for (uint8_t free_task = 0; free_task < MAX_TASKS; free_task++) {
if (p->tasks[free_task] != 0) { if (p->tasks[free_task] != 0) {
DEBUG_LOG("Cannot free platform handle, there are tasks running!"); DEBUG_LOG("Cannot free platform handle, there are tasks running! (id: %d)", free_task);
return PlatformStatusError; return PlatformStatusError;
} }
} }
@ -170,6 +165,11 @@ PlatformStatusCode platform_resolve_host(char *hostname , char *ip) {
PlatformStatusCode platform_connect(MQTTHandle *handle) { PlatformStatusCode platform_connect(MQTTHandle *handle) {
PlatformData *p = handle->platform; PlatformData *p = handle->platform;
if (WSAStartup(MAKEWORD(2,2),&handle->platform->wsa) != 0) {
DEBUG_LOG("Winsock init failed. Error Code : %d", WSAGetLastError());
return PlatformStatusError;
}
int ret; int ret;
struct sockaddr_in servaddr; struct sockaddr_in servaddr;
memset(&servaddr, 0, sizeof(servaddr)); memset(&servaddr, 0, sizeof(servaddr));
@ -258,6 +258,11 @@ PlatformStatusCode platform_write(MQTTHandle *handle, Buffer *buffer) {
PlatformStatusCode platform_disconnect(MQTTHandle *handle) { PlatformStatusCode platform_disconnect(MQTTHandle *handle) {
PlatformData *p = handle->platform; PlatformData *p = handle->platform;
if (p->sock != INVALID_SOCKET) { if (p->sock != INVALID_SOCKET) {
// u_long mode = 1;
// DEBUG_LOG("Unblocking socket");
// ioctlsocket(p->sock, FIONBIO, &mode); // unblock socket
DEBUG_LOG("Closing socket");
closesocket(p->sock); closesocket(p->sock);
WSACleanup(); WSACleanup();
p->sock = INVALID_SOCKET; p->sock = INVALID_SOCKET;
@ -271,7 +276,7 @@ PlatformStatusCode platform_create_timer(MQTTHandle *handle, int interval, int *
uint8_t free_timer = 0; uint8_t free_timer = 0;
for (free_timer = 0; free_timer < MAX_TIMERS; free_timer++) { for (free_timer = 0; free_timer < MAX_TIMERS; free_timer++) {
DEBUG_LOG("Timer %d: %s", free_timer, p->timers[free_timer].callback ? "Occupied" : "Free"); // DEBUG_LOG("Timer %d: %s", free_timer, p->timers[free_timer].callback ? "Occupied" : "Free");
if (p->timers[free_timer].callback == NULL) { if (p->timers[free_timer].callback == NULL) {
break; break;
} }