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.26 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.34 by root, Sun Jan 7 02:39:15 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
29 * 30 *
30 * Mainly deals with initialization and higher level socket 31 * Mainly deals with initialization and higher level socket
31 * maintenance (checking for lost connections and if data has arrived.) 32 * maintenance (checking for lost connections and if data has arrived.)
32 * The reading of data is handled in ericserver.c 33 * The reading of data is handled in ericserver.c
33 */ 34 */
34
35 35
36#include <global.h> 36#include <global.h>
37#include <sproto.h> 37#include <sproto.h>
38#include <sys/types.h> 38#include <sys/types.h>
39#include <sys/time.h> 39#include <sys/time.h>
43#include <netinet/ip.h> 43#include <netinet/ip.h>
44#include <netdb.h> 44#include <netdb.h>
45 45
46#include <unistd.h> 46#include <unistd.h>
47#include <arpa/inet.h> 47#include <arpa/inet.h>
48
49#include <algorithm>
48 50
49sockvec clients; 51sockvec clients;
50 52
51/** 53/**
52 * Initializes a connection. Really, it just sets up the data structure, 54 * Initializes a connection. Really, it just sets up the data structure,
57: fd (fd), host (strdup (peername)), 59: fd (fd), host (strdup (peername)),
58 socket_ev (this, &client::socket_cb), 60 socket_ev (this, &client::socket_cb),
59 cmd_ev (this, &client::cmd_cb), 61 cmd_ev (this, &client::cmd_cb),
60 cc_inv (this), cc_other (this) 62 cc_inv (this), cc_other (this)
61{ 63{
64 refcnt_inc (); // the socket is an external reference
65
62 { 66 {
63 struct linger linger_opt; 67 struct linger linger_opt;
64 68
65 linger_opt.l_onoff = 0; 69 linger_opt.l_onoff = 0;
66 linger_opt.l_linger = 0; 70 linger_opt.l_linger = 0;
119 123
120 buflen = sizeof (oldbufsize); 124 buflen = sizeof (oldbufsize);
121 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen); 125 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
122 } 126 }
123 127
128 state = ST_SETUP;
124 mapmode = Map0Cmd; 129 mapmode = Map0Cmd;
125 darkness = 1; 130 darkness = 1;
126 status = Ns_Add;
127 mapx = 11; 131 mapx = 11;
128 mapy = 11; 132 mapy = 11;
129 itemcmd = 1; /* Default is version item1 command */ 133 itemcmd = 1; /* Default is version item1 command */
130 134
131 faces_sent = salloc<uint8> (nrofpixmaps, 0); 135 faces_sent = salloc0<uint8> (nrofpixmaps);
132 136
133 /* Do this so we don't send a face command for the client for 137 /* Do this so we don't send a face command for the client for
134 * this face. Face 0 is sent to the client to say clear 138 * this face. Face 0 is sent to the client to say clear
135 * face information. 139 * face information.
136 */ 140 */
148 152
149 // initialisation done, kick it! 153 // initialisation done, kick it!
150 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); 154 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
151 flush (); 155 flush ();
152 156
153#if 0//TODO 157 clients.insert (this);
154 socket_info.nconns++;
155 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
156 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns;
157#endif
158} 158}
159 159
160client::~client () 160client::~client ()
161{ 161{
162 if (pl) 162 clients.erase (this);
163 pl->socket = 0;
164
165 if (fd >= 0)
166 close (fd);
167 163
168 sfree<uint8> (faces_sent, nrofpixmaps); 164 sfree<uint8> (faces_sent, nrofpixmaps);
169 free (stats.range); 165 free (stats.range);
170 free (stats.title); 166 free (stats.title);
171 free (host); 167 free (host);
172} 168}
173 169
174void 170void
175client::destroy () 171client::do_destroy ()
176{ 172{
177 status = Ns_Dead; 173 attachable::do_destroy ();
174
175 if (pl)
176 pl->disconnect ();
177
178 if (fd >= 0)
179 {
180 send_packet ("goodbye");
181 flush ();
182
183 close (fd);
184 }
185
186 state = ST_DEAD;
187
178 socket_ev.suspend (); 188 socket_ev.suspend ();
179 cmd_ev.suspend (); 189 cmd_ev.suspend ();
190
191 refcnt_dec (); // socket no longer open
180} 192}
181 193
182/** This sets up the socket and reads all the image information into memory. */ 194/** This sets up the socket and reads all the image information into memory. */
183void 195void
184init_ericserver (void) 196init_ericserver (void)
204{ 216{
205 LOG (llevDebug, "Freeing all new client/server information.\n"); 217 LOG (llevDebug, "Freeing all new client/server information.\n");
206 free_socket_images (); 218 free_socket_images ();
207} 219}
208 220
209/** Sends the 'goodbye' command to the player, and closes connection. */ 221client *
210void
211final_free_player (player *pl)
212{
213 free_player (pl);
214}
215
216bool
217add_client (int fd, const char *peername) 222client::create (int fd, const char *peername)
218{ 223{
219 if (checkbanned (NULL, peername)) 224 if (checkbanned (NULL, peername))
220 { 225 {
221 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 226 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
222 return false; 227 return 0;
223 } 228 }
224 else 229 else
225 { 230 {
226 client *ns = new client (dup (fd), peername); 231 client *ns = new client (dup (fd), peername);
227 clients.push_back (ns); 232
233 ns->instantiate (); // effectively a nop right now
234
235 INVOKE_CLIENT (CONNECT, ns);
236
228 return true; 237 return ns;
229 } 238 }
230} 239}
231 240

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines