Skip to content

Commit 69dfa08

Browse files
committed
wiseconnect: Fix compiler warning
To avoid any confusion between BSD sockets and Wiseconnect API, this patch just call the underlying functions (sli_si91x_shutdown()) instead of close(). sli_si91x_connect instead of connect() sli_si91x_send() intead of send() Signed-off-by: Rahul Gurram <[email protected]>
1 parent 13149b4 commit 69dfa08

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

wiseconnect/components/service/sl_websocket_client/src/sl_websocket_client.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,18 +177,18 @@ sl_websocket_error_t sl_websocket_connect(sl_websocket_client_t *handle)
177177
handle->socket_fd = client_socket;
178178

179179
if (handle->enable_ssl) {
180-
socket_return_value = setsockopt(client_socket, SOL_TCP, TCP_ULP, TLS, sizeof(TLS));
180+
socket_return_value = sl_si91x_setsockopt(client_socket, SOL_TCP, TCP_ULP, TLS, sizeof(TLS));
181181
if (socket_return_value < 0) {
182182
SL_DEBUG_LOG("\r\nSet socket failed with bsd error: %d\r\n", errno);
183-
close(client_socket);
183+
sli_si91x_shutdown(client_socket, SHUTDOWN_BY_ID);
184184
return SL_WEBSOCKET_ERR_SSL_SETSOCKOPT;
185185
}
186186
}
187187

188188
socket_return_value = sl_si91x_bind(client_socket, (struct sockaddr *)&client_address, socket_length);
189189
if (socket_return_value < 0) {
190190
SL_DEBUG_LOG("\r\nSocket bind failed with bsd error: %d\r\n", errno);
191-
close(client_socket);
191+
sli_si91x_shutdown(client_socket, SHUTDOWN_BY_ID);
192192
handle->state = SL_WEBSOCKET_STATE_DISCONNECTED;
193193
return SL_WEBSOCKET_ERR_SOCKET_BIND;
194194
}
@@ -197,7 +197,7 @@ sl_websocket_error_t sl_websocket_connect(sl_websocket_client_t *handle)
197197
sli_si91x_socket_t *si91x_socket = sli_get_si91x_socket(client_socket);
198198
if (!si91x_socket) {
199199
SL_DEBUG_LOG("\r\nFailed to retrieve si91x socket\r\n");
200-
close(client_socket);
200+
sli_si91x_shutdown(client_socket, SHUTDOWN_BY_ID);
201201
handle->state = SL_WEBSOCKET_STATE_DISCONNECTED;
202202
return SL_WEBSOCKET_ERR_SOCKET_CREATION;
203203
}
@@ -214,7 +214,7 @@ sl_websocket_error_t sl_websocket_connect(sl_websocket_client_t *handle)
214214
// Check if memory allocation was successful
215215
if (si91x_socket->websocket_info == NULL) {
216216
SL_DEBUG_LOG("\r\nMemory allocation for websocket_info failed\r\n");
217-
close(client_socket);
217+
sli_si91x_shutdown(client_socket, SHUTDOWN_BY_ID);
218218
handle->state = SL_WEBSOCKET_STATE_DISCONNECTED;
219219
return SL_WEBSOCKET_ERR_SOCKET_CREATION;
220220
}
@@ -227,10 +227,10 @@ sl_websocket_error_t sl_websocket_connect(sl_websocket_client_t *handle)
227227
memcpy(si91x_socket->websocket_info->websocket_data, handle->host, host_length);
228228
memcpy(si91x_socket->websocket_info->websocket_data + host_length, handle->resource, resource_length);
229229

230-
socket_return_value = connect(client_socket, (struct sockaddr *)&server_address, socket_length);
230+
socket_return_value = sli_si91x_connect(client_socket, (struct sockaddr *)&server_address, socket_length);
231231
if (socket_return_value < 0) {
232232
SL_DEBUG_LOG("\r\nSocket Connect failed with bsd error: %d\r\n", errno);
233-
close(client_socket);
233+
sli_si91x_shutdown(client_socket, SHUTDOWN_BY_ID);
234234
handle->state = SL_WEBSOCKET_STATE_DISCONNECTED;
235235
return SL_WEBSOCKET_ERR_SOCKET_CONNECT;
236236
}
@@ -270,7 +270,7 @@ sl_websocket_error_t sl_websocket_send_frame(sl_websocket_client_t *handle,
270270
si91x_socket->opcode = send_request->opcode;
271271

272272
// Send the WebSocket frame
273-
int sent_bytes = send(handle->socket_fd, send_request->buffer, send_request->length, 0);
273+
int sent_bytes = sl_si91x_send(handle->socket_fd, send_request->buffer, send_request->length, 0);
274274
if (sent_bytes < 0) {
275275
if (errno == ENOBUFS) {
276276
return SL_WEBSOCKET_SUCCESS;
@@ -298,7 +298,7 @@ sl_websocket_error_t sl_websocket_close(sl_websocket_client_t *handle)
298298
// Update state to closing
299299
handle->state = SL_WEBSOCKET_STATE_CLOSING;
300300
SL_DEBUG_LOG("\r\nAttempting to close socket with fd: %d\r\n", handle->socket_fd);
301-
int status = close(handle->socket_fd);
301+
int status = sli_si91x_shutdown(handle->socket_fd, SHUTDOWN_BY_ID);
302302
if (status == 0) {
303303
SL_DEBUG_LOG("\r\nSocket closed in FW");
304304
handle->socket_fd = -1; // Invalidate the socket file descriptor
@@ -325,7 +325,7 @@ sl_websocket_error_t sl_websocket_deinit(sl_websocket_client_t *handle)
325325
// Close the WebSocket connection if it's still open
326326
if (handle->socket_fd >= 0) {
327327
SL_DEBUG_LOG("\r\nDeinit: Closing socket with fd: %d\r\n", handle->socket_fd);
328-
close(handle->socket_fd);
328+
sli_si91x_shutdown(handle->socket_fd, SHUTDOWN_BY_ID);
329329
handle->socket_fd = -1;
330330
}
331331

0 commit comments

Comments
 (0)