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.10 by pippijn, Mon Dec 11 19:46:47 2006 UTC vs.
Revision 1.12 by root, Thu Dec 14 00:01:35 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#include <sys/types.h> 38#include <sys/types.h>
41#include <sys/time.h> 39#include <sys/time.h>
42#include <sys/socket.h> 40#include <sys/socket.h>
43#include <netinet/in.h> 41#include <netinet/in.h>
44#include <netdb.h> 42#include <netdb.h>
… …
59 * Initializes a connection. Really, it just sets up the data structure, 57 * Initializes a connection. Really, it just sets up the data structure,
60 * 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
61 * client. 59 * client.
62 */ 60 */
63void 61void
64InitConnection (NewSocket * ns, const char *from_ip) 62InitConnection (NewSocket *ns, const char *from_ip)
65{ 63{
66 SockList sl; 64 SockList sl;
67 char buf[256]; 65 char buf[256];
68 int bufsize = 65535; /*Supposed absolute upper limit */ 66 int bufsize = 65535; /*Supposed absolute upper limit */
69 int oldbufsize; 67 int oldbufsize;
70 int buflen = sizeof (int); 68 int buflen = sizeof (int);
71 69
72 if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1) 70 if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1)
73 {
74 LOG (llevError, "InitConnection: Error on fcntl.\n"); 71 LOG (llevError, "InitConnection: Error on fcntl.\n");
75 }
76 72
77 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)
78 oldbufsize = 0; 74 oldbufsize = 0;
75
79 if (oldbufsize < bufsize) 76 if (oldbufsize < bufsize)
80 {
81#ifdef ESRV_DEBUG
82 LOG (llevDebug, "Default buffer size was %d bytes, will reset it to %d\n", oldbufsize, bufsize);
83#endif
84 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)))
85 {
86 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);
87 } 79
88 }
89 buflen = sizeof (oldbufsize); 80 buflen = sizeof (oldbufsize);
90 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);
91#ifdef ESRV_DEBUG 82#ifdef ESRV_DEBUG
92 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize); 83 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize);
93#endif 84#endif
… …
119 /* we should really do some checking here - if total clients overflows 110 /* we should really do some checking here - if total clients overflows
120 * we need to do something more intelligent, because client id's will start 111 * we need to do something more intelligent, because client id's will start
121 * duplicating (not likely in normal cases, but malicous attacks that 112 * duplicating (not likely in normal cases, but malicous attacks that
122 * just open and close connections could get this total up. 113 * just open and close connections could get this total up.
123 */ 114 */
124 ns->inbuf.len = 0; 115 ns->inbuf_len = 0;
125 ns->inbuf.buf = (unsigned char *) malloc (sizeof (unsigned char) * MAXSOCKBUF); 116
126 /* Basic initialization. Needed because we do a check in 117 /* Basic initialization. Needed because we do a check in
127 * HandleClient for oldsocketmode without checking the 118 * HandleClient for oldsocketmode without checking the
128 * length of data. 119 * length of data.
129 */ 120 */
130 memset (ns->inbuf.buf, 0, sizeof (unsigned char) * MAXSOCKBUF);
131 memset (&ns->lastmap, 0, sizeof (struct Map)); 121 memset (&ns->lastmap, 0, sizeof (struct Map));
132 memset (ns->faces_sent, 0, ns->faces_sent_len * sizeof (*ns->faces_sent)); 122 memset (ns->faces_sent, 0, ns->faces_sent_len * sizeof (*ns->faces_sent));
133 memset (&ns->anims_sent, 0, sizeof (ns->anims_sent)); 123 memset (&ns->anims_sent, 0, sizeof (ns->anims_sent));
134 memset (&ns->stats, 0, sizeof (struct statsinfo)); 124 memset (&ns->stats, 0, sizeof (struct statsinfo));
135 /* Do this so we don't send a face command for the client for 125 /* Do this so we don't send a face command for the client for
… …
170{ 160{
171 struct sockaddr_in insock; 161 struct sockaddr_in insock;
172 struct protoent *protox; 162 struct protoent *protox;
173 struct linger linger_opt; 163 struct linger linger_opt;
174 164
175#ifdef HAVE_SYSCONF
176 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX); 165 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX);
177#else
178# ifdef HAVE_GETDTABLESIZE
179 socket_info.max_filedescriptor = getdtablesize ();
180# else
181 "Unable to find usable function to get max filedescriptors";
182# endif
183#endif
184 166
185 socket_info.timeout.tv_sec = 0; 167 socket_info.timeout.tv_sec = 0;
186 socket_info.timeout.tv_usec = 0; 168 socket_info.timeout.tv_usec = 0;
187 socket_info.nconns = 0; 169 socket_info.nconns = 0;
188 170
… …
203 if (protox == NULL) 185 if (protox == NULL)
204 { 186 {
205 LOG (llevError, "init_ericserver: Error getting protox\n"); 187 LOG (llevError, "init_ericserver: Error getting protox\n");
206 return; 188 return;
207 } 189 }
190
208 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto); 191 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto);
209 if (init_sockets[0].fd == -1) 192 if (init_sockets[0].fd == -1)
210 { 193 {
211 LOG (llevError, "Cannot create socket: %s\n", strerror (errno)); 194 LOG (llevError, "Cannot create socket: %s\n", strerror (errno));
212 exit (-1); 195 exit (-1);
213 } 196 }
197
214 insock.sin_family = AF_INET; 198 insock.sin_family = AF_INET;
215 insock.sin_port = htons (settings.csport); 199 insock.sin_port = htons (settings.csport);
216 insock.sin_addr.s_addr = htonl (INADDR_ANY); 200 insock.sin_addr.s_addr = htonl (INADDR_ANY);
217 201
218 linger_opt.l_onoff = 0; 202 linger_opt.l_onoff = 0;
219 linger_opt.l_linger = 0; 203 linger_opt.l_linger = 0;
220 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_LINGER, (char *) &linger_opt, sizeof (struct linger))) 204 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_LINGER, (char *) &linger_opt, sizeof (struct linger)))
221 {
222 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 205 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno));
223 }
224 206
225/* Would be nice to have an autoconf check for this. It appears that
226 * these functions are both using the same calling syntax, just one
227 * of them needs extra valus passed.
228 */
229#if defined(__osf__) || defined(hpux) || defined(sgi) || defined(NeXT) || \
230 defined(__sun__) || defined(__linux__) || defined(SVR4) || \
231 defined(__FreeBSD__) || defined(__OpenBSD__) || \
232 defined(WIN32) /* ---win32 add this here */ || \
233 defined(__GNU__) /* HURD */
234 { 207 {
235 int tmp = 1; 208 int tmp = 1;
236 209
237 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof (tmp))) 210 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof (tmp)))
238 {
239 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno)); 211 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
240 }
241 } 212 }
242#else
243 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, (char *) NULL, 0))
244 {
245 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
246 }
247#endif
248 213
249 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1)) 214 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1))
250 { 215 {
251 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno)); 216 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno));
252 close (init_sockets[0].fd); 217 close (init_sockets[0].fd);
253 exit (-1); 218 exit (-1);
254 } 219 }
220
255 if (listen (init_sockets[0].fd, 5) == (-1)) 221 if (listen (init_sockets[0].fd, 5) == (-1))
256 { 222 {
257 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno)); 223 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno));
258 close (init_sockets[0].fd); 224 close (init_sockets[0].fd);
259 exit (-1); 225 exit (-1);
260 } 226 }
227
261 init_sockets[0].status = Ns_Add; 228 init_sockets[0].status = Ns_Add;
262 read_client_images (); 229 read_client_images ();
263} 230}
264 231
265 232
… …
284 * might be associated with the socket. It is up to the caller to 251 * might be associated with the socket. It is up to the caller to
285 * update the list 252 * update the list
286 */ 253 */
287 254
288void 255void
289free_newsocket (NewSocket * ns) 256free_newsocket (NewSocket *ns)
290{ 257{
291 if (close (ns->fd)) 258 close (ns->fd);
292 {
293
294#ifdef ESRV_DEBUG
295 LOG (llevDebug, "Error closing socket %d\n", ns->fd);
296#endif
297 }
298 259
299 if (ns->stats.range) 260 if (ns->stats.range)
300 free (ns->stats.range); 261 free (ns->stats.range);
301 262
302 if (ns->stats.title) 263 if (ns->stats.title)
303 free (ns->stats.title); 264 free (ns->stats.title);
304 265
305 free (ns->host); 266 free (ns->host);
306 free (ns->inbuf.buf);
307} 267}
308 268
309/** Sends the 'goodbye' command to the player, and closes connection. */ 269/** Sends the 'goodbye' command to the player, and closes connection. */
310void 270void
311final_free_player (player *pl) 271final_free_player (player *pl)

Diff Legend

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