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.17 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.21 by root, Sat Dec 16 03:08:26 2006 UTC

… …
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 <netdb.h> 42#include <netdb.h>
43 43
44#ifdef HAVE_UNISTD_H
45# include <unistd.h> 44#include <unistd.h>
46#endif 45#include <arpa/inet.h>
47 46
48#ifdef HAVE_ARPA_INET_H
49# include <arpa/inet.h>
50#endif
51#include <newserver.h>
52
53sockvec client_sockets; 47sockvec clients;
54 48
55/** 49/**
56 * Initializes a connection. Really, it just sets up the data structure, 50 * Initializes a connection. Really, it just sets up the data structure,
57 * socket setup is handled elsewhere. We do send a version to the 51 * socket setup is handled elsewhere. We do send a version to the
58 * client. 52 * client.
59 */ 53 */
60client_socket::client_socket (int fd, const char *peername) 54client::client (int fd, const char *peername)
61: fd (fd), host (strdup (peername)), 55: fd (fd), host (strdup (peername)),
62 socket_ev (this, &client_socket::socket_cb) 56 socket_ev (this, &client::socket_cb),
57 cmd_ev (this, &client::cmd_cb)
63{ 58{
64 { 59 {
65 struct linger linger_opt; 60 struct linger linger_opt;
66 61
67 linger_opt.l_onoff = 0; 62 linger_opt.l_onoff = 0;
… …
106 * this face. Face 0 is sent to the client to say clear 101 * this face. Face 0 is sent to the client to say clear
107 * face information. 102 * face information.
108 */ 103 */
109 faces_sent[0] = NS_FACESENT_FACE; 104 faces_sent[0] = NS_FACESENT_FACE;
110 105
111 socket_ev.fd (fd).poll (PE_W).start (); 106 // socket I/O is low priority
107 // we prefer to have the server run instead of handling client requests
108 socket_ev.prio (PE_PRIO_NORMAL + 1);
109 socket_ev.fd (fd);
110 socket_ev.poll (PE_R);
111
112 // command handling is even lower priority
113 // that way no client can monopolise the server
114 cmd_ev.prio (PE_PRIO_NORMAL + 2);
112 115
113 // initialisation done, kick it! 116 // initialisation done, kick it!
114 117
115 {
116 packet sl;
117 sl.printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); 118 send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
118 send_packet (sl); 119 flush ();
119 }
120 120
121#if 0//TODO 121#if 0//TODO
122 socket_info.nconns++; 122 socket_info.nconns++;
123 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns; 123 if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
124 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns; 124 if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns;
125#endif 125#endif
126} 126}
127 127
128client_socket::~client_socket () 128client::~client ()
129{
130 if (pl)
131 pl->socket = 0;
132
133 if (fd >= 0)
134 close (fd), fd = -1;
135
136 free (stats.range), stats.range = 0;
137 free (stats.title), stats.title = 0;
138 free (host), host = 0;
139}
140
141void
142client::destroy ()
129{ 143{
130 status = Ns_Dead; 144 status = Ns_Dead;
145 socket_ev.suspend ();
146 cmd_ev.suspend ();
131} 147}
132 148
133/** This sets up the socket and reads all the image information into memory. */ 149/** This sets up the socket and reads all the image information into memory. */
134void 150void
135init_ericserver (void) 151init_ericserver (void)
136{ 152{
137 struct sockaddr_in insock;
138 struct linger linger_opt;
139
140 memset (&cst_tot, 0, sizeof (CS_Stats));
141 memset (&cst_lst, 0, sizeof (CS_Stats));
142 cst_tot.time_start = time (NULL); 153 cst_tot.time_start = time (NULL);
143 cst_lst.time_start = time (NULL); 154 cst_lst.time_start = time (NULL);
144 155
145 LOG (llevDebug, "Initialize new client/server data\n"); 156 LOG (llevDebug, "Initialize new client/server data\n");
146 157
… …
160{ 171{
161 LOG (llevDebug, "Freeing all new client/server information.\n"); 172 LOG (llevDebug, "Freeing all new client/server information.\n");
162 free_socket_images (); 173 free_socket_images ();
163} 174}
164 175
165/**
166 * Frees a socket.
167 * Basically, all we need to do here is free all data structures that
168 * might be associated with the socket. It is up to the caller to
169 * update the list
170 */
171
172void
173free_newsocket (client_socket *ns)
174{
175 if (ns->fd >= 0)
176 close (ns->fd);
177
178 if (ns->stats.range)
179 free (ns->stats.range);
180
181 if (ns->stats.title)
182 free (ns->stats.title);
183
184 free (ns->host);
185
186 ns->fd = -1;
187 ns->stats.range = 0;
188 ns->stats.title = 0;
189 ns->host = 0;
190}
191
192/** Sends the 'goodbye' command to the player, and closes connection. */ 176/** Sends the 'goodbye' command to the player, and closes connection. */
193void 177void
194final_free_player (player *pl) 178final_free_player (player *pl)
195{ 179{
196 pl->socket->send_packet ("goodbye");
197 free_newsocket (pl->socket);
198 free_player (pl); 180 free_player (pl);
199} 181}
200 182
201bool 183bool
202add_client_socket (int fd, const char *peername) 184add_client (int fd, const char *peername)
203{ 185{
204 if (checkbanned (NULL, peername)) 186 if (checkbanned (NULL, peername))
205 { 187 {
206 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 188 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
207 return false; 189 return false;
208 } 190 }
209 else 191 else
210 { 192 {
211 client_socket *ns = new client_socket (dup (fd), peername); 193 client *ns = new client (dup (fd), peername);
212 client_sockets.push_back (ns); 194 clients.push_back (ns);
213 return true; 195 return true;
214 } 196 }
215} 197}
216 198

Diff Legend

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