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.22 by root, Sat Dec 16 21:40: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)),
56 socket_ev (this, &client::socket_cb),
57 cmd_ev (this, &client::cmd_cb)
62{ 58{
63 { 59 {
64 struct linger linger_opt; 60 struct linger linger_opt;
65 61
66 linger_opt.l_onoff = 0; 62 linger_opt.l_onoff = 0;
… …
94 status = Ns_Add; 90 status = Ns_Add;
95 mapx = 11; 91 mapx = 11;
96 mapy = 11; 92 mapy = 11;
97 itemcmd = 1; /* Default is version item1 command */ 93 itemcmd = 1; /* Default is version item1 command */
98 94
99 faces_sent_len = nrofpixmaps; 95 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 96
104 /* 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
105 * 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
106 * face information. 99 * face information.
107 */ 100 */
108 faces_sent[0] = NS_FACESENT_FACE; 101 faces_sent[0] = NS_FACESENT_FACE;
109 102
110 can_write = 1; 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);
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);
111 112
112 // initialisation done, kick it! 113 // initialisation done, kick it!
113
114 {
115 packet sl;
116 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);
117 send_packet (sl); 115 flush ();
118 }
119 116
120#if 0//TODO 117#if 0//TODO
121 socket_info.nconns++; 118 socket_info.nconns++;
122 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;
123 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;
124#endif 121#endif
125} 122}
126 123
127client_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 ()
128{ 140{
129 status = Ns_Dead; 141 status = Ns_Dead;
142 socket_ev.suspend ();
143 cmd_ev.suspend ();
130} 144}
131 145
132/** 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. */
133void 147void
134init_ericserver (void) 148init_ericserver (void)
135{ 149{
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); 150 cst_tot.time_start = time (NULL);
142 cst_lst.time_start = time (NULL); 151 cst_lst.time_start = time (NULL);
143 152
144 LOG (llevDebug, "Initialize new client/server data\n"); 153 LOG (llevDebug, "Initialize new client/server data\n");
145 154
… …
159{ 168{
160 LOG (llevDebug, "Freeing all new client/server information.\n"); 169 LOG (llevDebug, "Freeing all new client/server information.\n");
161 free_socket_images (); 170 free_socket_images ();
162} 171}
163 172
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. */ 173/** Sends the 'goodbye' command to the player, and closes connection. */
192void 174void
193final_free_player (player *pl) 175final_free_player (player *pl)
194{ 176{
195 pl->socket->send_packet ("goodbye");
196 free_newsocket (pl->socket);
197 free_player (pl); 177 free_player (pl);
198} 178}
199 179
200bool 180bool
201add_client_socket (int fd, const char *peername) 181add_client (int fd, const char *peername)
202{ 182{
203 if (checkbanned (NULL, peername)) 183 if (checkbanned (NULL, peername))
204 { 184 {
205 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); 185 LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
206 return false; 186 return false;
207 } 187 }
208 else 188 else
209 { 189 {
210 client_socket *ns = new client_socket (dup (fd), peername); 190 client *ns = new client (dup (fd), peername);
211 client_sockets.push_back (ns); 191 clients.push_back (ns);
212 return true; 192 return true;
213 } 193 }
214} 194}
215 195

Diff Legend

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