This commit is contained in:
云风
2014-02-28 13:53:01 +08:00
parent 6ba28cd442
commit 89b63126db

View File

@@ -127,7 +127,7 @@ socket_keepalive(int fd) {
}
static int
reverve_id(struct socket_server *ss) {
reserve_id(struct socket_server *ss) {
int i;
for (i=0;i<MAX_SOCKET;i++) {
int id = __sync_add_and_fetch(&(ss->alloc_id), 1);
@@ -669,7 +669,7 @@ report_accept(struct socket_server *ss, struct socket *s, struct socket_message
if (client_fd < 0) {
return 0;
}
int id = reverve_id(ss);
int id = reserve_id(ss);
if (id < 0) {
close(client_fd);
return 0;
@@ -782,7 +782,7 @@ open_request(struct socket_server *ss, struct request_package *req, uintptr_t op
fprintf(stderr, "socket-server : Invalid addr %s.\n",addr);
return 0;
}
int id = reverve_id(ss);
int id = reserve_id(ss);
req->u.open.opaque = opaque;
req->u.open.id = id;
req->u.open.port = port;
@@ -886,7 +886,7 @@ socket_server_listen(struct socket_server *ss, uintptr_t opaque, const char * ad
return -1;
}
struct request_package request;
int id = reverve_id(ss);
int id = reserve_id(ss);
request.u.listen.opaque = opaque;
request.u.listen.id = id;
request.u.listen.fd = fd;
@@ -897,7 +897,7 @@ socket_server_listen(struct socket_server *ss, uintptr_t opaque, const char * ad
int
socket_server_bind(struct socket_server *ss, uintptr_t opaque, int fd) {
struct request_package request;
int id = reverve_id(ss);
int id = reserve_id(ss);
request.u.bind.opaque = opaque;
request.u.bind.id = id;
request.u.bind.fd = fd;