diff --git a/Makefile b/Makefile
index b0c5f84c..51d9de98 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ all : \
   service/tunnel.so \
   service/harbor.so \
   service/localcast.so \
-  service/socket.so \
   luaclib/skynet.so \
   luaclib/socketdriver.so \
   luaclib/int64.so \
@@ -75,8 +74,8 @@ service/logger.so : skynet-src/skynet_logger.c
 service/snlua.so : service-src/service_lua.c
 	gcc $(CFLAGS) $(SHARED) -Iluacompat $^ -o $@ -Iskynet-src
 
-service/gate.so : gate/mread.c gate/ringbuffer.c gate/main.c
-	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Igate -Iskynet-src -Iservice-src
+service/gate.so : service-src/service_gate.c
+	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src
 
 service/localcast.so : service-src/service_localcast.c
 	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src
@@ -87,9 +86,6 @@ luaclib/skynet.so : lualib-src/lua-skynet.c lualib-src/lua-seri.c lualib-src/lua
 service/client.so : service-src/service_client.c
 	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src
 
-service/socket.so : service-src/service_socket.c
-	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src
-
 luaclib/socketdriver.so : lualib-src/lua-socket.c | luaclib
 	gcc $(CFLAGS) $(SHARED) -Iluacompat $^ -o $@ -Iskynet-src -Iservice-src
 
diff --git a/lualib-src/lua-socket.c b/lualib-src/lua-socket.c
index ab4ec6b8..6d2b9374 100644
--- a/lualib-src/lua-socket.c
+++ b/lualib-src/lua-socket.c
@@ -417,10 +417,10 @@ lbind(lua_State *L) {
 }
 
 static int
