| … | |
… | |
| 129 | mapmode = Map0Cmd; |
129 | mapmode = Map0Cmd; |
| 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 | max_rate = 100000 / (1000000 / MAX_TIME); // ~1mbit is assumed per default |
| 135 | faces_sent = salloc0<uint8> (nrofpixmaps); |
|
|
| 136 | |
135 | |
| 137 | /* Do this so we don't send a face command for the client for |
136 | /* 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 |
137 | * this face. Face 0 is sent to the client to say clear |
| 139 | * face information. |
138 | * face information. |
| 140 | */ |
139 | */ |
| 141 | faces_sent[0] = NS_FACESENT_FACE; |
140 | faces_sent[0] = true; |
| 142 | |
141 | |
| 143 | socket_ev.prio (PE_PRIO_NORMAL); |
142 | socket_ev.prio (PE_PRIO_NORMAL); |
| 144 | socket_ev.fd (fd); |
143 | socket_ev.fd (fd); |
| 145 | socket_ev.poll (PE_R); |
144 | socket_ev.poll (PE_R); |
| 146 | |
145 | |
| … | |
… | |
| 157 | |
156 | |
| 158 | client::~client () |
157 | client::~client () |
| 159 | { |
158 | { |
| 160 | clients.erase (this); |
159 | clients.erase (this); |
| 161 | |
160 | |
| 162 | sfree<uint8> (faces_sent, nrofpixmaps); |
|
|
| 163 | free (stats.range); |
161 | free (stats.range); |
| 164 | free (stats.title); |
162 | free (stats.title); |
| 165 | free (host); |
163 | free (host); |
| 166 | } |
164 | } |
| 167 | |
165 | |
| … | |
… | |
| 226 | { |
224 | { |
| 227 | cst_tot.time_start = time (NULL); |
225 | cst_tot.time_start = time (NULL); |
| 228 | cst_lst.time_start = time (NULL); |
226 | cst_lst.time_start = time (NULL); |
| 229 | |
227 | |
| 230 | LOG (llevDebug, "Initialize new client/server data\n"); |
228 | LOG (llevDebug, "Initialize new client/server data\n"); |
| 231 | |
|
|
| 232 | read_client_images (); |
|
|
| 233 | } |
229 | } |
| 234 | |
230 | |
| 235 | |
231 | |
| 236 | /******************************************************************************* |
232 | /******************************************************************************* |
| 237 | * |
233 | * |
| … | |
… | |
| 248 | } |
244 | } |
| 249 | |
245 | |
| 250 | client * |
246 | client * |
| 251 | client::create (int fd, const char *peername) |
247 | client::create (int fd, const char *peername) |
| 252 | { |
248 | { |
| 253 | if (checkbanned (NULL, peername)) |
|
|
| 254 | { |
|
|
| 255 | LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername); |
|
|
| 256 | return 0; |
|
|
| 257 | } |
|
|
| 258 | else |
|
|
| 259 | { |
|
|
| 260 | client *ns = new client (dup (fd), peername); |
249 | client *ns = new client (dup (fd), peername); |
| 261 | |
|
|
| 262 | ns->instantiate (); // effectively a nop right now |
250 | ns->instantiate (); // effectively a nop right now |
| 263 | |
|
|
| 264 | INVOKE_CLIENT (CONNECT, ns); |
251 | INVOKE_CLIENT (CONNECT, ns); |
| 265 | |
|
|
| 266 | return ns; |
252 | return ns; |
| 267 | } |
|
|
| 268 | } |
253 | } |
| 269 | |
254 | |
