Partydeck/Websocket-Extension
3
0
Fork 0
mirror of https://github.com/defold/extension-websocket.git synced 2025-09-30 09:12:18 +02:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
JCash
2020-09-02 16:54:37 +02:00
parent 5de32250c3
commit 26a9ef0143
8 changed files with 242 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
websocket/src/wslay_callbacks.cpp
View File

@@ -80,22 +80,6 @@ ssize_t WSL_RecvCallback(wslay_event_context_ptr ctx, uint8_t *buf, size_t len,
{
WebsocketConnection* conn = (WebsocketConnection*)user_data;
// struct Session *session = (struct Session*)user_data;
// ssize_t r;
// while((r = recv(session->fd, buf, len, 0)) == -1 && errno == EINTR);
// if(r == -1) {
// if(errno == EAGAIN || errno == EWOULDBLOCK) {
// wslay_event_set_error(ctx, WSLAY_ERR_WOULDBLOCK);
// } else {
// wslay_event_set_error(ctx, WSLAY_ERR_CALLBACK_FAILURE);
// }
// } else if(r == 0) {
// /* Unexpected EOF is also treated as an error */
// wslay_event_set_error(ctx, WSLAY_ERR_CALLBACK_FAILURE);
// r = -1;
// }
// return r;
int r = -1; // received bytes if >=0, error if < 0
dmSocket::Result socket_result = Receive(conn, buf, len, &r);
@@ -119,36 +103,9 @@ ssize_t WSL_SendCallback(wslay_event_context_ptr ctx, const uint8_t *data, size_
{
WebsocketConnection* conn = (WebsocketConnection*)user_data;
// struct Session *session = (struct Session*)user_data;
// ssize_t r;
// int sflags = 0;
// // #ifdef MSG_MORE
// // if(flags & WSLAY_MSG_MORE) {
// // sflags |= MSG_MORE;
// // }
// // #endif // MSG_MORE
// while((r = send(session->fd, data, len, sflags)) == -1 && errno == EINTR);
// if(r == -1) {
// if(errno == EAGAIN || errno == EWOULDBLOCK) {
// wslay_event_set_error(ctx, WSLAY_ERR_WOULDBLOCK);
// } else {
// wslay_event_set_error(ctx, WSLAY_ERR_CALLBACK_FAILURE);
// }
// }
// return r;
int sent_bytes = 0;
dmSocket::Result socket_result = Send(conn, (const char*)data, len, &sent_bytes);
// dmSocket::Result socket_result;
// int r = -1; // sent bytes if >=0, error if < 0
// do {
// socket_result = dmSocket::Send(conn->m_Socket, data, len, &r);
// }
// while (r == -1 && socket_result == dmSocket::RESULT_INTR);
if (socket_result != dmSocket::RESULT_OK)
{
if (socket_result == dmSocket::RESULT_WOULDBLOCK || socket_result == dmSocket::RESULT_TRY_AGAIN)
@@ -174,24 +131,6 @@ void WSL_OnMsgRecvCallback(wslay_event_context_ptr ctx, const struct wslay_event
} else if (arg->opcode == WSLAY_CONNECTION_CLOSE)
{
// TODO: Store the reason
// close_code = arg->status_code;
// size_t len = arg->msg_length;
// close_reason = "";
// if (len > 2 /* first 2 bytes = close code */) {
// close_reason.parse_utf8((char *)arg->msg + 2, len - 2);
// }
// if (!wslay_event_get_close_sent(_data->ctx)) {
// if (_data->is_server) {
// WSLServer *helper = (WSLServer *)_data->obj;
// helper->_on_close_request(_data->id, close_code, close_reason);
// } else {
// WSLClient *helper = (WSLClient *)_data->obj;
// helper->_on_close_request(close_code, close_reason);
// }
// }
//SetStatus(conn, RESULT_NOT_CONNECTED, "Websocket received close event for %s", conn->m_Url.m_Hostname);
}
}