Skip to content

Commit

Permalink
websocket: use NAME in log message, removed unreachable code
Browse files Browse the repository at this point in the history
(cherry picked from commit 5c58ac7)
  • Loading branch information
miconda committed Aug 30, 2017
1 parent a11d457 commit fcaa84b
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions src/modules/websocket/ws_frame.c
Expand Up @@ -199,11 +199,11 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close)

if (frame->payload_len < 126) extended_length = 0;
else if (frame->payload_len <= USHRT_MAX ) extended_length = 2;
else if (frame->payload_len <= UINT_MAX) extended_length = 4;
else if (frame->payload_len < UINT_MAX) extended_length = 4;
else
{
LM_ERR("Kamailio only supports WebSocket frames with payload "
"<= %u\n", UINT_MAX);
LM_ERR(NAME " only supports WebSocket frames with payload "
"< %u\n", UINT_MAX);
return -1;
}

Expand Down Expand Up @@ -758,11 +758,6 @@ int ws_frame_receive(void *data)
wsconn_put(frame.wsc);
return -1;
}

/* how can we get here ? */
wsconn_put(frame.wsc);

return 0;
}

int ws_frame_transmit(void *data)
Expand Down

0 comments on commit fcaa84b

Please sign in to comment.