| … | |
… | |
| 130 | darkness = 1; |
130 | darkness = 1; |
| 131 | mapx = 11; |
131 | mapx = 11; |
| 132 | mapy = 11; |
132 | mapy = 11; |
| 133 | itemcmd = 1; /* Default is version item1 command */ |
133 | itemcmd = 1; /* Default is version item1 command */ |
| 134 | |
134 | |
| 135 | faces_sent = salloc0<uint8> (nrofpixmaps); |
|
|
| 136 | |
|
|
| 137 | /* Do this so we don't send a face command for the client for |
135 | /* Do this so we don't send a face command for the client for |
| 138 | * this face. Face 0 is sent to the client to say clear |
136 | * this face. Face 0 is sent to the client to say clear |
| 139 | * face information. |
137 | * face information. |
| 140 | */ |
138 | */ |
| 141 | faces_sent[0] = NS_FACESENT_FACE; |
139 | faces_sent[0] = true; |
| 142 | |
140 | |
| 143 | // socket I/O is low priority |
|
|
| 144 | // we prefer to have the server run instead of handling client requests |
|
|
| 145 | socket_ev.prio (PE_PRIO_NORMAL + 1); |
141 | socket_ev.prio (PE_PRIO_NORMAL); |
| 146 | socket_ev.fd (fd); |
142 | socket_ev.fd (fd); |
| 147 | socket_ev.poll (PE_R); |
143 | socket_ev.poll (PE_R); |
| 148 | |
144 | |
| 149 | // command handling is even lower priority |
|
|
| 150 | // that way no client can monopolise the server |
|
|
| 151 | cmd_ev.prio (PE_PRIO_NORMAL + 2); |
145 | cmd_ev.prio (PE_PRIO_NORMAL); |
| 152 | |
146 | |
| 153 | // initialisation done, kick it! |
147 | // initialisation done, kick it! |
| 154 | send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); |
148 | send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO); |
| 155 | flush (); |
149 | flush (); |
| 156 | |
150 | |
| … | |
… | |
| 161 | |
155 | |
| 162 | client::~client () |
156 | client::~client () |
| 163 | { |
157 | { |
| 164 | clients.erase (this); |
158 | clients.erase (this); |
| 165 | |
159 | |
| 166 | sfree<uint8> (faces_sent, nrofpixmaps); |
|
|
| 167 | free (stats.range); |
160 | free (stats.range); |
| 168 | free (stats.title); |
161 | free (stats.title); |
| 169 | free (host); |
162 | free (host); |
| 170 | } |
163 | } |
| 171 | |
164 | |
| … | |
… | |
| 230 | { |
223 | { |
| 231 | cst_tot.time_start = time (NULL); |
224 | cst_tot.time_start = time (NULL); |
| 232 | cst_lst.time_start = time (NULL); |
225 | cst_lst.time_start = time (NULL); |
| 233 | |
226 | |
| 234 | LOG (llevDebug, "Initialize new client/server data\n"); |
227 | LOG (llevDebug, "Initialize new client/server data\n"); |
| 235 | |
|
|
| 236 | read_client_images (); |
|
|
| 237 | } |
228 | } |
| 238 | |
229 | |
| 239 | |
230 | |
| 240 | /******************************************************************************* |
231 | /******************************************************************************* |
| 241 | * |
232 | * |
| … | |
… | |
| 252 | } |
243 | } |
| 253 | |
244 | |
| 254 | client * |
245 | client * |
| 255 | client::create (int fd, const char *peername) |
246 | client::create (int fd, const char *peername) |
| 256 | { |
247 | { |
| 257 | if (checkbanned (NULL, peername)) |
|
|
| 258 | { |
|
|
| 259 | LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); |
|
|
| 260 | return 0; |
|
|
| 261 | } |
|
|
| 262 | else |
|
|
| 263 | { |
|
|
| 264 | client *ns = new client (dup (fd), peername); |
248 | client *ns = new client (dup (fd), peername); |
| 265 | |
|
|
| 266 | ns->instantiate (); // effectively a nop right now |
249 | ns->instantiate (); // effectively a nop right now |
| 267 | |
|
|
| 268 | INVOKE_CLIENT (CONNECT, ns); |
250 | INVOKE_CLIENT (CONNECT, ns); |
| 269 | |
|
|
| 270 | return ns; |
251 | return ns; |
| 271 | } |
|
|
| 272 | } |
252 | } |
| 273 | |
253 | |
