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.16 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.26 by root, Wed Dec 20 09:14:22 2006 UTC

… …
37#include <sproto.h> 37#include <sproto.h>
38#include <sys/types.h> 38#include <sys/types.h>
39#include <sys/time.h> 39#include <sys/time.h>
40#include <sys/socket.h> 40#include <sys/socket.h>
41#include <netinet/in.h> 41#include <netinet/in.h>
42#include <netinet/tcp.h>
43#include <netinet/ip.h>
42#include <netdb.h> 44#include <netdb.h>
43 45
44#ifdef HAVE_UNISTD_H
45# include <unistd.h> 46#include <unistd.h>
46#endif
47
48#ifdef HAVE_ARPA_INET_H
49# include <arpa/inet.h> 47#include <arpa/inet.h>
50#endif
51#include <newserver.h>
52 48
53sockvec client_sockets; 49sockvec clients;
54 50
55/** 51/**
56 * Initializes a connection. Really, it just sets up the data structure, 52 * Initializes a connection. Really, it just sets up the data structure,
57 * socket setup is handled elsewhere. We do send a version to the 53 * socket setup is handled elsewhere. We do send a version to the
58 * client. 54 * client.
59 */ 55 */
60client_socket::client_socket (int fd, const char *peername) 56client::client (int fd, const char *peername)
61: fd (fd), host (strdup (peername)) 57: fd (fd), host (strdup (peername)),
58 socket_ev (this, &client::socket_cb),
59 cmd_ev (this, &client::cmd_cb),
60 cc_inv (this), cc_other (this)
62{ 61{
63 { 62 {
64 struct linger linger_opt; 63 struct linger linger_opt;
65 64
66 linger_opt.l_onoff = 0; 65 linger_opt.l_onoff = 0;
67 linger_opt.l_linger = 0; 66 linger_opt.l_linger = 0;
68 67
69 if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger))) 68 if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger)))
70 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 69 LOG (llevError, "SO_LINGER: %s\n", strerror (errno));
71 } 70 }
71
72 {
73 int val = IPTOS_LOWDELAY;
74
75 if (setsockopt (fd, IPPROTO_IP, IP_TOS, &val, sizeof (val)))
76 LOG (llevError, "IP_TOS: %s\n", strerror (errno));
77 }
78
79 {
80 int val = 1;
81
82 if (setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)))
83 LOG (llevError, "TCP_NODELAY: %s\n", strerror (errno));
84 }
85
86#ifdef __linux__
87 {
88 int val;
89
90 // set some very aggressive keepalive parameters
91 val = 10;
92 if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof (val)))
93 LOG (llevError, "TCP_KEEPIDLE: %s\n", strerror (errno));
94
95 val = 5;
96 if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof (val)))
97 LOG (llevError, "TCP_KEEPCNT: %s\n", strerror (errno));
98
99 val = 1;
100 if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof (val)))
101 LOG (llevError, "TCP_KEEPINTVL: %s\n", strerror (errno));
102 }
103#endif
72 104
73 { 105 {
74 int bufsize = 65535; /*Supposed absolute upper limit */ 106 int bufsize = 65535; /*Supposed absolute upper limit */
75 int oldbufsize; 107 int oldbufsize;
76 int buflen = sizeof (int); 108 int buflen = sizeof (int);
… …
94 status = Ns_Add; 126 status = Ns_Add;
95 mapx = 11; 127 mapx = 11;
96 mapy = 11; 128 mapy = 11;
97 itemcmd = 1; /* Default is version item1 command */ 129 itemcmd = 1; /* Default is version item1 command */
98 130
99 faces_sent_len = nrofpixmaps; 131 faces_sent = salloc<uint8> (nrofpixmaps, 0);
100 faces_sent = (uint8 *)calloc (nrofpixmaps, sizeof (*faces_sent));
101 if (!faces_sent)
102 fatal (OUT_OF_MEMORY);
103 132
104 /* Do this so we don't send a face command for the client for 133 /* Do this so we don't send a face command for the client for
105 * this face. Face 0 is sent to the client to say clear 134 * this face. Face 0 is sent to the client to say clear
106 * face information. 135 * face information.
107 */ 136 */
108 faces_sent[0] = NS_FACESENT_FACE; 137 faces_sent[0] = NS_FACESENT_FACE;
109 138
110 can_write = 1; 139 // socket I/O is low priority
140 // we prefer to have the server run instead of handling client requests
141 socket_ev.prio (PE_PRIO_NORMAL + 1);
142 socket_ev.fd (fd);
143 socket_ev.poll (PE_R);
144
145 // command handling is even lower priority
146 // that way no client can monopolise the server
147 cmd_ev.prio (PE_PRIO_NORMAL + 2);
111 148
112 // initialisation done, kick it! 149 // initialisation done, kick it!
113
114 {
115 packet sl;
116 sl.printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); 150 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
117 send_packet (sl); 151 flush ();
118 }
119 152
120#if 0//TODO 153#if 0//TODO
121 socket_info.nconns++; 154 socket_info.nconns++;
122 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns; 155 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
123 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns; 156 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns;
124#endif 157#endif
125} 158}
126 159
127client_socket::~client_socket () 160client::~client ()
161{
162 if (pl)
163 pl->socket = 0;
164
165 if (fd >= 0)
166 close (fd);
167
168 sfree<uint8> (faces_sent, nrofpixmaps);
169 free (stats.range);
170 free (stats.title);
171 free (host);
172}
173
174void
175client::destroy ()
128{ 176{
129 status = Ns_Dead; 177 status = Ns_Dead;
178 socket_ev.suspend ();
179 cmd_ev.suspend ();
130} 180}
131 181
132/** 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. */
133void 183void
134init_ericserver (void) 184init_ericserver (void)
135{ 185{
136 struct sockaddr_in insock;
137 struct linger linger_opt;
138
139 memset (&cst_tot, 0, sizeof (CS_Stats));
140 memset (&cst_lst, 0, sizeof (CS_Stats));
141 cst_tot.time_start = time (NULL); 186 cst_tot.time_start = time (NULL);
142 cst_lst.time_start = time (NULL); 187 cst_lst.time_start = time (NULL);
143 188
144 LOG (llevDebug, "Initialize new client/server data\n"); 189 LOG (llevDebug, "Initialize new client/server data\n");
145 190
… …
159{ 204{
160 LOG (llevDebug, "Freeing all new client/server information.\n"); 205 LOG (llevDebug, "Freeing all new client/server information.\n");
161 free_socket_images (); 206 free_socket_images ();
162} 207}
163 208
164/**
165 * Frees a socket.
166 * Basically, all we need to do here is free all data structures that
167 * might be associated with the socket. It is up to the caller to
168 * update the list
169 */
170
171void
172free_newsocket (client_socket *ns)
173{
174 if (ns->fd >= 0)
175 close (ns->fd);
176
177 if (ns->stats.range)
178 free (ns->stats.range);
179
180 if (ns->stats.title)
181 free (ns->stats.title);
182
183 free (ns->host);
184
185 ns->fd = -1;
186 ns->stats.range = 0;
187 ns->stats.title = 0;
188 ns->host = 0;
189}
190
191/** Sends the 'goodbye' command to the player, and closes connection. */ 209/** Sends the 'goodbye' command to the player, and closes connection. */
192void 210void
193final_free_player (player *pl) 211final_free_player (player *pl)
194{ 212{
195 pl->socket->send_packet ("goodbye");
196 free_newsocket (pl->socket);
197 free_player (pl); 213 free_player (pl);
198} 214}
199 215
200bool 216bool
201add_client_socket (int fd, const char *peername) 217add_client (int fd, const char *peername)
202{ 218{
203 if (checkbanned (NULL, peername)) 219 if (checkbanned (NULL, peername))
204 { 220 {
205 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 221 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
206 return false; 222 return false;
207 } 223 }
208 else 224 else
209 { 225 {
210 client_socket *ns = new client_socket (dup (fd), peername); 226 client *ns = new client (dup (fd), peername);
211 client_sockets.push_back (ns); 227 clients.push_back (ns);
212 return true; 228 return true;
213 } 229 }
214} 230}
215 231

Diff Legend

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