diff options
| author | TAW Dev <tawdev@taw> | 2009-07-06 11:49:58 -0400 |
|---|---|---|
| committer | TAW Dev <tawdev@taw> | 2009-07-06 11:49:58 -0400 |
| commit | e9c1a79b6306783d63655eca5ddbcca0b6d825d0 (patch) | |
| tree | 69116c5512190eba57b2ed2daa52f15e469ed36c /src/common/socket.c | |
| parent | d23c620a88ac71c68af195f5fe82b09ee171187f (diff) | |
| parent | ad8f53edc80811b933c9e2e0f469ef6e6a25972d (diff) | |
| download | tmwa-e9c1a79b6306783d63655eca5ddbcca0b6d825d0.tar.gz tmwa-e9c1a79b6306783d63655eca5ddbcca0b6d825d0.tar.bz2 tmwa-e9c1a79b6306783d63655eca5ddbcca0b6d825d0.tar.xz tmwa-e9c1a79b6306783d63655eca5ddbcca0b6d825d0.zip | |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/common/socket.c')
| -rw-r--r-- | src/common/socket.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/common/socket.c b/src/common/socket.c index 4543b6a..f968373 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -146,10 +146,15 @@ static int connect_client(int listen_fd) //printf("connect_client : %d\n",listen_fd); - len=sizeof(client_address); + len = sizeof(client_address); - fd=accept(listen_fd,(struct sockaddr*)&client_address,&len); - if(fd_max<=fd) fd_max=fd+1; + fd = accept(listen_fd,(struct sockaddr*)&client_address,&len); + if (fd_max <= fd) { + fd_max = fd + 1; + } else if (fd == -1) { + perror("accept"); + return -1; + } // setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,NULL,0); setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,(char *)&yes,sizeof yes); // reuse fix @@ -160,11 +165,7 @@ static int connect_client(int listen_fd) // setsockopt(fd,IPPROTO_TCP,TCP_NODELAY,NULL,0); setsockopt(fd,IPPROTO_TCP,TCP_NODELAY,(char *)&yes,sizeof yes); // reuse fix - if(fd==-1){ - perror("accept"); - } else { - FD_SET(fd,&readfds); - } + FD_SET(fd,&readfds); #ifdef LCCWIN32 { |