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.18 by root, Thu Dec 14 21:46:34 2006 UTC vs.
Revision 1.23 by root, Sun Dec 17 00:25:44 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)),
62 socket_ev (this, &client_socket::socket_cb) 58 socket_ev (this, &client::socket_cb),
59 cmd_ev (this, &client::cmd_cb)
63{ 60{
64 { 61 {
65 struct linger linger_opt; 62 struct linger linger_opt;
66 63
67 linger_opt.l_onoff = 0; 64 linger_opt.l_onoff = 0;
68 linger_opt.l_linger = 0; 65 linger_opt.l_linger = 0;
69 66
70 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)))
71 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 68 LOG (llevError, "SO_LINGER: %s\n", strerror (errno));
72 } 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
73 103
74 { 104 {
75 int bufsize = 65535; /*Supposed absolute upper limit */ 105 int bufsize = 65535; /*Supposed absolute upper limit */
76 int oldbufsize; 106 int oldbufsize;
77 int buflen = sizeof (int); 107 int buflen = sizeof (int);
… …
95 status = Ns_Add; 125 status = Ns_Add;
96 mapx = 11; 126 mapx = 11;
97 mapy = 11; 127 mapy = 11;
98 itemcmd = 1; /* Default is version item1 command */ 128 itemcmd = 1; /* Default is version item1 command */
99 129
100 faces_sent_len = nrofpixmaps; 130 faces_sent = salloc<uint8> (nrofpixmaps, 0);
101 faces_sent = (uint8 *)calloc (nrofpixmaps, sizeof (*faces_sent));
102 if (!faces_sent)
103 fatal (OUT_OF_MEMORY);
104 131
105 /* 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
106 * 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
107 * face information. 134 * face information.
108 */ 135 */
109 faces_sent[0] = NS_FACESENT_FACE; 136 faces_sent[0] = NS_FACESENT_FACE;
110 137
138 // socket I/O is low priority
139 // we prefer to have the server run instead of handling client requests
140 socket_ev.prio (PE_PRIO_NORMAL + 1);
111 socket_ev.fd (fd); 141 socket_ev.fd (fd);
142 socket_ev.poll (PE_R);
143
144 // command handling is even lower priority
145 // that way no client can monopolise the server
146 cmd_ev.prio (PE_PRIO_NORMAL + 2);
112 147
113 // initialisation done, kick it! 148 // initialisation done, kick it!
114
115 {
116 packet sl;
117 sl.printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); 149 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
118 send_packet (sl);
119 flush (); 150 flush ();
120 }
121 151
122#if 0//TODO 152#if 0//TODO
123 socket_info.nconns++; 153 socket_info.nconns++;
124 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns; 154 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
125 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns; 155 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns;
126#endif 156#endif
127} 157}
128 158
129client_socket::~client_socket () 159client::~client ()
160{
161 if (pl)
162 pl->socket = 0;
163
164 if (fd >= 0)
165 close (fd);
166
167 free (faces_sent);
168 free (stats.range);
169 free (stats.title);
170 free (host);
171}
172
173void
174client::destroy ()
130{ 175{
131 status = Ns_Dead; 176 status = Ns_Dead;
177 socket_ev.suspend ();
178 cmd_ev.suspend ();
132} 179}
133 180
134/** 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. */
135void 182void
136init_ericserver (void) 183init_ericserver (void)
137{ 184{
138 struct sockaddr_in insock;
139 struct linger linger_opt;
140
141 memset (&cst_tot, 0, sizeof (CS_Stats));
142 memset (&cst_lst, 0, sizeof (CS_Stats));
143 cst_tot.time_start = time (NULL); 185 cst_tot.time_start = time (NULL);
144 cst_lst.time_start = time (NULL); 186 cst_lst.time_start = time (NULL);
145 187
146 LOG (llevDebug, "Initialize new client/server data\n"); 188 LOG (llevDebug, "Initialize new client/server data\n");
147 189
… …
161{ 203{
162 LOG (llevDebug, "Freeing all new client/server information.\n"); 204 LOG (llevDebug, "Freeing all new client/server information.\n");
163 free_socket_images (); 205 free_socket_images ();
164} 206}
165 207
166/**
167 * Frees a socket.
168 * Basically, all we need to do here is free all data structures that
169 * might be associated with the socket. It is up to the caller to
170 * update the list
171 */
172
173void
174free_newsocket (client_socket *ns)
175{
176 if (ns->fd >= 0)
177 close (ns->fd);
178
179 if (ns->stats.range)
180 free (ns->stats.range);
181
182 if (ns->stats.title)
183 free (ns->stats.title);
184
185 free (ns->host);
186
187 ns->fd = -1;
188 ns->stats.range = 0;
189 ns->stats.title = 0;
190 ns->host = 0;
191}
192
193/** Sends the 'goodbye' command to the player, and closes connection. */ 208/** Sends the 'goodbye' command to the player, and closes connection. */
194void 209void
195final_free_player (player *pl) 210final_free_player (player *pl)
196{ 211{
197 pl->socket->send_packet ("goodbye");
198 free_newsocket (pl->socket);
199 free_player (pl); 212 free_player (pl);
200} 213}
201 214
202bool 215bool
203add_client_socket (int fd, const char *peername) 216add_client (int fd, const char *peername)
204{ 217{
205 if (checkbanned (NULL, peername)) 218 if (checkbanned (NULL, peername))
206 { 219 {
207 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 220 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
208 return false; 221 return false;
209 } 222 }
210 else 223 else
211 { 224 {
212 client_socket *ns = new client_socket (dup (fd), peername); 225 client *ns = new client (dup (fd), peername);
213 client_sockets.push_back (ns); 226 clients.push_back (ns);
214 return true; 227 return true;
215 } 228 }
216} 229}
217 230

Diff Legend

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