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.20 by root, Fri Dec 15 19:59:20 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#include <unistd.h> 46#include <unistd.h>
45#include <arpa/inet.h> 47#include <arpa/inet.h>
46 48
… …
51 * 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
52 * client. 54 * client.
53 */ 55 */
54client::client (int fd, const char *peername) 56client::client (int fd, const char *peername)
55: fd (fd), host (strdup (peername)), 57: fd (fd), host (strdup (peername)),
56 socket_ev (this, &client::socket_cb) 58 socket_ev (this, &client::socket_cb),
59 cmd_ev (this, &client::cmd_cb),
60 cc_inv (this), cc_other (this)
57{ 61{
58 { 62 {
59 struct linger linger_opt; 63 struct linger linger_opt;
60 64
61 linger_opt.l_onoff = 0; 65 linger_opt.l_onoff = 0;
62 linger_opt.l_linger = 0; 66 linger_opt.l_linger = 0;
63 67
64 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)))
65 LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno)); 69 LOG (llevError, "SO_LINGER: %s\n", strerror (errno));
66 } 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
67 104
68 { 105 {
69 int bufsize = 65535; /*Supposed absolute upper limit */ 106 int bufsize = 65535; /*Supposed absolute upper limit */
70 int oldbufsize; 107 int oldbufsize;
71 int buflen = sizeof (int); 108 int buflen = sizeof (int);
… …
89 status = Ns_Add; 126 status = Ns_Add;
90 mapx = 11; 127 mapx = 11;
91 mapy = 11; 128 mapy = 11;
92 itemcmd = 1; /* Default is version item1 command */ 129 itemcmd = 1; /* Default is version item1 command */
93 130
94 faces_sent_len = nrofpixmaps; 131 faces_sent = salloc<uint8> (nrofpixmaps, 0);
95 faces_sent = (uint8 *)calloc (nrofpixmaps, sizeof (*faces_sent));
96 if (!faces_sent)
97 fatal (OUT_OF_MEMORY);
98 132
99 /* 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
100 * 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
101 * face information. 135 * face information.
102 */ 136 */
103 faces_sent[0] = NS_FACESENT_FACE; 137 faces_sent[0] = NS_FACESENT_FACE;
104 138
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);
105 socket_ev.fd (fd); 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);
106 148
107 // initialisation done, kick it! 149 // initialisation done, kick it!
108
109 {
110 packet sl;
111 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);
112 send_packet (sl);
113 flush (); 151 flush ();
114 }
115 152
116#if 0//TODO 153#if 0//TODO
117 socket_info.nconns++; 154 socket_info.nconns++;
118 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;
119 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;
120#endif 157#endif
121} 158}
122 159
123client::~client () 160client::~client ()
124{ 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 ()
176{
125 status = Ns_Dead; 177 status = Ns_Dead;
178 socket_ev.suspend ();
179 cmd_ev.suspend ();
126} 180}
127 181
128/** 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. */
129void 183void
130init_ericserver (void) 184init_ericserver (void)
131{ 185{
132 struct sockaddr_in insock;
133 struct linger linger_opt;
134
135 memset (&cst_tot, 0, sizeof (CS_Stats));
136 memset (&cst_lst, 0, sizeof (CS_Stats));
137 cst_tot.time_start = time (NULL); 186 cst_tot.time_start = time (NULL);
138 cst_lst.time_start = time (NULL); 187 cst_lst.time_start = time (NULL);
139 188
140 LOG (llevDebug, "Initialize new client/server data\n"); 189 LOG (llevDebug, "Initialize new client/server data\n");
141 190
… …
155{ 204{
156 LOG (llevDebug, "Freeing all new client/server information.\n"); 205 LOG (llevDebug, "Freeing all new client/server information.\n");
157 free_socket_images (); 206 free_socket_images ();
158} 207}
159 208
160/**
161 * Frees a socket.
162 * Basically, all we need to do here is free all data structures that
163 * might be associated with the socket. It is up to the caller to
164 * update the list
165 */
166
167void
168free_newsocket (client *ns)
169{
170 if (ns->fd >= 0)
171 close (ns->fd);
172
173 if (ns->stats.range)
174 free (ns->stats.range);
175
176 if (ns->stats.title)
177 free (ns->stats.title);
178
179 free (ns->host);
180
181 ns->fd = -1;
182 ns->stats.range = 0;
183 ns->stats.title = 0;
184 ns->host = 0;
185}
186
187/** Sends the 'goodbye' command to the player, and closes connection. */ 209/** Sends the 'goodbye' command to the player, and closes connection. */
188void 210void
189final_free_player (player *pl) 211final_free_player (player *pl)
190{ 212{
191 pl->socket->send_packet ("goodbye");
192 free_newsocket (pl->socket);
193 free_player (pl); 213 free_player (pl);
194} 214}
195 215
196bool 216bool
197add_client (int fd, const char *peername) 217add_client (int fd, const char *peername)

Diff Legend

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