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.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#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
… …
170{ 161{
171 struct sockaddr_in insock; 162 struct sockaddr_in insock;
172 struct protoent *protox; 163 struct protoent *protox;
173 struct linger linger_opt; 164 struct linger linger_opt;
174 165
175#ifdef HAVE_SYSCONF
176 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX); 166 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 167
185 socket_info.timeout.tv_sec = 0; 168 socket_info.timeout.tv_sec = 0;
186 socket_info.timeout.tv_usec = 0; 169 socket_info.timeout.tv_usec = 0;
187 socket_info.nconns = 0; 170 socket_info.nconns = 0;
188 171
… …
203 if (protox == NULL) 186 if (protox == NULL)
204 { 187 {
205 LOG (llevError, "init_ericserver: Error getting protox\n"); 188 LOG (llevError, "init_ericserver: Error getting protox\n");
206 return; 189 return;
207 } 190 }
191
208 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);
209 if (init_sockets[0].fd == -1) 193 if (init_sockets[0].fd == -1)
210 { 194 {
211 LOG (llevError, "Cannot create socket: %s\n", strerror (errno)); 195 LOG (llevError, "Cannot create socket: %s\n", strerror (errno));
212 exit (-1); 196 exit (-1);
213 } 197 }
198
214 insock.sin_family = AF_INET; 199 insock.sin_family = AF_INET;
215 insock.sin_port = htons (settings.csport); 200 insock.sin_port = htons (settings.csport);
216 insock.sin_addr.s_addr = htonl (INADDR_ANY); 201 insock.sin_addr.s_addr = htonl (INADDR_ANY);
217 202
218 linger_opt.l_onoff = 0; 203 linger_opt.l_onoff = 0;
219 linger_opt.l_linger = 0; 204 linger_opt.l_linger = 0;
220 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)))
221 {
222 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 206 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno));
223 }
224 207
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 { 208 {
235 int tmp = 1; 209 int tmp = 1;
236 210
237 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)))
238 {
239 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno)); 212 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
240 }
241 } 213 }
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 214
249 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))
250 { 216 {
251 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));
252 close (init_sockets[0].fd); 218 close (init_sockets[0].fd);
253 exit (-1); 219 exit (-1);
254 } 220 }
221
255 if (listen (init_sockets[0].fd, 5) == (-1)) 222 if (listen (init_sockets[0].fd, 5) == (-1))
256 { 223 {
257 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno)); 224 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno));
258 close (init_sockets[0].fd); 225 close (init_sockets[0].fd);
259 exit (-1); 226 exit (-1);
260 } 227 }
228
261 init_sockets[0].status = Ns_Add; 229 init_sockets[0].status = Ns_Add;
262 read_client_images (); 230 read_client_images ();
263} 231}
264 232
265 233
… …
284 * 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
285 * update the list 253 * update the list
286 */ 254 */
287 255
288void 256void
289free_newsocket (NewSocket * ns) 257free_newsocket (NewSocket *ns)
290{ 258{
291 if (close (ns->fd)) 259 close (ns->fd);
292 {
293
294#ifdef ESRV_DEBUG
295 LOG (llevDebug, "Error closing socket %d\n", ns->fd);
296#endif
297 }
298 260
299 if (ns->stats.range) 261 if (ns->stats.range)
300 free (ns->stats.range); 262 free (ns->stats.range);
301 263
302 if (ns->stats.title) 264 if (ns->stats.title)

Diff Legend

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