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.28 by root, Thu Dec 21 23:37:06 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 state = ST_DEAD;
177
178 socket_ev.suspend (); 178 socket_ev.suspend ();
179 cmd_ev.suspend (); 179 cmd_ev.suspend ();
180} 180}
181 181
182/** This sets up the socket and reads all the image information into memory. */ 182/** This sets up the socket and reads all the image information into memory. */
211final_free_player (player *pl) 211final_free_player (player *pl)
212{ 212{
213 free_player (pl); 213 free_player (pl);
214} 214}
215 215
216bool 216client *
217add_client (int fd, const char *peername) 217client::create (int fd, const char *peername)
218{ 218{
219 if (checkbanned (NULL, peername)) 219 if (checkbanned (NULL, peername))
220 { 220 {
221 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 221 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
222 return false; 222 return 0;
223 } 223 }
224 else 224 else
225 { 225 {
226 client *ns = new client (dup (fd), peername); 226 client *ns = new client (dup (fd), peername);
227 clients.push_back (ns); 227 clients.push_back (ns);
228
229 ns->instantiate (); // effectively a nop right now
230
231 INVOKE_CLIENT (CONNECT, ns);
232
228 return true; 233 return ns;
229 } 234 }
230} 235}
231 236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines