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.22 by root, Sat Dec 16 21:40:26 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>
40#include <sys/socket.h> 39#include <sys/socket.h>
41#include <netinet/in.h> 40#include <netinet/in.h>
41#include <netinet/tcp.h>
42#include <netinet/ip.h>
42#include <netdb.h> 43#include <netdb.h>
43 44
44#include <unistd.h> 45#include <unistd.h>
45#include <arpa/inet.h> 46#include <arpa/inet.h>
46 47
… …
52 * client. 53 * client.
53 */ 54 */
54client::client (int fd, const char *peername) 55client::client (int fd, const char *peername)
55: fd (fd), host (strdup (peername)), 56: fd (fd), host (strdup (peername)),
56 socket_ev (this, &client::socket_cb), 57 socket_ev (this, &client::socket_cb),
57 cmd_ev (this, &client::cmd_cb) 58 cmd_ev (this, &client::cmd_cb),
59 cc_inv (this), cc_other (this)
58{ 60{
59 { 61 {
60 struct linger linger_opt; 62 struct linger linger_opt;
61 63
62 linger_opt.l_onoff = 0; 64 linger_opt.l_onoff = 0;
63 linger_opt.l_linger = 0; 65 linger_opt.l_linger = 0;
64 66
65 if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger))) 67 if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger)))
66 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 68 LOG (llevError, "SO_LINGER: %s\n", strerror (errno));
67 } 69 }
70
71 {
72 int val = IPTOS_LOWDELAY;
73
74 if (setsockopt (fd, IPPROTO_IP, IP_TOS, &val, sizeof (val)))
75 LOG (llevError, "IP_TOS: %s\n", strerror (errno));
76 }
77
78 {
79 int val = 1;
80
81 if (setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)))
82 LOG (llevError, "TCP_NODELAY: %s\n", strerror (errno));
83 }
84
85#ifdef __linux__
86 {
87 int val;
88
89 // set some very aggressive keepalive parameters
90 val = 10;
91 if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof (val)))
92 LOG (llevError, "TCP_KEEPIDLE: %s\n", strerror (errno));
93
94 val = 5;
95 if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof (val)))
96 LOG (llevError, "TCP_KEEPCNT: %s\n", strerror (errno));
97
98 val = 1;
99 if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof (val)))
100 LOG (llevError, "TCP_KEEPINTVL: %s\n", strerror (errno));
101 }
102#endif
68 103
69 { 104 {
70 int bufsize = 65535; /*Supposed absolute upper limit */ 105 int bufsize = 65535; /*Supposed absolute upper limit */
71 int oldbufsize; 106 int oldbufsize;
72 int buflen = sizeof (int); 107 int buflen = sizeof (int);
… …
83 118
84 buflen = sizeof (oldbufsize); 119 buflen = sizeof (oldbufsize);
85 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen); 120 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
86 } 121 }
87 122
123 state = ST_SETUP;
88 mapmode = Map0Cmd; 124 mapmode = Map0Cmd;
89 darkness = 1; 125 darkness = 1;
90 status = Ns_Add;
91 mapx = 11; 126 mapx = 11;
92 mapy = 11; 127 mapy = 11;
93 itemcmd = 1; /* Default is version item1 command */ 128 itemcmd = 1; /* Default is version item1 command */
94 129
95 faces_sent = salloc<uint8> (nrofpixmaps, 0); 130 faces_sent = salloc0<uint8> (nrofpixmaps);
96 131
97 /* 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
98 * 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
99 * face information. 134 * face information.
100 */ 135 */
… …
122} 157}
123 158
124client::~client () 159client::~client ()
125{ 160{
126 if (pl) 161 if (pl)
127 pl->socket = 0; 162 pl->ns = 0;
128 163
129 if (fd >= 0) 164 if (fd >= 0)
130 close (fd); 165 close (fd);
131 166
132 free (faces_sent); 167 sfree<uint8> (faces_sent, nrofpixmaps);
133 free (stats.range); 168 free (stats.range);
134 free (stats.title); 169 free (stats.title);
135 free (host); 170 free (host);
136} 171}
137 172
138void 173void
139client::destroy () 174client::destroy ()
140{ 175{
141 status = Ns_Dead; 176 state = ST_DEAD;
177
142 socket_ev.suspend (); 178 socket_ev.suspend ();
143 cmd_ev.suspend (); 179 cmd_ev.suspend ();
144} 180}
145 181
146/** 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. */
… …
175final_free_player (player *pl) 211final_free_player (player *pl)
176{ 212{
177 free_player (pl); 213 free_player (pl);
178} 214}
179 215
180bool 216client *
181add_client (int fd, const char *peername) 217client::create (int fd, const char *peername)
182{ 218{
183 if (checkbanned (NULL, peername)) 219 if (checkbanned (NULL, peername))
184 { 220 {
185 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 221 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
186 return false; 222 return 0;
187 } 223 }
188 else 224 else
189 { 225 {
190 client *ns = new client (dup (fd), peername); 226 client *ns = new client (dup (fd), peername);
191 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
192 return true; 233 return ns;
193 } 234 }
194} 235}
195 236

Diff Legend

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