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

Diff Legend

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