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.13 by root, Thu Dec 14 01:12: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;
67 char buf[256];
68 int bufsize = 65535; /*Supposed absolute upper limit */ 64 int bufsize = 65535; /*Supposed absolute upper limit */
69 int oldbufsize; 65 int oldbufsize;
70 int buflen = sizeof (int); 66 int buflen = sizeof (int);
71 67
72 if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1) 68 if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1)
73 {
74 LOG (llevError, "InitConnection: Error on fcntl.\n"); 69 LOG (llevError, "InitConnection: Error on fcntl.\n");
75 }
76 70
77 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)
78 oldbufsize = 0; 72 oldbufsize = 0;
73
79 if (oldbufsize < bufsize) 74 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))) 75 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); 76 LOG (llevError, "InitConnection: setsockopt unable to set output buf size to %d\n", bufsize);
87 } 77
88 }
89 buflen = sizeof (oldbufsize); 78 buflen = sizeof (oldbufsize);
90 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);
91#ifdef ESRV_DEBUG 80#ifdef ESRV_DEBUG
92 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize); 81 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize);
93#endif 82#endif
… …
119 /* we should really do some checking here - if total clients overflows 108 /* 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 109 * we need to do something more intelligent, because client id's will start
121 * duplicating (not likely in normal cases, but malicous attacks that 110 * duplicating (not likely in normal cases, but malicous attacks that
122 * just open and close connections could get this total up. 111 * just open and close connections could get this total up.
123 */ 112 */
124 ns->inbuf.len = 0; 113 ns->inbuf_len = 0;
125 ns->inbuf.buf = (unsigned char *) malloc (sizeof (unsigned char) * MAXSOCKBUF); 114
126 /* Basic initialization. Needed because we do a check in 115 /* Basic initialization. Needed because we do a check in
127 * HandleClient for oldsocketmode without checking the 116 * HandleClient for oldsocketmode without checking the
128 * length of data. 117 * length of data.
129 */ 118 */
130 memset (ns->inbuf.buf, 0, sizeof (unsigned char) * MAXSOCKBUF);
131 memset (&ns->lastmap, 0, sizeof (struct Map)); 119 memset (&ns->lastmap, 0, sizeof (struct Map));
132 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));
133 memset (&ns->anims_sent, 0, sizeof (ns->anims_sent)); 121 memset (&ns->anims_sent, 0, sizeof (ns->anims_sent));
134 memset (&ns->stats, 0, sizeof (struct statsinfo)); 122 memset (&ns->stats, 0, sizeof (struct statsinfo));
135 /* 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
… …
149 ns->client[0] = 0; 137 ns->client[0] = 0;
150 ns->buggy_mapscroll = 0; 138 ns->buggy_mapscroll = 0;
151 139
152 ns->sent_scroll = 0; 140 ns->sent_scroll = 0;
153 ns->host = strdup_local (from_ip); 141 ns->host = strdup_local (from_ip);
142
143 {
144 SockList sl (MAXSOCKBUF);
145
154 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);
155 sl.buf = (unsigned char *) buf;
156 sl.len = strlen ((char *) buf);
157 Send_With_Handling (ns, &sl); 147 Send_With_Handling (ns, &sl);
148 sl.free ();
149 }
150
158#ifdef CS_LOGSTATS 151#ifdef CS_LOGSTATS
159 if (socket_info.nconns > cst_tot.max_conn) 152 if (socket_info.nconns > cst_tot.max_conn)
160 cst_tot.max_conn = socket_info.nconns; 153 cst_tot.max_conn = socket_info.nconns;
161 if (socket_info.nconns > cst_lst.max_conn) 154 if (socket_info.nconns > cst_lst.max_conn)
162 cst_lst.max_conn = socket_info.nconns; 155 cst_lst.max_conn = socket_info.nconns;
… …
170{ 163{
171 struct sockaddr_in insock; 164 struct sockaddr_in insock;
172 struct protoent *protox; 165 struct protoent *protox;
173 struct linger linger_opt; 166 struct linger linger_opt;
174 167
175#ifdef HAVE_SYSCONF
176 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX); 168 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 169
185 socket_info.timeout.tv_sec = 0; 170 socket_info.timeout.tv_sec = 0;
186 socket_info.timeout.tv_usec = 0; 171 socket_info.timeout.tv_usec = 0;
187 socket_info.nconns = 0; 172 socket_info.nconns = 0;
188 173
… …
203 if (protox == NULL) 188 if (protox == NULL)
204 { 189 {
205 LOG (llevError, "init_ericserver: Error getting protox\n"); 190 LOG (llevError, "init_ericserver: Error getting protox\n");
206 return; 191 return;
207 } 192 }
193
208 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto); 194 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto);
209 if (init_sockets[0].fd == -1) 195 if (init_sockets[0].fd == -1)
210 { 196 {
211 LOG (llevError, "Cannot create socket: %s\n", strerror (errno)); 197 LOG (llevError, "Cannot create socket: %s\n", strerror (errno));
212 exit (-1); 198 exit (-1);
213 } 199 }
200
214 insock.sin_family = AF_INET; 201 insock.sin_family = AF_INET;
215 insock.sin_port = htons (settings.csport); 202 insock.sin_port = htons (settings.csport);
216 insock.sin_addr.s_addr = htonl (INADDR_ANY); 203 insock.sin_addr.s_addr = htonl (INADDR_ANY);
217 204
218 linger_opt.l_onoff = 0; 205 linger_opt.l_onoff = 0;
219 linger_opt.l_linger = 0; 206 linger_opt.l_linger = 0;
220 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_LINGER, (char *) &linger_opt, sizeof (struct linger))) 207 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)); 208 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno));
223 }
224 209
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 { 210 {
235 int tmp = 1; 211 int tmp = 1;
236 212
237 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof (tmp))) 213 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)); 214 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
240 }
241 } 215 }
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 216
249 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1)) 217 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1))
250 { 218 {
251 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno)); 219 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno));
252 close (init_sockets[0].fd); 220 close (init_sockets[0].fd);
253 exit (-1); 221 exit (-1);
254 } 222 }
223
255 if (listen (init_sockets[0].fd, 5) == (-1)) 224 if (listen (init_sockets[0].fd, 5) == (-1))
256 { 225 {
257 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno)); 226 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno));
258 close (init_sockets[0].fd); 227 close (init_sockets[0].fd);
259 exit (-1); 228 exit (-1);
260 } 229 }
230
261 init_sockets[0].status = Ns_Add; 231 init_sockets[0].status = Ns_Add;
262 read_client_images (); 232 read_client_images ();
263} 233}
264 234
265 235
… …
284 * might be associated with the socket. It is up to the caller to 254 * might be associated with the socket. It is up to the caller to
285 * update the list 255 * update the list
286 */ 256 */
287 257
288void 258void
289free_newsocket (NewSocket * ns) 259free_newsocket (NewSocket *ns)
290{ 260{
291 if (close (ns->fd)) 261 close (ns->fd);
292 {
293
294#ifdef ESRV_DEBUG
295 LOG (llevDebug, "Error closing socket %d\n", ns->fd);
296#endif
297 }
298 262
299 if (ns->stats.range) 263 if (ns->stats.range)
300 free (ns->stats.range); 264 free (ns->stats.range);
301 265
302 if (ns->stats.title) 266 if (ns->stats.title)
303 free (ns->stats.title); 267 free (ns->stats.title);
304 268
305 free (ns->host); 269 free (ns->host);
306 free (ns->inbuf.buf);
307} 270}
308 271
309/** Sends the 'goodbye' command to the player, and closes connection. */ 272/** Sends the 'goodbye' command to the player, and closes connection. */
310void 273void
311final_free_player (player *pl) 274final_free_player (player *pl)
312{ 275{
313 cs_write_string (&pl->socket, "goodbye", 8); 276 pl->socket.send_packet ("goodbye");
314 free_newsocket (&pl->socket); 277 free_newsocket (&pl->socket);
315 free_player (pl); 278 free_player (pl);
316} 279}
280

Diff Legend

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