1 |
|
/* |
2 |
< |
* ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd). |
3 |
< |
* client.c: Controls clients. |
2 |
> |
* ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd) |
3 |
|
* |
4 |
< |
* Copyright (C) 2002 by the past and present ircd coders, and others. |
4 |
> |
* Copyright (c) 1997-2014 ircd-hybrid development team |
5 |
|
* |
6 |
|
* This program is free software; you can redistribute it and/or modify |
7 |
|
* it under the terms of the GNU General Public License as published by |
17 |
|
* along with this program; if not, write to the Free Software |
18 |
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
19 |
|
* USA |
20 |
< |
* |
21 |
< |
* $Id$ |
20 |
> |
*/ |
21 |
> |
|
22 |
> |
/*! \file client.c |
23 |
> |
* \brief Controls clients. |
24 |
> |
* \version $Id$ |
25 |
|
*/ |
26 |
|
|
27 |
|
#include "stdinc.h" |
28 |
< |
#include "tools.h" |
28 |
> |
#include "list.h" |
29 |
|
#include "client.h" |
30 |
|
#include "channel_mode.h" |
29 |
– |
#include "common.h" |
31 |
|
#include "event.h" |
32 |
|
#include "fdlist.h" |
33 |
|
#include "hash.h" |
34 |
|
#include "irc_string.h" |
34 |
– |
#include "sprintf_irc.h" |
35 |
|
#include "ircd.h" |
36 |
– |
#include "list.h" |
36 |
|
#include "s_gline.h" |
37 |
|
#include "numeric.h" |
38 |
|
#include "packet.h" |
39 |
|
#include "s_auth.h" |
40 |
|
#include "s_bsd.h" |
41 |
< |
#include "s_conf.h" |
42 |
< |
#include "s_log.h" |
41 |
> |
#include "conf.h" |
42 |
> |
#include "log.h" |
43 |
|
#include "s_misc.h" |
44 |
|
#include "s_serv.h" |
45 |
|
#include "send.h" |
47 |
|
#include "s_user.h" |
48 |
|
#include "dbuf.h" |
49 |
|
#include "memory.h" |
50 |
+ |
#include "mempool.h" |
51 |
|
#include "hostmask.h" |
52 |
– |
#include "balloc.h" |
52 |
|
#include "listener.h" |
53 |
|
#include "irc_res.h" |
54 |
|
#include "userhost.h" |
55 |
+ |
#include "watch.h" |
56 |
+ |
#include "rng_mt.h" |
57 |
+ |
#include "parse.h" |
58 |
|
|
59 |
|
dlink_list listing_client_list = { NULL, NULL, 0 }; |
60 |
|
/* Pointer to beginning of Client list */ |
68 |
|
|
69 |
|
static EVH check_pings; |
70 |
|
|
71 |
< |
static BlockHeap *client_heap = NULL; |
72 |
< |
static BlockHeap *lclient_heap = NULL; |
71 |
> |
static mp_pool_t *client_pool = NULL; |
72 |
> |
static mp_pool_t *lclient_pool = NULL; |
73 |
|
|
74 |
|
static dlink_list dead_list = { NULL, NULL, 0}; |
75 |
|
static dlink_list abort_list = { NULL, NULL, 0}; |
78 |
|
|
79 |
|
static void check_pings_list(dlink_list *); |
80 |
|
static void check_unknowns_list(void); |
79 |
– |
static void ban_them(struct Client *client_p, struct ConfItem *conf); |
81 |
|
|
82 |
|
|
83 |
< |
/* init_client() |
83 |
> |
/* client_init() |
84 |
|
* |
85 |
|
* inputs - NONE |
86 |
|
* output - NONE |
87 |
|
* side effects - initialize client free memory |
88 |
|
*/ |
89 |
|
void |
90 |
< |
init_client(void) |
90 |
> |
client_init(void) |
91 |
|
{ |
92 |
|
/* start off the check ping event .. -- adrian |
93 |
|
* Every 30 seconds is plenty -- db |
94 |
|
*/ |
95 |
< |
client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE); |
96 |
< |
lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE); |
95 |
> |
client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT); |
96 |
> |
lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT); |
97 |
|
eventAdd("check_pings", check_pings, NULL, 5); |
98 |
|
} |
99 |
|
|
115 |
|
struct Client * |
116 |
|
make_client(struct Client *from) |
117 |
|
{ |
118 |
< |
struct Client *client_p = BlockHeapAlloc(client_heap); |
118 |
> |
struct Client *client_p = mp_pool_get(client_pool); |
119 |
> |
|
120 |
> |
memset(client_p, 0, sizeof(*client_p)); |
121 |
|
|
122 |
< |
if (from == NULL) |
122 |
> |
if (!from) |
123 |
|
{ |
124 |
< |
client_p->from = client_p; /* 'from' of local client is self! */ |
125 |
< |
client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime; |
124 |
> |
client_p->from = client_p; /* 'from' of local client is self! */ |
125 |
> |
client_p->localClient = mp_pool_get(lclient_pool); |
126 |
> |
|
127 |
> |
memset(client_p->localClient, 0, sizeof(*client_p->localClient)); |
128 |
> |
|
129 |
> |
client_p->localClient->since = CurrentTime; |
130 |
> |
client_p->localClient->lasttime = CurrentTime; |
131 |
> |
client_p->localClient->firsttime = CurrentTime; |
132 |
> |
client_p->localClient->registration = REG_INIT; |
133 |
|
|
124 |
– |
client_p->localClient = BlockHeapAlloc(lclient_heap); |
134 |
|
/* as good a place as any... */ |
135 |
< |
dlinkAdd(client_p, make_dlink_node(), &unknown_list); |
135 |
> |
dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list); |
136 |
|
} |
137 |
|
else |
138 |
|
client_p->from = from; /* 'from' of local client is self! */ |
139 |
|
|
140 |
+ |
client_p->idhnext = client_p; |
141 |
|
client_p->hnext = client_p; |
142 |
< |
client_p->status = STAT_UNKNOWN; |
142 |
> |
SetUnknown(client_p); |
143 |
|
strcpy(client_p->username, "unknown"); |
144 |
+ |
strcpy(client_p->svid, "0"); |
145 |
|
|
146 |
|
return client_p; |
147 |
|
} |
156 |
|
static void |
157 |
|
free_client(struct Client *client_p) |
158 |
|
{ |
159 |
< |
assert(client_p != NULL); |
159 |
> |
assert(client_p); |
160 |
|
assert(client_p != &me); |
161 |
|
assert(client_p->hnext == client_p); |
162 |
+ |
assert(client_p->idhnext == client_p); |
163 |
|
assert(client_p->channel.head == NULL); |
164 |
|
assert(dlink_list_length(&client_p->channel) == 0); |
165 |
+ |
assert(dlink_list_length(&client_p->whowas) == 0); |
166 |
+ |
assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv)); |
167 |
|
|
154 |
– |
MyFree(client_p->away); |
168 |
|
MyFree(client_p->serv); |
169 |
+ |
MyFree(client_p->certfp); |
170 |
|
|
171 |
|
if (MyConnect(client_p)) |
172 |
|
{ |
173 |
|
assert(client_p->localClient->invited.head == NULL); |
174 |
|
assert(dlink_list_length(&client_p->localClient->invited) == 0); |
175 |
+ |
assert(dlink_list_length(&client_p->localClient->watches) == 0); |
176 |
|
assert(IsClosing(client_p) && IsDead(client_p)); |
177 |
|
|
178 |
|
MyFree(client_p->localClient->response); |
185 |
|
{ |
186 |
|
assert(0 < client_p->localClient->listener->ref_count); |
187 |
|
if (0 == --client_p->localClient->listener->ref_count && |
188 |
< |
!client_p->localClient->listener->active) |
188 |
> |
!client_p->localClient->listener->active) |
189 |
|
free_listener(client_p->localClient->listener); |
190 |
|
} |
191 |
|
|
192 |
|
dbuf_clear(&client_p->localClient->buf_recvq); |
193 |
|
dbuf_clear(&client_p->localClient->buf_sendq); |
194 |
|
|
195 |
< |
BlockHeapFree(lclient_heap, client_p->localClient); |
195 |
> |
mp_pool_release(client_p->localClient); |
196 |
|
} |
197 |
|
|
198 |
< |
BlockHeapFree(client_heap, client_p); |
198 |
> |
mp_pool_release(client_p); |
199 |
|
} |
200 |
|
|
201 |
|
/* |
204 |
|
* |
205 |
|
* inputs - NOT USED (from event) |
206 |
|
* output - next time_t when check_pings() should be called again |
207 |
< |
* side effects - |
207 |
> |
* side effects - |
208 |
|
* |
209 |
|
* |
210 |
|
* A PING can be sent to clients as necessary. |
226 |
|
|
227 |
|
static void |
228 |
|
check_pings(void *notused) |
229 |
< |
{ |
229 |
> |
{ |
230 |
|
check_pings_list(&local_client_list); |
231 |
|
check_pings_list(&serv_list); |
232 |
|
check_unknowns_list(); |
236 |
|
* |
237 |
|
* inputs - pointer to list to check |
238 |
|
* output - NONE |
239 |
< |
* side effects - |
239 |
> |
* side effects - |
240 |
|
*/ |
241 |
|
static void |
242 |
|
check_pings_list(dlink_list *list) |
243 |
|
{ |
244 |
< |
char scratch[32]; /* way too generous but... */ |
245 |
< |
struct Client *client_p; /* current local client_p being examined */ |
246 |
< |
int ping, pingwarn; /* ping time value from client */ |
232 |
< |
dlink_node *ptr, *next_ptr; |
244 |
> |
char scratch[IRCD_BUFSIZE]; |
245 |
> |
int ping = 0; /* ping time value from client */ |
246 |
> |
dlink_node *ptr = NULL, *next_ptr = NULL; |
247 |
|
|
248 |
|
DLINK_FOREACH_SAFE(ptr, next_ptr, list->head) |
249 |
|
{ |
250 |
< |
client_p = ptr->data; |
250 |
> |
struct Client *client_p = ptr->data; |
251 |
|
|
252 |
|
/* |
253 |
|
** Note: No need to notify opers here. It's |
256 |
|
if (IsDead(client_p)) |
257 |
|
{ |
258 |
|
/* Ignore it, its been exited already */ |
245 |
– |
continue; |
246 |
– |
} |
247 |
– |
|
248 |
– |
if (client_p->localClient->reject_delay > 0) |
249 |
– |
{ |
250 |
– |
if (client_p->localClient->reject_delay <= CurrentTime) |
251 |
– |
exit_client(client_p, &me, "Rejected"); |
259 |
|
continue; |
260 |
|
} |
261 |
|
|
255 |
– |
if (GlobalSetOptions.idletime && IsClient(client_p)) |
256 |
– |
{ |
257 |
– |
if (!IsExemptKline(client_p) && !IsOper(client_p) && |
258 |
– |
!IsIdlelined(client_p) && |
259 |
– |
((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime)) |
260 |
– |
{ |
261 |
– |
struct ConfItem *conf; |
262 |
– |
struct AccessItem *aconf; |
263 |
– |
|
264 |
– |
conf = make_conf_item(KLINE_TYPE); |
265 |
– |
aconf = (struct AccessItem *)map_to_conf(conf); |
266 |
– |
|
267 |
– |
DupString(aconf->host, client_p->host); |
268 |
– |
DupString(aconf->reason, "idle exceeder"); |
269 |
– |
DupString(aconf->user, client_p->username); |
270 |
– |
aconf->hold = CurrentTime + 60; |
271 |
– |
add_temp_line(conf); |
272 |
– |
|
273 |
– |
sendto_realops_flags(UMODE_ALL, L_ALL, |
274 |
– |
"Idle time limit exceeded for %s - temp k-lining", |
275 |
– |
get_client_name(client_p, HIDE_IP)); |
276 |
– |
exit_client(client_p, &me, aconf->reason); |
277 |
– |
continue; |
278 |
– |
} |
279 |
– |
} |
280 |
– |
|
262 |
|
if (!IsRegistered(client_p)) |
263 |
< |
ping = CONNECTTIMEOUT, pingwarn = 0; |
263 |
> |
ping = CONNECTTIMEOUT; |
264 |
|
else |
265 |
< |
ping = get_client_ping(client_p, &pingwarn); |
265 |
> |
ping = get_client_ping(&client_p->localClient->confs); |
266 |
|
|
267 |
< |
if (ping < CurrentTime - client_p->lasttime) |
267 |
> |
if (ping < CurrentTime - client_p->localClient->lasttime) |
268 |
|
{ |
269 |
|
if (!IsPingSent(client_p)) |
270 |
|
{ |
271 |
< |
/* |
272 |
< |
* if we havent PINGed the connection and we havent |
273 |
< |
* heard from it in a while, PING it to make sure |
274 |
< |
* it is still alive. |
275 |
< |
*/ |
276 |
< |
SetPingSent(client_p); |
277 |
< |
ClearPingWarning(client_p); |
278 |
< |
client_p->lasttime = CurrentTime - ping; |
298 |
< |
sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p)); |
271 |
> |
/* |
272 |
> |
* if we havent PINGed the connection and we havent |
273 |
> |
* heard from it in a while, PING it to make sure |
274 |
> |
* it is still alive. |
275 |
> |
*/ |
276 |
> |
SetPingSent(client_p); |
277 |
> |
client_p->localClient->lasttime = CurrentTime - ping; |
278 |
> |
sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p)); |
279 |
|
} |
280 |
|
else |
281 |
|
{ |
282 |
< |
if (CurrentTime - client_p->lasttime >= 2 * ping) |
282 |
> |
if (CurrentTime - client_p->localClient->lasttime >= 2 * ping) |
283 |
|
{ |
284 |
|
/* |
285 |
|
* If the client/server hasn't talked to us in 2*ping seconds |
286 |
|
* and it has a ping time, then close its connection. |
287 |
|
*/ |
288 |
|
if (IsServer(client_p) || IsHandshake(client_p)) |
289 |
< |
{ |
290 |
< |
sendto_realops_flags(UMODE_ALL, L_ADMIN, |
291 |
< |
"No response from %s, closing link", |
292 |
< |
get_client_name(client_p, HIDE_IP)); |
293 |
< |
sendto_realops_flags(UMODE_ALL, L_OPER, |
294 |
< |
"No response from %s, closing link", |
295 |
< |
get_client_name(client_p, MASK_IP)); |
296 |
< |
ilog(L_NOTICE, "No response from %s, closing link", |
297 |
< |
get_client_name(client_p, HIDE_IP)); |
298 |
< |
} |
299 |
< |
ircsprintf(scratch, "Ping timeout: %d seconds", |
300 |
< |
(int)(CurrentTime - client_p->lasttime)); |
301 |
< |
|
302 |
< |
exit_client(client_p, &me, scratch); |
323 |
< |
} |
324 |
< |
else if (!IsPingWarning(client_p) && pingwarn > 0 && |
325 |
< |
(IsServer(client_p) || IsHandshake(client_p)) && |
326 |
< |
CurrentTime - client_p->lasttime >= ping + pingwarn) |
327 |
< |
{ |
328 |
< |
/* |
329 |
< |
* If the server hasn't replied in pingwarn seconds after sending |
330 |
< |
* the PING, notify the opers so that they are aware of the problem. |
331 |
< |
*/ |
332 |
< |
SetPingWarning(client_p); |
333 |
< |
sendto_realops_flags(UMODE_ALL, L_ADMIN, |
334 |
< |
"Warning, no response from %s in %d seconds", |
335 |
< |
get_client_name(client_p, HIDE_IP), pingwarn); |
336 |
< |
sendto_realops_flags(UMODE_ALL, L_OPER, |
337 |
< |
"Warning, no response from %s in %d seconds", |
338 |
< |
get_client_name(client_p, MASK_IP), pingwarn); |
339 |
< |
ilog(L_NOTICE, "No response from %s in %d seconds", |
340 |
< |
get_client_name(client_p, HIDE_IP), pingwarn); |
289 |
> |
{ |
290 |
> |
sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, |
291 |
> |
"No response from %s, closing link", |
292 |
> |
get_client_name(client_p, HIDE_IP)); |
293 |
> |
sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE, |
294 |
> |
"No response from %s, closing link", |
295 |
> |
get_client_name(client_p, MASK_IP)); |
296 |
> |
ilog(LOG_TYPE_IRCD, "No response from %s, closing link", |
297 |
> |
get_client_name(client_p, HIDE_IP)); |
298 |
> |
} |
299 |
> |
|
300 |
> |
snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds", |
301 |
> |
(int)(CurrentTime - client_p->localClient->lasttime)); |
302 |
> |
exit_client(client_p, scratch); |
303 |
|
} |
304 |
|
} |
305 |
|
} |
315 |
|
static void |
316 |
|
check_unknowns_list(void) |
317 |
|
{ |
318 |
< |
dlink_node *ptr, *next_ptr; |
318 |
> |
dlink_node *ptr = NULL, *ptr_next = NULL; |
319 |
|
|
320 |
< |
DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head) |
320 |
> |
DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head) |
321 |
|
{ |
322 |
|
struct Client *client_p = ptr->data; |
323 |
|
|
324 |
< |
if (client_p->localClient->reject_delay > 0) |
325 |
< |
{ |
364 |
< |
if (client_p->localClient->reject_delay <= CurrentTime) |
365 |
< |
exit_client(client_p, &me, "Rejected"); |
366 |
< |
continue; |
367 |
< |
} |
368 |
< |
|
369 |
< |
/* Check UNKNOWN connections - if they have been in this state |
324 |
> |
/* |
325 |
> |
* Check UNKNOWN connections - if they have been in this state |
326 |
|
* for > 30s, close them. |
327 |
|
*/ |
328 |
< |
if (client_p->firsttime ? ((CurrentTime - client_p->firsttime) > 30) : 0) |
329 |
< |
exit_client(client_p, &me, "Connection timed out"); |
328 |
> |
if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30) |
329 |
> |
exit_client(client_p, "Registration timed out"); |
330 |
|
} |
331 |
|
} |
332 |
|
|
337 |
|
* side effects - Check all connections for a pending kline against the |
338 |
|
* client, exit the client if a kline matches. |
339 |
|
*/ |
340 |
< |
void |
340 |
> |
void |
341 |
|
check_conf_klines(void) |
342 |
< |
{ |
342 |
> |
{ |
343 |
|
struct Client *client_p = NULL; /* current local client_p being examined */ |
344 |
< |
struct AccessItem *aconf = NULL; |
389 |
< |
struct ConfItem *conf = NULL; |
344 |
> |
struct MaskItem *conf = NULL; |
345 |
|
dlink_node *ptr, *next_ptr; |
346 |
|
|
347 |
|
DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head) |
353 |
|
if (IsDead(client_p) || !IsClient(client_p)) |
354 |
|
continue; |
355 |
|
|
356 |
< |
/* if there is a returned struct ConfItem then kill it */ |
357 |
< |
if ((aconf = find_dline_conf(&client_p->localClient->ip, |
403 |
< |
client_p->localClient->aftype)) != NULL) |
356 |
> |
if ((conf = find_dline_conf(&client_p->localClient->ip, |
357 |
> |
client_p->localClient->aftype))) |
358 |
|
{ |
359 |
< |
if (aconf->status & CONF_EXEMPTDLINE) |
360 |
< |
continue; |
359 |
> |
if (conf->type == CONF_EXEMPT) |
360 |
> |
continue; |
361 |
|
|
362 |
< |
conf = unmap_conf_item(aconf); |
409 |
< |
ban_them(client_p, conf); |
362 |
> |
conf_try_ban(client_p, conf); |
363 |
|
continue; /* and go examine next fd/client_p */ |
364 |
|
} |
365 |
|
|
366 |
< |
if (ConfigFileEntry.glines && (aconf = find_gline(client_p))) |
366 |
> |
if (ConfigFileEntry.glines) |
367 |
|
{ |
368 |
< |
if (IsExemptKline(client_p) || |
369 |
< |
IsExemptGline(client_p)) |
368 |
> |
if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip, |
369 |
> |
CONF_GLINE, client_p->localClient->aftype, |
370 |
> |
client_p->username, NULL, 1))) |
371 |
|
{ |
372 |
< |
sendto_realops_flags(UMODE_ALL, L_ALL, |
373 |
< |
"GLINE over-ruled for %s, client is %sline_exempt", |
420 |
< |
get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g"); |
372 |
> |
conf_try_ban(client_p, conf); |
373 |
> |
/* and go examine next fd/client_p */ |
374 |
|
continue; |
375 |
|
} |
376 |
+ |
} |
377 |
|
|
378 |
< |
conf = unmap_conf_item(aconf); |
379 |
< |
ban_them(client_p, conf); |
380 |
< |
/* and go examine next fd/client_p */ |
427 |
< |
continue; |
428 |
< |
} |
429 |
< |
|
430 |
< |
if ((aconf = find_kill(client_p)) != NULL) |
378 |
> |
if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip, |
379 |
> |
CONF_KLINE, client_p->localClient->aftype, |
380 |
> |
client_p->username, NULL, 1))) |
381 |
|
{ |
382 |
< |
|
383 |
< |
/* if there is a returned struct AccessItem.. then kill it */ |
434 |
< |
if (IsExemptKline(client_p)) |
435 |
< |
{ |
436 |
< |
sendto_realops_flags(UMODE_ALL, L_ALL, |
437 |
< |
"KLINE over-ruled for %s, client is kline_exempt", |
438 |
< |
get_client_name(client_p, HIDE_IP)); |
439 |
< |
continue; |
440 |
< |
} |
441 |
< |
|
442 |
< |
conf = unmap_conf_item(aconf); |
443 |
< |
ban_them(client_p, conf); |
444 |
< |
continue; |
382 |
> |
conf_try_ban(client_p, conf); |
383 |
> |
continue; |
384 |
|
} |
385 |
|
|
386 |
< |
/* if there is a returned struct MatchItem then kill it */ |
387 |
< |
if ((conf = find_matching_name_conf(XLINE_TYPE, client_p->info, |
449 |
< |
NULL, NULL, 0)) != NULL || |
450 |
< |
(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info, |
451 |
< |
NULL, NULL, 0)) != NULL) |
386 |
> |
if ((conf = find_matching_name_conf(CONF_XLINE, client_p->info, |
387 |
> |
NULL, NULL, 0))) |
388 |
|
{ |
389 |
< |
ban_them(client_p, conf); |
389 |
> |
conf_try_ban(client_p, conf); |
390 |
|
continue; |
391 |
|
} |
392 |
|
} |
396 |
|
{ |
397 |
|
client_p = ptr->data; |
398 |
|
|
399 |
< |
if ((aconf = find_dline_conf(&client_p->localClient->ip, |
400 |
< |
client_p->localClient->aftype))) |
399 |
> |
if ((conf = find_dline_conf(&client_p->localClient->ip, |
400 |
> |
client_p->localClient->aftype))) |
401 |
|
{ |
402 |
< |
if (aconf->status & CONF_EXEMPTDLINE) |
402 |
> |
if (conf->type == CONF_EXEMPT) |
403 |
|
continue; |
404 |
|
|
405 |
< |
exit_client(client_p, &me, "D-lined"); |
405 |
> |
exit_client(client_p, "D-lined"); |
406 |
|
} |
407 |
|
} |
408 |
|
} |
409 |
|
|
410 |
|
/* |
411 |
< |
* ban_them |
411 |
> |
* conf_try_ban |
412 |
|
* |
413 |
|
* inputs - pointer to client to ban |
414 |
< |
* - pointer to ConfItem |
414 |
> |
* - pointer to MaskItem |
415 |
|
* output - NONE |
416 |
|
* side effects - given client_p is banned |
417 |
|
*/ |
418 |
< |
static void |
419 |
< |
ban_them(struct Client *client_p, struct ConfItem *conf) |
418 |
> |
void |
419 |
> |
conf_try_ban(struct Client *client_p, struct MaskItem *conf) |
420 |
|
{ |
421 |
< |
const char *user_reason = NULL; /* What is sent to user */ |
486 |
< |
const char *channel_reason = NULL; /* What is sent to channel */ |
487 |
< |
struct AccessItem *aconf = NULL; |
488 |
< |
struct MatchItem *xconf = NULL; |
421 |
> |
const char *user_reason = NULL; /* What is sent to user */ |
422 |
|
const char *type_string = NULL; |
423 |
|
const char dline_string[] = "D-line"; |
424 |
|
const char kline_string[] = "K-line"; |
427 |
|
|
428 |
|
switch (conf->type) |
429 |
|
{ |
430 |
< |
case RKLINE_TYPE: |
431 |
< |
case KLINE_TYPE: |
430 |
> |
case CONF_KLINE: |
431 |
> |
if (IsExemptKline(client_p)) |
432 |
> |
{ |
433 |
> |
sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, |
434 |
> |
"KLINE over-ruled for %s, client is kline_exempt", |
435 |
> |
get_client_name(client_p, HIDE_IP)); |
436 |
> |
return; |
437 |
> |
} |
438 |
> |
|
439 |
|
type_string = kline_string; |
500 |
– |
aconf = map_to_conf(conf); |
440 |
|
break; |
441 |
< |
case DLINE_TYPE: |
441 |
> |
case CONF_DLINE: |
442 |
|
type_string = dline_string; |
504 |
– |
aconf = map_to_conf(conf); |
443 |
|
break; |
444 |
< |
case GLINE_TYPE: |
444 |
> |
case CONF_GLINE: |
445 |
> |
if (IsExemptKline(client_p) || |
446 |
> |
IsExemptGline(client_p)) |
447 |
> |
{ |
448 |
> |
sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, |
449 |
> |
"GLINE over-ruled for %s, client is %sline_exempt", |
450 |
> |
get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g"); |
451 |
> |
return; |
452 |
> |
} |
453 |
> |
|
454 |
|
type_string = gline_string; |
508 |
– |
aconf = map_to_conf(conf); |
455 |
|
break; |
456 |
< |
case RXLINE_TYPE: |
511 |
< |
case XLINE_TYPE: |
456 |
> |
case CONF_XLINE: |
457 |
|
type_string = xline_string; |
458 |
< |
xconf = map_to_conf(conf); |
514 |
< |
++xconf->count; |
458 |
> |
++conf->count; |
459 |
|
break; |
460 |
|
default: |
461 |
|
assert(0); |
462 |
|
break; |
463 |
|
} |
464 |
|
|
465 |
< |
if (ConfigFileEntry.kline_with_reason) |
522 |
< |
{ |
523 |
< |
if (aconf != NULL) |
524 |
< |
user_reason = aconf->reason ? aconf->reason : type_string; |
525 |
< |
if (xconf != NULL) |
526 |
< |
user_reason = xconf->reason ? xconf->reason : type_string; |
527 |
< |
} |
528 |
< |
else |
529 |
< |
user_reason = type_string; |
530 |
< |
|
531 |
< |
if (ConfigFileEntry.kline_reason != NULL) |
532 |
< |
channel_reason = ConfigFileEntry.kline_reason; |
533 |
< |
else |
534 |
< |
channel_reason = user_reason; |
465 |
> |
user_reason = conf->reason ? conf->reason : type_string; |
466 |
|
|
467 |
< |
sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s", |
467 |
> |
sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s", |
468 |
|
type_string, get_client_name(client_p, HIDE_IP)); |
469 |
|
|
470 |
|
if (IsClient(client_p)) |
471 |
< |
sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP), |
541 |
< |
me.name, client_p->name, user_reason); |
471 |
> |
sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason); |
472 |
|
|
473 |
< |
exit_client(client_p, &me, channel_reason); |
473 |
> |
exit_client(client_p, user_reason); |
474 |
|
} |
475 |
|
|
476 |
|
/* update_client_exit_stats() |
477 |
|
* |
478 |
|
* input - pointer to client |
479 |
|
* output - NONE |
480 |
< |
* side effects - |
480 |
> |
* side effects - |
481 |
|
*/ |
482 |
|
static void |
483 |
|
update_client_exit_stats(struct Client *client_p) |
484 |
|
{ |
485 |
< |
if (IsServer(client_p)) |
556 |
< |
{ |
557 |
< |
sendto_realops_flags(UMODE_EXTERNAL, L_ALL, |
558 |
< |
"Server %s split from %s", |
559 |
< |
client_p->name, client_p->servptr->name); |
560 |
< |
} |
561 |
< |
else if (IsClient(client_p)) |
485 |
> |
if (IsClient(client_p)) |
486 |
|
{ |
487 |
+ |
assert(Count.total > 0); |
488 |
|
--Count.total; |
489 |
< |
if (IsOper(client_p)) |
489 |
> |
if (HasUMode(client_p, UMODE_OPER)) |
490 |
|
--Count.oper; |
491 |
< |
if (IsInvisible(client_p)) |
491 |
> |
if (HasUMode(client_p, UMODE_INVISIBLE)) |
492 |
|
--Count.invisi; |
493 |
|
} |
494 |
+ |
else if (IsServer(client_p)) |
495 |
+ |
sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE, |
496 |
+ |
"Server %s split from %s", |
497 |
+ |
client_p->name, client_p->servptr->name); |
498 |
|
|
499 |
|
if (splitchecking && !splitmode) |
500 |
|
check_splitmode(NULL); |
506 |
|
* output - return client pointer |
507 |
|
* side effects - find person by (nick)name |
508 |
|
*/ |
580 |
– |
/* XXX - ugly wrapper */ |
509 |
|
struct Client * |
510 |
< |
find_person(const struct Client *client_p, const char *name) |
510 |
> |
find_person(const struct Client *const source_p, const char *name) |
511 |
|
{ |
512 |
< |
struct Client *c2ptr; |
512 |
> |
struct Client *target_p = NULL; |
513 |
|
|
514 |
|
if (IsDigit(*name)) |
515 |
|
{ |
516 |
< |
if ((c2ptr = hash_find_id(name)) != NULL) |
517 |
< |
{ |
590 |
< |
/* invisible users shall not be found by UID guessing */ |
591 |
< |
if (IsInvisible(c2ptr) && !IsServer(client_p)) |
592 |
< |
c2ptr = NULL; |
593 |
< |
} |
516 |
> |
if (IsServer(source_p->from)) |
517 |
> |
target_p = hash_find_id(name); |
518 |
|
} |
519 |
|
else |
520 |
< |
c2ptr = find_client(name); |
520 |
> |
target_p = hash_find_client(name); |
521 |
|
|
522 |
< |
return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL); |
522 |
> |
return (target_p && IsClient(target_p)) ? target_p : NULL; |
523 |
|
} |
524 |
|
|
525 |
|
/* |
526 |
< |
* find_chasing - find the client structure for a nick name (user) |
527 |
< |
* using history mechanism if necessary. If the client is not found, |
528 |
< |
* an error message (NO SUCH NICK) is generated. If the client was found |
605 |
< |
* through the history, chasing will be 1 and otherwise 0. |
526 |
> |
* find_chasing - find the client structure for a nick name (name) |
527 |
> |
* using history mechanism if necessary. If the client is not found, |
528 |
> |
* an error message (NO SUCH NICK) is generated. |
529 |
|
*/ |
530 |
|
struct Client * |
531 |
< |
find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing) |
531 |
> |
find_chasing(struct Client *source_p, const char *name) |
532 |
|
{ |
533 |
< |
struct Client *who = find_person(client_p, user); |
611 |
< |
|
612 |
< |
if (chasing) |
613 |
< |
*chasing = 0; |
533 |
> |
struct Client *who = find_person(source_p, name); |
534 |
|
|
535 |
|
if (who) |
536 |
< |
return(who); |
536 |
> |
return who; |
537 |
|
|
538 |
< |
if (IsDigit(*user)) |
539 |
< |
return(NULL); |
538 |
> |
if (IsDigit(*name)) |
539 |
> |
return NULL; |
540 |
|
|
541 |
< |
if ((who = get_history(user, |
542 |
< |
(time_t)ConfigFileEntry.kill_chase_time_limit)) |
543 |
< |
== NULL) |
541 |
> |
if ((who = whowas_get_history(name, |
542 |
> |
(time_t)ConfigFileEntry.kill_chase_time_limit)) |
543 |
> |
== NULL) |
544 |
|
{ |
545 |
< |
sendto_one(source_p, form_str(ERR_NOSUCHNICK), |
546 |
< |
me.name, source_p->name, user); |
627 |
< |
return(NULL); |
545 |
> |
sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name); |
546 |
> |
return NULL; |
547 |
|
} |
548 |
|
|
549 |
< |
if (chasing) |
631 |
< |
*chasing = 1; |
632 |
< |
|
633 |
< |
return(who); |
549 |
> |
return who; |
550 |
|
} |
551 |
|
|
552 |
|
/* |
568 |
|
* to modify what it points!!! |
569 |
|
*/ |
570 |
|
const char * |
571 |
< |
get_client_name(struct Client *client, int showip) |
571 |
> |
get_client_name(const struct Client *client_p, enum addr_mask_type type) |
572 |
|
{ |
573 |
|
static char nbuf[HOSTLEN * 2 + USERLEN + 5]; |
574 |
|
|
575 |
< |
assert(client != NULL); |
575 |
> |
assert(client_p); |
576 |
|
|
577 |
< |
if (irccmp(client->name, client->host) == 0) |
578 |
< |
return(client->name); |
577 |
> |
if (!MyConnect(client_p)) |
578 |
> |
return client_p->name; |
579 |
|
|
580 |
< |
if (ConfigServerHide.hide_server_ips) |
581 |
< |
if (IsServer(client) || IsConnecting(client) || IsHandshake(client)) |
582 |
< |
showip = MASK_IP; |
580 |
> |
if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p)) |
581 |
> |
{ |
582 |
> |
if (!irccmp(client_p->name, client_p->host)) |
583 |
> |
return client_p->name; |
584 |
> |
else if (ConfigServerHide.hide_server_ips) |
585 |
> |
type = MASK_IP; |
586 |
> |
} |
587 |
|
|
588 |
|
if (ConfigFileEntry.hide_spoof_ips) |
589 |
< |
if (showip == SHOW_IP && IsIPSpoof(client)) |
590 |
< |
showip = MASK_IP; |
589 |
> |
if (type == SHOW_IP && IsIPSpoof(client_p)) |
590 |
> |
type = MASK_IP; |
591 |
|
|
592 |
|
/* And finally, let's get the host information, ip or name */ |
593 |
< |
switch (showip) |
593 |
> |
switch (type) |
594 |
|
{ |
595 |
|
case SHOW_IP: |
596 |
< |
if (MyConnect(client)) |
597 |
< |
{ |
598 |
< |
ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username, |
599 |
< |
client->sockhost); |
680 |
< |
break; |
681 |
< |
} |
596 |
> |
snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", |
597 |
> |
client_p->name, |
598 |
> |
client_p->username, client_p->sockhost); |
599 |
> |
break; |
600 |
|
case MASK_IP: |
601 |
< |
ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name, |
602 |
< |
client->username); |
601 |
> |
if (client_p->localClient->aftype == AF_INET) |
602 |
> |
snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]", |
603 |
> |
client_p->name, client_p->username); |
604 |
> |
else |
605 |
> |
snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]", |
606 |
> |
client_p->name, client_p->username); |
607 |
|
break; |
608 |
|
default: |
609 |
< |
ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username, |
610 |
< |
client->host); |
609 |
> |
snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]", |
610 |
> |
client_p->name, |
611 |
> |
client_p->username, client_p->host); |
612 |
|
} |
613 |
|
|
614 |
< |
return(nbuf); |
614 |
> |
return nbuf; |
615 |
|
} |
616 |
|
|
617 |
|
void |
618 |
|
free_exited_clients(void) |
619 |
|
{ |
620 |
< |
dlink_node *ptr, *next; |
621 |
< |
struct Client *target_p; |
699 |
< |
|
620 |
> |
dlink_node *ptr = NULL, *next = NULL; |
621 |
> |
|
622 |
|
DLINK_FOREACH_SAFE(ptr, next, dead_list.head) |
623 |
|
{ |
624 |
< |
target_p = ptr->data; |
703 |
< |
|
704 |
< |
if (ptr->data == NULL) |
705 |
< |
{ |
706 |
< |
sendto_realops_flags(UMODE_ALL, L_ALL, |
707 |
< |
"Warning: null client on dead_list!"); |
708 |
< |
dlinkDelete(ptr, &dead_list); |
709 |
< |
free_dlink_node(ptr); |
710 |
< |
continue; |
711 |
< |
} |
712 |
< |
|
713 |
< |
free_client(target_p); |
624 |
> |
free_client(ptr->data); |
625 |
|
dlinkDelete(ptr, &dead_list); |
626 |
|
free_dlink_node(ptr); |
627 |
|
} |
636 |
|
static void |
637 |
|
exit_one_client(struct Client *source_p, const char *quitmsg) |
638 |
|
{ |
639 |
< |
dlink_node *lp = NULL, *next_lp = NULL; |
639 |
> |
dlink_node *ptr = NULL, *ptr_next = NULL; |
640 |
|
|
641 |
|
assert(!IsMe(source_p)); |
642 |
|
|
643 |
< |
if (IsServer(source_p)) |
733 |
< |
{ |
734 |
< |
dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers); |
735 |
< |
|
736 |
< |
if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL) |
737 |
< |
free_dlink_node(lp); |
738 |
< |
|
739 |
< |
if (!MyConnect(source_p)) |
740 |
< |
{ |
741 |
< |
source_p->from->serv->dep_servers--; |
742 |
< |
assert(source_p->from->serv->dep_servers > 0); |
743 |
< |
} |
744 |
< |
} |
745 |
< |
else if (IsClient(source_p)) |
643 |
> |
if (IsClient(source_p)) |
644 |
|
{ |
645 |
< |
if (source_p->servptr->serv != NULL) |
748 |
< |
dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users); |
645 |
> |
dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list); |
646 |
|
|
647 |
< |
/* If a person is on a channel, send a QUIT notice |
648 |
< |
** to every client (person) on the same channel (so |
649 |
< |
** that the client can show the "**signoff" message). |
650 |
< |
** (Note: The notice is to the local clients *only*) |
651 |
< |
*/ |
652 |
< |
sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s", |
647 |
> |
/* |
648 |
> |
* If a person is on a channel, send a QUIT notice |
649 |
> |
* to every client (person) on the same channel (so |
650 |
> |
* that the client can show the "**signoff" message). |
651 |
> |
* (Note: The notice is to the local clients *only*) |
652 |
> |
*/ |
653 |
> |
sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s", |
654 |
|
source_p->name, source_p->username, |
655 |
|
source_p->host, quitmsg); |
656 |
< |
DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head) |
657 |
< |
remove_user_from_channel(lp->data); |
656 |
> |
DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head) |
657 |
> |
remove_user_from_channel(ptr->data); |
658 |
|
|
659 |
< |
/* Clean up allow lists */ |
660 |
< |
del_all_accepts(source_p); |
763 |
< |
add_history(source_p, 0); |
764 |
< |
off_history(source_p); |
659 |
> |
whowas_add_history(source_p, 0); |
660 |
> |
whowas_off_history(source_p); |
661 |
|
|
662 |
< |
if (!MyConnect(source_p)) |
663 |
< |
{ |
664 |
< |
source_p->from->serv->dep_users--; |
769 |
< |
assert(source_p->from->serv->dep_users >= 0); |
770 |
< |
} |
771 |
< |
else |
662 |
> |
watch_check_hash(source_p, RPL_LOGOFF); |
663 |
> |
|
664 |
> |
if (MyConnect(source_p)) |
665 |
|
{ |
666 |
|
/* Clean up invitefield */ |
667 |
< |
DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head) |
668 |
< |
del_invite(lp->data, source_p); |
667 |
> |
DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head) |
668 |
> |
del_invite(ptr->data, source_p); |
669 |
> |
|
670 |
> |
del_all_accepts(source_p); |
671 |
|
} |
672 |
|
} |
673 |
+ |
else if (IsServer(source_p)) |
674 |
+ |
{ |
675 |
+ |
dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list); |
676 |
+ |
|
677 |
+ |
if ((ptr = dlinkFindDelete(&global_serv_list, source_p))) |
678 |
+ |
free_dlink_node(ptr); |
679 |
+ |
} |
680 |
|
|
681 |
|
/* Remove source_p from the client lists */ |
682 |
< |
if (HasID(source_p)) |
682 |
> |
if (source_p->id[0]) |
683 |
|
hash_del_id(source_p); |
684 |
|
if (source_p->name[0]) |
685 |
|
hash_del_client(source_p); |
691 |
|
* NOTE: source_p->node.next cannot be NULL if the client is added |
692 |
|
* to global_client_list (there is always &me at its end) |
693 |
|
*/ |
694 |
< |
if (source_p != NULL && source_p->node.next != NULL) |
694 |
> |
if (source_p->node.next) /* XXX: not needed? */ |
695 |
|
dlinkDelete(&source_p->node, &global_client_list); |
696 |
|
|
697 |
|
update_client_exit_stats(source_p); |
704 |
|
dlinkAdd(source_p, make_dlink_node(), &dead_list); |
705 |
|
} |
706 |
|
|
707 |
< |
/* Recursively send QUITs and SQUITs for source_p and all its dependent clients |
806 |
< |
* and servers to those servers that need them. A server needs the client |
807 |
< |
* QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it |
808 |
< |
* isn't getting the SQUIT because of @#(*&@)# hostmasking. With TS4, once |
809 |
< |
* a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending |
810 |
< |
* on that one -orabidoo |
811 |
< |
* |
812 |
< |
* This is now called on each local server -adx |
813 |
< |
*/ |
814 |
< |
static void |
815 |
< |
recurse_send_quits(struct Client *original_source_p, struct Client *source_p, |
816 |
< |
struct Client *from, struct Client *to, const char *comment, |
817 |
< |
const char *splitstr, const char *myname) |
818 |
< |
{ |
819 |
< |
dlink_node *ptr, *next; |
820 |
< |
struct Client *target_p; |
821 |
< |
int hidden = match(myname, source_p->name); |
822 |
< |
|
823 |
< |
assert(to != source_p); /* should be already removed from serv_list */ |
824 |
< |
|
825 |
< |
/* If this server can handle quit storm (QS) removal |
826 |
< |
* of dependents, just send the SQUIT |
827 |
< |
* |
828 |
< |
* Always check *all* dependent servers if some of them are |
829 |
< |
* hidden behind fakename. If so, send out the QUITs -adx |
830 |
< |
*/ |
831 |
< |
if (hidden || !IsCapable(to, CAP_QS)) |
832 |
< |
DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head) |
833 |
< |
{ |
834 |
< |
target_p = ptr->data; |
835 |
< |
sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr); |
836 |
< |
} |
837 |
< |
|
838 |
< |
DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head) |
839 |
< |
recurse_send_quits(original_source_p, ptr->data, from, to, |
840 |
< |
comment, splitstr, myname); |
841 |
< |
|
842 |
< |
if (!hidden && ((source_p == original_source_p && to != from) || |
843 |
< |
!IsCapable(to, CAP_QS))) |
844 |
< |
{ |
845 |
< |
/* don't use a prefix here - we have to be 100% sure the message |
846 |
< |
* will be accepted without Unknown prefix etc.. */ |
847 |
< |
sendto_one(to, "SQUIT %s :%s", ID_or_name(source_p, to), comment); |
848 |
< |
} |
849 |
< |
} |
850 |
< |
|
851 |
< |
/* |
707 |
> |
/* |
708 |
|
* Remove all clients that depend on source_p; assumes all (S)QUITs have |
709 |
< |
* already been sent. we make sure to exit a server's dependent clients |
710 |
< |
* and servers before the server itself; exit_one_client takes care of |
709 |
> |
* already been sent. we make sure to exit a server's dependent clients |
710 |
> |
* and servers before the server itself; exit_one_client takes care of |
711 |
|
* actually removing things off llists. tweaked from +CSr31 -orabidoo |
712 |
|
*/ |
713 |
|
static void |
714 |
|
recurse_remove_clients(struct Client *source_p, const char *quitmsg) |
715 |
|
{ |
716 |
< |
dlink_node *ptr, *next; |
716 |
> |
dlink_node *ptr = NULL, *ptr_next = NULL; |
717 |
|
|
718 |
< |
DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head) |
718 |
> |
DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head) |
719 |
|
exit_one_client(ptr->data, quitmsg); |
720 |
|
|
721 |
< |
DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head) |
721 |
> |
DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head) |
722 |
|
{ |
723 |
|
recurse_remove_clients(ptr->data, quitmsg); |
724 |
|
exit_one_client(ptr->data, quitmsg); |
725 |
|
} |
870 |
– |
|
871 |
– |
assert(source_p->serv->dep_servers == 1); |
872 |
– |
assert(source_p->serv->dep_users == 0); |
873 |
– |
} |
874 |
– |
|
875 |
– |
/* |
876 |
– |
** Remove *everything* that depends on source_p, from all lists, and sending |
877 |
– |
** all necessary QUITs and SQUITs. source_p itself is still on the lists, |
878 |
– |
** and its SQUITs have been sent except for the upstream one -orabidoo |
879 |
– |
*/ |
880 |
– |
static void |
881 |
– |
remove_dependents(struct Client *source_p, struct Client *from, |
882 |
– |
const char *comment, const char *splitstr) |
883 |
– |
{ |
884 |
– |
struct Client *to; |
885 |
– |
struct ConfItem *conf; |
886 |
– |
static char myname[HOSTLEN+1]; |
887 |
– |
dlink_node *ptr; |
888 |
– |
|
889 |
– |
DLINK_FOREACH(ptr, serv_list.head) |
890 |
– |
{ |
891 |
– |
to = ptr->data; |
892 |
– |
|
893 |
– |
if ((conf = to->serv->sconf) != NULL) |
894 |
– |
strlcpy(myname, my_name_for_link(conf), sizeof(myname)); |
895 |
– |
else |
896 |
– |
strlcpy(myname, me.name, sizeof(myname)); |
897 |
– |
recurse_send_quits(source_p, source_p, from, to, |
898 |
– |
comment, splitstr, myname); |
899 |
– |
} |
900 |
– |
|
901 |
– |
recurse_remove_clients(source_p, splitstr); |
726 |
|
} |
727 |
|
|
728 |
|
/* |
730 |
|
* this on any struct Client, regardless of its state. |
731 |
|
* |
732 |
|
* Note, you shouldn't exit remote _users_ without first doing |
733 |
< |
* SetKilled and propagating a kill or similar message. However, |
734 |
< |
* it is perfectly correct to call exit_client to force a _server_ |
733 |
> |
* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message. |
734 |
> |
* |
735 |
> |
* However, it is perfectly correct to call exit_client to force a _server_ |
736 |
|
* quit (either local or remote one). |
737 |
|
* |
738 |
+ |
* |
739 |
|
* inputs: - a client pointer that is going to be exited |
914 |
– |
* - for servers, the second argument is a pointer to who |
915 |
– |
* is firing the server. This side won't get any generated |
916 |
– |
* messages. NEVER NULL! |
740 |
|
* output: none |
741 |
|
* side effects: the client is delinked from all lists, disconnected, |
742 |
|
* and the rest of IRC network is notified of the exit. |
743 |
|
* Client memory is scheduled to be freed |
744 |
|
*/ |
745 |
|
void |
746 |
< |
exit_client(struct Client *source_p, struct Client *from, const char *comment) |
746 |
> |
exit_client(struct Client *source_p, const char *comment) |
747 |
|
{ |
748 |
< |
dlink_node *m; |
748 |
> |
dlink_node *m = NULL; |
749 |
|
|
750 |
|
if (MyConnect(source_p)) |
751 |
|
{ |
760 |
|
if (IsIpHash(source_p)) |
761 |
|
remove_one_ip(&source_p->localClient->ip); |
762 |
|
|
763 |
< |
delete_auth(source_p); |
763 |
> |
delete_auth(&source_p->localClient->auth); |
764 |
|
|
765 |
< |
/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING |
765 |
> |
/* |
766 |
> |
* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING |
767 |
|
* STAT_HANDSHAKE or STAT_UNKNOWN |
768 |
|
* all of which are lumped together into unknown_list |
769 |
|
* |
771 |
|
*/ |
772 |
|
if (!IsRegistered(source_p)) |
773 |
|
{ |
774 |
< |
if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL) |
775 |
< |
free_dlink_node(m); |
774 |
> |
assert(dlinkFind(&unknown_list, source_p)); |
775 |
> |
|
776 |
> |
dlinkDelete(&source_p->localClient->lclient_node, &unknown_list); |
777 |
|
} |
778 |
|
else if (IsClient(source_p)) |
779 |
|
{ |
780 |
+ |
time_t on_for = CurrentTime - source_p->localClient->firsttime; |
781 |
+ |
assert(Count.local > 0); |
782 |
|
Count.local--; |
783 |
|
|
784 |
< |
if (IsOper(source_p)) |
785 |
< |
{ |
959 |
< |
if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL) |
784 |
> |
if (HasUMode(source_p, UMODE_OPER)) |
785 |
> |
if ((m = dlinkFindDelete(&oper_list, source_p))) |
786 |
|
free_dlink_node(m); |
961 |
– |
} |
787 |
|
|
788 |
+ |
assert(dlinkFind(&local_client_list, source_p)); |
789 |
|
dlinkDelete(&source_p->localClient->lclient_node, &local_client_list); |
790 |
< |
if (source_p->localClient->list_task != NULL) |
790 |
> |
|
791 |
> |
if (source_p->localClient->list_task) |
792 |
|
free_list_task(source_p->localClient->list_task, source_p); |
793 |
|
|
794 |
< |
sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]", |
794 |
> |
watch_del_watch_list(source_p); |
795 |
> |
sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE, |
796 |
> |
"Client exiting: %s (%s@%s) [%s] [%s]", |
797 |
|
source_p->name, source_p->username, source_p->host, comment, |
798 |
|
ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ? |
799 |
|
"255.255.255.255" : source_p->sockhost); |
800 |
+ |
ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu", |
801 |
+ |
myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600), |
802 |
+ |
(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60), |
803 |
+ |
source_p->name, source_p->username, source_p->host, |
804 |
+ |
source_p->localClient->send.bytes>>10, |
805 |
+ |
source_p->localClient->recv.bytes>>10); |
806 |
|
} |
807 |
< |
|
973 |
< |
/* As soon as a client is known to be a server of some sort |
974 |
< |
* it has to be put on the serv_list, or SJOIN's to this new server |
975 |
< |
* from the connect burst will not be seen. |
976 |
< |
*/ |
977 |
< |
if (IsServer(source_p) || IsConnecting(source_p) || |
978 |
< |
IsHandshake(source_p)) |
807 |
> |
else if (IsServer(source_p)) |
808 |
|
{ |
809 |
< |
if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL) |
810 |
< |
{ |
982 |
< |
free_dlink_node(m); |
983 |
< |
unset_chcap_usage_counts(source_p); |
984 |
< |
} |
809 |
> |
assert(Count.myserver > 0); |
810 |
> |
--Count.myserver; |
811 |
|
|
812 |
< |
if (IsServer(source_p)) |
813 |
< |
{ |
988 |
< |
Count.myserver--; |
989 |
< |
if (ServerInfo.hub) |
990 |
< |
remove_lazylink_flags(source_p->localClient->serverMask); |
991 |
< |
else |
992 |
< |
uplink = NULL; |
993 |
< |
} |
812 |
> |
assert(dlinkFind(&serv_list, source_p)); |
813 |
> |
dlinkDelete(&source_p->localClient->lclient_node, &serv_list); |
814 |
|
} |
815 |
|
|
996 |
– |
log_user_exit(source_p); |
997 |
– |
|
816 |
|
if (!IsDead(source_p)) |
817 |
|
{ |
818 |
|
if (IsServer(source_p)) |
819 |
|
{ |
820 |
< |
/* for them, we are exiting the network */ |
821 |
< |
sendto_one(source_p, ":%s SQUIT %s :%s", |
822 |
< |
ID_or_name(from, source_p), me.name, comment); |
820 |
> |
if (!HasFlag(source_p, FLAGS_SQUIT)) |
821 |
> |
{ |
822 |
> |
/* for them, we are exiting the network */ |
823 |
> |
sendto_one(source_p, ":%s SQUIT %s :%s", |
824 |
> |
me.id, me.id, comment); |
825 |
> |
} |
826 |
|
} |
827 |
|
|
828 |
|
sendto_one(source_p, "ERROR :Closing Link: %s (%s)", |
842 |
|
*/ |
843 |
|
close_connection(source_p); |
844 |
|
} |
845 |
+ |
else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB)) |
846 |
+ |
sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE, |
847 |
+ |
"Client exiting at %s: %s (%s@%s) [%s]", |
848 |
+ |
source_p->servptr->name, source_p->name, |
849 |
+ |
source_p->username, source_p->host, comment); |
850 |
|
|
851 |
|
if (IsServer(source_p)) |
852 |
|
{ |
853 |
< |
char splitstr[HOSTLEN + HOSTLEN + 2]; |
853 |
> |
char splitstr[HOSTLEN + HOSTLEN + 2] = ""; |
854 |
|
|
855 |
|
/* This shouldn't ever happen */ |
856 |
< |
assert(source_p->serv != NULL && source_p->servptr != NULL); |
856 |
> |
assert(source_p->serv && source_p->servptr); |
857 |
|
|
858 |
|
if (ConfigServerHide.hide_servers) |
859 |
< |
/* set netsplit message to "*.net *.split" to still show |
859 |
> |
/* |
860 |
> |
* Set netsplit message to "*.net *.split" to still show |
861 |
|
* that its a split, but hide the servers splitting |
862 |
|
*/ |
863 |
< |
strcpy(splitstr, "*.net *.split"); |
863 |
> |
strlcpy(splitstr, "*.net *.split", sizeof(splitstr)); |
864 |
|
else |
865 |
|
snprintf(splitstr, sizeof(splitstr), "%s %s", |
866 |
|
source_p->servptr->name, source_p->name); |
867 |
|
|
868 |
< |
remove_dependents(source_p, from->from, comment, splitstr); |
868 |
> |
/* Send SQUIT for source_p in every direction. source_p is already off of serv_list here */ |
869 |
> |
if (!HasFlag(source_p, FLAGS_SQUIT)) |
870 |
> |
sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment); |
871 |
> |
|
872 |
> |
/* Now exit the clients internally */ |
873 |
> |
recurse_remove_clients(source_p, splitstr); |
874 |
|
|
875 |
< |
if (source_p->servptr == &me) |
875 |
> |
if (MyConnect(source_p)) |
876 |
|
{ |
877 |
< |
sendto_realops_flags(UMODE_ALL, L_ALL, |
877 |
> |
sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, |
878 |
|
"%s was connected for %d seconds. %llu/%llu sendK/recvK.", |
879 |
< |
source_p->name, (int)(CurrentTime - source_p->firsttime), |
879 |
> |
source_p->name, (int)(CurrentTime - source_p->localClient->firsttime), |
880 |
|
source_p->localClient->send.bytes >> 10, |
881 |
|
source_p->localClient->recv.bytes >> 10); |
882 |
< |
ilog(L_NOTICE, "%s was connected for %d seconds. %llu/%llu sendK/recvK.", |
883 |
< |
source_p->name, (int)(CurrentTime - source_p->firsttime), |
882 |
> |
ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds. %llu/%llu sendK/recvK.", |
883 |
> |
source_p->name, (int)(CurrentTime - source_p->localClient->firsttime), |
884 |
|
source_p->localClient->send.bytes >> 10, |
885 |
|
source_p->localClient->recv.bytes >> 10); |
886 |
|
} |
887 |
|
} |
888 |
< |
else if (IsClient(source_p) && !IsKilled(source_p)) |
889 |
< |
{ |
890 |
< |
sendto_server(NULL, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS, |
1059 |
< |
":%s QUIT :%s", ID(source_p), comment); |
1060 |
< |
sendto_server(NULL, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS, |
1061 |
< |
":%s QUIT :%s", source_p->name, comment); |
1062 |
< |
} |
888 |
> |
else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED)) |
889 |
> |
sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s", |
890 |
> |
source_p->id, comment); |
891 |
|
|
892 |
|
/* The client *better* be off all of the lists */ |
893 |
|
assert(dlinkFind(&unknown_list, source_p) == NULL); |
931 |
|
void |
932 |
|
dead_link_on_read(struct Client *client_p, int error) |
933 |
|
{ |
934 |
< |
char errmsg[255]; |
934 |
> |
char errmsg[IRCD_BUFSIZE]; |
935 |
|
int current_error; |
936 |
|
|
937 |
|
if (IsDefunct(client_p)) |
944 |
|
|
945 |
|
if (IsServer(client_p) || IsHandshake(client_p)) |
946 |
|
{ |
947 |
< |
int connected = CurrentTime - client_p->firsttime; |
948 |
< |
|
947 |
> |
int connected = CurrentTime - client_p->localClient->firsttime; |
948 |
> |
|
949 |
|
if (error == 0) |
950 |
|
{ |
951 |
|
/* Admins get the real IP */ |
952 |
< |
sendto_realops_flags(UMODE_ALL, L_ADMIN, |
953 |
< |
"Server %s closed the connection", |
954 |
< |
get_client_name(client_p, SHOW_IP)); |
952 |
> |
sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, |
953 |
> |
"Server %s closed the connection", |
954 |
> |
get_client_name(client_p, SHOW_IP)); |
955 |
|
|
956 |
|
/* Opers get a masked IP */ |
957 |
< |
sendto_realops_flags(UMODE_ALL, L_OPER, |
958 |
< |
"Server %s closed the connection", |
959 |
< |
get_client_name(client_p, MASK_IP)); |
957 |
> |
sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE, |
958 |
> |
"Server %s closed the connection", |
959 |
> |
get_client_name(client_p, MASK_IP)); |
960 |
|
|
961 |
< |
ilog(L_NOTICE, "Server %s closed the connection", |
962 |
< |
get_client_name(client_p, SHOW_IP)); |
961 |
> |
ilog(LOG_TYPE_IRCD, "Server %s closed the connection", |
962 |
> |
get_client_name(client_p, SHOW_IP)); |
963 |
|
} |
964 |
|
else |
965 |
|
{ |
966 |
< |
report_error(L_ADMIN, "Lost connection to %s: %d", |
967 |
< |
get_client_name(client_p, SHOW_IP), current_error); |
968 |
< |
report_error(L_OPER, "Lost connection to %s: %d", |
969 |
< |
get_client_name(client_p, MASK_IP), current_error); |
966 |
> |
report_error(L_ADMIN, "Lost connection to %s: %s", |
967 |
> |
get_client_name(client_p, SHOW_IP), current_error); |
968 |
> |
report_error(L_OPER, "Lost connection to %s: %s", |
969 |
> |
get_client_name(client_p, MASK_IP), current_error); |
970 |
|
} |
971 |
|
|
972 |
< |
sendto_realops_flags(UMODE_ALL, L_ALL, |
973 |
< |
"%s had been connected for %d day%s, %2d:%02d:%02d", |
974 |
< |
client_p->name, connected/86400, |
975 |
< |
(connected/86400 == 1) ? "" : "s", |
976 |
< |
(connected % 86400) / 3600, (connected % 3600) / 60, |
977 |
< |
connected % 60); |
972 |
> |
sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, |
973 |
> |
"%s had been connected for %d day%s, %2d:%02d:%02d", |
974 |
> |
client_p->name, connected/86400, |
975 |
> |
(connected/86400 == 1) ? "" : "s", |
976 |
> |
(connected % 86400) / 3600, (connected % 3600) / 60, |
977 |
> |
connected % 60); |
978 |
|
} |
979 |
|
|
980 |
|
if (error == 0) |
981 |
|
strlcpy(errmsg, "Remote host closed the connection", |
982 |
|
sizeof(errmsg)); |
983 |
|
else |
984 |
< |
ircsprintf(errmsg, "Read error: %s", |
985 |
< |
strerror(current_error)); |
984 |
> |
snprintf(errmsg, sizeof(errmsg), "Read error: %s", |
985 |
> |
strerror(current_error)); |
986 |
|
|
987 |
< |
exit_client(client_p, &me, errmsg); |
987 |
> |
exit_client(client_p, errmsg); |
988 |
|
} |
989 |
|
|
990 |
|
void |
1001 |
|
|
1002 |
|
if (target_p == NULL) |
1003 |
|
{ |
1004 |
< |
sendto_realops_flags(UMODE_ALL, L_ALL, |
1004 |
> |
sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, |
1005 |
|
"Warning: null client on abort_list!"); |
1006 |
|
dlinkDelete(ptr, &abort_list); |
1007 |
|
free_dlink_node(ptr); |
1015 |
|
else |
1016 |
|
notice = "Write error: connection closed"; |
1017 |
|
|
1018 |
< |
exit_client(target_p, &me, notice); |
1018 |
> |
exit_client(target_p, notice); |
1019 |
|
free_dlink_node(ptr); |
1020 |
|
} |
1021 |
|
} |
1022 |
|
|
1023 |
|
/* |
1024 |
|
* accept processing, this adds a form of "caller ID" to ircd |
1025 |
< |
* |
1025 |
> |
* |
1026 |
|
* If a client puts themselves into "caller ID only" mode, |
1027 |
< |
* only clients that match a client pointer they have put on |
1027 |
> |
* only clients that match a client pointer they have put on |
1028 |
|
* the accept list will be allowed to message them. |
1029 |
|
* |
1030 |
< |
* [ source.on_allow_list ] -> [ target1 ] -> [ target2 ] |
1203 |
< |
* |
1204 |
< |
* [target.allow_list] -> [ source1 ] -> [source2 ] |
1205 |
< |
* |
1206 |
< |
* i.e. a target will have a link list of source pointers it will allow |
1207 |
< |
* each source client then has a back pointer pointing back |
1208 |
< |
* to the client that has it on its accept list. |
1209 |
< |
* This allows for exit_one_client to remove these now bogus entries |
1210 |
< |
* from any client having an accept on them. |
1030 |
> |
* Diane Bruce, "Dianora" db@db.net |
1031 |
|
*/ |
1032 |
|
|
1033 |
< |
/* accept_message() |
1034 |
< |
* |
1215 |
< |
* inputs - pointer to source client |
1216 |
< |
* - pointer to target client |
1217 |
< |
* output - 1 if accept this message 0 if not |
1218 |
< |
* side effects - See if source is on target's allow list |
1219 |
< |
*/ |
1220 |
< |
int |
1221 |
< |
accept_message(struct Client *source, struct Client *target) |
1033 |
> |
void |
1034 |
> |
del_accept(struct split_nuh_item *accept_p, struct Client *client_p) |
1035 |
|
{ |
1036 |
< |
dlink_node *ptr; |
1036 |
> |
dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist); |
1037 |
|
|
1038 |
< |
DLINK_FOREACH(ptr, target->allow_list.head) |
1039 |
< |
{ |
1040 |
< |
struct Client *target_p = ptr->data; |
1038 |
> |
MyFree(accept_p->nickptr); |
1039 |
> |
MyFree(accept_p->userptr); |
1040 |
> |
MyFree(accept_p->hostptr); |
1041 |
> |
MyFree(accept_p); |
1042 |
> |
} |
1043 |
|
|
1044 |
< |
if (source == target_p) |
1045 |
< |
return (1); |
1046 |
< |
} |
1044 |
> |
struct split_nuh_item * |
1045 |
> |
find_accept(const char *nick, const char *user, |
1046 |
> |
const char *host, struct Client *client_p, |
1047 |
> |
int (*cmpfunc)(const char *, const char *)) |
1048 |
> |
{ |
1049 |
> |
dlink_node *ptr = NULL; |
1050 |
|
|
1051 |
< |
if (IsSoftCallerId(target)) |
1051 |
> |
DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head) |
1052 |
|
{ |
1053 |
< |
DLINK_FOREACH(ptr, target->channel.head) |
1054 |
< |
if (IsMember(source, ptr->data)) |
1055 |
< |
return (1); |
1053 |
> |
struct split_nuh_item *accept_p = ptr->data; |
1054 |
> |
|
1055 |
> |
if (!cmpfunc(accept_p->nickptr, nick) && |
1056 |
> |
!cmpfunc(accept_p->userptr, user) && |
1057 |
> |
!cmpfunc(accept_p->hostptr, host)) |
1058 |
> |
return accept_p; |
1059 |
|
} |
1060 |
|
|
1061 |
< |
return (0); |
1061 |
> |
return NULL; |
1062 |
|
} |
1063 |
|
|
1064 |
< |
/* del_from_accept() |
1244 |
< |
* |
1245 |
< |
* inputs - pointer to source client |
1246 |
< |
* - pointer to target client |
1247 |
< |
* output - NONE |
1248 |
< |
* side effects - Delete's source pointer to targets allow list |
1064 |
> |
/* accept_message() |
1065 |
|
* |
1066 |
< |
* Walk through the target's accept list, remove if source is found, |
1067 |
< |
* Then walk through the source's on_accept_list remove target if found. |
1066 |
> |
* inputs - pointer to source client |
1067 |
> |
* - pointer to target client |
1068 |
> |
* output - 1 if accept this message 0 if not |
1069 |
> |
* side effects - See if source is on target's allow list |
1070 |
|
*/ |
1071 |
< |
void |
1072 |
< |
del_from_accept(struct Client *source, struct Client *target) |
1071 |
> |
int |
1072 |
> |
accept_message(struct Client *source, |
1073 |
> |
struct Client *target) |
1074 |
|
{ |
1075 |
< |
dlink_node *ptr; |
1257 |
< |
dlink_node *ptr2; |
1258 |
< |
dlink_node *next_ptr; |
1259 |
< |
dlink_node *next_ptr2; |
1260 |
< |
struct Client *target_p; |
1261 |
< |
|
1262 |
< |
DLINK_FOREACH_SAFE(ptr, next_ptr, target->allow_list.head) |
1263 |
< |
{ |
1264 |
< |
target_p = ptr->data; |
1075 |
> |
dlink_node *ptr = NULL; |
1076 |
|
|
1077 |
< |
if (source == target_p) |
1078 |
< |
{ |
1079 |
< |
dlinkDelete(ptr, &target->allow_list); |
1269 |
< |
free_dlink_node(ptr); |
1077 |
> |
if (source == target || find_accept(source->name, source->username, |
1078 |
> |
source->host, target, match)) |
1079 |
> |
return 1; |
1080 |
|
|
1081 |
< |
DLINK_FOREACH_SAFE(ptr2, next_ptr2, source->on_allow_list.head) |
1082 |
< |
{ |
1083 |
< |
target_p = ptr2->data; |
1081 |
> |
if (HasUMode(target, UMODE_SOFTCALLERID)) |
1082 |
> |
DLINK_FOREACH(ptr, target->channel.head) |
1083 |
> |
if (IsMember(source, ((struct Membership *)ptr->data)->chptr)) |
1084 |
> |
return 1; |
1085 |
|
|
1086 |
< |
if (target == target_p) |
1276 |
< |
{ |
1277 |
< |
dlinkDelete(ptr2, &source->on_allow_list); |
1278 |
< |
free_dlink_node(ptr2); |
1279 |
< |
} |
1280 |
< |
} |
1281 |
< |
} |
1282 |
< |
} |
1086 |
> |
return 0; |
1087 |
|
} |
1088 |
|
|
1089 |
|
/* del_all_accepts() |
1090 |
|
* |
1091 |
< |
* inputs - pointer to exiting client |
1092 |
< |
* output - NONE |
1093 |
< |
* side effects - Walk through given clients allow_list and on_allow_list |
1290 |
< |
* remove all references to this client |
1091 |
> |
* inputs - pointer to exiting client |
1092 |
> |
* output - NONE |
1093 |
> |
* side effects - Walk through given clients acceptlist and remove all entries |
1094 |
|
*/ |
1095 |
|
void |
1096 |
|
del_all_accepts(struct Client *client_p) |
1097 |
|
{ |
1098 |
< |
dlink_node *ptr, *next_ptr; |
1098 |
> |
dlink_node *ptr = NULL, *ptr_next = NULL; |
1099 |
|
|
1100 |
< |
DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->allow_list.head) |
1101 |
< |
del_from_accept(ptr->data, client_p); |
1299 |
< |
|
1300 |
< |
DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head) |
1301 |
< |
del_from_accept(client_p, ptr->data); |
1100 |
> |
DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head) |
1101 |
> |
del_accept(ptr->data, client_p); |
1102 |
|
} |
1103 |
|
|
1104 |
< |
/* del_all_their_accepts() |
1105 |
< |
* |
1306 |
< |
* inputs - pointer to exiting client |
1307 |
< |
* output - NONE |
1308 |
< |
* side effects - Walk through given clients on_allow_list |
1309 |
< |
* remove all references to this client, |
1310 |
< |
* allow this client to keep their own allow_list |
1311 |
< |
*/ |
1312 |
< |
void |
1313 |
< |
del_all_their_accepts(struct Client *client_p) |
1104 |
> |
unsigned int |
1105 |
> |
idle_time_get(const struct Client *source_p, const struct Client *target_p) |
1106 |
|
{ |
1107 |
< |
dlink_node *ptr, *next_ptr; |
1107 |
> |
unsigned int idle = 0; |
1108 |
> |
unsigned int min_idle = 0; |
1109 |
> |
unsigned int max_idle = 0; |
1110 |
> |
const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs); |
1111 |
|
|
1112 |
< |
DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head) |
1113 |
< |
del_from_accept(client_p, ptr->data); |
1114 |
< |
} |
1112 |
> |
if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p) |
1113 |
> |
return CurrentTime - target_p->localClient->last_privmsg; |
1114 |
> |
if (HasUMode(source_p, UMODE_OPER) && |
1115 |
> |
!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS)) |
1116 |
> |
return CurrentTime - target_p->localClient->last_privmsg; |
1117 |
|
|
1118 |
< |
/* set_initial_nick() |
1119 |
< |
* |
1323 |
< |
* inputs |
1324 |
< |
* output |
1325 |
< |
* side effects - |
1326 |
< |
* |
1327 |
< |
* This function is only called to set up an initially registering |
1328 |
< |
* client. |
1329 |
< |
*/ |
1330 |
< |
void |
1331 |
< |
set_initial_nick(struct Client *client_p, struct Client *source_p, |
1332 |
< |
const char *nick) |
1333 |
< |
{ |
1334 |
< |
char buf[USERLEN + 1]; |
1335 |
< |
|
1336 |
< |
/* Client setting NICK the first time */ |
1337 |
< |
|
1338 |
< |
/* This had to be copied here to avoid problems.. */ |
1339 |
< |
source_p->tsinfo = CurrentTime; |
1340 |
< |
|
1341 |
< |
if (source_p->name[0]) |
1342 |
< |
hash_del_client(source_p); |
1343 |
< |
|
1344 |
< |
strlcpy(source_p->name, nick, sizeof(source_p->name)); |
1345 |
< |
hash_add_client(source_p); |
1346 |
< |
|
1347 |
< |
/* fd_desc is long enough */ |
1348 |
< |
fd_note(&client_p->localClient->fd, "Nick: %s", nick); |
1349 |
< |
|
1350 |
< |
/* They have the nick they want now.. */ |
1351 |
< |
client_p->llname[0] = '\0'; |
1352 |
< |
|
1353 |
< |
if (source_p->flags & FLAGS_GOTUSER) |
1354 |
< |
{ |
1355 |
< |
strlcpy(buf, source_p->username, sizeof(buf)); |
1118 |
> |
min_idle = class->min_idle; |
1119 |
> |
max_idle = class->max_idle; |
1120 |
|
|
1121 |
< |
/* |
1122 |
< |
* USER already received, now we have NICK. |
1359 |
< |
* *NOTE* For servers "NICK" *must* precede the |
1360 |
< |
* user message (giving USER before NICK is possible |
1361 |
< |
* only for local client connection!). register_user |
1362 |
< |
* may reject the client and call exit_client for it |
1363 |
< |
* --must test this and exit m_nick too!!! |
1364 |
< |
*/ |
1365 |
< |
register_local_user(client_p, source_p, nick, buf); |
1366 |
< |
} |
1367 |
< |
} |
1121 |
> |
if (min_idle == max_idle) |
1122 |
> |
return min_idle; |
1123 |
|
|
1124 |
< |
/* change_local_nick() |
1125 |
< |
* |
1371 |
< |
* inputs - pointer to server |
1372 |
< |
* - pointer to client |
1373 |
< |
* - nick |
1374 |
< |
* output - |
1375 |
< |
* side effects - changes nick of a LOCAL user |
1376 |
< |
*/ |
1377 |
< |
void |
1378 |
< |
change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick) |
1379 |
< |
{ |
1380 |
< |
/* |
1381 |
< |
** Client just changing his/her nick. If he/she is |
1382 |
< |
** on a channel, send note of change to all clients |
1383 |
< |
** on that channel. Propagate notice to other servers. |
1384 |
< |
*/ |
1385 |
< |
if ((source_p->localClient->last_nick_change + |
1386 |
< |
ConfigFileEntry.max_nick_time) < CurrentTime) |
1387 |
< |
source_p->localClient->number_of_nick_changes = 0; |
1388 |
< |
source_p->localClient->last_nick_change = CurrentTime; |
1389 |
< |
source_p->localClient->number_of_nick_changes++; |
1390 |
< |
|
1391 |
< |
if ((ConfigFileEntry.anti_nick_flood && |
1392 |
< |
(source_p->localClient->number_of_nick_changes |
1393 |
< |
<= ConfigFileEntry.max_nick_changes)) || |
1394 |
< |
!ConfigFileEntry.anti_nick_flood || |
1395 |
< |
(IsOper(source_p) && ConfigFileEntry.no_oper_flood)) |
1396 |
< |
{ |
1397 |
< |
if (irccmp(source_p->name, nick)) |
1398 |
< |
source_p->tsinfo = CurrentTime; |
1399 |
< |
|
1400 |
< |
/* XXX - the format of this notice should eventually be changed |
1401 |
< |
* to either %s[%s@%s], or even better would be get_client_name() -bill |
1402 |
< |
*/ |
1403 |
< |
sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]", |
1404 |
< |
source_p->name, nick, source_p->username, source_p->host); |
1405 |
< |
sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s", |
1406 |
< |
source_p->name, source_p->username, |
1407 |
< |
source_p->host, nick); |
1408 |
< |
|
1409 |
< |
add_history(source_p, 1); |
1410 |
< |
|
1411 |
< |
/* Only hubs care about lazy link nicks not being sent on yet |
1412 |
< |
* lazylink leafs/leafs always send their nicks up to hub, |
1413 |
< |
* hence must always propagate nick changes. |
1414 |
< |
* hubs might not propagate a nick change, if the leaf |
1415 |
< |
* does not know about that client yet. |
1416 |
< |
*/ |
1417 |
< |
sendto_server(client_p, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS, |
1418 |
< |
":%s NICK %s :%lu", |
1419 |
< |
ID(source_p), nick, (unsigned long)source_p->tsinfo); |
1420 |
< |
sendto_server(client_p, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS, |
1421 |
< |
":%s NICK %s :%lu", |
1422 |
< |
source_p->name, nick, (unsigned long)source_p->tsinfo); |
1423 |
< |
} |
1124 |
> |
if (class->flags & CLASS_FLAGS_RANDOM_IDLE) |
1125 |
> |
idle = genrand_int32(); |
1126 |
|
else |
1127 |
< |
{ |
1426 |
< |
sendto_one(source_p, form_str(ERR_NICKTOOFAST), |
1427 |
< |
me.name, source_p->name, source_p->name, |
1428 |
< |
nick, ConfigFileEntry.max_nick_time); |
1429 |
< |
return; |
1430 |
< |
} |
1127 |
> |
idle = CurrentTime - target_p->localClient->last_privmsg; |
1128 |
|
|
1129 |
< |
/* Finally, add to hash */ |
1130 |
< |
if (source_p->name[0]) |
1131 |
< |
hash_del_client(source_p); |
1132 |
< |
|
1436 |
< |
strcpy(source_p->name, nick); |
1437 |
< |
hash_add_client(source_p); |
1129 |
> |
if (!max_idle) |
1130 |
> |
idle = 0; |
1131 |
> |
else |
1132 |
> |
idle %= max_idle; |
1133 |
|
|
1134 |
< |
/* Make sure everyone that has this client on its accept list |
1135 |
< |
* loses that reference. |
1441 |
< |
*/ |
1442 |
< |
del_all_their_accepts(source_p); |
1134 |
> |
if (idle < min_idle) |
1135 |
> |
idle = min_idle + (idle % (max_idle - min_idle)); |
1136 |
|
|
1137 |
< |
/* fd_desc is long enough */ |
1445 |
< |
fd_note(&client_p->localClient->fd, "Nick: %s", nick); |
1137 |
> |
return idle; |
1138 |
|
} |