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.6 by root, Wed Aug 30 16:30:37 2006 UTC vs.
Revision 1.7 by root, Sun Sep 10 13:43:33 2006 UTC

1
1/* 2/*
2 * static char *rcsid_init_c = 3 * static char *rcsid_init_c =
3 * "$Id: init.C,v 1.6 2006/08/30 16:30:37 root Exp $"; 4 * "$Id: init.C,v 1.7 2006/09/10 13:43:33 root Exp $";
4 */ 5 */
5 6
6/* 7/*
7 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
8 9
… …
38 */ 39 */
39 40
40 41
41#include <global.h> 42#include <global.h>
42#ifndef __CEXTRACT__ 43#ifndef __CEXTRACT__
43#include <sproto.h> 44# include <sproto.h>
44#endif 45#endif
45#ifndef WIN32 /* ---win32 exclude include files */ 46#ifndef WIN32 /* ---win32 exclude include files */
46#include <sys/types.h> 47# include <sys/types.h>
47#include <sys/time.h> 48# include <sys/time.h>
48#include <sys/socket.h> 49# include <sys/socket.h>
49#include <netinet/in.h> 50# include <netinet/in.h>
50#include <netdb.h> 51# include <netdb.h>
51#endif /* win32 */ 52#endif /* win32 */
52 53
53#ifdef HAVE_UNISTD_H 54#ifdef HAVE_UNISTD_H
54#include <unistd.h> 55# include <unistd.h>
55#endif 56#endif
56 57
57#ifdef HAVE_ARPA_INET_H 58#ifdef HAVE_ARPA_INET_H
58#include <arpa/inet.h> 59# include <arpa/inet.h>
59#endif 60#endif
60#include <newserver.h> 61#include <newserver.h>
61 62
62Socket_Info socket_info; 63Socket_Info socket_info;
63NewSocket *init_sockets; 64NewSocket *init_sockets;
… …
65/** 66/**
66 * Initializes a connection. Really, it just sets up the data structure, 67 * Initializes a connection. Really, it just sets up the data structure,
67 * socket setup is handled elsewhere. We do send a version to the 68 * socket setup is handled elsewhere. We do send a version to the
68 * client. 69 * client.
69 */ 70 */
71void
70void InitConnection(NewSocket *ns, const char *from_ip) 72InitConnection (NewSocket * ns, const char *from_ip)
71{ 73{
72 SockList sl; 74 SockList sl;
73 char buf[256]; 75 char buf[256];
74 int bufsize=65535; /*Supposed absolute upper limit */ 76 int bufsize = 65535; /*Supposed absolute upper limit */
75 int oldbufsize; 77 int oldbufsize;
76 int buflen=sizeof(int); 78 int buflen = sizeof (int);
77 79
78#ifdef WIN32 /* ***WIN32 SOCKET: init win32 non blocking socket */ 80#ifdef WIN32 /* ***WIN32 SOCKET: init win32 non blocking socket */
79 int temp = 1; 81 int temp = 1;
80 82
81 if(ioctlsocket(ns->fd, FIONBIO , &temp) == -1) 83 if (ioctlsocket (ns->fd, FIONBIO, &temp) == -1)
82 LOG(llevError,"InitConnection: Error on ioctlsocket.\n"); 84 LOG (llevError, "InitConnection: Error on ioctlsocket.\n");
83#else 85#else
84 if (fcntl(ns->fd, F_SETFL, O_NONBLOCK)==-1) { 86 if (fcntl (ns->fd, F_SETFL, O_NONBLOCK) == -1)
87 {
85 LOG(llevError,"InitConnection: Error on fcntl.\n"); 88 LOG (llevError, "InitConnection: Error on fcntl.\n");
86 } 89 }
87#endif /* end win32 */ 90#endif /* end win32 */
88 91
89 if (getsockopt(ns->fd,SOL_SOCKET,SO_SNDBUF, (char*)&oldbufsize, (socklen_t*) &buflen)==-1) 92 if (getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1)
90 oldbufsize=0; 93 oldbufsize = 0;
91 if (oldbufsize<bufsize) { 94 if (oldbufsize < bufsize)
95 {
92#ifdef ESRV_DEBUG 96#ifdef ESRV_DEBUG
93 LOG(llevDebug, "Default buffer size was %d bytes, will reset it to %d\n", oldbufsize, bufsize); 97 LOG (llevDebug, "Default buffer size was %d bytes, will reset it to %d\n", oldbufsize, bufsize);
94#endif 98#endif
95 if(setsockopt(ns->fd,SOL_SOCKET,SO_SNDBUF, (char*)&bufsize, sizeof(&bufsize))) { 99 if (setsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &bufsize, sizeof (&bufsize)))
100 {
96 LOG(llevError,"InitConnection: setsockopt unable to set output buf size to %d\n", bufsize); 101 LOG (llevError, "InitConnection: setsockopt unable to set output buf size to %d\n", bufsize);
97 } 102 }
98 } 103 }
99 buflen=sizeof(oldbufsize); 104 buflen = sizeof (oldbufsize);
100 getsockopt(ns->fd,SOL_SOCKET,SO_SNDBUF, (char*)&oldbufsize, (socklen_t*) &buflen); 105 getsockopt (ns->fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
101#ifdef ESRV_DEBUG 106#ifdef ESRV_DEBUG
102 LOG(llevDebug, "Socket buffer size now %d bytes\n", oldbufsize); 107 LOG (llevDebug, "Socket buffer size now %d bytes\n", oldbufsize);
103#endif 108#endif
104 109
105 ns->faceset = 0; 110 ns->faceset = 0;
106 ns->facecache = 0; 111 ns->facecache = 0;
107 ns->image2 = 0; 112 ns->image2 = 0;
108 ns->sound = 0; 113 ns->sound = 0;
109 ns->exp64 = 0; 114 ns->exp64 = 0;
110 ns->monitor_spells = 0; 115 ns->monitor_spells = 0;
111 ns->mapmode = Map0Cmd; 116 ns->mapmode = Map0Cmd;
112 ns->darkness = 1; 117 ns->darkness = 1;
113 ns->status = Ns_Add; 118 ns->status = Ns_Add;
114 ns->comment = NULL; 119 ns->comment = NULL;
115 ns->old_mode = (Old_Mode) 0; 120 ns->old_mode = (Old_Mode) 0;
116 ns->mapx = 11; 121 ns->mapx = 11;
117 ns->mapy = 11; 122 ns->mapy = 11;
118 ns->newmapcmd= 0; 123 ns->newmapcmd = 0;
119 ns->itemcmd = 1; /* Default is version item1 command*/ 124 ns->itemcmd = 1; /* Default is version item1 command */
120 ns->ext_mapinfos=0; /*extendedmapinfo datas*/ 125 ns->ext_mapinfos = 0; /*extendedmapinfo datas */
121 ns->EMI_smooth=0; 126 ns->EMI_smooth = 0;
122 ns->look_position = 0; 127 ns->look_position = 0;
123 ns->update_look = 0; 128 ns->update_look = 0;
124 ns->has_readable_type = 0; 129 ns->has_readable_type = 0;
125 ns->supported_readables = 0; 130 ns->supported_readables = 0;
126 ns->monitor_spells = 0; 131 ns->monitor_spells = 0;
127 ns->mapinfocmd = 0; 132 ns->mapinfocmd = 0;
128 ns->extcmd = 0; 133 ns->extcmd = 0;
129 ns->extmap = 0; 134 ns->extmap = 0;
130 135
131 /* we should really do some checking here - if total clients overflows 136 /* we should really do some checking here - if total clients overflows
132 * we need to do something more intelligent, because client id's will start 137 * we need to do something more intelligent, because client id's will start
133 * duplicating (not likely in normal cases, but malicous attacks that 138 * duplicating (not likely in normal cases, but malicous attacks that
134 * just open and close connections could get this total up. 139 * just open and close connections could get this total up.
135 */ 140 */
136 ns->inbuf.len=0; 141 ns->inbuf.len = 0;
137 ns->inbuf.buf= (unsigned char*) malloc( sizeof( unsigned char ) * MAXSOCKBUF ); 142 ns->inbuf.buf = (unsigned char *) malloc (sizeof (unsigned char) * MAXSOCKBUF);
138 /* Basic initialization. Needed because we do a check in 143 /* Basic initialization. Needed because we do a check in
139 * HandleClient for oldsocketmode without checking the 144 * HandleClient for oldsocketmode without checking the
140 * length of data. 145 * length of data.
141 */ 146 */
142 memset( ns->inbuf.buf, 0, sizeof( unsigned char ) * MAXSOCKBUF ); 147 memset (ns->inbuf.buf, 0, sizeof (unsigned char) * MAXSOCKBUF);
143 memset(&ns->lastmap,0,sizeof(struct Map)); 148 memset (&ns->lastmap, 0, sizeof (struct Map));
144 memset(ns->faces_sent, 0, ns->faces_sent_len*sizeof(*ns->faces_sent)); 149 memset (ns->faces_sent, 0, ns->faces_sent_len * sizeof (*ns->faces_sent));
145 memset(&ns->anims_sent,0,sizeof(ns->anims_sent)); 150 memset (&ns->anims_sent, 0, sizeof (ns->anims_sent));
146 memset(&ns->stats,0,sizeof(struct statsinfo)); 151 memset (&ns->stats, 0, sizeof (struct statsinfo));
147 /* Do this so we don't send a face command for the client for 152 /* Do this so we don't send a face command for the client for
148 * this face. Face 0 is sent to the client to say clear 153 * this face. Face 0 is sent to the client to say clear
149 * face information. 154 * face information.
150 */ 155 */
151 ns->faces_sent[0] = NS_FACESENT_FACE; 156 ns->faces_sent[0] = NS_FACESENT_FACE;
152 157
153 ns->outputbuffer.start=0; 158 ns->outputbuffer.start = 0;
154 ns->outputbuffer.len=0; 159 ns->outputbuffer.len = 0;
155 ns->can_write=1; 160 ns->can_write = 1;
156 ns->password_fails = 0; 161 ns->password_fails = 0;
157 162
158 ns->current_map = 0; 163 ns->current_map = 0;
159 ns->current_x = 0; 164 ns->current_x = 0;
160 ns->current_y = 0; 165 ns->current_y = 0;
161 ns->client[0] = 0; 166 ns->client[0] = 0;
162 ns->buggy_mapscroll = 0; 167 ns->buggy_mapscroll = 0;
163 168
164 ns->sent_scroll=0; 169 ns->sent_scroll = 0;
165 ns->host=strdup_local(from_ip); 170 ns->host = strdup_local (from_ip);
166 sprintf((char*)buf, "version %d %d %s\n", VERSION_CS,VERSION_SC, VERSION_INFO); 171 sprintf ((char *) buf, "version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
167 sl.buf=(unsigned char*)buf; 172 sl.buf = (unsigned char *) buf;
168 sl.len=strlen((char*)buf); 173 sl.len = strlen ((char *) buf);
169 Send_With_Handling(ns, &sl); 174 Send_With_Handling (ns, &sl);
170#ifdef CS_LOGSTATS 175#ifdef CS_LOGSTATS
171 if (socket_info.nconns>cst_tot.max_conn) 176 if (socket_info.nconns > cst_tot.max_conn)
172 cst_tot.max_conn = socket_info.nconns; 177 cst_tot.max_conn = socket_info.nconns;
173 if (socket_info.nconns>cst_lst.max_conn) 178 if (socket_info.nconns > cst_lst.max_conn)
174 cst_lst.max_conn = socket_info.nconns; 179 cst_lst.max_conn = socket_info.nconns;
175#endif 180#endif
176} 181}
177 182
178 183
179/** This sets up the socket and reads all the image information into memory. */ 184/** This sets up the socket and reads all the image information into memory. */
185void
180void init_ericserver(void) 186init_ericserver (void)
181{ 187{
182 struct sockaddr_in insock; 188 struct sockaddr_in insock;
183 struct protoent *protox; 189 struct protoent *protox;
184 struct linger linger_opt; 190 struct linger linger_opt;
185 191
186#ifdef WIN32 /* ***win32 - we init a windows socket */ 192#ifdef WIN32 /* ***win32 - we init a windows socket */
187 WSADATA w; 193 WSADATA w;
188 194
189 socket_info.max_filedescriptor = 1; /* used in select, ignored in winsockets */ 195 socket_info.max_filedescriptor = 1; /* used in select, ignored in winsockets */
190 WSAStartup (0x0101,&w); /* this setup all socket stuff */ 196 WSAStartup (0x0101, &w); /* this setup all socket stuff */
191 /* ill include no error tests here, winsocket 1.1 should always work */ 197 /* ill include no error tests here, winsocket 1.1 should always work */
192 /* except some old win95 versions without tcp/ip stack */ 198 /* except some old win95 versions without tcp/ip stack */
193#else /* non windows */ 199#else /* non windows */
194 200
195#ifdef HAVE_SYSCONF 201# ifdef HAVE_SYSCONF
196 socket_info.max_filedescriptor = sysconf(_SC_OPEN_MAX); 202 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX);
197#else 203# else
198# ifdef HAVE_GETDTABLESIZE 204# ifdef HAVE_GETDTABLESIZE
199 socket_info.max_filedescriptor = getdtablesize(); 205 socket_info.max_filedescriptor = getdtablesize ();
200# else 206# else
201 "Unable to find usable function to get max filedescriptors"; 207 "Unable to find usable function to get max filedescriptors";
202# endif 208# endif
203#endif 209# endif
204#endif /* win32 */ 210#endif /* win32 */
205 211
206 socket_info.timeout.tv_sec = 0; 212 socket_info.timeout.tv_sec = 0;
207 socket_info.timeout.tv_usec = 0; 213 socket_info.timeout.tv_usec = 0;
208 socket_info.nconns=0; 214 socket_info.nconns = 0;
209 215
210#ifdef CS_LOGSTATS 216#ifdef CS_LOGSTATS
211 memset(&cst_tot, 0, sizeof(CS_Stats)); 217 memset (&cst_tot, 0, sizeof (CS_Stats));
212 memset(&cst_lst, 0, sizeof(CS_Stats)); 218 memset (&cst_lst, 0, sizeof (CS_Stats));
213 cst_tot.time_start=time(NULL); 219 cst_tot.time_start = time (NULL);
214 cst_lst.time_start=time(NULL); 220 cst_lst.time_start = time (NULL);
215#endif 221#endif
216 222
217 LOG(llevDebug,"Initialize new client/server data\n"); 223 LOG (llevDebug, "Initialize new client/server data\n");
218 socket_info.nconns = 1; 224 socket_info.nconns = 1;
219 init_sockets = (NewSocket *) malloc(sizeof(NewSocket)); 225 init_sockets = (NewSocket *) malloc (sizeof (NewSocket));
220 init_sockets[0].faces_sent = NULL; /* unused */ 226 init_sockets[0].faces_sent = NULL; /* unused */
221 socket_info.allocated_sockets=1; 227 socket_info.allocated_sockets = 1;
222 228
223 protox = getprotobyname("tcp"); 229 protox = getprotobyname ("tcp");
224 if (protox==NULL) { 230 if (protox == NULL)
231 {
225 LOG(llevError,"init_ericserver: Error getting protox\n"); 232 LOG (llevError, "init_ericserver: Error getting protox\n");
226 return; 233 return;
227 } 234 }
228 init_sockets[0].fd = socket(PF_INET, SOCK_STREAM, protox->p_proto); 235 init_sockets[0].fd = socket (PF_INET, SOCK_STREAM, protox->p_proto);
229 if (init_sockets[0].fd == -1) { 236 if (init_sockets[0].fd == -1)
237 {
230 LOG(llevError, "Cannot create socket: %s\n", strerror(errno)); 238 LOG (llevError, "Cannot create socket: %s\n", strerror (errno));
231 exit(-1); 239 exit (-1);
232 } 240 }
233 insock.sin_family = AF_INET; 241 insock.sin_family = AF_INET;
234 insock.sin_port = htons(settings.csport); 242 insock.sin_port = htons (settings.csport);
235 insock.sin_addr.s_addr = htonl(INADDR_ANY); 243 insock.sin_addr.s_addr = htonl (INADDR_ANY);
236 244
237 linger_opt.l_onoff = 0; 245 linger_opt.l_onoff = 0;
238 linger_opt.l_linger = 0; 246 linger_opt.l_linger = 0;
239 if(setsockopt(init_sockets[0].fd,SOL_SOCKET,SO_LINGER,(char *) &linger_opt, 247 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_LINGER, (char *) &linger_opt, sizeof (struct linger)))
240 sizeof(struct linger))) { 248 {
241 LOG(llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror(errno)); 249 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno));
242 } 250 }
251
243/* Would be nice to have an autoconf check for this. It appears that 252/* Would be nice to have an autoconf check for this. It appears that
244 * these functions are both using the same calling syntax, just one 253 * these functions are both using the same calling syntax, just one
245 * of them needs extra valus passed. 254 * of them needs extra valus passed.
246 */ 255 */
247#if defined(__osf__) || defined(hpux) || defined(sgi) || defined(NeXT) || \ 256#if defined(__osf__) || defined(hpux) || defined(sgi) || defined(NeXT) || \
248 defined(__sun__) || defined(__linux__) || defined(SVR4) || \ 257 defined(__sun__) || defined(__linux__) || defined(SVR4) || \
249 defined(__FreeBSD__) || defined(__OpenBSD__) || \ 258 defined(__FreeBSD__) || defined(__OpenBSD__) || \
250 defined(WIN32) /* ---win32 add this here */ || \ 259 defined(WIN32) /* ---win32 add this here */ || \
251 defined(__GNU__) /* HURD */ 260 defined(__GNU__) /* HURD */
252 { 261 {
253#ifdef WIN32 262# ifdef WIN32
254 char tmp = 1; 263 char tmp = 1;
255#else 264# else
256 int tmp =1; 265 int tmp = 1;
257#endif 266# endif
258 267
259 if(setsockopt(init_sockets[0].fd,SOL_SOCKET,SO_REUSEADDR, &tmp, sizeof(tmp))) { 268 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof (tmp)))
260 LOG(llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror(errno));
261 } 269 {
262 }
263#else
264 if(setsockopt(init_sockets[0].fd,SOL_SOCKET,SO_REUSEADDR,(char *)NULL,0)) {
265 LOG(llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror(errno)); 270 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
266 } 271 }
272 }
273#else
274 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, (char *) NULL, 0))
275 {
276 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
277 }
267#endif 278#endif
268 279
269 if (bind(init_sockets[0].fd,(struct sockaddr *)&insock,sizeof(insock)) == (-1)) { 280 if (bind (init_sockets[0].fd, (struct sockaddr *) &insock, sizeof (insock)) == (-1))
281 {
270 LOG(llevError, "Cannot bind socket to port %d: %s\n", ntohs(insock.sin_port), strerror(errno)); 282 LOG (llevError, "Cannot bind socket to port %d: %s\n", ntohs (insock.sin_port), strerror (errno));
271#ifdef WIN32 /* ***win32: close() -> closesocket() */ 283#ifdef WIN32 /* ***win32: close() -> closesocket() */
272 shutdown(init_sockets[0].fd,SD_BOTH); 284 shutdown (init_sockets[0].fd, SD_BOTH);
273 closesocket(init_sockets[0].fd); 285 closesocket (init_sockets[0].fd);
274#else 286#else
275 close(init_sockets[0].fd); 287 close (init_sockets[0].fd);
276#endif /* win32 */ 288#endif /* win32 */
277 exit(-1); 289 exit (-1);
278 } 290 }
279 if (listen(init_sockets[0].fd,5) == (-1)) { 291 if (listen (init_sockets[0].fd, 5) == (-1))
292 {
280 LOG(llevError, "Cannot listen on socket: %s\n", strerror(errno)); 293 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno));
281#ifdef WIN32 /* ***win32: close() -> closesocket() */ 294#ifdef WIN32 /* ***win32: close() -> closesocket() */
282 shutdown(init_sockets[0].fd,SD_BOTH); 295 shutdown (init_sockets[0].fd, SD_BOTH);
283 closesocket(init_sockets[0].fd); 296 closesocket (init_sockets[0].fd);
284#else 297#else
285 close(init_sockets[0].fd); 298 close (init_sockets[0].fd);
286#endif /* win32 */ 299#endif /* win32 */
287 exit(-1); 300 exit (-1);
288 } 301 }
289 init_sockets[0].status=Ns_Add; 302 init_sockets[0].status = Ns_Add;
290 read_client_images(); 303 read_client_images ();
291} 304}
292 305
293 306
294/******************************************************************************* 307/*******************************************************************************
295 * 308 *
296 * Start of functions dealing with freeing of the data. 309 * Start of functions dealing with freeing of the data.
297 * 310 *
298 ******************************************************************************/ 311 ******************************************************************************/
299 312
300/** Free's all the memory that ericserver allocates. */ 313/** Free's all the memory that ericserver allocates. */
314void
301void free_all_newserver(void) 315free_all_newserver (void)
302{ 316{
303 LOG(llevDebug,"Freeing all new client/server information.\n"); 317 LOG (llevDebug, "Freeing all new client/server information.\n");
304 free_socket_images(); 318 free_socket_images ();
305 free(init_sockets); 319 free (init_sockets);
306} 320}
307 321
308/** 322/**
309 * Frees a socket. 323 * Frees a socket.
310 * Basically, all we need to do here is free all data structures that 324 * Basically, all we need to do here is free all data structures that
311 * might be associated with the socket. It is up to the caller to 325 * might be associated with the socket. It is up to the caller to
312 * update the list 326 * update the list
313 */ 327 */
314 328
329void
315void free_newsocket(NewSocket *ns) 330free_newsocket (NewSocket * ns)
316{ 331{
317#ifdef WIN32 /* ***win32: closesocket in windows style */ 332#ifdef WIN32 /* ***win32: closesocket in windows style */
318 shutdown(ns->fd,SD_BOTH); 333 shutdown (ns->fd, SD_BOTH);
319 if (closesocket(ns->fd)) { 334 if (closesocket (ns->fd))
335 {
320#else 336#else
321 if (close(ns->fd)) { 337 if (close (ns->fd))
338 {
322#endif /* win32 */ 339#endif /* win32 */
323 340
324#ifdef ESRV_DEBUG 341#ifdef ESRV_DEBUG
325 LOG(llevDebug,"Error closing socket %d\n", ns->fd); 342 LOG (llevDebug, "Error closing socket %d\n", ns->fd);
326#endif 343#endif
327 } 344 }
328 if (ns->stats.range) 345 if (ns->stats.range)
329 free(ns->stats.range); 346 free (ns->stats.range);
330 if (ns->stats.title) 347 if (ns->stats.title)
331 free(ns->stats.title); 348 free (ns->stats.title);
332 if (ns->comment) 349 if (ns->comment)
333 free(ns->comment); 350 free (ns->comment);
334 free(ns->host); 351 free (ns->host);
335 free(ns->inbuf.buf); 352 free (ns->inbuf.buf);
336} 353}
337 354
338/** Sends the 'goodbye' command to the player, and closes connection. */ 355/** Sends the 'goodbye' command to the player, and closes connection. */
356void
339void final_free_player(player *pl) 357final_free_player (player *pl)
340{ 358{
341 cs_write_string(&pl->socket, "goodbye", 8); 359 cs_write_string (&pl->socket, "goodbye", 8);
342 free_newsocket(&pl->socket); 360 free_newsocket (&pl->socket);
343 free_player(pl); 361 free_player (pl);
344} 362}
345

Diff Legend

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