ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/init.C
(Generate patch)

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.9 by root, Wed Sep 20 21:53:50 2006 UTC vs.
Revision 1.11 by root, Wed Dec 13 02:55:51 2006 UTC

… …
32 * The reading of data is handled in ericserver.c 32 * The reading of data is handled in ericserver.c
33 */ 33 */
34 34
35 35
36#include <global.h> 36#include <global.h>
37#ifndef __CEXTRACT__
38# include <sproto.h> 37#include <sproto.h>
39#endif
40#ifndef WIN32 /* ---win32 exclude include files */
41# include <sys/types.h> 38#include <sys/types.h>
42# include <sys/time.h> 39#include <sys/time.h>
43# include <sys/socket.h> 40#include <sys/socket.h>
44# include <netinet/in.h> 41#include <netinet/in.h>
45# include <netdb.h> 42#include <netdb.h>
46#endif /* win32 */
47 43
48#ifdef HAVE_UNISTD_H 44#ifdef HAVE_UNISTD_H
49# include <unistd.h> 45# include <unistd.h>
50#endif 46#endif
51 47
… …
61 * Initializes a connection. Really, it just sets up the data structure, 57 * Initializes a connection. Really, it just sets up the data structure,
62 * socket setup is handled elsewhere. We do send a version to the 58 * socket setup is handled elsewhere. We do send a version to the
63 * client. 59 * client.
64 */ 60 */
65void 61void
66InitConnection (NewSocket * ns, const char *from_ip) 62InitConnection (NewSocket *ns, const char *from_ip)
67{ 63{
68 SockList sl; 64 SockList sl;
69 char buf[256]; 65 char buf[256];
70 int bufsize = 65535; /*Supposed absolute upper limit */ 66 int bufsize = 65535; /*Supposed absolute upper limit */
71 int oldbufsize; 67 int oldbufsize;
72 int buflen = sizeof (int); 68 int buflen = sizeof (int);
73 69
74#ifdef WIN32 /* ***WIN32 SOCKET: init win32 non blocking socket */
75 int temp = 1;
76
77 if (ioctlsocket (ns->fd, FIONBIO, &temp) == -1)
78 LOG (llevError, "InitConnection: Error on ioctlsocket.\n");
79#else
80 if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1) 70 if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1)
81 {
82 LOG (llevError, "InitConnection: Error on fcntl.\n"); 71 LOG (llevError, "InitConnection: Error on fcntl.\n");
83 }
84#endif /* end win32 */
85 72
86 if (getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1) 73 if (getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1)
87 oldbufsize = 0; 74 oldbufsize = 0;
75
88 if (oldbufsize < bufsize) 76 if (oldbufsize < bufsize)
89 {
90#ifdef ESRV_DEBUG
91 LOG (llevDebug, "Default buffer size was %d bytes, will reset it to %d\n", oldbufsize, bufsize);
92#endif
93 if (setsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &bufsize, sizeof (&bufsize))) 77 if (setsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &bufsize, sizeof (&bufsize)))
94 {
95 LOG (llevError, "InitConnection: setsockopt unable to set output buf size to %d\n", bufsize); 78 LOG (llevError, "InitConnection: setsockopt unable to set output buf size to %d\n", bufsize);
96 } 79
97 }
98 buflen = sizeof (oldbufsize); 80 buflen = sizeof (oldbufsize);
99 getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen); 81 getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
100#ifdef ESRV_DEBUG 82#ifdef ESRV_DEBUG
101 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize); 83 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize);
102#endif 84#endif
… …
179{ 161{
180 struct sockaddr_in insock; 162 struct sockaddr_in insock;
181 struct protoent *protox; 163 struct protoent *protox;
182 struct linger linger_opt; 164 struct linger linger_opt;
183 165
184#ifdef WIN32 /* ***win32 - we init a windows socket */
185 WSADATA w;
186
187 socket_info.max_filedescriptor = 1; /* used in select, ignored in winsockets */
188 WSAStartup (0x0101, &w); /* this setup all socket stuff */
189 /* ill include no error tests here, winsocket 1.1 should always work */
190 /* except some old win95 versions without tcp/ip stack */
191#else /* non windows */
192
193# ifdef HAVE_SYSCONF
194 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX); 166 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX);
195# else
196# ifdef HAVE_GETDTABLESIZE
197 socket_info.max_filedescriptor = getdtablesize ();
198# else
199 "Unable to find usable function to get max filedescriptors";
200# endif
201# endif
202#endif /* win32 */
203 167
204 socket_info.timeout.tv_sec = 0; 168 socket_info.timeout.tv_sec = 0;
205 socket_info.timeout.tv_usec = 0; 169 socket_info.timeout.tv_usec = 0;
206 socket_info.nconns = 0; 170 socket_info.nconns = 0;
207 171
… …
222 if (protox == NULL) 186 if (protox == NULL)
223 { 187 {
224 LOG (llevError, "init_ericserver: Error getting protox\n"); 188 LOG (llevError, "init_ericserver: Error getting protox\n");
225 return; 189 return;
226 } 190 }
191
227 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto); 192 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto);
228 if (init_sockets[0].fd == -1) 193 if (init_sockets[0].fd == -1)
229 { 194 {
230 LOG (llevError, "Cannot create socket: %s\n", strerror (errno)); 195 LOG (llevError, "Cannot create socket: %s\n", strerror (errno));
231 exit (-1); 196 exit (-1);
232 } 197 }
198
233 insock.sin_family = AF_INET; 199 insock.sin_family = AF_INET;
234 insock.sin_port = htons (settings.csport); 200 insock.sin_port = htons (settings.csport);
235 insock.sin_addr.s_addr = htonl (INADDR_ANY); 201 insock.sin_addr.s_addr = htonl (INADDR_ANY);
236 202
237 linger_opt.l_onoff = 0; 203 linger_opt.l_onoff = 0;
238 linger_opt.l_linger = 0; 204 linger_opt.l_linger = 0;
239 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_LINGER, (char *) &linger_opt, sizeof (struct linger))) 205 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_LINGER, (char *) &linger_opt, sizeof (struct linger)))
240 {
241 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 206 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno));
242 }
243 207
244/* Would be nice to have an autoconf check for this. It appears that
245 * these functions are both using the same calling syntax, just one
246 * of them needs extra valus passed.
247 */
248#if defined(__osf__) || defined(hpux) || defined(sgi) || defined(NeXT) || \
249 defined(__sun__) || defined(__linux__) || defined(SVR4) || \
250 defined(__FreeBSD__) || defined(__OpenBSD__) || \
251 defined(WIN32) /* ---win32 add this here */ || \
252 defined(__GNU__) /* HURD */
253 { 208 {
254# ifdef WIN32
255 char tmp = 1;
256# else
257 int tmp = 1; 209 int tmp = 1;
258# endif
259 210
260 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof (tmp))) 211 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof (tmp)))
261 {
262 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno)); 212 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
263 }
264 } 213 }
265#else
266 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, (char *) NULL, 0))
267 {
268 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
269 }
270#endif
271 214
272 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1)) 215 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1))
273 { 216 {
274 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno)); 217 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno));
275#ifdef WIN32 /* ***win32: close() -> closesocket() */
276 shutdown (init_sockets[0].fd, SD_BOTH);
277 closesocket (init_sockets[0].fd);
278#else
279 close (init_sockets[0].fd); 218 close (init_sockets[0].fd);
280#endif /* win32 */
281 exit (-1); 219 exit (-1);
282 } 220 }
221
283 if (listen (init_sockets[0].fd, 5) == (-1)) 222 if (listen (init_sockets[0].fd, 5) == (-1))
284 { 223 {
285 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno)); 224 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno));
286#ifdef WIN32 /* ***win32: close() -> closesocket() */
287 shutdown (init_sockets[0].fd, SD_BOTH);
288 closesocket (init_sockets[0].fd);
289#else
290 close (init_sockets[0].fd); 225 close (init_sockets[0].fd);
291#endif /* win32 */
292 exit (-1); 226 exit (-1);
293 } 227 }
228
294 init_sockets[0].status = Ns_Add; 229 init_sockets[0].status = Ns_Add;
295 read_client_images (); 230 read_client_images ();
296} 231}
297 232
298 233
… …
317 * might be associated with the socket. It is up to the caller to 252 * might be associated with the socket. It is up to the caller to
318 * update the list 253 * update the list
319 */ 254 */
320 255
321void 256void
322free_newsocket (NewSocket * ns) 257free_newsocket (NewSocket *ns)
323{ 258{
324#ifdef WIN32 /* ***win32: closesocket in windows style */
325 shutdown (ns->fd, SD_BOTH);
326 if (closesocket (ns->fd))
327 {
328#else
329 if (close (ns->fd)) 259 close (ns->fd);
330 {
331#endif /* win32 */
332
333#ifdef ESRV_DEBUG
334 LOG (llevDebug, "Error closing socket %d\n", ns->fd);
335#endif
336 }
337 260
338 if (ns->stats.range) 261 if (ns->stats.range)
339 free (ns->stats.range); 262 free (ns->stats.range);
340 263
341 if (ns->stats.title) 264 if (ns->stats.title)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines