1 |
|
/* |
2 |
|
* ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd) |
3 |
|
* |
4 |
< |
* Copyright (c) 1997-2014 ircd-hybrid development team |
4 |
> |
* Copyright (c) 1997-2017 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 |
19 |
|
* USA |
20 |
|
*/ |
21 |
|
|
22 |
< |
/*! \file s_user.c |
22 |
> |
/*! \file user.c |
23 |
|
* \brief User related functions. |
24 |
|
* \version $Id$ |
25 |
|
*/ |
31 |
|
#include "channel_mode.h" |
32 |
|
#include "client.h" |
33 |
|
#include "hash.h" |
34 |
+ |
#include "id.h" |
35 |
|
#include "irc_string.h" |
36 |
|
#include "ircd.h" |
37 |
|
#include "listener.h" |
38 |
|
#include "motd.h" |
39 |
|
#include "numeric.h" |
40 |
|
#include "conf.h" |
41 |
+ |
#include "conf_gecos.h" |
42 |
|
#include "log.h" |
43 |
|
#include "server.h" |
44 |
+ |
#include "server_capab.h" /* TBR: RHOST compatibility mode */ |
45 |
|
#include "send.h" |
46 |
|
#include "memory.h" |
47 |
|
#include "packet.h" |
50 |
|
#include "misc.h" |
51 |
|
#include "parse.h" |
52 |
|
#include "watch.h" |
53 |
+ |
#include "isupport.h" |
54 |
+ |
#include "tls.h" |
55 |
|
|
56 |
< |
static char umode_buffer[IRCD_BUFSIZE]; |
52 |
< |
static const char *uid_get(void); |
56 |
> |
static char umode_buffer[UMODE_MAX_STR]; |
57 |
|
|
58 |
< |
/* Used for building up the isupport string, |
59 |
< |
* used with init_isupport, add_isupport, delete_isupport |
56 |
< |
*/ |
57 |
< |
struct Isupport |
58 |
< |
{ |
59 |
< |
dlink_node node; |
60 |
< |
char *name; |
61 |
< |
char *options; |
62 |
< |
int number; |
63 |
< |
}; |
64 |
< |
|
65 |
< |
static dlink_list support_list; |
66 |
< |
static dlink_list support_list_lines; |
67 |
< |
|
68 |
< |
/* memory is cheap. map 0-255 to equivalent mode */ |
69 |
< |
const unsigned int user_modes[256] = |
58 |
> |
const struct user_modes *umode_map[256]; |
59 |
> |
const struct user_modes umode_tab[] = |
60 |
|
{ |
61 |
< |
/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */ |
62 |
< |
/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */ |
63 |
< |
/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */ |
64 |
< |
/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */ |
65 |
< |
0, /* @ */ |
66 |
< |
0, /* A */ |
67 |
< |
0, /* B */ |
68 |
< |
0, /* C */ |
69 |
< |
UMODE_DEAF, /* D */ |
70 |
< |
0, /* E */ |
71 |
< |
UMODE_FARCONNECT, /* F */ |
72 |
< |
UMODE_SOFTCALLERID, /* G */ |
73 |
< |
UMODE_HIDDEN, /* H */ |
74 |
< |
0, /* I */ |
75 |
< |
0, /* J */ |
76 |
< |
0, /* K */ |
77 |
< |
0, /* L */ |
78 |
< |
0, /* M */ |
79 |
< |
0, /* N */ |
80 |
< |
0, /* O */ |
81 |
< |
0, /* P */ |
82 |
< |
0, /* Q */ |
83 |
< |
UMODE_REGONLY, /* R */ |
84 |
< |
UMODE_SSL, /* S */ |
85 |
< |
0, /* T */ |
86 |
< |
0, /* U */ |
87 |
< |
0, /* V */ |
88 |
< |
UMODE_WEBIRC, /* W */ |
99 |
< |
0, /* X */ |
100 |
< |
0, /* Y */ |
101 |
< |
0, /* Z 0x5A */ |
102 |
< |
0, 0, 0, 0, 0, /* 0x5F */ |
103 |
< |
0, /* 0x60 */ |
104 |
< |
UMODE_ADMIN, /* a */ |
105 |
< |
UMODE_BOTS, /* b */ |
106 |
< |
UMODE_CCONN, /* c */ |
107 |
< |
UMODE_DEBUG, /* d */ |
108 |
< |
UMODE_EXTERNAL, /* e */ |
109 |
< |
UMODE_FULL, /* f */ |
110 |
< |
UMODE_CALLERID, /* g */ |
111 |
< |
0, /* h */ |
112 |
< |
UMODE_INVISIBLE, /* i */ |
113 |
< |
UMODE_REJ, /* j */ |
114 |
< |
UMODE_SKILL, /* k */ |
115 |
< |
UMODE_LOCOPS, /* l */ |
116 |
< |
0, /* m */ |
117 |
< |
UMODE_NCHANGE, /* n */ |
118 |
< |
UMODE_OPER, /* o */ |
119 |
< |
UMODE_HIDECHANS, /* p */ |
120 |
< |
UMODE_HIDEIDLE, /* q */ |
121 |
< |
UMODE_REGISTERED, /* r */ |
122 |
< |
UMODE_SERVNOTICE, /* s */ |
123 |
< |
0, /* t */ |
124 |
< |
UMODE_UNAUTH, /* u */ |
125 |
< |
0, /* v */ |
126 |
< |
UMODE_WALLOP, /* w */ |
127 |
< |
UMODE_HIDDENHOST, /* x */ |
128 |
< |
UMODE_SPY, /* y */ |
129 |
< |
0, /* z 0x7A */ |
130 |
< |
0,0,0,0,0, /* 0x7B - 0x7F */ |
131 |
< |
|
132 |
< |
/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */ |
133 |
< |
/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */ |
134 |
< |
/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */ |
135 |
< |
/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */ |
136 |
< |
/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */ |
137 |
< |
/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */ |
138 |
< |
/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */ |
139 |
< |
/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* 0xFF */ |
61 |
> |
{ 'D', UMODE_DEAF }, |
62 |
> |
{ 'F', UMODE_FARCONNECT }, |
63 |
> |
{ 'G', UMODE_SOFTCALLERID }, |
64 |
> |
{ 'H', UMODE_HIDDEN }, |
65 |
> |
{ 'R', UMODE_REGONLY }, |
66 |
> |
{ 'S', UMODE_SSL }, |
67 |
> |
{ 'W', UMODE_WEBIRC }, |
68 |
> |
{ 'a', UMODE_ADMIN }, |
69 |
> |
{ 'b', UMODE_BOTS }, |
70 |
> |
{ 'c', UMODE_CCONN }, |
71 |
> |
{ 'd', UMODE_DEBUG }, |
72 |
> |
{ 'e', UMODE_EXTERNAL }, |
73 |
> |
{ 'f', UMODE_FULL }, |
74 |
> |
{ 'g', UMODE_CALLERID }, |
75 |
> |
{ 'i', UMODE_INVISIBLE }, |
76 |
> |
{ 'j', UMODE_REJ }, |
77 |
> |
{ 'k', UMODE_SKILL }, |
78 |
> |
{ 'l', UMODE_LOCOPS }, |
79 |
> |
{ 'n', UMODE_NCHANGE }, |
80 |
> |
{ 'o', UMODE_OPER }, |
81 |
> |
{ 'p', UMODE_HIDECHANS }, |
82 |
> |
{ 'q', UMODE_HIDEIDLE }, |
83 |
> |
{ 'r', UMODE_REGISTERED }, |
84 |
> |
{ 's', UMODE_SERVNOTICE }, |
85 |
> |
{ 'u', UMODE_UNAUTH }, |
86 |
> |
{ 'w', UMODE_WALLOP }, |
87 |
> |
{ 'y', UMODE_SPY }, |
88 |
> |
{ '\0', 0 } |
89 |
|
}; |
90 |
|
|
91 |
|
void |
92 |
< |
assemble_umode_buffer(void) |
92 |
> |
user_modes_init(void) |
93 |
|
{ |
145 |
– |
unsigned int idx = 0; |
94 |
|
char *umode_buffer_ptr = umode_buffer; |
95 |
|
|
96 |
< |
for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx) |
97 |
< |
if (user_modes[idx]) |
98 |
< |
*umode_buffer_ptr++ = idx; |
96 |
> |
for (const struct user_modes *tab = umode_tab; tab->c; ++tab) |
97 |
> |
{ |
98 |
> |
umode_map[tab->c] = tab; |
99 |
> |
*umode_buffer_ptr++ = tab->c; |
100 |
> |
} |
101 |
|
|
102 |
|
*umode_buffer_ptr = '\0'; |
103 |
|
} |
109 |
|
* side effects - display to client user counts etc. |
110 |
|
*/ |
111 |
|
void |
112 |
< |
show_lusers(struct Client *source_p) |
112 |
> |
show_lusers(struct Client *client_p) |
113 |
|
{ |
114 |
< |
if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER)) |
115 |
< |
sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi), |
114 |
> |
if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER)) |
115 |
> |
sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (dlink_list_length(&global_client_list) - Count.invisi), |
116 |
|
Count.invisi, dlink_list_length(&global_server_list)); |
117 |
|
else |
118 |
< |
sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, |
119 |
< |
(Count.total - Count.invisi), Count.invisi, 1); |
118 |
> |
sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (dlink_list_length(&global_client_list) - Count.invisi), |
119 |
> |
Count.invisi, 1); |
120 |
|
|
121 |
|
if (Count.oper) |
122 |
< |
sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper); |
122 |
> |
sendto_one_numeric(client_p, &me, RPL_LUSEROP, Count.oper); |
123 |
|
|
124 |
|
if (dlink_list_length(&unknown_list)) |
125 |
< |
sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list)); |
125 |
> |
sendto_one_numeric(client_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list)); |
126 |
|
|
127 |
|
if (dlink_list_length(&channel_list)) |
128 |
< |
sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list)); |
128 |
> |
sendto_one_numeric(client_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list)); |
129 |
|
|
130 |
< |
if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER)) |
130 |
> |
if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER)) |
131 |
|
{ |
132 |
< |
sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver); |
133 |
< |
sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc); |
132 |
> |
sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&local_client_list), dlink_list_length(&local_server_list)); |
133 |
> |
sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&local_client_list), Count.max_loc); |
134 |
> |
sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot); |
135 |
> |
sendto_one_numeric(client_p, &me, RPL_STATSCONN, Count.max_loc_con, Count.max_loc, Count.totalrestartcount); |
136 |
|
} |
137 |
|
else |
138 |
|
{ |
139 |
< |
sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0); |
140 |
< |
sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot); |
139 |
> |
sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&global_client_list), 0); |
140 |
> |
sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&global_client_list), Count.max_tot); |
141 |
> |
sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot); |
142 |
|
} |
190 |
– |
|
191 |
– |
sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot); |
192 |
– |
|
193 |
– |
if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER)) |
194 |
– |
sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con, |
195 |
– |
Count.max_loc_cli, Count.totalrestartcount); |
196 |
– |
|
197 |
– |
if (Count.local > Count.max_loc_cli) |
198 |
– |
Count.max_loc_cli = Count.local; |
199 |
– |
|
200 |
– |
if ((Count.local + Count.myserver) > Count.max_loc_con) |
201 |
– |
Count.max_loc_con = Count.local + Count.myserver; |
143 |
|
} |
144 |
|
|
204 |
– |
/* show_isupport() |
205 |
– |
* |
206 |
– |
* inputs - pointer to client |
207 |
– |
* output - NONE |
208 |
– |
* side effects - display to client what we support (for them) |
209 |
– |
*/ |
210 |
– |
void |
211 |
– |
show_isupport(struct Client *source_p) |
212 |
– |
{ |
213 |
– |
const dlink_node *ptr = NULL; |
214 |
– |
|
215 |
– |
DLINK_FOREACH(ptr, support_list_lines.head) |
216 |
– |
sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data); |
217 |
– |
} |
218 |
– |
|
219 |
– |
|
145 |
|
/* report_and_set_user_flags() |
146 |
|
* |
147 |
< |
* inputs - pointer to source_p |
147 |
> |
* inputs - pointer to client_p |
148 |
|
* - pointer to conf for this user |
149 |
|
* output - NONE |
150 |
|
* side effects - Report to user any special flags |
151 |
|
* they are getting, and set them. |
152 |
|
*/ |
153 |
|
static void |
154 |
< |
report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf) |
154 |
> |
report_and_set_user_flags(struct Client *client_p, const struct MaskItem *conf) |
155 |
|
{ |
156 |
|
/* If this user is being spoofed, tell them so */ |
157 |
|
if (IsConfDoSpoofIp(conf)) |
158 |
< |
sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats."); |
158 |
> |
sendto_one_notice(client_p, &me, ":*** Spoofing your IP"); |
159 |
|
|
160 |
< |
/* If this user is in the exception class, Set it "E lined" */ |
160 |
> |
/* If this user is in the exception class, set it "E lined" */ |
161 |
|
if (IsConfExemptKline(conf)) |
162 |
|
{ |
163 |
< |
SetExemptKline(source_p); |
164 |
< |
sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats."); |
163 |
> |
AddFlag(client_p, FLAGS_EXEMPTKLINE); |
164 |
> |
sendto_one_notice(client_p, &me, ":*** You are exempt from K/D lines"); |
165 |
|
} |
166 |
|
|
167 |
< |
/* |
243 |
< |
* The else here is to make sure that G line exempt users |
244 |
< |
* do not get noticed twice. |
245 |
< |
*/ |
246 |
< |
else if (IsConfExemptGline(conf)) |
167 |
> |
if (IsConfExemptXline(conf)) |
168 |
|
{ |
169 |
< |
SetExemptGline(source_p); |
170 |
< |
sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats."); |
169 |
> |
AddFlag(client_p, FLAGS_EXEMPTXLINE); |
170 |
> |
sendto_one_notice(client_p, &me, ":*** You are exempt from X lines"); |
171 |
|
} |
172 |
|
|
173 |
|
if (IsConfExemptResv(conf)) |
174 |
|
{ |
175 |
< |
SetExemptResv(source_p); |
176 |
< |
sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats."); |
175 |
> |
AddFlag(client_p, FLAGS_EXEMPTRESV); |
176 |
> |
sendto_one_notice(client_p, &me, ":*** You are exempt from resvs"); |
177 |
|
} |
178 |
|
|
179 |
|
/* If this user is exempt from user limits set it "F lined" */ |
180 |
|
if (IsConfExemptLimits(conf)) |
181 |
|
{ |
182 |
< |
SetExemptLimits(source_p); |
183 |
< |
sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats."); |
182 |
> |
AddFlag(client_p, FLAGS_NOLIMIT); |
183 |
> |
sendto_one_notice(client_p, &me, ":*** You are exempt from user limits"); |
184 |
|
} |
185 |
|
|
186 |
|
if (IsConfCanFlood(conf)) |
187 |
|
{ |
188 |
< |
SetCanFlood(source_p); |
189 |
< |
sendto_one_notice(source_p, &me, ":*** You are exempt from flood " |
269 |
< |
"protection, aren't you fearsome."); |
188 |
> |
AddFlag(client_p, FLAGS_CANFLOOD); |
189 |
> |
sendto_one_notice(client_p, &me, ":*** You are exempt from flood protection"); |
190 |
|
} |
191 |
|
} |
192 |
|
|
193 |
|
/* introduce_client() |
194 |
|
* |
195 |
< |
* inputs - source_p |
195 |
> |
* inputs - client_p |
196 |
|
* output - NONE |
197 |
|
* side effects - This common function introduces a client to the rest |
198 |
|
* of the net, either from a local client connect or |
199 |
|
* from a remote connect. |
200 |
|
*/ |
201 |
|
static void |
202 |
< |
introduce_client(struct Client *source_p) |
202 |
> |
introduce_client(struct Client *client_p) |
203 |
|
{ |
204 |
< |
dlink_node *ptr = NULL; |
205 |
< |
char ubuf[IRCD_BUFSIZE] = ""; |
204 |
> |
dlink_node *node; |
205 |
> |
char buf[UMODE_MAX_STR] = ""; |
206 |
|
|
207 |
< |
if (MyClient(source_p)) |
208 |
< |
send_umode(source_p, source_p, 0, ubuf); |
289 |
< |
else |
290 |
< |
send_umode(NULL, source_p, 0, ubuf); |
291 |
< |
|
292 |
< |
watch_check_hash(source_p, RPL_LOGON); |
207 |
> |
send_umode(client_p, MyConnect(client_p), 0, buf); |
208 |
> |
watch_check_hash(client_p, RPL_LOGON); |
209 |
|
|
210 |
< |
if (ubuf[0] == '\0') |
210 |
> |
if (buf[0] == '\0') |
211 |
|
{ |
212 |
< |
ubuf[0] = '+'; |
213 |
< |
ubuf[1] = '\0'; |
212 |
> |
buf[0] = '+'; |
213 |
> |
buf[1] = '\0'; |
214 |
|
} |
215 |
|
|
216 |
< |
DLINK_FOREACH(ptr, local_server_list.head) |
216 |
> |
DLINK_FOREACH(node, local_server_list.head) |
217 |
|
{ |
218 |
< |
struct Client *server = ptr->data; |
218 |
> |
struct Client *server_p = node->data; |
219 |
|
|
220 |
< |
if (server == source_p->from) |
220 |
> |
if (server_p == client_p->from) |
221 |
|
continue; |
222 |
|
|
223 |
< |
if (IsCapable(server, CAP_SVS)) |
224 |
< |
sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s", |
225 |
< |
source_p->servptr->id, |
226 |
< |
source_p->name, source_p->hopcount+1, |
227 |
< |
(unsigned long)source_p->tsinfo, |
228 |
< |
ubuf, source_p->username, source_p->host, |
229 |
< |
(MyClient(source_p) && IsIPSpoof(source_p)) ? |
230 |
< |
"0" : source_p->sockhost, source_p->id, |
231 |
< |
source_p->svid, |
232 |
< |
source_p->info); |
223 |
> |
/* TBR: compatibility mode */ |
224 |
> |
if (IsCapable(server_p, CAPAB_RHOST)) |
225 |
> |
sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s %s :%s", |
226 |
> |
client_p->servptr->id, |
227 |
> |
client_p->name, client_p->hopcount+1, |
228 |
> |
client_p->tsinfo, |
229 |
> |
buf, client_p->username, client_p->host, client_p->realhost, |
230 |
> |
client_p->sockhost, client_p->id, |
231 |
> |
client_p->account, |
232 |
> |
client_p->info); |
233 |
|
else |
234 |
< |
sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s", |
235 |
< |
source_p->servptr->id, |
236 |
< |
source_p->name, source_p->hopcount+1, |
237 |
< |
(unsigned long)source_p->tsinfo, |
238 |
< |
ubuf, source_p->username, source_p->host, |
239 |
< |
(MyClient(source_p) && IsIPSpoof(source_p)) ? |
240 |
< |
"0" : source_p->sockhost, source_p->id, source_p->info); |
234 |
> |
sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s :%s", |
235 |
> |
client_p->servptr->id, |
236 |
> |
client_p->name, client_p->hopcount+1, |
237 |
> |
client_p->tsinfo, |
238 |
> |
buf, client_p->username, client_p->host, |
239 |
> |
client_p->sockhost, client_p->id, |
240 |
> |
client_p->account, |
241 |
> |
client_p->info); |
242 |
|
|
243 |
< |
if (!EmptyString(source_p->certfp)) |
244 |
< |
sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp); |
243 |
> |
if (!EmptyString(client_p->certfp)) |
244 |
> |
sendto_one(server_p, ":%s CERTFP %s", client_p->id, client_p->certfp); |
245 |
|
} |
246 |
|
} |
247 |
|
|
252 |
|
* side effects - |
253 |
|
*/ |
254 |
|
static void |
255 |
< |
user_welcome(struct Client *source_p) |
255 |
> |
user_welcome(struct Client *client_p) |
256 |
|
{ |
340 |
– |
#if defined(__TIME__) && defined(__DATE__) |
257 |
|
static const char built_date[] = __DATE__ " at " __TIME__; |
342 |
– |
#else |
343 |
– |
static const char built_date[] = "unknown"; |
344 |
– |
#endif |
345 |
– |
|
346 |
– |
#ifdef HAVE_LIBCRYPTO |
347 |
– |
if (HasFlag(source_p, FLAGS_SSL)) |
348 |
– |
{ |
349 |
– |
AddUMode(source_p, UMODE_SSL); |
350 |
– |
sendto_one_notice(source_p, &me, ":*** Connected securely via %s", |
351 |
– |
ssl_get_cipher(source_p->connection->fd.ssl)); |
352 |
– |
} |
353 |
– |
#endif |
354 |
– |
|
355 |
– |
sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name, |
356 |
– |
source_p->name); |
357 |
– |
sendto_one_numeric(source_p, &me, RPL_YOURHOST, |
358 |
– |
get_listener_name(source_p->connection->listener), ircd_version); |
359 |
– |
sendto_one_numeric(source_p, &me, RPL_CREATED, built_date); |
360 |
– |
sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer); |
361 |
– |
show_isupport(source_p); |
362 |
– |
sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id); |
258 |
|
|
259 |
< |
show_lusers(source_p); |
260 |
< |
motd_signon(source_p); |
259 |
> |
if (HasFlag(client_p, FLAGS_SSL)) |
260 |
> |
{ |
261 |
> |
AddUMode(client_p, UMODE_SSL); |
262 |
> |
sendto_one_notice(client_p, &me, ":*** Connected securely via %s", |
263 |
> |
tls_get_cipher(&client_p->connection->fd.ssl)); |
264 |
> |
} |
265 |
> |
|
266 |
> |
sendto_one_numeric(client_p, &me, RPL_WELCOME, ConfigServerInfo.network_name, |
267 |
> |
client_p->name); |
268 |
> |
sendto_one_numeric(client_p, &me, RPL_YOURHOST, |
269 |
> |
listener_get_name(client_p->connection->listener), ircd_version); |
270 |
> |
sendto_one_numeric(client_p, &me, RPL_CREATED, built_date); |
271 |
> |
sendto_one_numeric(client_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer); |
272 |
> |
|
273 |
> |
isupport_show(client_p); |
274 |
> |
show_lusers(client_p); |
275 |
> |
motd_signon(client_p); |
276 |
|
} |
277 |
|
|
278 |
|
/* check_xline() |
282 |
|
* side effects - |
283 |
|
*/ |
284 |
|
static int |
285 |
< |
check_xline(struct Client *source_p) |
285 |
> |
check_xline(struct Client *client_p) |
286 |
|
{ |
287 |
< |
struct MaskItem *conf = NULL; |
378 |
< |
const char *reason = NULL; |
287 |
> |
const struct GecosItem *gecos = NULL; |
288 |
|
|
289 |
< |
if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0))) |
290 |
< |
{ |
382 |
< |
++conf->count; |
383 |
< |
|
384 |
< |
if (conf->reason) |
385 |
< |
reason = conf->reason; |
386 |
< |
else |
387 |
< |
reason = CONF_NOREASON; |
289 |
> |
if (HasFlag(client_p, FLAGS_EXEMPTXLINE)) |
290 |
> |
return 0; |
291 |
|
|
292 |
+ |
if ((gecos = gecos_find(client_p->info, match))) |
293 |
+ |
{ |
294 |
|
sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE, |
295 |
|
"X-line Rejecting [%s] [%s], user %s [%s]", |
296 |
< |
source_p->info, reason, |
297 |
< |
get_client_name(source_p, HIDE_IP), |
298 |
< |
source_p->sockhost); |
296 |
> |
client_p->info, gecos->reason, |
297 |
> |
client_get_name(client_p, HIDE_IP), |
298 |
> |
client_p->sockhost); |
299 |
|
|
300 |
|
++ServerStats.is_ref; |
301 |
< |
exit_client(source_p, "Bad user info"); |
301 |
> |
exit_client(client_p, "Bad user info"); |
302 |
|
return 1; |
303 |
|
} |
304 |
|
|
308 |
|
/*! \brief This function is called when both NICK and USER messages |
309 |
|
* have been accepted for the client, in whatever order. Only |
310 |
|
* after this, is the UID message propagated. |
311 |
< |
* \param source_p Pointer to given client to introduce |
311 |
> |
* \param client_p Pointer to given client to introduce |
312 |
|
*/ |
313 |
|
void |
314 |
< |
register_local_user(struct Client *source_p) |
314 |
> |
register_local_user(struct Client *client_p) |
315 |
|
{ |
411 |
– |
const char *id = NULL; |
316 |
|
const struct MaskItem *conf = NULL; |
317 |
|
|
318 |
< |
assert(source_p == source_p->from); |
319 |
< |
assert(MyConnect(source_p)); |
320 |
< |
assert(!source_p->connection->registration); |
321 |
< |
|
418 |
< |
ClearCap(source_p, CAP_TS6); |
318 |
> |
assert(client_p == client_p->from); |
319 |
> |
assert(MyConnect(client_p)); |
320 |
> |
assert(IsUnknown(client_p)); |
321 |
> |
assert(!client_p->connection->registration); |
322 |
|
|
323 |
|
if (ConfigGeneral.ping_cookie) |
324 |
|
{ |
325 |
< |
if (!IsPingSent(source_p) && !source_p->connection->random_ping) |
325 |
> |
if (!HasFlag(client_p, FLAGS_PINGSENT) && !client_p->connection->random_ping) |
326 |
|
{ |
327 |
|
do |
328 |
< |
source_p->connection->random_ping = genrand_int32(); |
329 |
< |
while (!source_p->connection->random_ping); |
328 |
> |
client_p->connection->random_ping = genrand_int32(); |
329 |
> |
while (!client_p->connection->random_ping); |
330 |
|
|
331 |
< |
sendto_one(source_p, "PING :%u", |
332 |
< |
source_p->connection->random_ping); |
430 |
< |
SetPingSent(source_p); |
331 |
> |
sendto_one(client_p, "PING :%u", client_p->connection->random_ping); |
332 |
> |
AddFlag(client_p, FLAGS_PINGSENT); |
333 |
|
return; |
334 |
|
} |
335 |
|
|
336 |
< |
if (!HasPingCookie(source_p)) |
336 |
> |
if (!HasFlag(client_p, FLAGS_PING_COOKIE)) |
337 |
|
return; |
338 |
|
} |
339 |
|
|
340 |
< |
source_p->connection->last_privmsg = CurrentTime; |
340 |
> |
client_p->connection->last_privmsg = CurrentTime; |
341 |
|
/* Straight up the maximum rate of flooding... */ |
342 |
< |
source_p->connection->allow_read = MAX_FLOOD_BURST; |
342 |
> |
client_p->connection->allow_read = MAX_FLOOD_BURST; |
343 |
|
|
344 |
< |
if (!check_client(source_p)) |
344 |
> |
if (!check_client(client_p)) |
345 |
|
return; |
346 |
|
|
347 |
< |
if (!valid_hostname(source_p->host)) |
347 |
> |
if (!valid_hostname(client_p->host)) |
348 |
|
{ |
349 |
< |
sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal " |
349 |
> |
sendto_one_notice(client_p, &me, ":*** Notice -- You have an illegal " |
350 |
|
"character in your hostname"); |
351 |
< |
strlcpy(source_p->host, source_p->sockhost, |
450 |
< |
sizeof(source_p->host)); |
351 |
> |
strlcpy(client_p->host, client_p->sockhost, sizeof(client_p->host)); |
352 |
|
} |
353 |
|
|
354 |
< |
conf = source_p->connection->confs.head->data; |
354 |
> |
conf = client_p->connection->confs.head->data; |
355 |
|
|
356 |
< |
if (!IsGotId(source_p)) |
356 |
> |
if (!HasFlag(client_p, FLAGS_GOTID)) |
357 |
|
{ |
358 |
|
char username[USERLEN + 1] = ""; |
458 |
– |
const char *p = username; |
359 |
|
unsigned int i = 0; |
360 |
|
|
361 |
|
if (IsNeedIdentd(conf)) |
362 |
|
{ |
363 |
|
++ServerStats.is_ref; |
364 |
< |
sendto_one_notice(source_p, &me, ":*** Notice -- You need to install " |
364 |
> |
sendto_one_notice(client_p, &me, ":*** Notice -- You need to install " |
365 |
|
"identd to use this server"); |
366 |
< |
exit_client(source_p, "Install identd"); |
366 |
> |
exit_client(client_p, "Install identd"); |
367 |
|
return; |
368 |
|
} |
369 |
|
|
370 |
< |
strlcpy(username, source_p->username, sizeof(username)); |
370 |
> |
strlcpy(username, client_p->username, sizeof(username)); |
371 |
|
|
372 |
|
if (!IsNoTilde(conf)) |
373 |
< |
source_p->username[i++] = '~'; |
373 |
> |
client_p->username[i++] = '~'; |
374 |
|
|
375 |
< |
for (; *p && i < USERLEN; ++p) |
376 |
< |
source_p->username[i++] = *p; |
375 |
> |
for (const char *p = username; *p && i < USERLEN; ++p) |
376 |
> |
client_p->username[i++] = *p; |
377 |
|
|
378 |
< |
source_p->username[i] = '\0'; |
378 |
> |
client_p->username[i] = '\0'; |
379 |
|
} |
380 |
|
|
381 |
|
/* Password check */ |
382 |
|
if (!EmptyString(conf->passwd)) |
383 |
|
{ |
384 |
< |
if (!match_conf_password(source_p->connection->password, conf)) |
384 |
> |
if (!match_conf_password(client_p->connection->password, conf)) |
385 |
|
{ |
386 |
|
++ServerStats.is_ref; |
387 |
|
|
388 |
< |
sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH); |
389 |
< |
exit_client(source_p, "Bad Password"); |
388 |
> |
sendto_one_numeric(client_p, &me, ERR_PASSWDMISMATCH); |
389 |
> |
exit_client(client_p, "Bad Password"); |
390 |
|
return; |
391 |
|
} |
392 |
|
} |
393 |
|
|
394 |
|
/* |
395 |
< |
* Don't free source_p->connection->password here - it can be required |
396 |
< |
* by masked /stats I if there are auth{} blocks with need_password = no; |
395 |
> |
* Don't free client_p->connection->password here - it can be required |
396 |
> |
* by masked /stats I if there are auth {} blocks with need_password = no; |
397 |
|
* --adx |
398 |
|
*/ |
399 |
|
|
400 |
|
/* |
401 |
< |
* Report if user has &^>= etc. and set flags as needed in source_p |
401 |
> |
* Report if user has &^>= etc. and set flags as needed in client_p |
402 |
|
*/ |
403 |
< |
report_and_set_user_flags(source_p, conf); |
403 |
> |
report_and_set_user_flags(client_p, conf); |
404 |
|
|
405 |
< |
if (IsDead(source_p)) |
405 |
> |
if (IsDead(client_p)) |
406 |
|
return; |
407 |
|
|
408 |
|
/* |
413 |
|
* probably be just a percentage of the MAXCLIENTS... |
414 |
|
* -Taner |
415 |
|
*/ |
416 |
< |
if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) || |
417 |
< |
(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p))) |
416 |
> |
if ((dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients + MAX_BUFFER) || |
417 |
> |
(dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients && !HasFlag(client_p, FLAGS_NOLIMIT))) |
418 |
|
{ |
419 |
|
sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE, |
420 |
|
"Too many clients, rejecting %s[%s].", |
421 |
< |
source_p->name, source_p->host); |
421 |
> |
client_p->name, client_p->host); |
422 |
|
++ServerStats.is_ref; |
423 |
< |
exit_client(source_p, "Sorry, server is full - try later"); |
423 |
> |
exit_client(client_p, "Sorry, server is full - try later"); |
424 |
|
return; |
425 |
|
} |
426 |
|
|
427 |
< |
if (!valid_username(source_p->username, 1)) |
427 |
> |
if (!valid_username(client_p->username, 1)) |
428 |
|
{ |
429 |
|
char buf[IRCD_BUFSIZE] = ""; |
430 |
|
|
431 |
|
sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE, |
432 |
|
"Invalid username: %s (%s@%s)", |
433 |
< |
source_p->name, source_p->username, source_p->host); |
433 |
> |
client_p->name, client_p->username, client_p->host); |
434 |
|
++ServerStats.is_ref; |
435 |
< |
snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username); |
436 |
< |
exit_client(source_p, buf); |
435 |
> |
snprintf(buf, sizeof(buf), "Invalid username [%s]", client_p->username); |
436 |
> |
exit_client(client_p, buf); |
437 |
|
return; |
438 |
|
} |
439 |
|
|
440 |
< |
if (check_xline(source_p)) |
440 |
> |
if (check_xline(client_p)) |
441 |
|
return; |
442 |
|
|
443 |
+ |
const char *id; |
444 |
|
while (hash_find_id((id = uid_get()))) |
445 |
|
; |
446 |
|
|
447 |
< |
strlcpy(source_p->id, id, sizeof(source_p->id)); |
448 |
< |
hash_add_id(source_p); |
447 |
> |
strlcpy(client_p->id, id, sizeof(client_p->id)); |
448 |
> |
hash_add_id(client_p); |
449 |
|
|
450 |
|
sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE, |
451 |
|
"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>", |
452 |
< |
source_p->name, source_p->username, source_p->host, |
453 |
< |
ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ? |
454 |
< |
"255.255.255.255" : source_p->sockhost, |
455 |
< |
get_client_class(&source_p->connection->confs), |
555 |
< |
source_p->info, source_p->id); |
452 |
> |
client_p->name, client_p->username, client_p->host, |
453 |
> |
client_p->sockhost, |
454 |
> |
get_client_class(&client_p->connection->confs), |
455 |
> |
client_p->info, client_p->id); |
456 |
|
|
457 |
|
if (ConfigGeneral.invisible_on_connect) |
458 |
|
{ |
459 |
< |
AddUMode(source_p, UMODE_INVISIBLE); |
459 |
> |
AddUMode(client_p, UMODE_INVISIBLE); |
460 |
|
++Count.invisi; |
461 |
|
} |
462 |
|
|
463 |
< |
if (++Count.local > Count.max_loc) |
463 |
> |
assert(client_p->servptr == &me); |
464 |
> |
SetClient(client_p); |
465 |
> |
dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list); |
466 |
> |
dlinkAdd(client_p, &client_p->node, &global_client_list); |
467 |
> |
|
468 |
> |
assert(dlinkFind(&unknown_list, client_p)); |
469 |
> |
|
470 |
> |
dlink_move_node(&client_p->connection->lclient_node, |
471 |
> |
&unknown_list, &local_client_list); |
472 |
> |
|
473 |
> |
if (dlink_list_length(&local_client_list) > Count.max_loc) |
474 |
|
{ |
475 |
< |
Count.max_loc = Count.local; |
475 |
> |
Count.max_loc = dlink_list_length(&local_client_list); |
476 |
|
|
477 |
|
if (!(Count.max_loc % 10)) |
478 |
< |
sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, |
478 |
> |
sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, |
479 |
|
"New maximum local client connections: %u", |
480 |
|
Count.max_loc); |
481 |
|
} |
482 |
|
|
483 |
< |
if (++Count.total > Count.max_tot) |
484 |
< |
Count.max_tot = Count.total; |
485 |
< |
++Count.totalrestartcount; |
486 |
< |
|
577 |
< |
assert(source_p->servptr == &me); |
578 |
< |
SetClient(source_p); |
579 |
< |
dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list); |
580 |
< |
dlinkAdd(source_p, &source_p->node, &global_client_list); |
483 |
> |
if ((dlink_list_length(&local_client_list) + |
484 |
> |
dlink_list_length(&local_server_list)) > Count.max_loc_con) |
485 |
> |
Count.max_loc_con = dlink_list_length(&local_client_list) + |
486 |
> |
dlink_list_length(&local_server_list); |
487 |
|
|
488 |
< |
assert(dlinkFind(&unknown_list, source_p)); |
489 |
< |
|
490 |
< |
dlink_move_node(&source_p->connection->lclient_node, |
585 |
< |
&unknown_list, &local_client_list); |
488 |
> |
if (dlink_list_length(&global_client_list) > Count.max_tot) |
489 |
> |
Count.max_tot = dlink_list_length(&global_client_list); |
490 |
> |
++Count.totalrestartcount; |
491 |
|
|
492 |
< |
user_welcome(source_p); |
493 |
< |
add_user_host(source_p->username, source_p->host, 0); |
494 |
< |
SetUserHost(source_p); |
492 |
> |
user_welcome(client_p); |
493 |
> |
userhost_add(client_p->sockhost, 0); |
494 |
> |
AddFlag(client_p, FLAGS_USERHOST); |
495 |
|
|
496 |
< |
introduce_client(source_p); |
496 |
> |
introduce_client(client_p); |
497 |
|
} |
498 |
|
|
499 |
|
/* register_remote_user() |
500 |
|
* |
501 |
< |
* inputs - source_p remote or directly connected client |
501 |
> |
* inputs - client_p remote or directly connected client |
502 |
|
* - username to register as |
503 |
|
* - host name to register as |
504 |
|
* - server name |
507 |
|
* is introduced by a server. |
508 |
|
*/ |
509 |
|
void |
510 |
< |
register_remote_user(struct Client *source_p) |
510 |
> |
register_remote_user(struct Client *client_p) |
511 |
|
{ |
512 |
< |
const struct Client *target_p = NULL; |
608 |
< |
|
609 |
< |
if ((target_p = source_p->servptr) && target_p->from != source_p->from) |
610 |
< |
{ |
611 |
< |
sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE, |
612 |
< |
"Bad User [%s] :%s USER %s@%s %s, != %s[%s]", |
613 |
< |
source_p->from->name, source_p->name, source_p->username, |
614 |
< |
source_p->host, source_p->servptr->name, |
615 |
< |
target_p->name, target_p->from->name); |
616 |
< |
sendto_one(source_p->from, |
617 |
< |
":%s KILL %s :%s (NICK from wrong direction (%s != %s))", |
618 |
< |
me.id, source_p->id, me.name, source_p->servptr->name, |
619 |
< |
target_p->from->name); |
620 |
< |
|
621 |
< |
AddFlag(source_p, FLAGS_KILLED); |
622 |
< |
exit_client(source_p, "USER server wrong direction"); |
623 |
< |
return; |
624 |
< |
} |
512 |
> |
assert(client_p->servptr->from == client_p->from); |
513 |
|
|
514 |
|
/* |
515 |
|
* If the nick has been introduced by a services server, |
516 |
|
* make it a service as well. |
517 |
|
*/ |
518 |
< |
if (HasFlag(source_p->servptr, FLAGS_SERVICE)) |
519 |
< |
AddFlag(source_p, FLAGS_SERVICE); |
518 |
> |
if (HasFlag(client_p->servptr, FLAGS_SERVICE)) |
519 |
> |
AddFlag(client_p, FLAGS_SERVICE); |
520 |
|
|
521 |
< |
if (++Count.total > Count.max_tot) |
522 |
< |
Count.max_tot = Count.total; |
521 |
> |
SetClient(client_p); |
522 |
> |
dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list); |
523 |
> |
dlinkAdd(client_p, &client_p->node, &global_client_list); |
524 |
|
|
525 |
< |
SetClient(source_p); |
526 |
< |
dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list); |
638 |
< |
dlinkAdd(source_p, &source_p->node, &global_client_list); |
639 |
< |
add_user_host(source_p->username, source_p->host, 1); |
640 |
< |
SetUserHost(source_p); |
525 |
> |
if (dlink_list_length(&global_client_list) > Count.max_tot) |
526 |
> |
Count.max_tot = dlink_list_length(&global_client_list); |
527 |
|
|
528 |
< |
if (HasFlag(source_p->servptr, FLAGS_EOB)) |
528 |
> |
userhost_add(client_p->sockhost, 1); |
529 |
> |
AddFlag(client_p, FLAGS_USERHOST); |
530 |
> |
|
531 |
> |
if (HasFlag(client_p->servptr, FLAGS_EOB)) |
532 |
|
sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE, |
533 |
< |
"Client connecting at %s: %s (%s@%s) [%s] <%s>", |
534 |
< |
source_p->servptr->name, |
535 |
< |
source_p->name, source_p->username, source_p->host, |
536 |
< |
source_p->info, source_p->id); |
533 |
> |
"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>", |
534 |
> |
client_p->servptr->name, |
535 |
> |
client_p->name, client_p->username, client_p->host, |
536 |
> |
client_p->sockhost, client_p->info, client_p->id); |
537 |
|
|
538 |
< |
introduce_client(source_p); |
538 |
> |
introduce_client(client_p); |
539 |
|
} |
540 |
|
|
541 |
|
/* valid_hostname() |
578 |
|
int |
579 |
|
valid_username(const char *username, const int local) |
580 |
|
{ |
692 |
– |
unsigned int dots = 0; |
581 |
|
const char *p = username; |
582 |
|
|
583 |
|
assert(p); |
595 |
|
|
596 |
|
if (local) |
597 |
|
{ |
598 |
+ |
unsigned int dots = 0; |
599 |
+ |
|
600 |
|
while (*++p) |
601 |
|
{ |
602 |
|
if (*p == '.' && ConfigGeneral.dots_in_ident) |
632 |
|
{ |
633 |
|
const char *p = nickname; |
634 |
|
|
635 |
< |
assert(nickname && *nickname); |
635 |
> |
assert(p); |
636 |
|
|
637 |
|
/* |
638 |
|
* Nicks can't start with a digit or - or be 0 length. |
639 |
|
*/ |
640 |
< |
if (*p == '-' || (IsDigit(*p) && local) || *p == '\0') |
640 |
> |
if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local)) |
641 |
|
return 0; |
642 |
|
|
643 |
|
for (; *p; ++p) |
647 |
|
return p - nickname <= NICKLEN; |
648 |
|
} |
649 |
|
|
650 |
< |
/* send_umode() |
651 |
< |
* send the MODE string for user (user) to connection client_p |
652 |
< |
* -avalon |
653 |
< |
* |
654 |
< |
* inputs - client_p |
765 |
< |
* - source_p |
766 |
< |
* - int old |
767 |
< |
* - sendmask mask of modes to send |
768 |
< |
* - suplied umode_buf |
769 |
< |
* output - NONE |
650 |
> |
/*! \brief Builds a mode change string to buffer pointed by \a buf |
651 |
> |
* \param client_p Pointer to client |
652 |
> |
* \param dispatch Whether to send a MODE message to client_p |
653 |
> |
* \param old Old user mode to compare against when building new mode buffer |
654 |
> |
* \param buf Pointer to buffer to build string in |
655 |
|
*/ |
656 |
|
void |
657 |
< |
send_umode(struct Client *client_p, struct Client *source_p, |
658 |
< |
unsigned int old, char *umode_buf) |
657 |
> |
send_umode(struct Client *client_p, unsigned int dispatch, |
658 |
> |
unsigned int old, char *buf) |
659 |
|
{ |
660 |
< |
char *m = umode_buf; |
660 |
> |
char *m = buf; |
661 |
|
int what = 0; |
662 |
|
|
663 |
|
/* |
664 |
|
* Build a string in umode_buf to represent the change in the user's |
665 |
< |
* mode between the new (source_p->umodes) and 'old'. |
665 |
> |
* mode between the new (client_p->umodes) and 'old'. |
666 |
|
*/ |
667 |
< |
for (unsigned int i = 0; i < 128; ++i) |
667 |
> |
for (const struct user_modes *tab = umode_tab; tab->c; ++tab) |
668 |
|
{ |
669 |
< |
unsigned int flag = user_modes[i]; |
785 |
< |
|
786 |
< |
if (!flag) |
787 |
< |
continue; |
788 |
< |
|
789 |
< |
if ((flag & old) && !HasUMode(source_p, flag)) |
669 |
> |
if ((tab->flag & old) && !HasUMode(client_p, tab->flag)) |
670 |
|
{ |
671 |
|
if (what == MODE_DEL) |
672 |
< |
*m++ = (char)i; |
672 |
> |
*m++ = tab->c; |
673 |
|
else |
674 |
|
{ |
675 |
|
what = MODE_DEL; |
676 |
|
*m++ = '-'; |
677 |
< |
*m++ = (char)i; |
677 |
> |
*m++ = tab->c; |
678 |
|
} |
679 |
|
} |
680 |
< |
else if (!(flag & old) && HasUMode(source_p, flag)) |
680 |
> |
else if (!(tab->flag & old) && HasUMode(client_p, tab->flag)) |
681 |
|
{ |
682 |
|
if (what == MODE_ADD) |
683 |
< |
*m++ = (char)i; |
683 |
> |
*m++ = tab->c; |
684 |
|
else |
685 |
|
{ |
686 |
|
what = MODE_ADD; |
687 |
|
*m++ = '+'; |
688 |
< |
*m++ = (char)i; |
688 |
> |
*m++ = tab->c; |
689 |
|
} |
690 |
|
} |
691 |
|
} |
692 |
|
|
693 |
|
*m = '\0'; |
694 |
|
|
695 |
< |
if (*umode_buf && client_p) |
695 |
> |
if (dispatch && *buf) |
696 |
|
sendto_one(client_p, ":%s!%s@%s MODE %s :%s", |
697 |
|
client_p->name, client_p->username, |
698 |
< |
client_p->host, client_p->name, umode_buf); |
698 |
> |
client_p->host, client_p->name, buf); |
699 |
|
} |
700 |
|
|
701 |
|
/* send_umode_out() |
705 |
|
* side effects - Only send ubuf out to servers that know about this client |
706 |
|
*/ |
707 |
|
void |
708 |
< |
send_umode_out(struct Client *client_p, struct Client *source_p, |
829 |
< |
unsigned int old) |
708 |
> |
send_umode_out(struct Client *client_p, unsigned int old) |
709 |
|
{ |
710 |
< |
char buf[IRCD_BUFSIZE] = ""; |
710 |
> |
char buf[UMODE_MAX_STR] = ""; |
711 |
|
|
712 |
< |
send_umode(NULL, source_p, old, buf); |
712 |
> |
send_umode(client_p, MyConnect(client_p), old, buf); |
713 |
|
|
714 |
|
if (buf[0]) |
715 |
< |
sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s", |
716 |
< |
source_p->id, source_p->id, buf); |
838 |
< |
|
839 |
< |
if (client_p && MyClient(client_p)) |
840 |
< |
send_umode(client_p, source_p, old, buf); |
715 |
> |
sendto_server(client_p, 0, 0, ":%s MODE %s :%s", |
716 |
> |
client_p->id, client_p->id, buf); |
717 |
|
} |
718 |
|
|
719 |
|
void |
720 |
< |
user_set_hostmask(struct Client *target_p, const char *hostname, const int what) |
720 |
> |
user_set_hostmask(struct Client *client_p, const char *hostname) |
721 |
|
{ |
722 |
< |
dlink_node *ptr = NULL; |
722 |
> |
dlink_node *node; |
723 |
|
|
724 |
< |
if (!strcmp(target_p->host, hostname)) |
724 |
> |
if (!strcmp(client_p->host, hostname)) |
725 |
|
return; |
726 |
|
|
851 |
– |
switch (what) |
852 |
– |
{ |
853 |
– |
case MODE_ADD: |
854 |
– |
AddUMode(target_p, UMODE_HIDDENHOST); |
855 |
– |
AddFlag(target_p, FLAGS_IP_SPOOFING); |
856 |
– |
break; |
857 |
– |
case MODE_DEL: |
858 |
– |
DelUMode(target_p, UMODE_HIDDENHOST); |
859 |
– |
|
860 |
– |
if (!HasFlag(target_p, FLAGS_AUTH_SPOOF)) |
861 |
– |
DelFlag(target_p, FLAGS_IP_SPOOFING); |
862 |
– |
break; |
863 |
– |
default: return; |
864 |
– |
} |
865 |
– |
|
727 |
|
if (ConfigGeneral.cycle_on_host_change) |
728 |
< |
sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname", |
729 |
< |
target_p->name, target_p->username, target_p->host); |
728 |
> |
sendto_common_channels_local(client_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname", |
729 |
> |
client_p->name, client_p->username, client_p->host); |
730 |
|
|
731 |
< |
if (IsUserHostIp(target_p)) |
732 |
< |
delete_user_host(target_p->username, target_p->host, !MyConnect(target_p)); |
731 |
> |
sendto_common_channels_local(client_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s", |
732 |
> |
client_p->name, client_p->username, |
733 |
> |
client_p->host, client_p->username, hostname); |
734 |
|
|
735 |
< |
strlcpy(target_p->host, hostname, sizeof(target_p->host)); |
735 |
> |
strlcpy(client_p->host, hostname, sizeof(client_p->host)); |
736 |
|
|
737 |
< |
add_user_host(target_p->username, target_p->host, !MyConnect(target_p)); |
876 |
< |
SetUserHost(target_p); |
877 |
< |
|
878 |
< |
if (MyClient(target_p)) |
737 |
> |
if (MyConnect(client_p)) |
738 |
|
{ |
739 |
< |
sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host); |
740 |
< |
clear_ban_cache_client(target_p); |
739 |
> |
sendto_one_numeric(client_p, &me, RPL_VISIBLEHOST, client_p->host); |
740 |
> |
clear_ban_cache_list(&client_p->channel); |
741 |
|
} |
742 |
|
|
743 |
|
if (!ConfigGeneral.cycle_on_host_change) |
744 |
|
return; |
745 |
|
|
746 |
< |
DLINK_FOREACH(ptr, target_p->channel.head) |
746 |
> |
DLINK_FOREACH(node, client_p->channel.head) |
747 |
|
{ |
748 |
< |
char modebuf[4], nickbuf[NICKLEN * 3 + 3] = ""; |
748 |
> |
char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1]; |
749 |
> |
char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = ""; |
750 |
|
char *p = modebuf; |
751 |
|
int len = 0; |
752 |
< |
const struct Membership *ms = ptr->data; |
752 |
> |
const struct Membership *member = node->data; |
753 |
|
|
754 |
< |
if (has_member_flags(ms, CHFL_CHANOP)) |
754 |
> |
if (has_member_flags(member, CHFL_CHANOP)) |
755 |
|
{ |
756 |
|
*p++ = 'o'; |
757 |
< |
len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name); |
757 |
> |
len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name); |
758 |
|
} |
759 |
|
|
760 |
< |
if (has_member_flags(ms, CHFL_HALFOP)) |
760 |
> |
if (has_member_flags(member, CHFL_HALFOP)) |
761 |
|
{ |
762 |
|
*p++ = 'h'; |
763 |
< |
len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name); |
763 |
> |
len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name); |
764 |
|
} |
765 |
|
|
766 |
< |
if (has_member_flags(ms, CHFL_VOICE)) |
766 |
> |
if (has_member_flags(member, CHFL_VOICE)) |
767 |
|
{ |
768 |
|
*p++ = 'v'; |
769 |
< |
len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name); |
769 |
> |
len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name); |
770 |
|
} |
771 |
|
|
772 |
|
*p = '\0'; |
773 |
|
|
774 |
< |
sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s", |
775 |
< |
target_p->name, target_p->username, target_p->host, |
776 |
< |
ms->chptr->name); |
777 |
< |
if (nickbuf[0]) |
778 |
< |
sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s", |
779 |
< |
target_p->servptr->name, ms->chptr->name, |
780 |
< |
modebuf, nickbuf); |
774 |
> |
sendto_channel_local(client_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s", |
775 |
> |
client_p->name, client_p->username, |
776 |
> |
client_p->host, member->chptr->name, |
777 |
> |
client_p->account, client_p->info); |
778 |
> |
sendto_channel_local(client_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s", |
779 |
> |
client_p->name, client_p->username, |
780 |
> |
client_p->host, member->chptr->name); |
781 |
|
|
782 |
+ |
if (nickbuf[0]) |
783 |
+ |
sendto_channel_local(client_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s", |
784 |
+ |
client_p->servptr->name, member->chptr->name, |
785 |
+ |
modebuf, nickbuf); |
786 |
|
} |
787 |
|
|
788 |
< |
if (target_p->away[0]) |
789 |
< |
sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, |
788 |
> |
if (client_p->away[0]) |
789 |
> |
sendto_common_channels_local(client_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST, |
790 |
|
":%s!%s@%s AWAY :%s", |
791 |
< |
target_p->name, target_p->username, |
792 |
< |
target_p->host, target_p->away); |
929 |
< |
} |
930 |
< |
|
931 |
< |
/*! \brief Blindly opers up given source_p, using conf info. |
932 |
< |
* All checks on passwords have already been done. |
933 |
< |
* \param source_p Pointer to given client to oper |
934 |
< |
*/ |
935 |
< |
void |
936 |
< |
oper_up(struct Client *source_p) |
937 |
< |
{ |
938 |
< |
const unsigned int old = source_p->umodes; |
939 |
< |
const struct MaskItem *conf = source_p->connection->confs.head->data; |
940 |
< |
|
941 |
< |
assert(source_p->connection->confs.head); |
942 |
< |
|
943 |
< |
++Count.oper; |
944 |
< |
SetOper(source_p); |
945 |
< |
|
946 |
< |
if (conf->modes) |
947 |
< |
AddUMode(source_p, conf->modes); |
948 |
< |
else if (ConfigGeneral.oper_umodes) |
949 |
< |
AddUMode(source_p, ConfigGeneral.oper_umodes); |
950 |
< |
|
951 |
< |
if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE)) |
952 |
< |
++Count.invisi; |
953 |
< |
if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE)) |
954 |
< |
--Count.invisi; |
955 |
< |
|
956 |
< |
assert(dlinkFind(&oper_list, source_p) == NULL); |
957 |
< |
dlinkAdd(source_p, make_dlink_node(), &oper_list); |
958 |
< |
|
959 |
< |
AddOFlag(source_p, conf->port); |
960 |
< |
|
961 |
< |
if (HasOFlag(source_p, OPER_FLAG_ADMIN)) |
962 |
< |
AddUMode(source_p, UMODE_ADMIN); |
963 |
< |
|
964 |
< |
sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator", |
965 |
< |
get_oper_name(source_p)); |
966 |
< |
sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator", |
967 |
< |
me.id, get_oper_name(source_p)); |
968 |
< |
send_umode_out(source_p, source_p, old); |
969 |
< |
sendto_one_numeric(source_p, &me, RPL_YOUREOPER); |
970 |
< |
} |
971 |
< |
|
972 |
< |
static char new_uid[TOTALSIDUID + 1]; /* Allow for \0 */ |
973 |
< |
|
974 |
< |
int |
975 |
< |
valid_sid(const char *sid) |
976 |
< |
{ |
977 |
< |
if (strlen(sid) == IRC_MAXSID) |
978 |
< |
if (IsDigit(*sid)) |
979 |
< |
if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2))) |
980 |
< |
return 1; |
981 |
< |
|
982 |
< |
return 0; |
983 |
< |
} |
984 |
< |
|
985 |
< |
/* |
986 |
< |
* init_uid() |
987 |
< |
* |
988 |
< |
* inputs - NONE |
989 |
< |
* output - NONE |
990 |
< |
* side effects - new_uid is filled in with server id portion (sid) |
991 |
< |
* (first 3 bytes) or defaulted to 'A'. |
992 |
< |
* Rest is filled in with 'A' |
993 |
< |
*/ |
994 |
< |
void |
995 |
< |
init_uid(void) |
996 |
< |
{ |
997 |
< |
memset(new_uid, 0, sizeof(new_uid)); |
998 |
< |
|
999 |
< |
if (!EmptyString(ConfigServerInfo.sid)) |
1000 |
< |
strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid)); |
1001 |
< |
|
1002 |
< |
for (unsigned int i = 0; i < IRC_MAXSID; ++i) |
1003 |
< |
if (new_uid[i] == '\0') |
1004 |
< |
new_uid[i] = 'A'; |
1005 |
< |
|
1006 |
< |
/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */ |
1007 |
< |
memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID); |
1008 |
< |
} |
1009 |
< |
|
1010 |
< |
/* |
1011 |
< |
* add_one_to_uid |
1012 |
< |
* |
1013 |
< |
* inputs - index number into new_uid |
1014 |
< |
* output - NONE |
1015 |
< |
* side effects - new_uid is incremented by one |
1016 |
< |
* note this is a recursive function |
1017 |
< |
*/ |
1018 |
< |
static void |
1019 |
< |
add_one_to_uid(unsigned int i) |
1020 |
< |
{ |
1021 |
< |
if (i != IRC_MAXSID) /* Not reached server SID portion yet? */ |
1022 |
< |
{ |
1023 |
< |
if (new_uid[i] == 'Z') |
1024 |
< |
new_uid[i] = '0'; |
1025 |
< |
else if (new_uid[i] == '9') |
1026 |
< |
{ |
1027 |
< |
new_uid[i] = 'A'; |
1028 |
< |
add_one_to_uid(i - 1); |
1029 |
< |
} |
1030 |
< |
else |
1031 |
< |
++new_uid[i]; |
1032 |
< |
} |
1033 |
< |
else |
1034 |
< |
{ |
1035 |
< |
/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */ |
1036 |
< |
if (new_uid[i] == 'Z') |
1037 |
< |
memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID); |
1038 |
< |
else |
1039 |
< |
++new_uid[i]; |
1040 |
< |
} |
1041 |
< |
} |
1042 |
< |
|
1043 |
< |
/* |
1044 |
< |
* uid_get |
1045 |
< |
* |
1046 |
< |
* inputs - struct Client * |
1047 |
< |
* output - new UID is returned to caller |
1048 |
< |
* side effects - new_uid is incremented by one. |
1049 |
< |
*/ |
1050 |
< |
static const char * |
1051 |
< |
uid_get(void) |
1052 |
< |
{ |
1053 |
< |
add_one_to_uid(TOTALSIDUID - 1); /* Index from 0 */ |
1054 |
< |
return new_uid; |
1055 |
< |
} |
1056 |
< |
|
1057 |
< |
/* |
1058 |
< |
* init_isupport() |
1059 |
< |
* |
1060 |
< |
* input - NONE |
1061 |
< |
* output - NONE |
1062 |
< |
* side effects - Must be called before isupport is enabled |
1063 |
< |
*/ |
1064 |
< |
void |
1065 |
< |
init_isupport(void) |
1066 |
< |
{ |
1067 |
< |
add_isupport("CALLERID", NULL, -1); |
1068 |
< |
add_isupport("CASEMAPPING", "rfc1459", -1); |
1069 |
< |
add_isupport("DEAF", "D", -1); |
1070 |
< |
add_isupport("KICKLEN", NULL, KICKLEN); |
1071 |
< |
add_isupport("MODES", NULL, MAXMODEPARAMS); |
1072 |
< |
add_isupport("PREFIX", "(ohv)@%+", -1); |
1073 |
< |
add_isupport("STATUSMSG", "@%+", -1); |
1074 |
< |
add_isupport("EXCEPTS", "e", -1); |
1075 |
< |
add_isupport("INVEX", "I", -1); |
1076 |
< |
} |
1077 |
< |
|
1078 |
< |
/* |
1079 |
< |
* add_isupport() |
1080 |
< |
* |
1081 |
< |
* input - name of supported function |
1082 |
< |
* - options if any |
1083 |
< |
* - number if any |
1084 |
< |
* output - NONE |
1085 |
< |
* side effects - Each supported item must call this when activated |
1086 |
< |
*/ |
1087 |
< |
void |
1088 |
< |
add_isupport(const char *name, const char *options, int n) |
1089 |
< |
{ |
1090 |
< |
dlink_node *ptr; |
1091 |
< |
struct Isupport *support = NULL; |
1092 |
< |
|
1093 |
< |
DLINK_FOREACH(ptr, support_list.head) |
1094 |
< |
{ |
1095 |
< |
support = ptr->data; |
1096 |
< |
if (irccmp(support->name, name) == 0) |
1097 |
< |
{ |
1098 |
< |
MyFree(support->name); |
1099 |
< |
MyFree(support->options); |
1100 |
< |
break; |
1101 |
< |
} |
1102 |
< |
} |
1103 |
< |
|
1104 |
< |
if (ptr == NULL) |
1105 |
< |
{ |
1106 |
< |
support = MyCalloc(sizeof(*support)); |
1107 |
< |
dlinkAddTail(support, &support->node, &support_list); |
1108 |
< |
} |
1109 |
< |
|
1110 |
< |
support->name = xstrdup(name); |
1111 |
< |
if (options) |
1112 |
< |
support->options = xstrdup(options); |
1113 |
< |
support->number = n; |
1114 |
< |
|
1115 |
< |
rebuild_isupport_message_line(); |
1116 |
< |
} |
1117 |
< |
|
1118 |
< |
/* |
1119 |
< |
* delete_isupport() |
1120 |
< |
* |
1121 |
< |
* input - name of supported function |
1122 |
< |
* output - NONE |
1123 |
< |
* side effects - Each supported item must call this when deactivated |
1124 |
< |
*/ |
1125 |
< |
void |
1126 |
< |
delete_isupport(const char *name) |
1127 |
< |
{ |
1128 |
< |
dlink_node *ptr; |
1129 |
< |
struct Isupport *support; |
1130 |
< |
|
1131 |
< |
DLINK_FOREACH(ptr, support_list.head) |
1132 |
< |
{ |
1133 |
< |
support = ptr->data; |
1134 |
< |
if (irccmp(support->name, name) == 0) |
1135 |
< |
{ |
1136 |
< |
dlinkDelete(ptr, &support_list); |
1137 |
< |
MyFree(support->name); |
1138 |
< |
MyFree(support->options); |
1139 |
< |
MyFree(support); |
1140 |
< |
break; |
1141 |
< |
} |
1142 |
< |
} |
1143 |
< |
|
1144 |
< |
rebuild_isupport_message_line(); |
1145 |
< |
} |
1146 |
< |
|
1147 |
< |
/* |
1148 |
< |
* rebuild_isupport_message_line |
1149 |
< |
* |
1150 |
< |
* input - NONE |
1151 |
< |
* output - NONE |
1152 |
< |
* side effects - Destroy the isupport MessageFile lines, and rebuild. |
1153 |
< |
*/ |
1154 |
< |
void |
1155 |
< |
rebuild_isupport_message_line(void) |
1156 |
< |
{ |
1157 |
< |
char isupportbuffer[IRCD_BUFSIZE]; |
1158 |
< |
char *p = isupportbuffer; |
1159 |
< |
dlink_node *ptr = NULL, *ptr_next = NULL; |
1160 |
< |
int n = 0; |
1161 |
< |
int tokens = 0; |
1162 |
< |
size_t len = 0; |
1163 |
< |
size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT)); |
1164 |
< |
|
1165 |
< |
DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head) |
1166 |
< |
{ |
1167 |
< |
dlinkDelete(ptr, &support_list_lines); |
1168 |
< |
MyFree(ptr->data); |
1169 |
< |
free_dlink_node(ptr); |
1170 |
< |
} |
1171 |
< |
|
1172 |
< |
DLINK_FOREACH(ptr, support_list.head) |
1173 |
< |
{ |
1174 |
< |
struct Isupport *support = ptr->data; |
1175 |
< |
|
1176 |
< |
p += (n = sprintf(p, "%s", support->name)); |
1177 |
< |
len += n; |
1178 |
< |
|
1179 |
< |
if (support->options) |
1180 |
< |
{ |
1181 |
< |
p += (n = sprintf(p, "=%s", support->options)); |
1182 |
< |
len += n; |
1183 |
< |
} |
1184 |
< |
|
1185 |
< |
if (support->number > 0) |
1186 |
< |
{ |
1187 |
< |
p += (n = sprintf(p, "=%d", support->number)); |
1188 |
< |
len += n; |
1189 |
< |
} |
1190 |
< |
|
1191 |
< |
*p++ = ' '; |
1192 |
< |
len++; |
1193 |
< |
*p = '\0'; |
1194 |
< |
|
1195 |
< |
if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve)) |
1196 |
< |
{ /* arbritrary for now */ |
1197 |
< |
if (*--p == ' ') |
1198 |
< |
*p = '\0'; |
1199 |
< |
|
1200 |
< |
dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines); |
1201 |
< |
p = isupportbuffer; |
1202 |
< |
len = 0; |
1203 |
< |
n = tokens = 0; |
1204 |
< |
} |
1205 |
< |
} |
1206 |
< |
|
1207 |
< |
if (len) |
1208 |
< |
{ |
1209 |
< |
if (*--p == ' ') |
1210 |
< |
*p = '\0'; |
1211 |
< |
dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines); |
1212 |
< |
} |
791 |
> |
client_p->name, client_p->username, |
792 |
> |
client_p->host, client_p->away); |
793 |
|
} |