-laccept(lua_State *L) {
+lstart(lua_State *L) {
 	struct skynet_context * ctx = lua_touserdata(L, lua_upvalueindex(1));
 	int id = luaL_checkinteger(L, 1);
-	skynet_socket_accept(ctx,id);
+	skynet_socket_start(ctx,id);
 	return 0;
 }
 
@@ -447,7 +447,7 @@ luaopen_socketdriver(lua_State *L) {
 		{ "listen", llisten },
 		{ "send", lsend },
 		{ "bind", lbind },
-		{ "accept", laccept },
+		{ "start", lstart },
 		{ NULL, NULL },
 	};
 	lua_getfield(L, LUA_REGISTRYINDEX, "skynet_lua");
diff --git a/service-src/service_client.c b/service-src/service_client.c
index 645b36d6..ecce6fb5 100644
--- a/service-src/service_client.c
+++ b/service-src/service_client.c
@@ -15,13 +15,14 @@ static int
 _cb(struct skynet_context * context, void * ud, int type, int session, uint32_t source, const void * msg, size_t sz) {
 	assert(sz <= 65535);
 	struct client * c = ud;
-	// tmp will be free by gate.
-	// see gate/mread.c : mread_push()
+	// tmp will be free by skynet_socket.
+	// see skynet_src/socket_server.c : send_socket()
 	uint8_t *tmp = malloc(sz + 4 + 2);
-	memcpy(tmp, c->id, 4);
-	tmp[4] = (sz >> 8) & 0xff;
-	tmp[5] = sz & 0xff;
-	memcpy(tmp+6, msg, sz);
+	tmp[0] = (sz >> 8) & 0xff;
+	tmp[1] = sz & 0xff;
+	memcpy(tmp+2, msg, sz);
+	// 4 bytes id at the end
+	memcpy(tmp+2+sz, c->id, 4);
 
 	skynet_send(context, source, c->gate, PTYPE_CLIENT | PTYPE_TAG_DONTCOPY, 0, tmp, sz+6);
 
diff --git a/service-src/service_harbor.c b/service-src/service_harbor.c
index fd2537c6..a0c4fcf6 100644
--- a/service-src/service_harbor.c
+++ b/service-src/service_harbor.c
@@ -561,7 +561,7 @@ _connect_master(struct skynet_context * ctx, void * ud, int type, int session, u
 		return 0;
 	}
 	if (message->type == SKYNET_SOCKET_TYPE_ERROR) {
-		fprintf(stderr, "Harbor: Conenct to master failed\n");
+		fprintf(stderr, "Harbor: Connect to master failed\n");
 		exit(1);
 	}
 	assert(message->type == SKYNET_SOCKET_TYPE_CONNECT);
diff --git a/service-src/service_socket.c b/service-src/service_socket.c
deleted file mode 100644
index f36e57b9..00000000
--- a/service-src/service_socket.c
+++ /dev/null
@@ -1,491 +0,0 @@
-#include "skynet.h"
-#include "event.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <assert.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#define MAX_ID 0x7fffffff
-#define MAX_CONNECTION 256
-#define READ_BUFFER 4000
-
-#define STATUS_INVALID 0
-#define STATUS_CONNECT 1
-#define STATUS_HALFCLOSE 2
-#define STATUS_SUSPEND 3
-
-struct write_buffer {
-	struct write_buffer * next;
-	char *ptr;
-	size_t sz;
-	void *buffer;
-};
-
-struct socket {
-	int fd;
-	int id;
-	uint32_t source;
-	int status;
-	int session;
-	struct write_buffer * head;
-	struct write_buffer * tail;
-};
-
-struct socket_pool {
-	int fd;
-	struct event ev[MAX_EVENT];
-	int id;
-	int count;
-	int cap;
-	struct socket * s;
-};
-
-static void
-reply(struct skynet_context * ctx, uint32_t source, int session, char * cmd, int sz) {
-	if (session == 0) {
-		// don't reply when session == 0
-		return;
-	}
-	if (sz < 0) {
-		sz = strlen(cmd);
-	}
-	skynet_send(ctx, 0, source, PTYPE_RESPONSE,  session, cmd, sz);
-}
-
-static void
-_reply_bind(struct skynet_context * ctx, int sock, int session, uint32_t source) {
-	char ret[10];
-	int sz = sprintf(ret,"%d",sock);
-	reply(ctx, source, session, ret, sz);
-}
-
-static int
-_set_nonblocking(int fd)
-{
-	int flag = fcntl(fd, F_GETFL, 0);
-	if ( -1 == flag ) {
-		return -1;
-	}
-
-	return fcntl(fd, F_SETFL, flag | O_NONBLOCK);
-}
-
-static int
-new_socket(struct socket_pool *p, int sock, uint32_t addr, int session, bool connecting) {
-	int i;
-	if (p->count >= p->cap) {
-		goto _error;
-	}
-	for (i=0;i<p->cap;i++) {
-		int id = p->id + i;
-		int n = id % p->cap;
-		struct socket * s = &p->s[n];
-		if (s->status == STATUS_INVALID) {
-			if (event_add(p->fd, sock, s)) {
-				goto _error;
-			}
-			if (connecting) {
-				event_write(p->fd, sock, s, true);
-				s->status = STATUS_CONNECT;
-			} else {
-				s->status = STATUS_SUSPEND;
-			}
-			int keepalive = 1; 
-			setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive , sizeof(keepalive));
-			s->fd = sock;
-			s->id = id;
-			s->source = addr;
-			s->session = session;
-			p->count++;
-			p->id = id + 1;
-			if (p->id > MAX_ID) {
-				p->id = 1;
-			}
-			assert(s->head == NULL && s->tail == NULL);
-			return id;
-		}
-	}
-_error:
-	close(sock);
-	return -1;
-}
-
-static void
-cmd_bind(struct skynet_context * ctx, struct socket_pool *p, int sock, int session, uint32_t source, bool connecting) {
-	if (!connecting) {
-		_set_nonblocking(sock);
-	}
-	int id = new_socket(p, sock, source, session, connecting);
-	if (id<0) {
-		reply(ctx, source, session, NULL , 0);
-		return;
-	}
-	if (!connecting) {
-		_reply_bind(ctx, id, session, source);
-	}
-	if (p->count == 1) {
-		skynet_command(ctx, "TIMEOUT", "0");
-	}
-}
-
-static void
-cmd_open(struct skynet_context * ctx, struct socket_pool *p, char * cmd, int session, uint32_t source) {
-	int status;
-	bool connecting = true;
-	struct addrinfo ai_hints;
-	struct addrinfo *ai_list = NULL;
-	struct addrinfo *ai_ptr = NULL;
-
-	char * host = strsep(&cmd, ":");
-	if (cmd == NULL) {
-		goto _failed;
-	}
-
-	memset( &ai_hints, 0, sizeof( ai_hints ) );
-	ai_hints.ai_family = AF_UNSPEC;
-	ai_hints.ai_socktype = SOCK_STREAM;
-	ai_hints.ai_protocol = IPPROTO_TCP;
-
-	status = getaddrinfo( host, cmd, &ai_hints, &ai_list );
-	if ( status != 0 ) {
-		goto _failed;
-	}
-	int sock= -1;
-	for	( ai_ptr = ai_list;	ai_ptr != NULL;	ai_ptr = ai_ptr->ai_next ) {
-		sock = socket( ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol );
-		if ( sock < 0 ) {
-			continue;
-		}
-		_set_nonblocking(sock);
-		status = connect( sock,	ai_ptr->ai_addr, ai_ptr->ai_addrlen	);
-		if ( status	!= 0 && errno != EINPROGRESS) {
-			close(sock);
-			sock = -1;
-			continue;
-		}
-		break;
-	}
-
-	freeaddrinfo( ai_list );
-
-	if (sock < 0) {
-		goto _failed;
-	}
-
-	if(status == 0) {
-		connecting = false;
-	}
-
-	cmd_bind(ctx, p, sock, session, source, connecting);
-
-	return;
-_failed:
-	reply(ctx, source, session, NULL , 0);
-}
-
-static void
-force_close(struct socket *s, struct socket_pool *p) {
-	struct write_buffer *wb = s->head;
-	while (wb) {
-		struct write_buffer *tmp = wb;
-		wb = wb->next;
-		free(tmp->buffer);
-		free(tmp);
-	}
-	s->head = s->tail = NULL;
-	assert(s->status != STATUS_INVALID);
-	s->status = STATUS_INVALID;
-	s->id = 0;
-	event_del(p->fd, s->fd);
-	close(s->fd);
-	--p->count;
-}
-
-static void
-cmd_close(struct skynet_context * ctx, struct socket_pool *p, int id, int session, uint32_t source) {
-	struct socket * s = &p->s[id % p->cap];
-	if (id != s->id) {
-		reply(ctx, source, session, "invalid", -1);
-		return;
-	}
-	if (source != s->source) {
-		skynet_error(ctx, "%x try to close socket %d:%x", source, id, s->source);
-		reply(ctx, source, session, "permission", -1);
-		return;
-	}
-	if (s->head == NULL) {
-		force_close(s,p);
-		reply(ctx, source, session, NULL, 0);
-	} else {
-		s->status = STATUS_HALFCLOSE;
-		s->session = session;
-	}
-}
-
-static void
-_ctrl(struct skynet_context * ctx, struct socket_pool *p, char * command, int id, char * arg, int session, uint32_t source) {
-	if (strcmp(command, "open")==0) {
-		cmd_open(ctx, p, arg, session, source);
-	} else if (strcmp(command, "close")==0) {
-		cmd_close(ctx, p, id, session, source);
-	} else if (strcmp(command, "bind")==0) {
-		cmd_bind(ctx, p, id, session, source, false);
-	} else {
-		skynet_error(ctx, "Unknown command %s", command);
-		reply(ctx, source, session, NULL, 0);
-	}
-}
-
-static char *
-parser(const char * msg, int sz, char * buffer, int *id) {
-	int i;
-	for (i=0;i<sz && msg[i] && msg[i]!=' ';i++) {
-		if (msg[i] != ' ') {
-			buffer[i] = msg[i];
-		}
-	}
-	buffer[i] = '\0';
-	if (i+1 < sz) {
-		*id = strtol(msg+i+1, NULL, 10);
-		memcpy(buffer+i+1,msg+i+1, sz-i-1);
-	}
-	buffer[sz] = '\0';
-	return buffer+i+1;
-}
-
-static void
-forward(struct skynet_context * context, struct socket *s, struct socket_pool *p) {
-	for (;;) {
-		int * buffer = malloc(READ_BUFFER + sizeof(int));
-		*buffer = s->id;	// convert endian ?
-		int r = 0;
-		for (;;) {
-			r = read(s->fd, buffer+1, READ_BUFFER);
-			if (r == -1) {
-				switch(errno) {
-				case EWOULDBLOCK:
-					free(buffer);
-					return;
-				case EINTR:
-					continue;
-				}
-				r = 0;
-				break;
-			}
-			break;
-		}
-		if (r == 0) {
-			force_close(s,p);
-		}
-
-		if (s->status == STATUS_HALFCLOSE) {
-			free(buffer);
-		} else {
-			skynet_send(context, 0, s->source, PTYPE_CLIENT | PTYPE_TAG_DONTCOPY, 0, buffer, r + 4);
-		}
-		if (r < READ_BUFFER)
-			return;
-	}
-}
-
-static void
-sendout(struct socket_pool *p, struct socket *s) {
-	while (s->head) {
-		struct write_buffer * tmp = s->head;
-		for (;;) {
-			int sz = write(s->fd, tmp->ptr, tmp->sz);
-			if (sz < 0) {
-				switch(errno) {
-				case EINTR:
-					continue;
-				case EAGAIN:
-					return;
-				}
-				force_close(s,p);
-				return;
-			}
-			if (sz != tmp->sz) {
-				tmp->ptr += sz;
-				tmp->sz -= sz;
-				return;
-			}
-			break;
-		}
-		s->head = tmp->next;
-		free(tmp->buffer);
-		free(tmp);
-	}
-	s->tail = NULL;
-	event_write(p->fd, s->fd, s, false);
-}
-
-static int
-try_send(struct skynet_context *ctx, struct socket_pool *p, uint32_t source, const int * msg, size_t sz) {
-	if (sz < 4) {
-		skynet_error(ctx, "%x invalid message", source);
-		return 0;
-	}
-	sz-=4;
-	int id = *msg;
-	struct socket * s = &p->s[id % p->cap];
-	if (id != s->id) {
-		skynet_error(ctx, "%x write to invalid socket %d", source, id);
-		return 0;
-	}
-	if (source != s->source) {
-		skynet_error(ctx, "%x try to write socket %d:%x", source, id, s->source);
-		return 0;
-	}
-	if (s->status != STATUS_SUSPEND && s->status != STATUS_CONNECT) {
-		skynet_error(ctx, "%x write to closed socket %d", source, id);
-		return 0;
-	}
-	if (s->head) {
-		struct write_buffer * buf = malloc(sizeof(*buf));
-		buf->ptr = (char *)(msg+1);
-		buf->buffer = (void *)msg;
-		buf->sz = sz;
-		assert(s->tail != NULL);
-		assert(s->tail->next == NULL);
-		buf->next = s->tail->next;
-		s->tail->next = buf;
-		s->tail = buf;
-		return 1;
-	}
-
-	char * ptr = (char *)(msg+1);
-
-	if (s->status != STATUS_CONNECT) {
-		for (;;) {
-			int wt = write(s->fd, ptr, sz);
-			if (wt < 0) {
-				switch(errno) {
-				case EINTR:
-					continue;
-				}
-				break;
-			}
-			if (wt == sz) {
-				return 0;
-			}
-			sz-=wt;
-			ptr+=wt;
-
-			break;
-		}
-	}
-
-	struct write_buffer * buf = malloc(sizeof(*buf));
-	buf->next = NULL;
-	buf->ptr = ptr;
-	buf->sz = sz;
-	buf->buffer = (void *)msg;
-	s->head = s->tail = buf;
-
-	event_write(p->fd, s->fd, s, true);
-
-	return 1;
-}
-
-static int
-_cb(struct skynet_context * context, void * ud, int type, int session, uint32_t source, const void * msg, size_t sz) {
-	struct socket_pool *p = ud;
-	if (type == PTYPE_TEXT) {
-		char tmp[sz+1];
-		int id=0;
-		char * arg = parser(msg, (int)sz, tmp, &id);
-		_ctrl(context, p , tmp, id, arg, session, source);
-		return 0;
-	} else if (type == PTYPE_CLIENT) {
-		return try_send(context, p, source, msg, sz);
-	}
-	if (p->count == 0)
-		return 0;
-	assert(type == PTYPE_RESPONSE);
-	int n = event_wait(p->fd, p->ev, 1); // timeout : 1ms
-
-	int i;
-	for (i=0;i<n;i++) {
-		struct event *e = &p->ev[i];
-		struct socket *s= e->s;
-		if (s->status == STATUS_CONNECT) {
-			int error;
-			socklen_t len = sizeof(error);  
-			int code = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, &error, &len);  
-			if (code < 0 || error) {  
-				force_close(s,p);
-				reply(context, s->source, s->session, NULL , 0);
-			} else {
-				_reply_bind(context, s->id, s->session, s->source);
-				s->status = STATUS_SUSPEND;
-			}
-		} else {
-			if (e->read) {
-				forward(context, e->s, p);
-			}
-			if (e->write) {
-				struct socket *s = e->s;
-				sendout(p, s);
-				if (s->status == STATUS_HALFCLOSE && s->head == NULL) {
-					force_close(s, p);
-					reply(context, source, s->session, NULL, 0);
-				}
-			}
-		}
-	}
-	skynet_command(context, "TIMEOUT", "0");
-	return 0;
-}
-
-int
-socket_init(struct socket_pool *pool, struct skynet_context *ctx, const char * args) {
-	int max = 0;
-	sscanf(args, "%d",&max);
-	if (max == 0) {
-		max = MAX_CONNECTION;
-	}
-	pool->cap = max;
-	int fd = event_init(max);
-	if (fd < 0) {
-		return 1;
-	}
-	pool->s = malloc(sizeof(struct socket) * max);
-	memset(pool->s, 0, sizeof(struct socket) * max);
-	pool->fd = fd;
-	pool->id = 1;
-
-	skynet_callback(ctx, pool, _cb);
-	skynet_command(ctx,"REG",".socket");
-	return 0;
-}
-
-struct socket_pool *
-socket_create(void) {
-	struct socket_pool *pool = malloc(sizeof(*pool));
-	memset(pool,0,sizeof(*pool));
-	pool->id = 1;
-	pool->fd = -1;
-	return pool;
-}
-
-void
-socket_release(struct socket_pool *pool) {
-	if (pool->fd >= 0) {
-		close(pool->fd);
-	}
-	int i;
-	for (i=0;i<pool->cap;i++) {
-		if (pool->s[i].status != STATUS_INVALID && pool->s[i].fd >=0) {
-			close(pool->s[i].fd);
-		}
-	}
-	free(pool->s);
-	free(pool);
-}
diff --git a/service/main.lua b/service/main.lua
index 31ab2a31..d68ab888 100644
--- a/service/main.lua
+++ b/service/main.lua
@@ -2,7 +2,6 @@ local skynet = require "skynet"
 
 skynet.start(function()
 	print("Server start")
-	skynet.launch("socket",128)
 	local service = skynet.newservice("service_mgr")
 	skynet.monitor "simplemonitor"
 	local lualog = skynet.newservice("lualog")
diff --git a/service/main_log.lua b/service/main_log.lua
index 500e8dab..477db27e 100644
--- a/service/main_log.lua
+++ b/service/main_log.lua
@@ -2,7 +2,6 @@ local skynet = require "skynet"
 
 skynet.start(function()
 	print("Log server start")
-	skynet.launch("socket",128)
 	local service = skynet.newservice("service_mgr")
 	skynet.monitor "simplemonitor"
 	local lualog = skynet.newservice("lualog")
diff --git a/service/testsocket.lua b/service/testsocket.lua
index 3e77b27d..608963d6 100644
--- a/service/testsocket.lua
+++ b/service/testsocket.lua
@@ -2,7 +2,7 @@ local skynet = require "skynet"
 local socket = require "socket"
 
 local function accepter(id)
-	socket.accept(id)
+	socket.start(id)
 	socket.write(id, "Hello Skynet\n")
 	while true do
 		local str = socket.readline(id,"\n")
diff --git a/skynet-src/skynet_socket.c b/skynet-src/skynet_socket.c
index 177f124d..29118139 100644
--- a/skynet-src/skynet_socket.c
+++ b/skynet-src/skynet_socket.c
@@ -130,7 +130,7 @@ skynet_socket_close(struct skynet_context *ctx, int id) {
 }
 
 void 
-skynet_socket_accept(struct skynet_context *ctx, int id) {
+skynet_socket_start(struct skynet_context *ctx, int id) {
 	uint32_t source = skynet_context_handle(ctx);
-	socket_server_accept(SOCKET_SERVER, source, id);
+	socket_server_start(SOCKET_SERVER, source, id);
 }
diff --git a/skynet-src/skynet_socket.h b/skynet-src/skynet_socket.h
index 97bf219a..c0a61fd7 100644
--- a/skynet-src/skynet_socket.h
+++ b/skynet-src/skynet_socket.h
@@ -26,6 +26,6 @@ int skynet_socket_listen(struct skynet_context *ctx, const char *host, int port,
 int skynet_socket_connect(struct skynet_context *ctx, const char *host, int port);
 int skynet_socket_bind(struct skynet_context *ctx, int fd);
 void skynet_socket_close(struct skynet_context *ctx, int id);
-void skynet_socket_accept(struct skynet_context *ctx, int id);
+void skynet_socket_start(struct skynet_context *ctx, int id);
 
 #endif
diff --git a/skynet-src/socket_server.c b/skynet-src/socket_server.c
index 25db4b6f..7395c2eb 100644
--- a/skynet-src/socket_server.c
+++ b/skynet-src/socket_server.c
@@ -17,15 +17,15 @@
 #define MAX_SOCKET_P 16
 #define MAX_EVENT 64
 #define MIN_READ_BUFFER 64
-
 #define SOCKET_TYPE_INVALID 0
 #define SOCKET_TYPE_RESERVE 1
-#define SOCKET_TYPE_LISTEN 2
-#define SOCKET_TYPE_CONNECTING 3
-#define SOCKET_TYPE_CONNECTED 4
-#define SOCKET_TYPE_HALFCLOSE 5
-#define SOCKET_TYPE_BIND 6
-#define SOCKET_TYPE_NOTACCEPT 7
+#define SOCKET_TYPE_PLISTEN 2
+#define SOCKET_TYPE_LISTEN 3
+#define SOCKET_TYPE_CONNECTING 4
+#define SOCKET_TYPE_CONNECTED 5
+#define SOCKET_TYPE_HALFCLOSE 6
+#define SOCKET_TYPE_PACCEPT 7
+#define SOCKET_TYPE_BIND 8
 
 #define MAX_SOCKET (1<<MAX_SOCKET_P)
 
@@ -90,7 +90,7 @@ struct request_bind {
 	uintptr_t opaque;
 };
 
-struct request_accept {
+struct request_start {
 	int id;
 	uintptr_t opaque;
 };
@@ -104,7 +104,7 @@ struct request_package {
 		struct request_close close;
 		struct request_listen listen;
 		struct request_bind bind;
-		struct request_accept accept;
+		struct request_start start;
 	} u;
 };
 
@@ -197,7 +197,7 @@ force_close(struct socket_server *ss, struct socket *s, struct socket_message *r
 		FREE(tmp);
 	}
 	s->head = s->tail = NULL;
-	if (s->type != SOCKET_TYPE_NOTACCEPT) {
+	if (s->type != SOCKET_TYPE_PACCEPT && s->type != SOCKET_TYPE_PLISTEN) {
 		sp_del(ss->event_fd, s->fd);
 	}
 	if (s->type != SOCKET_TYPE_BIND) {
@@ -354,10 +354,11 @@ send_socket(struct socket_server *ss, struct request_send * request, struct sock
 	struct socket * s = &ss->slot[id % MAX_SOCKET];
 	if (s->type == SOCKET_TYPE_INVALID || s->id != id 
 		|| s->type == SOCKET_TYPE_HALFCLOSE
-		|| s->type == SOCKET_TYPE_NOTACCEPT) {
+		|| s->type == SOCKET_TYPE_PACCEPT) {
 		FREE(request->buffer);
 		return -1;
 	}
+	assert(s->type != SOCKET_TYPE_PLISTEN && s->type != SOCKET_TYPE_LISTEN);
 	if (s->head == NULL) {
 		int n = write(s->fd, request->buffer, request->sz);
 		if (n<0) {
@@ -428,11 +429,11 @@ listen_socket(struct socket_server *ss, struct request_listen * request, struct
 	if (listen(listen_fd, request->backlog) == -1) {
 		goto _failed;
 	}
-	struct socket *s = new_fd(ss, id, listen_fd, request->opaque, true);
+	struct socket *s = new_fd(ss, id, listen_fd, request->opaque, false);
 	if (s == NULL) {
 		goto _failed;
 	}
-	s->type = SOCKET_TYPE_LISTEN;
+	s->type = SOCKET_TYPE_PLISTEN;
 	return -1;
 _failed:
 	close(listen_fd);
@@ -491,7 +492,7 @@ bind_socket(struct socket_server *ss, struct request_bind *request, struct socke
 }
 
 static int
-accept_socket(struct socket_server *ss, struct request_accept *request, struct socket_message *result) {
+start_socket(struct socket_server *ss, struct request_start *request, struct socket_message *result) {
 	int id = request->id;
 	result->id = id;
 	result->opaque = request->opaque;
@@ -501,16 +502,17 @@ accept_socket(struct socket_server *ss, struct request_accept *request, struct s
 	if (s->type == SOCKET_TYPE_INVALID || s->id !=id) {
 		return SOCKET_ERROR;
 	}
-	if (s->type == SOCKET_TYPE_NOTACCEPT) {
+	if (s->type == SOCKET_TYPE_PACCEPT || s->type == SOCKET_TYPE_PLISTEN) {
 		if (sp_add(ss->event_fd, s->fd, s)) {
 			s->type = SOCKET_TYPE_INVALID;
 			return SOCKET_ERROR;
 		}
+		s->type = (s->type == SOCKET_TYPE_PACCEPT) ? SOCKET_TYPE_CONNECTED : SOCKET_TYPE_LISTEN;
+		s->opaque = request->opaque;
+		result->data = "start";
+		return SOCKET_OPEN;
 	}
-	s->type = SOCKET_TYPE_CONNECTED;
-	s->opaque = request->opaque;
-	result->data = "accept";
-	return SOCKET_OPEN;
+	return -1;
 }
 
 static void
@@ -542,8 +544,8 @@ ctrl_cmd(struct socket_server *ss, struct socket_message *result) {
 	block_readpipe(fd, buffer, len);
 	// ctrl command only exist in local fd, so don't worry about endian.
 	switch (type) {
-	case 'A':
-		return accept_socket(ss,(struct request_accept *)buffer, result);
+	case 'S':
+		return start_socket(ss,(struct request_start *)buffer, result);
 	case 'B':
 		return bind_socket(ss,(struct request_bind *)buffer, result);
 	case 'L':
@@ -661,7 +663,7 @@ report_accept(struct socket_server *ss, struct socket *s, struct socket_message
 		close(client_fd);
 		return 0;
 	}
-	ns->type = SOCKET_TYPE_NOTACCEPT;
+	ns->type = SOCKET_TYPE_PACCEPT;
 	result->opaque = s->opaque;
 	result->id = s->id;
 	result->ud = id;
@@ -824,11 +826,11 @@ socket_server_bind(struct socket_server *ss, uintptr_t opaque, int fd) {
 }
 
 void 
-socket_server_accept(struct socket_server *ss, uintptr_t opaque, int id) {
+socket_server_start(struct socket_server *ss, uintptr_t opaque, int id) {
 	struct request_package request;
-	request.u.accept.id = id;
-	request.u.accept.opaque = opaque;
-	send_request(ss, &request, 'A', sizeof(request.u.accept));
+	request.u.start.id = id;
+	request.u.start.opaque = opaque;
+	send_request(ss, &request, 'S', sizeof(request.u.start));
 }
 
 
diff --git a/skynet-src/socket_server.h b/skynet-src/socket_server.h
index f1cb7d28..bad8140b 100644
--- a/skynet-src/socket_server.h
+++ b/skynet-src/socket_server.h
@@ -25,7 +25,7 @@ int socket_server_poll(struct socket_server *, struct socket_message *result);
 
 void socket_server_exit(struct socket_server *);
 void socket_server_close(struct socket_server *, uintptr_t opaque, int id);
-void socket_server_accept(struct socket_server *, uintptr_t opaque, int id);
+void socket_server_start(struct socket_server *, uintptr_t opaque, int id);
 
 // return -1 when error
 int socket_server_send(struct socket_server *, int id, const void * buffer, int sz);