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.8 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.14 by root, Thu Dec 14 01:21:58 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;
69 char buf[256];
70 int bufsize = 65535; /*Supposed absolute upper limit */ 64 int bufsize = 65535; /*Supposed absolute upper limit */
71 int oldbufsize; 65 int oldbufsize;
72 int buflen = sizeof (int); 66 int buflen = sizeof (int);
73 67
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) 68 if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1)
81 {
82 LOG (llevError, "InitConnection: Error on fcntl.\n"); 69 LOG (llevError, "InitConnection: Error on fcntl.\n");
83 }
84#endif /* end win32 */
85 70
86 if (getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1) 71 if (getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1)
87 oldbufsize = 0; 72 oldbufsize = 0;
73
88 if (oldbufsize < bufsize) 74 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))) 75 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); 76 LOG (llevError, "InitConnection: setsockopt unable to set output buf size to %d\n", bufsize);
96 } 77
97 }
98 buflen = sizeof (oldbufsize); 78 buflen = sizeof (oldbufsize);
99 getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen); 79 getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
100#ifdef ESRV_DEBUG 80#ifdef ESRV_DEBUG
101 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize); 81 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize);
102#endif 82#endif
… …
108 ns->exp64 = 0; 88 ns->exp64 = 0;
109 ns->monitor_spells = 0; 89 ns->monitor_spells = 0;
110 ns->mapmode = Map0Cmd; 90 ns->mapmode = Map0Cmd;
111 ns->darkness = 1; 91 ns->darkness = 1;
112 ns->status = Ns_Add; 92 ns->status = Ns_Add;
113 ns->comment = NULL;
114 ns->old_mode = (Old_Mode) 0;
115 ns->mapx = 11; 93 ns->mapx = 11;
116 ns->mapy = 11; 94 ns->mapy = 11;
117 ns->newmapcmd = 0; 95 ns->newmapcmd = 0;
118 ns->itemcmd = 1; /* Default is version item1 command */ 96 ns->itemcmd = 1; /* Default is version item1 command */
119 ns->ext_mapinfos = 0; /*extendedmapinfo datas */ 97 ns->ext_mapinfos = 0; /*extendedmapinfo datas */
… …
130 /* we should really do some checking here - if total clients overflows 108 /* we should really do some checking here - if total clients overflows
131 * we need to do something more intelligent, because client id's will start 109 * we need to do something more intelligent, because client id's will start
132 * duplicating (not likely in normal cases, but malicous attacks that 110 * duplicating (not likely in normal cases, but malicous attacks that
133 * just open and close connections could get this total up. 111 * just open and close connections could get this total up.
134 */ 112 */
135 ns->inbuf.len = 0; 113 ns->inbuf_len = 0;
136 ns->inbuf.buf = (unsigned char *) malloc (sizeof (unsigned char) * MAXSOCKBUF); 114
137 /* Basic initialization. Needed because we do a check in 115 /* Basic initialization. Needed because we do a check in
138 * HandleClient for oldsocketmode without checking the 116 * HandleClient for oldsocketmode without checking the
139 * length of data. 117 * length of data.
140 */ 118 */
141 memset (ns->inbuf.buf, 0, sizeof (unsigned char) * MAXSOCKBUF);
142 memset (&ns->lastmap, 0, sizeof (struct Map)); 119 memset (&ns->lastmap, 0, sizeof (struct Map));
143 memset (ns->faces_sent, 0, ns->faces_sent_len * sizeof (*ns->faces_sent)); 120 memset (ns->faces_sent, 0, ns->faces_sent_len * sizeof (*ns->faces_sent));
144 memset (&ns->anims_sent, 0, sizeof (ns->anims_sent)); 121 memset (&ns->anims_sent, 0, sizeof (ns->anims_sent));
145 memset (&ns->stats, 0, sizeof (struct statsinfo)); 122 memset (&ns->stats, 0, sizeof (struct statsinfo));
146 /* Do this so we don't send a face command for the client for 123 /* Do this so we don't send a face command for the client for
… …
160 ns->client[0] = 0; 137 ns->client[0] = 0;
161 ns->buggy_mapscroll = 0; 138 ns->buggy_mapscroll = 0;
162 139
163 ns->sent_scroll = 0; 140 ns->sent_scroll = 0;
164 ns->host = strdup_local (from_ip); 141 ns->host = strdup_local (from_ip);
142
143 {
144 packet sl;
145
165 sprintf ((char *) buf, "version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); 146 sl.printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
166 sl.buf = (unsigned char *) buf;
167 sl.len = strlen ((char *) buf);
168 Send_With_Handling (ns, &sl); 147 Send_With_Handling (ns, &sl);
148 }
149
169#ifdef CS_LOGSTATS 150#ifdef CS_LOGSTATS
170 if (socket_info.nconns > cst_tot.max_conn) 151 if (socket_info.nconns > cst_tot.max_conn)
171 cst_tot.max_conn = socket_info.nconns; 152 cst_tot.max_conn = socket_info.nconns;
172 if (socket_info.nconns > cst_lst.max_conn) 153 if (socket_info.nconns > cst_lst.max_conn)
173 cst_lst.max_conn = socket_info.nconns; 154 cst_lst.max_conn = socket_info.nconns;
… …
181{ 162{
182 struct sockaddr_in insock; 163 struct sockaddr_in insock;
183 struct protoent *protox; 164 struct protoent *protox;
184 struct linger linger_opt; 165 struct linger linger_opt;
185 166
186#ifdef WIN32 /* ***win32 - we init a windows socket */
187 WSADATA w;
188
189 socket_info.max_filedescriptor = 1; /* used in select, ignored in winsockets */
190 WSAStartup (0x0101, &w); /* this setup all socket stuff */
191 /* ill include no error tests here, winsocket 1.1 should always work */
192 /* except some old win95 versions without tcp/ip stack */
193#else /* non windows */
194
195# ifdef HAVE_SYSCONF
196 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX); 167 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX);
197# else
198# ifdef HAVE_GETDTABLESIZE
199 socket_info.max_filedescriptor = getdtablesize ();
200# else
201 "Unable to find usable function to get max filedescriptors";
202# endif
203# endif
204#endif /* win32 */
205 168
206 socket_info.timeout.tv_sec = 0; 169 socket_info.timeout.tv_sec = 0;
207 socket_info.timeout.tv_usec = 0; 170 socket_info.timeout.tv_usec = 0;
208 socket_info.nconns = 0; 171 socket_info.nconns = 0;
209 172
… …
224 if (protox == NULL) 187 if (protox == NULL)
225 { 188 {
226 LOG (llevError, "init_ericserver: Error getting protox\n"); 189 LOG (llevError, "init_ericserver: Error getting protox\n");
227 return; 190 return;
228 } 191 }
192
229 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto); 193 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto);
230 if (init_sockets[0].fd == -1) 194 if (init_sockets[0].fd == -1)
231 { 195 {
232 LOG (llevError, "Cannot create socket: %s\n", strerror (errno)); 196 LOG (llevError, "Cannot create socket: %s\n", strerror (errno));
233 exit (-1); 197 exit (-1);
234 } 198 }
199
235 insock.sin_family = AF_INET; 200 insock.sin_family = AF_INET;
236 insock.sin_port = htons (settings.csport); 201 insock.sin_port = htons (settings.csport);
237 insock.sin_addr.s_addr = htonl (INADDR_ANY); 202 insock.sin_addr.s_addr = htonl (INADDR_ANY);
238 203
239 linger_opt.l_onoff = 0; 204 linger_opt.l_onoff = 0;
240 linger_opt.l_linger = 0; 205 linger_opt.l_linger = 0;
241 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_LINGER, (char *) &linger_opt, sizeof (struct linger))) 206 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_LINGER, (char *) &linger_opt, sizeof (struct linger)))
242 {
243 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 207 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno));
244 }
245 208
246/* Would be nice to have an autoconf check for this. It appears that
247 * these functions are both using the same calling syntax, just one
248 * of them needs extra valus passed.
249 */
250#if defined(__osf__) || defined(hpux) || defined(sgi) || defined(NeXT) || \
251 defined(__sun__) || defined(__linux__) || defined(SVR4) || \
252 defined(__FreeBSD__) || defined(__OpenBSD__) || \
253 defined(WIN32) /* ---win32 add this here */ || \
254 defined(__GNU__) /* HURD */
255 { 209 {
256# ifdef WIN32
257 char tmp = 1;
258# else
259 int tmp = 1; 210 int tmp = 1;
260# endif
261 211
262 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof (tmp))) 212 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof (tmp)))
263 {
264 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno)); 213 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
265 }
266 } 214 }
267#else
268 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, (char *) NULL, 0))
269 {
270 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
271 }
272#endif
273 215
274 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1)) 216 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1))
275 { 217 {
276 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno)); 218 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno));
277#ifdef WIN32 /* ***win32: close() -> closesocket() */
278 shutdown (init_sockets[0].fd, SD_BOTH);
279 closesocket (init_sockets[0].fd);
280#else
281 close (init_sockets[0].fd); 219 close (init_sockets[0].fd);
282#endif /* win32 */
283 exit (-1); 220 exit (-1);
284 } 221 }
222
285 if (listen (init_sockets[0].fd, 5) == (-1)) 223 if (listen (init_sockets[0].fd, 5) == (-1))
286 { 224 {
287 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno)); 225 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno));
288#ifdef WIN32 /* ***win32: close() -> closesocket() */
289 shutdown (init_sockets[0].fd, SD_BOTH);
290 closesocket (init_sockets[0].fd);
291#else
292 close (init_sockets[0].fd); 226 close (init_sockets[0].fd);
293#endif /* win32 */
294 exit (-1); 227 exit (-1);
295 } 228 }
229
296 init_sockets[0].status = Ns_Add; 230 init_sockets[0].status = Ns_Add;
297 read_client_images (); 231 read_client_images ();
298} 232}
299 233
300 234
… …
319 * might be associated with the socket. It is up to the caller to 253 * might be associated with the socket. It is up to the caller to
320 * update the list 254 * update the list
321 */ 255 */
322 256
323void 257void
324free_newsocket (NewSocket * ns) 258free_newsocket (NewSocket *ns)
325{ 259{
326#ifdef WIN32 /* ***win32: closesocket in windows style */
327 shutdown (ns->fd, SD_BOTH);
328 if (closesocket (ns->fd))
329 {
330#else
331 if (close (ns->fd)) 260 close (ns->fd);
332 {
333#endif /* win32 */
334 261
335#ifdef ESRV_DEBUG
336 LOG (llevDebug, "Error closing socket %d\n", ns->fd);
337#endif
338 }
339 if (ns->stats.range) 262 if (ns->stats.range)
340 free (ns->stats.range); 263 free (ns->stats.range);
264
341 if (ns->stats.title) 265 if (ns->stats.title)
342 free (ns->stats.title); 266 free (ns->stats.title);
343 if (ns->comment) 267
344 free (ns->comment);
345 free (ns->host); 268 free (ns->host);
346 free (ns->inbuf.buf);
347} 269}
348 270
349/** Sends the 'goodbye' command to the player, and closes connection. */ 271/** Sends the 'goodbye' command to the player, and closes connection. */
350void 272void
351final_free_player (player *pl) 273final_free_player (player *pl)
352{ 274{
353 cs_write_string (&pl->socket, "goodbye", 8); 275 pl->socket.send_packet ("goodbye");
354 free_newsocket (&pl->socket); 276 free_newsocket (&pl->socket);
355 free_player (pl); 277 free_player (pl);
356} 278}
279

Diff Legend

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