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.19 by root, Thu Dec 14 22:45:41 2006 UTC vs.
Revision 1.22 by root, Sat Dec 16 21:40:26 2006 UTC

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

Diff Legend

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