mirror of
https://github.com/jerryscript-project/jerryscript.git
synced 2025-12-15 16:29:21 +00:00
There was an issue not checking if recv() set the error value to EWOULDBLOCK or EAGAIN (both equals 11). If recv() returns 0 that means the connection was gracefully closed from the other side. However, if you are using non-blocking sockets, and recv() returns 0, but sets the errno to EWOULDBLOCK or EAGAIN it means the socket operation would block. This patch fixes #2537 JerryScript-DCO-1.0-Signed-off-by: Daniel Balla dballa@inf.u-szeged.hu
264 lines
6.8 KiB
C
264 lines
6.8 KiB
C
/* Copyright JS Foundation and other contributors, http://js.foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "jerryscript-debugger-transport.h"
|
|
#include "jerryscript-ext/debugger.h"
|
|
#include "jext-common.h"
|
|
|
|
#ifdef JERRY_DEBUGGER
|
|
|
|
#include <arpa/inet.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
|
|
/**
|
|
* Implementation of transport over tcp/ip.
|
|
*/
|
|
typedef struct
|
|
{
|
|
jerry_debugger_transport_header_t header; /**< transport header */
|
|
int tcp_socket; /**< tcp socket */
|
|
} jerryx_debugger_transport_tcp_t;
|
|
|
|
/**
|
|
* Log tcp error message.
|
|
*/
|
|
static void
|
|
jerryx_debugger_tcp_log_error (int err_val)
|
|
{
|
|
JERRYX_ERROR_MSG ("TCP Error: %s\n", strerror (err_val));
|
|
} /* jerryx_debugger_tcp_log_error */
|
|
|
|
/**
|
|
* Close a tcp connection.
|
|
*/
|
|
static void
|
|
jerryx_debugger_tcp_close (jerry_debugger_transport_header_t *header_p) /**< tcp implementation */
|
|
{
|
|
JERRYX_ASSERT (!jerry_debugger_transport_is_connected ());
|
|
|
|
jerryx_debugger_transport_tcp_t *tcp_p = (jerryx_debugger_transport_tcp_t *) header_p;
|
|
|
|
JERRYX_DEBUG_MSG ("TCP connection closed.\n");
|
|
|
|
close (tcp_p->tcp_socket);
|
|
|
|
jerry_heap_free ((void *) header_p, sizeof (jerryx_debugger_transport_tcp_t));
|
|
} /* jerryx_debugger_tcp_close */
|
|
|
|
/**
|
|
* Send data over a tcp connection.
|
|
*
|
|
* @return true - if the data has been sent successfully
|
|
* false - otherwise
|
|
*/
|
|
static bool
|
|
jerryx_debugger_tcp_send (jerry_debugger_transport_header_t *header_p, /**< tcp implementation */
|
|
uint8_t *message_p, /**< message to be sent */
|
|
size_t message_length) /**< message length in bytes */
|
|
{
|
|
JERRYX_ASSERT (jerry_debugger_transport_is_connected ());
|
|
|
|
jerryx_debugger_transport_tcp_t *tcp_p = (jerryx_debugger_transport_tcp_t *) header_p;
|
|
|
|
do
|
|
{
|
|
ssize_t is_err = recv (tcp_p->tcp_socket, NULL, 0, MSG_PEEK);
|
|
|
|
if (is_err == 0 && errno != EWOULDBLOCK)
|
|
{
|
|
int err_val = errno;
|
|
jerry_debugger_transport_close ();
|
|
jerryx_debugger_tcp_log_error (err_val);
|
|
return false;
|
|
}
|
|
ssize_t sent_bytes = send (tcp_p->tcp_socket, message_p, message_length, 0);
|
|
|
|
if (sent_bytes < 0)
|
|
{
|
|
if (errno == EWOULDBLOCK)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
int err_val = errno;
|
|
jerry_debugger_transport_close ();
|
|
jerryx_debugger_tcp_log_error (err_val);
|
|
return false;
|
|
}
|
|
|
|
message_p += sent_bytes;
|
|
message_length -= (size_t) sent_bytes;
|
|
}
|
|
while (message_length > 0);
|
|
|
|
return true;
|
|
} /* jerryx_debugger_tcp_send */
|
|
|
|
/**
|
|
* Receive data from a tcp connection.
|
|
*/
|
|
static bool
|
|
jerryx_debugger_tcp_receive (jerry_debugger_transport_header_t *header_p, /**< tcp implementation */
|
|
jerry_debugger_transport_receive_context_t *receive_context_p) /**< receive context */
|
|
{
|
|
jerryx_debugger_transport_tcp_t *tcp_p = (jerryx_debugger_transport_tcp_t *) header_p;
|
|
|
|
uint8_t *buffer_p = receive_context_p->buffer_p + receive_context_p->received_length;
|
|
size_t buffer_size = JERRY_DEBUGGER_TRANSPORT_MAX_BUFFER_SIZE - receive_context_p->received_length;
|
|
|
|
ssize_t length = recv (tcp_p->tcp_socket, buffer_p, buffer_size, 0);
|
|
|
|
if (length <= 0)
|
|
{
|
|
if (errno != EWOULDBLOCK || length == 0)
|
|
{
|
|
int err_val = errno;
|
|
jerry_debugger_transport_close ();
|
|
jerryx_debugger_tcp_log_error (err_val);
|
|
return false;
|
|
}
|
|
length = 0;
|
|
}
|
|
|
|
receive_context_p->received_length += (size_t) length;
|
|
|
|
if (receive_context_p->received_length > 0)
|
|
{
|
|
receive_context_p->message_p = receive_context_p->buffer_p;
|
|
receive_context_p->message_length = receive_context_p->received_length;
|
|
}
|
|
|
|
return true;
|
|
} /* jerryx_debugger_tcp_receive */
|
|
|
|
/**
|
|
* Create a tcp connection.
|
|
*
|
|
* @return true if successful,
|
|
* false otherwise
|
|
*/
|
|
bool
|
|
jerryx_debugger_tcp_create (uint16_t port) /**< listening port */
|
|
{
|
|
int server_socket;
|
|
struct sockaddr_in addr;
|
|
socklen_t sin_size = sizeof (struct sockaddr_in);
|
|
|
|
addr.sin_family = AF_INET;
|
|
addr.sin_port = htons (port);
|
|
addr.sin_addr.s_addr = INADDR_ANY;
|
|
|
|
if ((server_socket = socket (AF_INET, SOCK_STREAM, 0)) == -1)
|
|
{
|
|
JERRYX_ERROR_MSG ("Error: %s\n", strerror (errno));
|
|
return false;
|
|
}
|
|
|
|
int opt_value = 1;
|
|
|
|
if (setsockopt (server_socket, SOL_SOCKET, SO_REUSEADDR, &opt_value, sizeof (int)) == -1)
|
|
{
|
|
close (server_socket);
|
|
JERRYX_ERROR_MSG ("Error: %s\n", strerror (errno));
|
|
return false;
|
|
}
|
|
|
|
if (bind (server_socket, (struct sockaddr *)&addr, sizeof (struct sockaddr)) == -1)
|
|
{
|
|
close (server_socket);
|
|
JERRYX_ERROR_MSG ("Error: %s\n", strerror (errno));
|
|
return false;
|
|
}
|
|
|
|
if (listen (server_socket, 1) == -1)
|
|
{
|
|
close (server_socket);
|
|
JERRYX_ERROR_MSG ("Error: %s\n", strerror (errno));
|
|
return false;
|
|
}
|
|
|
|
JERRYX_DEBUG_MSG ("Waiting for client connection\n");
|
|
|
|
int tcp_socket = accept (server_socket, (struct sockaddr *)&addr, &sin_size);
|
|
|
|
close (server_socket);
|
|
|
|
if (tcp_socket == -1)
|
|
{
|
|
JERRYX_ERROR_MSG ("Error: %s\n", strerror (errno));
|
|
return false;
|
|
}
|
|
|
|
/* Set non-blocking mode. */
|
|
int socket_flags = fcntl (tcp_socket, F_GETFL, 0);
|
|
|
|
if (socket_flags < 0)
|
|
{
|
|
close (tcp_socket);
|
|
return false;
|
|
}
|
|
|
|
if (fcntl (tcp_socket, F_SETFL, socket_flags | O_NONBLOCK) == -1)
|
|
{
|
|
close (tcp_socket);
|
|
return false;
|
|
}
|
|
|
|
JERRYX_DEBUG_MSG ("Connected from: %s\n", inet_ntoa (addr.sin_addr));
|
|
|
|
size_t size = sizeof (jerryx_debugger_transport_tcp_t);
|
|
|
|
jerry_debugger_transport_header_t *header_p;
|
|
header_p = (jerry_debugger_transport_header_t *) jerry_heap_alloc (size);
|
|
|
|
if (!header_p)
|
|
{
|
|
close (tcp_socket);
|
|
return false;
|
|
}
|
|
|
|
header_p->close = jerryx_debugger_tcp_close;
|
|
header_p->send = jerryx_debugger_tcp_send;
|
|
header_p->receive = jerryx_debugger_tcp_receive;
|
|
|
|
((jerryx_debugger_transport_tcp_t *) header_p)->tcp_socket = tcp_socket;
|
|
|
|
jerry_debugger_transport_add (header_p,
|
|
0,
|
|
JERRY_DEBUGGER_TRANSPORT_MAX_BUFFER_SIZE,
|
|
0,
|
|
JERRY_DEBUGGER_TRANSPORT_MAX_BUFFER_SIZE);
|
|
|
|
return true;
|
|
} /* jerryx_debugger_tcp_create */
|
|
|
|
#else /* !JERRY_DEBUGGER */
|
|
|
|
/**
|
|
* Dummy function when debugger is disabled.
|
|
*
|
|
* @return false
|
|
*/
|
|
bool
|
|
jerryx_debugger_tcp_create (uint16_t port)
|
|
{
|
|
JERRYX_UNUSED (port);
|
|
return false;
|
|
} /* jerryx_debugger_tcp_create */
|
|
|
|
#endif /* JERRY_DEBUGGER */
|