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.15 by root, Thu Dec 14 02:37:37 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>
… …
51# include <arpa/inet.h> 49# include <arpa/inet.h>
52#endif 50#endif
53#include <newserver.h> 51#include <newserver.h>
54 52
55Socket_Info socket_info; 53Socket_Info socket_info;
56NewSocket *init_sockets; 54client_socket *init_sockets;
55
56client_socket::client_socket ()
57{
58}
59
60client_socket::~client_socket ()
61{
62}
57 63
58/** 64/**
59 * Initializes a connection. Really, it just sets up the data structure, 65 * Initializes a connection. Really, it just sets up the data structure,
60 * socket setup is handled elsewhere. We do send a version to the 66 * socket setup is handled elsewhere. We do send a version to the
61 * client. 67 * client.
62 */ 68 */
63void 69void
64InitConnection (NewSocket * ns, const char *from_ip) 70client_socket::init (const char *from_ip)
65{ 71{
66 SockList sl;
67 char buf[256];
68 int bufsize = 65535; /*Supposed absolute upper limit */ 72 int bufsize = 65535; /*Supposed absolute upper limit */
69 int oldbufsize; 73 int oldbufsize;
70 int buflen = sizeof (int); 74 int buflen = sizeof (int);
71 75
72 if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1) 76 if (fcntl (fd, F_SETFL, O_NONBLOCK) == -1)
73 {
74 LOG (llevError, "InitConnection: Error on fcntl.\n"); 77 LOG (llevError, "InitConnection: Error on fcntl.\n");
75 }
76 78
77 if (getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1) 79 if (getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1)
78 oldbufsize = 0; 80 oldbufsize = 0;
81
79 if (oldbufsize < bufsize) 82 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))) 83 if (setsockopt (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); 84 LOG (llevError, "InitConnection: setsockopt unable to set output buf size to %d\n", bufsize);
87 } 85
88 }
89 buflen = sizeof (oldbufsize); 86 buflen = sizeof (oldbufsize);
90 getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen); 87 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
91#ifdef ESRV_DEBUG 88#ifdef ESRV_DEBUG
92 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize); 89 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize);
93#endif 90#endif
94 91
95 ns->faceset = 0; 92 faceset = 0;
96 ns->facecache = 0; 93 facecache = 0;
97 ns->image2 = 0; 94 image2 = 0;
98 ns->sound = 0; 95 sound = 0;
99 ns->exp64 = 0; 96 exp64 = 0;
100 ns->monitor_spells = 0; 97 monitor_spells = 0;
101 ns->mapmode = Map0Cmd; 98 mapmode = Map0Cmd;
102 ns->darkness = 1; 99 darkness = 1;
103 ns->status = Ns_Add; 100 status = Ns_Add;
104 ns->mapx = 11; 101 mapx = 11;
105 ns->mapy = 11; 102 mapy = 11;
106 ns->newmapcmd = 0; 103 newmapcmd = 0;
107 ns->itemcmd = 1; /* Default is version item1 command */ 104 itemcmd = 1; /* Default is version item1 command */
108 ns->ext_mapinfos = 0; /*extendedmapinfo datas */ 105 ext_mapinfos = 0; /*extendedmapinfo datas */
109 ns->EMI_smooth = 0; 106 EMI_smooth = 0;
110 ns->look_position = 0; 107 look_position = 0;
111 ns->update_look = 0; 108 update_look = 0;
112 ns->has_readable_type = 0; 109 has_readable_type = 0;
113 ns->supported_readables = 0; 110 supported_readables = 0;
114 ns->monitor_spells = 0; 111 monitor_spells = 0;
115 ns->mapinfocmd = 0; 112 mapinfocmd = 0;
116 ns->extcmd = 0; 113 extcmd = 0;
117 ns->extmap = 0; 114 extmap = 0;
118 115
119 /* we should really do some checking here - if total clients overflows 116 /* 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 117 * we need to do something more intelligent, because client id's will start
121 * duplicating (not likely in normal cases, but malicous attacks that 118 * duplicating (not likely in normal cases, but malicous attacks that
122 * just open and close connections could get this total up. 119 * just open and close connections could get this total up.
123 */ 120 */
124 ns->inbuf.len = 0; 121 inbuf_len = 0;
125 ns->inbuf.buf = (unsigned char *) malloc (sizeof (unsigned char) * MAXSOCKBUF); 122
126 /* Basic initialization. Needed because we do a check in 123 /* Basic initialization. Needed because we do a check in
127 * HandleClient for oldsocketmode without checking the 124 * HandleClient for oldsocketmode without checking the
128 * length of data. 125 * length of data.
129 */ 126 */
130 memset (ns->inbuf.buf, 0, sizeof (unsigned char) * MAXSOCKBUF);
131 memset (&ns->lastmap, 0, sizeof (struct Map)); 127 memset (&lastmap, 0, sizeof (struct Map));
132 memset (ns->faces_sent, 0, ns->faces_sent_len * sizeof (*ns->faces_sent)); 128 memset (faces_sent, 0, faces_sent_len * sizeof (*faces_sent));
133 memset (&ns->anims_sent, 0, sizeof (ns->anims_sent)); 129 memset (&anims_sent, 0, sizeof (anims_sent));
134 memset (&ns->stats, 0, sizeof (struct statsinfo)); 130 memset (&stats, 0, sizeof (struct statsinfo));
135 /* Do this so we don't send a face command for the client for 131 /* Do this so we don't send a face command for the client for
136 * this face. Face 0 is sent to the client to say clear 132 * this face. Face 0 is sent to the client to say clear
137 * face information. 133 * face information.
138 */ 134 */
139 ns->faces_sent[0] = NS_FACESENT_FACE; 135 faces_sent[0] = NS_FACESENT_FACE;
140 136
141 ns->outputbuffer.start = 0; 137 outputbuffer.start = 0;
142 ns->outputbuffer.len = 0; 138 outputbuffer.len = 0;
143 ns->can_write = 1; 139 can_write = 1;
144 ns->password_fails = 0; 140 password_fails = 0;
145 141
146 ns->current_map = 0; 142 current_map = 0;
147 ns->current_x = 0; 143 current_x = 0;
148 ns->current_y = 0; 144 current_y = 0;
149 ns->client[0] = 0; 145 client[0] = 0;
150 ns->buggy_mapscroll = 0; 146 buggy_mapscroll = 0;
151 147
152 ns->sent_scroll = 0; 148 sent_scroll = 0;
153 ns->host = strdup_local (from_ip); 149 host = strdup_local (from_ip);
150
151 {
152 packet sl;
154 sprintf ((char *) buf, "version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); 153 sl.printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
155 sl.buf = (unsigned char *) buf; 154 send_packet (sl);
156 sl.len = strlen ((char *) buf); 155 }
157 Send_With_Handling (ns, &sl); 156
158#ifdef CS_LOGSTATS
159 if (socket_info.nconns > cst_tot.max_conn) 157 if (socket_info.nconns > cst_tot.max_conn)
160 cst_tot.max_conn = socket_info.nconns; 158 cst_tot.max_conn = socket_info.nconns;
161 if (socket_info.nconns > cst_lst.max_conn) 159 if (socket_info.nconns > cst_lst.max_conn)
162 cst_lst.max_conn = socket_info.nconns; 160 cst_lst.max_conn = socket_info.nconns;
163#endif
164} 161}
165 162
166 163
167/** This sets up the socket and reads all the image information into memory. */ 164/** This sets up the socket and reads all the image information into memory. */
168void 165void
… …
170{ 167{
171 struct sockaddr_in insock; 168 struct sockaddr_in insock;
172 struct protoent *protox; 169 struct protoent *protox;
173 struct linger linger_opt; 170 struct linger linger_opt;
174 171
175#ifdef HAVE_SYSCONF
176 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX); 172 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 173
185 socket_info.timeout.tv_sec = 0; 174 socket_info.timeout.tv_sec = 0;
186 socket_info.timeout.tv_usec = 0; 175 socket_info.timeout.tv_usec = 0;
187 socket_info.nconns = 0; 176 socket_info.nconns = 0;
188 177
189#ifdef CS_LOGSTATS
190 memset (&cst_tot, 0, sizeof (CS_Stats)); 178 memset (&cst_tot, 0, sizeof (CS_Stats));
191 memset (&cst_lst, 0, sizeof (CS_Stats)); 179 memset (&cst_lst, 0, sizeof (CS_Stats));
192 cst_tot.time_start = time (NULL); 180 cst_tot.time_start = time (NULL);
193 cst_lst.time_start = time (NULL); 181 cst_lst.time_start = time (NULL);
194#endif
195 182
196 LOG (llevDebug, "Initialize new client/server data\n"); 183 LOG (llevDebug, "Initialize new client/server data\n");
197 socket_info.nconns = 1; 184 socket_info.nconns = 1;
198 init_sockets = (NewSocket *) malloc (sizeof (NewSocket)); 185 init_sockets = (client_socket *) malloc (sizeof (client_socket));
199 init_sockets[0].faces_sent = NULL; /* unused */ 186 init_sockets[0].faces_sent = NULL; /* unused */
200 socket_info.allocated_sockets = 1; 187 socket_info.allocated_sockets = 1;
201 188
202 protox = getprotobyname ("tcp"); 189 protox = getprotobyname ("tcp");
203 if (protox == NULL) 190 if (protox == NULL)
204 { 191 {
205 LOG (llevError, "init_ericserver: Error getting protox\n"); 192 LOG (llevError, "init_ericserver: Error getting protox\n");
206 return; 193 return;
207 } 194 }
195
208 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto); 196 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto);
209 if (init_sockets[0].fd == -1) 197 if (init_sockets[0].fd == -1)
210 { 198 {
211 LOG (llevError, "Cannot create socket: %s\n", strerror (errno)); 199 LOG (llevError, "Cannot create socket: %s\n", strerror (errno));
212 exit (-1); 200 exit (-1);
213 } 201 }
202
214 insock.sin_family = AF_INET; 203 insock.sin_family = AF_INET;
215 insock.sin_port = htons (settings.csport); 204 insock.sin_port = htons (settings.csport);
216 insock.sin_addr.s_addr = htonl (INADDR_ANY); 205 insock.sin_addr.s_addr = htonl (INADDR_ANY);
217 206
218 linger_opt.l_onoff = 0; 207 linger_opt.l_onoff = 0;
219 linger_opt.l_linger = 0; 208 linger_opt.l_linger = 0;
220 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_LINGER, (char *) &linger_opt, sizeof (struct linger))) 209 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)); 210 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno));
223 }
224 211
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 { 212 {
235 int tmp = 1; 213 int tmp = 1;
236 214
237 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof (tmp))) 215 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)); 216 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
240 }
241 } 217 }
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 218
249 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1)) 219 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1))
250 { 220 {
251 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno)); 221 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno));
252 close (init_sockets[0].fd); 222 close (init_sockets[0].fd);
253 exit (-1); 223 exit (-1);
254 } 224 }
225
255 if (listen (init_sockets[0].fd, 5) == (-1)) 226 if (listen (init_sockets[0].fd, 5) == (-1))
256 { 227 {
257 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno)); 228 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno));
258 close (init_sockets[0].fd); 229 close (init_sockets[0].fd);
259 exit (-1); 230 exit (-1);
260 } 231 }
232
261 init_sockets[0].status = Ns_Add; 233 init_sockets[0].status = Ns_Add;
262 read_client_images (); 234 read_client_images ();
263} 235}
264 236
265 237
… …
284 * might be associated with the socket. It is up to the caller to 256 * might be associated with the socket. It is up to the caller to
285 * update the list 257 * update the list
286 */ 258 */
287 259
288void 260void
289free_newsocket (NewSocket * ns) 261free_newsocket (client_socket *ns)
290{ 262{
291 if (close (ns->fd)) 263 close (ns->fd);
292 {
293
294#ifdef ESRV_DEBUG
295 LOG (llevDebug, "Error closing socket %d\n", ns->fd);
296#endif
297 }
298 264
299 if (ns->stats.range) 265 if (ns->stats.range)
300 free (ns->stats.range); 266 free (ns->stats.range);
301 267
302 if (ns->stats.title) 268 if (ns->stats.title)
303 free (ns->stats.title); 269 free (ns->stats.title);
304 270
305 free (ns->host); 271 free (ns->host);
306 free (ns->inbuf.buf);
307} 272}
308 273
309/** Sends the 'goodbye' command to the player, and closes connection. */ 274/** Sends the 'goodbye' command to the player, and closes connection. */
310void 275void
311final_free_player (player *pl) 276final_free_player (player *pl)
312{ 277{
313 cs_write_string (&pl->socket, "goodbye", 8); 278 pl->socket.send_packet ("goodbye");
314 free_newsocket (&pl->socket); 279 free_newsocket (&pl->socket);
315 free_player (pl); 280 free_player (pl);
316} 281}
282

Diff Legend

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