Merge branch 'sunnyboy00-master'

nikhilm · Sep 21, 2014 · 14ac232 · 14ac232
2 parents c97df2d + a71caea
commit 14ac232
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/code/multi-echo-server/main.c b/code/multi-echo-server/main.c
@@ -32,8 +32,8 @@ void on_new_connection(uv_stream_t *server, int status) {
         return;
     }
 
-    uv_pipe_t *client = (uv_pipe_t*) malloc(sizeof(uv_pipe_t));
-    uv_pipe_init(loop, client, 0);
+    uv_tcp_t *client = (uv_tcp_t*) malloc(sizeof(uv_tcp_t));
+    uv_tcp_init(loop, client);
     if (uv_accept(server, (uv_stream_t*) client) == 0) {
         uv_write_t *write_req = (uv_write_t*) malloc(sizeof(uv_write_t));
         dummy_buf = uv_buf_init(".", 1);

diff --git a/code/multi-echo-server/worker.c b/code/multi-echo-server/worker.c
@@ -40,8 +40,8 @@ void on_new_connection(uv_pipe_t *q, ssize_t nread, uv_buf_t buf, uv_handle_type
         return;
     }
 
-    uv_pipe_t *client = (uv_pipe_t*) malloc(sizeof(uv_pipe_t));
-    uv_pipe_init(loop, client, 0);
+    uv_tcp_t *client = (uv_tcp_t*) malloc(sizeof(uv_tcp_t));
+    uv_tcp_init(loop, client, 0);
     if (uv_accept((uv_stream_t*) q, (uv_stream_t*) client) == 0) {
         fprintf(stderr, "Worker %d: Accepted fd %d\n", getpid(), client->io_watcher.fd);
         uv_read_start((uv_stream_t*) client, alloc_buffer, echo_read);