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.29 by root, Fri Dec 22 06:02:29 2006 UTC

… …
29 * 29 *
30 * Mainly deals with initialization and higher level socket 30 * Mainly deals with initialization and higher level socket
31 * maintenance (checking for lost connections and if data has arrived.) 31 * maintenance (checking for lost connections and if data has arrived.)
32 * The reading of data is handled in ericserver.c 32 * The reading of data is handled in ericserver.c
33 */ 33 */
34
35 34
36#include <global.h> 35#include <global.h>
37#include <sproto.h> 36#include <sproto.h>
38#include <sys/types.h> 37#include <sys/types.h>
39#include <sys/time.h> 38#include <sys/time.h>
… …
119 118
120 buflen = sizeof (oldbufsize); 119 buflen = sizeof (oldbufsize);
121 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen); 120 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
122 } 121 }
123 122
123 state = ST_SETUP;
124 mapmode = Map0Cmd; 124 mapmode = Map0Cmd;
125 darkness = 1; 125 darkness = 1;
126 status = Ns_Add;
127 mapx = 11; 126 mapx = 11;
128 mapy = 11; 127 mapy = 11;
129 itemcmd = 1; /* Default is version item1 command */ 128 itemcmd = 1; /* Default is version item1 command */
130 129
131 faces_sent = salloc<uint8> (nrofpixmaps, 0); 130 faces_sent = salloc0<uint8> (nrofpixmaps);
132 131
133 /* Do this so we don't send a face command for the client for 132 /* 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 133 * this face. Face 0 is sent to the client to say clear
135 * face information. 134 * face information.
136 */ 135 */
… …
158} 157}
159 158
160client::~client () 159client::~client ()
161{ 160{
162 if (pl) 161 if (pl)
163 pl->socket = 0; 162 pl->ns = 0;
164 163
165 if (fd >= 0) 164 if (fd >= 0)
166 close (fd); 165 close (fd);
167 166
168 sfree<uint8> (faces_sent, nrofpixmaps); 167 sfree<uint8> (faces_sent, nrofpixmaps);
… …
172} 171}
173 172
174void 173void
175client::destroy () 174client::destroy ()
176{ 175{
177 status = Ns_Dead; 176 INVOKE_CLIENT (DESTROY, this);
177
178 state = ST_DEAD;
179
178 socket_ev.suspend (); 180 socket_ev.suspend ();
179 cmd_ev.suspend (); 181 cmd_ev.suspend ();
180} 182}
181 183
182/** This sets up the socket and reads all the image information into memory. */ 184/** This sets up the socket and reads all the image information into memory. */
… …
211final_free_player (player *pl) 213final_free_player (player *pl)
212{ 214{
213 free_player (pl); 215 free_player (pl);
214} 216}
215 217
216bool 218client *
217add_client (int fd, const char *peername) 219client::create (int fd, const char *peername)
218{ 220{
219 if (checkbanned (NULL, peername)) 221 if (checkbanned (NULL, peername))
220 { 222 {
221 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 223 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
222 return false; 224 return 0;
223 } 225 }
224 else 226 else
225 { 227 {
226 client *ns = new client (dup (fd), peername); 228 client *ns = new client (dup (fd), peername);
227 clients.push_back (ns); 229 clients.push_back (ns);
230
231 ns->instantiate (); // effectively a nop right now
232
233 INVOKE_CLIENT (CONNECT, ns);
234
228 return true; 235 return ns;
229 } 236 }
230} 237}
231 238

Diff Legend

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