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

Diff Legend

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