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.1 by elmex, Sun Aug 13 17:16:05 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.1 2006/08/13 17:16:05 elmex 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;
128 ns->extmap = 0;
129 129
130 /* we should really do some checking here - if total clients overflows 130 /* we should really do some checking here - if total clients overflows
131 * 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
132 * duplicating (not likely in normal cases, but malicous attacks that 132 * duplicating (not likely in normal cases, but malicous attacks that
133 * just open and close connections could get this total up. 133 * just open and close connections could get this total up.
134 */ 134 */
135 ns->inbuf.len=0; 135 ns->inbuf.len = 0;
136 ns->inbuf.buf= (unsigned char*) malloc( sizeof( unsigned char ) * MAXSOCKBUF ); 136 ns->inbuf.buf = (unsigned char *) malloc (sizeof (unsigned char) * MAXSOCKBUF);
137 /* Basic initialization. Needed because we do a check in 137 /* Basic initialization. Needed because we do a check in
138 * HandleClient for oldsocketmode without checking the 138 * HandleClient for oldsocketmode without checking the
139 * length of data. 139 * length of data.
140 */ 140 */
141 memset( ns->inbuf.buf, 0, sizeof( unsigned char ) * MAXSOCKBUF ); 141 memset (ns->inbuf.buf, 0, sizeof (unsigned char) * MAXSOCKBUF);
142 memset(&ns->lastmap,0,sizeof(struct Map)); 142 memset (&ns->lastmap, 0, sizeof (struct Map));
143 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));
144 memset(&ns->anims_sent,0,sizeof(ns->anims_sent)); 144 memset (&ns->anims_sent, 0, sizeof (ns->anims_sent));
145 memset(&ns->stats,0,sizeof(struct statsinfo)); 145 memset (&ns->stats, 0, sizeof (struct statsinfo));
146 /* 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
147 * 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
148 * face information. 148 * face information.
149 */ 149 */
150 ns->faces_sent[0] = NS_FACESENT_FACE; 150 ns->faces_sent[0] = NS_FACESENT_FACE;
151 151
152 ns->outputbuffer.start=0; 152 ns->outputbuffer.start = 0;
153 ns->outputbuffer.len=0; 153 ns->outputbuffer.len = 0;
154 ns->can_write=1; 154 ns->can_write = 1;
155 ns->password_fails = 0; 155 ns->password_fails = 0;
156 156
157 ns->current_map = 0; 157 ns->current_map = 0;
158 ns->current_x = 0;
159 ns->current_y = 0;
160 ns->client[0] = 0;
161 ns->buggy_mapscroll = 0;
158 162
159 ns->sent_scroll=0; 163 ns->sent_scroll = 0;
160 ns->host=strdup_local(from_ip); 164 ns->host = strdup_local (from_ip);
161 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);
162 sl.buf=(unsigned char*)buf; 166 sl.buf = (unsigned char *) buf;
163 sl.len=strlen((char*)buf); 167 sl.len = strlen ((char *) buf);
164 Send_With_Handling(ns, &sl); 168 Send_With_Handling (ns, &sl);
165#ifdef CS_LOGSTATS 169#ifdef CS_LOGSTATS
166 if (socket_info.nconns>cst_tot.max_conn) 170 if (socket_info.nconns > cst_tot.max_conn)
167 cst_tot.max_conn = socket_info.nconns; 171 cst_tot.max_conn = socket_info.nconns;
168 if (socket_info.nconns>cst_lst.max_conn) 172 if (socket_info.nconns > cst_lst.max_conn)
169 cst_lst.max_conn = socket_info.nconns; 173 cst_lst.max_conn = socket_info.nconns;
170#endif 174#endif
171} 175}
172 176
173 177
174/** 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
175void init_ericserver(void) 180init_ericserver (void)
176{ 181{
177 struct sockaddr_in insock; 182 struct sockaddr_in insock;
178 struct protoent *protox; 183 struct protoent *protox;
179 struct linger linger_opt; 184 struct linger linger_opt;
180 185
181#ifdef WIN32 /* ***win32 - we init a windows socket */ 186#ifdef WIN32 /* ***win32 - we init a windows socket */
182 WSADATA w; 187 WSADATA w;
183 188
184 socket_info.max_filedescriptor = 1; /* used in select, ignored in winsockets */ 189 socket_info.max_filedescriptor = 1; /* used in select, ignored in winsockets */
185 WSAStartup (0x0101,&w); /* this setup all socket stuff */ 190 WSAStartup (0x0101, &w); /* this setup all socket stuff */
186 /* 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 */
187 /* except some old win95 versions without tcp/ip stack */ 192 /* except some old win95 versions without tcp/ip stack */
188#else /* non windows */ 193#else /* non windows */
189 194
190#ifdef HAVE_SYSCONF 195# ifdef HAVE_SYSCONF
191 socket_info.max_filedescriptor = sysconf(_SC_OPEN_MAX); 196 socket_info.max_filedescriptor = sysconf (_SC_OPEN_MAX);
192#else 197# else
193# ifdef HAVE_GETDTABLESIZE 198# ifdef HAVE_GETDTABLESIZE
194 socket_info.max_filedescriptor = getdtablesize(); 199 socket_info.max_filedescriptor = getdtablesize ();
195# else 200# else
196 "Unable to find usable function to get max filedescriptors"; 201 "Unable to find usable function to get max filedescriptors";
197# endif 202# endif
198#endif 203# endif
199#endif /* win32 */ 204#endif /* win32 */
200 205
201 socket_info.timeout.tv_sec = 0; 206 socket_info.timeout.tv_sec = 0;
202 socket_info.timeout.tv_usec = 0; 207 socket_info.timeout.tv_usec = 0;
203 socket_info.nconns=0; 208 socket_info.nconns = 0;
204 209
205#ifdef CS_LOGSTATS 210#ifdef CS_LOGSTATS
206 memset(&cst_tot, 0, sizeof(CS_Stats)); 211 memset (&cst_tot, 0, sizeof (CS_Stats));
207 memset(&cst_lst, 0, sizeof(CS_Stats)); 212 memset (&cst_lst, 0, sizeof (CS_Stats));
208 cst_tot.time_start=time(NULL); 213 cst_tot.time_start = time (NULL);
209 cst_lst.time_start=time(NULL); 214 cst_lst.time_start = time (NULL);
210#endif 215#endif
211 216
212 LOG(llevDebug,"Initialize new client/server data\n"); 217 LOG (llevDebug, "Initialize new client/server data\n");
213 socket_info.nconns = 1; 218 socket_info.nconns = 1;
214 init_sockets = (NewSocket *) malloc(sizeof(NewSocket)); 219 init_sockets = (NewSocket *) malloc (sizeof (NewSocket));
215 init_sockets[0].faces_sent = NULL; /* unused */ 220 init_sockets[0].faces_sent = NULL; /* unused */
216 socket_info.allocated_sockets=1; 221 socket_info.allocated_sockets = 1;
217 222
218 protox = getprotobyname("tcp"); 223 protox = getprotobyname ("tcp");
219 if (protox==NULL) { 224 if (protox == NULL)
225 {
220 LOG(llevError,"init_ericserver: Error getting protox\n"); 226 LOG (llevError, "init_ericserver: Error getting protox\n");
221 return; 227 return;
222 } 228 }
223 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);
224 if (init_sockets[0].fd == -1) { 230 if (init_sockets[0].fd == -1)
231 {
225 LOG(llevError, "Cannot create socket: %s\n", strerror_local(errno)); 232 LOG (llevError, "Cannot create socket: %s\n", strerror (errno));
226 exit(-1); 233 exit (-1);
227 } 234 }
228 insock.sin_family = AF_INET; 235 insock.sin_family = AF_INET;
229 insock.sin_port = htons(settings.csport); 236 insock.sin_port = htons (settings.csport);
230 insock.sin_addr.s_addr = htonl(INADDR_ANY); 237 insock.sin_addr.s_addr = htonl (INADDR_ANY);
231 238
232 linger_opt.l_onoff = 0; 239 linger_opt.l_onoff = 0;
233 linger_opt.l_linger = 0; 240 linger_opt.l_linger = 0;
234 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)))
235 sizeof(struct linger))) { 242 {
236 LOG(llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror_local(errno)); 243 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno));
237 } 244 }
245
238/* 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
239 * these functions are both using the same calling syntax, just one 247 * these functions are both using the same calling syntax, just one
240 * of them needs extra valus passed. 248 * of them needs extra valus passed.
241 */ 249 */
242#if defined(__osf__) || defined(hpux) || defined(sgi) || defined(NeXT) || \ 250#if defined(__osf__) || defined(hpux) || defined(sgi) || defined(NeXT) || \
243 defined(__sun__) || defined(__linux__) || defined(SVR4) || \ 251 defined(__sun__) || defined(__linux__) || defined(SVR4) || \
244 defined(__FreeBSD__) || defined(__OpenBSD__) || \ 252 defined(__FreeBSD__) || defined(__OpenBSD__) || \
245 defined(WIN32) /* ---win32 add this here */ || \ 253 defined(WIN32) /* ---win32 add this here */ || \
246 defined(__GNU__) /* HURD */ 254 defined(__GNU__) /* HURD */
247 { 255 {
248#ifdef WIN32 256# ifdef WIN32
249 char tmp = 1; 257 char tmp = 1;
250#else 258# else
251 int tmp =1; 259 int tmp = 1;
252#endif 260# endif
253 261
254 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)))
263 {
264 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
265 }
266 }
267#else
268 if (setsockopt (init_sockets[0].fd, SOL_SOCKET, SO_REUSEADDR, (char *) NULL, 0))
269 {
255 LOG(llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror_local(errno)); 270 LOG (llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror (errno));
256 }
257 } 271 }
258#else
259 if(setsockopt(init_sockets[0].fd,SOL_SOCKET,SO_REUSEADDR,(char *)NULL,0)) {
260 LOG(llevError, "Cannot setsockopt(SO_REUSEADDR): %s\n", strerror_local(errno));
261 }
262#endif 272#endif
263 273
264 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 {
265 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));
266#ifdef WIN32 /* ***win32: close() -> closesocket() */ 277#ifdef WIN32 /* ***win32: close() -> closesocket() */
267 shutdown(init_sockets[0].fd,SD_BOTH); 278 shutdown (init_sockets[0].fd, SD_BOTH);
268 closesocket(init_sockets[0].fd); 279 closesocket (init_sockets[0].fd);
269#else 280#else
270 close(init_sockets[0].fd); 281 close (init_sockets[0].fd);
271#endif /* win32 */ 282#endif /* win32 */
272 exit(-1); 283 exit (-1);
273 } 284 }
274 if (listen(init_sockets[0].fd,5) == (-1)) { 285 if (listen (init_sockets[0].fd, 5) == (-1))
286 {
275 LOG(llevError, "Cannot listen on socket: %s\n", strerror_local(errno)); 287 LOG (llevError, "Cannot listen on socket: %s\n", strerror (errno));
276#ifdef WIN32 /* ***win32: close() -> closesocket() */ 288#ifdef WIN32 /* ***win32: close() -> closesocket() */
277 shutdown(init_sockets[0].fd,SD_BOTH); 289 shutdown (init_sockets[0].fd, SD_BOTH);
278 closesocket(init_sockets[0].fd); 290 closesocket (init_sockets[0].fd);
279#else 291#else
280 close(init_sockets[0].fd); 292 close (init_sockets[0].fd);
281#endif /* win32 */ 293#endif /* win32 */
282 exit(-1); 294 exit (-1);
283 } 295 }
284 init_sockets[0].status=Ns_Add; 296 init_sockets[0].status = Ns_Add;
285 read_client_images(); 297 read_client_images ();
286} 298}
287 299
288 300
289/******************************************************************************* 301/*******************************************************************************
290 * 302 *
291 * Start of functions dealing with freeing of the data. 303 * Start of functions dealing with freeing of the data.
292 * 304 *
293 ******************************************************************************/ 305 ******************************************************************************/
294 306
295/** Free's all the memory that ericserver allocates. */ 307/** Free's all the memory that ericserver allocates. */
308void
296void free_all_newserver(void) 309free_all_newserver (void)
297{ 310{
298 LOG(llevDebug,"Freeing all new client/server information.\n"); 311 LOG (llevDebug, "Freeing all new client/server information.\n");
299 free_socket_images(); 312 free_socket_images ();
300 free(init_sockets); 313 free (init_sockets);
301} 314}
302 315
303/** 316/**
304 * Frees a socket. 317 * Frees a socket.
305 * 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
306 * 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
307 * update the list 320 * update the list
308 */ 321 */
309 322
323void
310void free_newsocket(NewSocket *ns) 324free_newsocket (NewSocket * ns)
311{ 325{
312#ifdef WIN32 /* ***win32: closesocket in windows style */ 326#ifdef WIN32 /* ***win32: closesocket in windows style */
313 shutdown(ns->fd,SD_BOTH); 327 shutdown (ns->fd, SD_BOTH);
314 if (closesocket(ns->fd)) { 328 if (closesocket (ns->fd))
329 {
315#else 330#else
316 if (close(ns->fd)) { 331 if (close (ns->fd))
332 {
317#endif /* win32 */ 333#endif /* win32 */
318 334
319#ifdef ESRV_DEBUG 335#ifdef ESRV_DEBUG
320 LOG(llevDebug,"Error closing socket %d\n", ns->fd); 336 LOG (llevDebug, "Error closing socket %d\n", ns->fd);
321#endif 337#endif
322 } 338 }
323 if (ns->stats.range) 339 if (ns->stats.range)
324 free(ns->stats.range); 340 free (ns->stats.range);
325 if (ns->stats.title) 341 if (ns->stats.title)
326 free(ns->stats.title); 342 free (ns->stats.title);
327 if (ns->comment) 343 if (ns->comment)
328 free(ns->comment); 344 free (ns->comment);
329 free(ns->host); 345 free (ns->host);
330 free(ns->inbuf.buf); 346 free (ns->inbuf.buf);
331} 347}
332 348
333/** Sends the 'goodbye' command to the player, and closes connection. */ 349/** Sends the 'goodbye' command to the player, and closes connection. */
350void
334void final_free_player(player *pl) 351final_free_player (player *pl)
335{ 352{
336 cs_write_string(&pl->socket, "goodbye", 8); 353 cs_write_string (&pl->socket, "goodbye", 8);
337 free_newsocket(&pl->socket); 354 free_newsocket (&pl->socket);
338 free_player(pl); 355 free_player (pl);
339} 356}
340

Diff Legend

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