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.31 by root, Mon Dec 25 11:25:50 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>
47
48#include <algorithm>
46 49
47sockvec clients; 50sockvec clients;
48 51
49/** 52/**
50 * Initializes a connection. Really, it just sets up the data structure, 53 * Initializes a connection. Really, it just sets up the data structure,
… …
52 * client. 55 * client.
53 */ 56 */
54client::client (int fd, const char *peername) 57client::client (int fd, const char *peername)
55: fd (fd), host (strdup (peername)), 58: fd (fd), host (strdup (peername)),
56 socket_ev (this, &client::socket_cb), 59 socket_ev (this, &client::socket_cb),
57 cmd_ev (this, &client::cmd_cb) 60 cmd_ev (this, &client::cmd_cb),
61 cc_inv (this), cc_other (this)
58{ 62{
59 { 63 {
60 struct linger linger_opt; 64 struct linger linger_opt;
61 65
62 linger_opt.l_onoff = 0; 66 linger_opt.l_onoff = 0;
63 linger_opt.l_linger = 0; 67 linger_opt.l_linger = 0;
64 68
65 if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger))) 69 if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger)))
66 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 70 LOG (llevError, "SO_LINGER: %s\n", strerror (errno));
67 } 71 }
72
73 {
74 int val = IPTOS_LOWDELAY;
75
76 if (setsockopt (fd, IPPROTO_IP, IP_TOS, &val, sizeof (val)))
77 LOG (llevError, "IP_TOS: %s\n", strerror (errno));
78 }
79
80 {
81 int val = 1;
82
83 if (setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)))
84 LOG (llevError, "TCP_NODELAY: %s\n", strerror (errno));
85 }
86
87#ifdef __linux__
88 {
89 int val;
90
91 // set some very aggressive keepalive parameters
92 val = 10;
93 if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof (val)))
94 LOG (llevError, "TCP_KEEPIDLE: %s\n", strerror (errno));
95
96 val = 5;
97 if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof (val)))
98 LOG (llevError, "TCP_KEEPCNT: %s\n", strerror (errno));
99
100 val = 1;
101 if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof (val)))
102 LOG (llevError, "TCP_KEEPINTVL: %s\n", strerror (errno));
103 }
104#endif
68 105
69 { 106 {
70 int bufsize = 65535; /*Supposed absolute upper limit */ 107 int bufsize = 65535; /*Supposed absolute upper limit */
71 int oldbufsize; 108 int oldbufsize;
72 int buflen = sizeof (int); 109 int buflen = sizeof (int);
… …
83 120
84 buflen = sizeof (oldbufsize); 121 buflen = sizeof (oldbufsize);
85 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen); 122 getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
86 } 123 }
87 124
125 state = ST_SETUP;
88 mapmode = Map0Cmd; 126 mapmode = Map0Cmd;
89 darkness = 1; 127 darkness = 1;
90 status = Ns_Add;
91 mapx = 11; 128 mapx = 11;
92 mapy = 11; 129 mapy = 11;
93 itemcmd = 1; /* Default is version item1 command */ 130 itemcmd = 1; /* Default is version item1 command */
94 131
95 faces_sent = salloc<uint8> (nrofpixmaps, 0); 132 faces_sent = salloc0<uint8> (nrofpixmaps);
96 133
97 /* Do this so we don't send a face command for the client for 134 /* 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 135 * this face. Face 0 is sent to the client to say clear
99 * face information. 136 * face information.
100 */ 137 */
… …
112 149
113 // initialisation done, kick it! 150 // initialisation done, kick it!
114 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); 151 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
115 flush (); 152 flush ();
116 153
154 // clients are externally referenced by the socket
155 refcnt_inc ();
156 clients.push_back (this);
157
117#if 0//TODO 158#if 0//TODO
118 socket_info.nconns++; 159 socket_info.nconns++;
119 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns; 160 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
120 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns; 161 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns;
121#endif 162#endif
122} 163}
123 164
124client::~client () 165client::~client ()
125{ 166{
126 if (pl) 167 sfree<uint8> (faces_sent, nrofpixmaps);
127 pl->socket = 0;
128
129 if (fd >= 0)
130 close (fd);
131
132 free (faces_sent);
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::do_destroy ()
140{ 175{
141 status = Ns_Dead; 176 attachable::do_destroy ();
177
178 sockvec::iterator i = find (clients.begin (), clients.end (), this);
179 if (i != clients.end ())
180 clients.erase (i);
181
182 if (pl)
183 pl->disconnect ();
184
185 if (fd >= 0)
186 close (fd);
187
188 state = ST_DEAD;
189
142 socket_ev.suspend (); 190 socket_ev.suspend ();
143 cmd_ev.suspend (); 191 cmd_ev.suspend ();
192
193 // socket now longer references us
194 refcnt_dec ();
144} 195}
145 196
146/** This sets up the socket and reads all the image information into memory. */ 197/** This sets up the socket and reads all the image information into memory. */
147void 198void
148init_ericserver (void) 199init_ericserver (void)
… …
168{ 219{
169 LOG (llevDebug, "Freeing all new client/server information.\n"); 220 LOG (llevDebug, "Freeing all new client/server information.\n");
170 free_socket_images (); 221 free_socket_images ();
171} 222}
172 223
173/** Sends the 'goodbye' command to the player, and closes connection. */ 224client *
174void
175final_free_player (player *pl)
176{
177 free_player (pl);
178}
179
180bool
181add_client (int fd, const char *peername) 225client::create (int fd, const char *peername)
182{ 226{
183 if (checkbanned (NULL, peername)) 227 if (checkbanned (NULL, peername))
184 { 228 {
185 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 229 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
186 return false; 230 return 0;
187 } 231 }
188 else 232 else
189 { 233 {
190 client *ns = new client (dup (fd), peername); 234 client *ns = new client (dup (fd), peername);
191 clients.push_back (ns); 235
236 ns->instantiate (); // effectively a nop right now
237
238 INVOKE_CLIENT (CONNECT, ns);
239
192 return true; 240 return ns;
193 } 241 }
194} 242}
195 243

Diff Legend

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