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.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)),
58 socket_ev (this, &client::socket_cb),
59 cmd_ev (this, &client::cmd_cb)
62{ 60{
63 { 61 {
64 struct linger linger_opt; 62 struct linger linger_opt;
65 63
66 linger_opt.l_onoff = 0; 64 linger_opt.l_onoff = 0;
67 linger_opt.l_linger = 0; 65 linger_opt.l_linger = 0;
68 66
69 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)))
70 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 68 LOG (llevError, "SO_LINGER: %s\n", strerror (errno));
71 } 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
72 103
73 { 104 {
74 int bufsize = 65535; /*Supposed absolute upper limit */ 105 int bufsize = 65535; /*Supposed absolute upper limit */
75 int oldbufsize; 106 int oldbufsize;
76 int buflen = sizeof (int); 107 int buflen = sizeof (int);
… …
94 status = Ns_Add; 125 status = Ns_Add;
95 mapx = 11; 126 mapx = 11;
96 mapy = 11; 127 mapy = 11;
97 itemcmd = 1; /* Default is version item1 command */ 128 itemcmd = 1; /* Default is version item1 command */
98 129
99 faces_sent_len = nrofpixmaps; 130 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 131
104 /* 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
105 * 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
106 * face information. 134 * face information.
107 */ 135 */
108 faces_sent[0] = NS_FACESENT_FACE; 136 faces_sent[0] = NS_FACESENT_FACE;
109 137
110 can_write = 1; 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);
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);
111 147
112 // initialisation done, kick it! 148 // initialisation done, kick it!
113
114 {
115 packet sl;
116 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);
117 send_packet (sl); 150 flush ();
118 }
119 151
120#if 0//TODO 152#if 0//TODO
121 socket_info.nconns++; 153 socket_info.nconns++;
122 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;
123 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;
124#endif 156#endif
125} 157}
126 158
127client_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 ()
128{ 175{
129 status = Ns_Dead; 176 status = Ns_Dead;
177 socket_ev.suspend ();
178 cmd_ev.suspend ();
130} 179}
131 180
132/** 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. */
133void 182void
134init_ericserver (void) 183init_ericserver (void)
135{ 184{
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); 185 cst_tot.time_start = time (NULL);
142 cst_lst.time_start = time (NULL); 186 cst_lst.time_start = time (NULL);
143 187
144 LOG (llevDebug, "Initialize new client/server data\n"); 188 LOG (llevDebug, "Initialize new client/server data\n");
145 189
… …
159{ 203{
160 LOG (llevDebug, "Freeing all new client/server information.\n"); 204 LOG (llevDebug, "Freeing all new client/server information.\n");
161 free_socket_images (); 205 free_socket_images ();
162} 206}
163 207
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. */ 208/** Sends the 'goodbye' command to the player, and closes connection. */
192void 209void
193final_free_player (player *pl) 210final_free_player (player *pl)
194{ 211{
195 pl->socket->send_packet ("goodbye");
196 free_newsocket (pl->socket);
197 free_player (pl); 212 free_player (pl);
198} 213}
199 214
200bool 215bool
201add_client_socket (int fd, const char *peername) 216add_client (int fd, const char *peername)
202{ 217{
203 if (checkbanned (NULL, peername)) 218 if (checkbanned (NULL, peername))
204 { 219 {
205 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 220 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
206 return false; 221 return false;
207 } 222 }
208 else 223 else
209 { 224 {
210 client_socket *ns = new client_socket (dup (fd), peername); 225 client *ns = new client (dup (fd), peername);
211 client_sockets.push_back (ns); 226 clients.push_back (ns);
212 return true; 227 return true;
213 } 228 }
214} 229}
215 230

Diff Legend

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