luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: fixed udp4_echo_server implementation

Browse Source 
It was missing socket binding and the on_recv() callback was wrong.

PR-URL: https://github.com/libuv/libuv/pull/2532
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Saúl Ibarra Corretgé <s@saghul.net>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
This commit is contained in:
Marek Vavrusa 2015-07-02 02:01:50 +02:00 committed by Saúl Ibarra Corretgé
parent 18ff13c71e
commit 618533b7e3
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
test/echo-server.c
View File

@ -37,6 +37,7 @@ static uv_tcp_t tcpServer;
static uv_udp_t udpServer;
static uv_pipe_t pipeServer;
static uv_handle_t* server;
static uv_udp_send_t* send_freelist;
static void after_write(uv_write_t* req, int status);
static void after_read(uv_stream_t*, ssize_t nread, const uv_buf_t* buf);
@ -133,6 +134,14 @@ static void echo_alloc(uv_handle_t* handle,
buf->len = suggested_size;
}
static void slab_alloc(uv_handle_t* handle,
size_t suggested_size,
uv_buf_t* buf) {
/* up to 16 datagrams at once */
static char slab[16 * 64 * 1024];
buf->base = slab;
buf->len = sizeof(slab);
}
static void on_connection(uv_stream_t* server, int status) {
uv_stream_t* stream;
@ -178,35 +187,43 @@ static void on_server_close(uv_handle_t* handle) {
ASSERT(handle == server);
}
static uv_udp_send_t* send_alloc(void) {
uv_udp_send_t* req = send_freelist;
if (req != NULL)
send_freelist = req->data;
else
req = malloc(sizeof(*req));
return req;
}
static void on_send(uv_udp_send_t* req, int status);
static void on_send(uv_udp_send_t* req, int status) {
ASSERT(req != NULL);
ASSERT(status == 0);
req->data = send_freelist;
send_freelist = req;
}
static void on_recv(uv_udp_t* handle,
ssize_t nread,
const uv_buf_t* rcvbuf,
const struct sockaddr* addr,
unsigned flags) {
uv_udp_send_t* req;
uv_buf_t sndbuf;
if (nread == 0) {
/* Everything OK, but nothing read. */
return;
}
ASSERT(nread > 0);
ASSERT(addr->sa_family == AF_INET);
req = malloc(sizeof(*req));
uv_udp_send_t* req = send_alloc();
ASSERT(req != NULL);
sndbuf = *rcvbuf;
ASSERT(0 == uv_udp_send(req, handle, &sndbuf, 1, addr, on_send));
sndbuf = uv_buf_init(rcvbuf->base, nread);
ASSERT(0 <= uv_udp_send(req, handle, &sndbuf, 1, addr, on_send));
}
static void on_send(uv_udp_send_t* req, int status) {
ASSERT(status == 0);
free(req);
}
static int tcp4_echo_start(int port) {
struct sockaddr_in addr;
int r;
@ -277,8 +294,10 @@ static int tcp6_echo_start(int port) {
static int udp4_echo_start(int port) {
struct sockaddr_in addr;
int r;
ASSERT(0 == uv_ip4_addr("127.0.0.1", port, &addr));
server = (uv_handle_t*)&udpServer;
serverType = UDP;
@ -288,7 +307,13 @@ static int udp4_echo_start(int port) {
return 1;
}
r = uv_udp_recv_start(&udpServer, echo_alloc, on_recv);
r = uv_udp_bind(&udpServer, (const struct sockaddr*) &addr, 0);
if (r) {
fprintf(stderr, "uv_udp_bind: %s\n", uv_strerror(r));
return 1;
}
r = uv_udp_recv_start(&udpServer, slab_alloc, on_recv);
if (r) {
fprintf(stderr, "uv_udp_recv_start: %s\n", uv_strerror(r));
return 1;