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.5 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.8 by root, Thu Sep 14 22:34:05 2006 UTC

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

Diff Legend

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