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.23 by root, Sun Dec 17 00:25:44 2006 UTC vs.
Revision 1.27 by root, Thu Dec 21 06:12:37 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>
… …
54 * client. 53 * client.
55 */ 54 */
56client::client (int fd, const char *peername) 55client::client (int fd, const char *peername)
57: fd (fd), host (strdup (peername)), 56: fd (fd), host (strdup (peername)),
58 socket_ev (this, &client::socket_cb), 57 socket_ev (this, &client::socket_cb),
59 cmd_ev (this, &client::cmd_cb) 58 cmd_ev (this, &client::cmd_cb),
59 cc_inv (this), cc_other (this)
60{ 60{
61 { 61 {
62 struct linger linger_opt; 62 struct linger linger_opt;
63 63
64 linger_opt.l_onoff = 0; 64 linger_opt.l_onoff = 0;
… …
120 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen); 120 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
121 } 121 }
122 122
123 mapmode = Map0Cmd; 123 mapmode = Map0Cmd;
124 darkness = 1; 124 darkness = 1;
125 status = Ns_Add;
126 mapx = 11; 125 mapx = 11;
127 mapy = 11; 126 mapy = 11;
128 itemcmd = 1; /* Default is version item1 command */ 127 itemcmd = 1; /* Default is version item1 command */
129 128
130 faces_sent = salloc<uint8> (nrofpixmaps, 0); 129 faces_sent = salloc0<uint8> (nrofpixmaps);
131 130
132 /* Do this so we don't send a face command for the client for 131 /* Do this so we don't send a face command for the client for
133 * this face. Face 0 is sent to the client to say clear 132 * this face. Face 0 is sent to the client to say clear
134 * face information. 133 * face information.
135 */ 134 */
… …
162 pl->socket = 0; 161 pl->socket = 0;
163 162
164 if (fd >= 0) 163 if (fd >= 0)
165 close (fd); 164 close (fd);
166 165
167 free (faces_sent); 166 sfree<uint8> (faces_sent, nrofpixmaps);
168 free (stats.range); 167 free (stats.range);
169 free (stats.title); 168 free (stats.title);
170 free (host); 169 free (host);
171} 170}
172 171
173void 172void
174client::destroy () 173client::destroy ()
175{ 174{
176 status = Ns_Dead; 175 destroyed = true;
176
177 socket_ev.suspend (); 177 socket_ev.suspend ();
178 cmd_ev.suspend (); 178 cmd_ev.suspend ();
179} 179}
180 180
181/** This sets up the socket and reads all the image information into memory. */ 181/** This sets up the socket and reads all the image information into memory. */
… …
210final_free_player (player *pl) 210final_free_player (player *pl)
211{ 211{
212 free_player (pl); 212 free_player (pl);
213} 213}
214 214
215bool 215client *
216add_client (int fd, const char *peername) 216client::create (int fd, const char *peername)
217{ 217{
218 if (checkbanned (NULL, peername)) 218 if (checkbanned (NULL, peername))
219 { 219 {
220 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 220 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
221 return false; 221 return 0;
222 } 222 }
223 else 223 else
224 { 224 {
225 client *ns = new client (dup (fd), peername); 225 client *ns = new client (dup (fd), peername);
226 clients.push_back (ns); 226 clients.push_back (ns);
227
228 ns->instantiate (); // effectively a nop right now
229
230 INVOKE_CLIENT (CONNECT, ns);
231
227 return true; 232 return ns;
228 } 233 }
229} 234}
230 235

Diff Legend

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