ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/user.c

Comparing ircd-hybrid/trunk/src/s_user.c (file contents):
Revision 3079 by michael, Sat Mar 1 17:22:03 2014 UTC vs.
Revision 3109 by michael, Thu Mar 6 19:25:12 2014 UTC

#	Line 173 | Line 173 | assemble_umode_buffer(void)
173		void
174		show_lusers(struct Client *source_p)
175		{
176	–	const char *from, *to;
177	–
178	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
179	–	{
180	–	from = me.id;
181	–	to = source_p->id;
182	–	}
183	–	else
184	–	{
185	–	from = me.name;
186	–	to = source_p->name;
187	–	}
188	–
176		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
177	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
178	<	from, to, (Count.total-Count.invisi),
192	<	Count.invisi, dlink_list_length(&global_serv_list));
177	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
178	>	Count.invisi, dlink_list_length(&global_serv_list));
179		else
180	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
181	<	(Count.total-Count.invisi), Count.invisi, 1);
180	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
181	>	(Count.total-Count.invisi), Count.invisi, 1);
182
183		if (Count.oper > 0)
184	<	sendto_one(source_p, form_str(RPL_LUSEROP),
199	<	from, to, Count.oper);
184	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
185
186		if (dlink_list_length(&unknown_list) > 0)
187	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
203	<	from, to, dlink_list_length(&unknown_list));
187	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
188
189		if (dlink_list_length(&global_channel_list) > 0)
190	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
207	<	from, to, dlink_list_length(&global_channel_list));
190	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
191
192		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
193		{
194	<	sendto_one(source_p, form_str(RPL_LUSERME),
195	<	from, to, Count.local, Count.myserver);
213	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
214	<	from, to, Count.local, Count.max_loc);
194	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
195	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
196		}
197		else
198		{
199	<	sendto_one(source_p, form_str(RPL_LUSERME),
200	<	from, to, Count.total, 0);
220	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
221	<	from, to, Count.total, Count.max_tot);
199	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
200	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
201		}
202
203	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
225	<	from, to, Count.total, Count.max_tot);
203	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
204
205		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
206	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
207	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
206	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
207	>	Count.max_loc_cli, Count.totalrestartcount);
208
209		if (Count.local > Count.max_loc_cli)
210		Count.max_loc_cli = Count.local;
#	Line 247 | Line 225 | show_isupport(struct Client *source_p)
225		const dlink_node *ptr = NULL;
226
227		DLINK_FOREACH(ptr, support_list_lines.head)
228	<	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
251	<	source_p->name, ptr->data);
228	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
229		}
230
231		/*
#	Line 357 | Line 334 | register_local_user(struct Client *sourc
334		if (!match_conf_password(pass, conf))
335		{
336		++ServerStats.is_ref;
337	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
338	<	me.name, source_p->name);
337	>
338	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
339		exit_client(source_p, &me, "Bad Password");
340		return;
341		}
#	Line 818 | Line 795 | set_user_mode(struct Client *client_p, s
795		if ((target_p = find_person(client_p, parv[1])) == NULL)
796		{
797		if (MyConnect(source_p))
798	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
822	<	me.name, source_p->name, parv[1]);
798	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
799		return;
800		}
801
802		if (source_p != target_p)
803		{
804	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
829	<	me.name, source_p->name);
804	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
805		return;
806		}
807
#	Line 840 | Line 815 | set_user_mode(struct Client *client_p, s
815		*m++ = (char)i;
816		*m = '\0';
817
818	<	sendto_one(source_p, form_str(RPL_UMODEIS),
844	<	me.name, source_p->name, buf);
818	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
819		return;
820		}
821
#	Line 922 | Line 896 | set_user_mode(struct Client *client_p, s
896		}
897
898		if (badflag)
899	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
926	<	me.name, source_p->name);
899	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
900
901		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
902		!HasOFlag(source_p, OPER_FLAG_ADMIN))
#	Line 1079 | Line 1052 | user_set_hostmask(struct Client *target_
1052
1053		if (MyClient(target_p))
1054		{
1055	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1083	<	target_p->name, target_p->host);
1055	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1056		clear_ban_cache_client(target_p);
1057		}
1058
#	Line 1156 | Line 1128 | user_welcome(struct Client *source_p)
1128		}
1129		#endif
1130
1131	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1132	<	ServerInfo.network_name, source_p->name);
1133	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1134	<	get_listener_name(source_p->localClient->listener), ircd_version);
1135	<	sendto_one(source_p, form_str(RPL_CREATED),
1136	<	me.name, source_p->name, built_date);
1165	<	sendto_one(source_p, form_str(RPL_MYINFO),
1166	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1131	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1132	>	source_p->name);
1133	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1134	>	get_listener_name(source_p->localClient->listener), ircd_version);
1135	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1136	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1137		show_isupport(source_p);
1138
1139		if (source_p->id[0] != '\0')
1140	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1171	<	source_p->name, source_p->id);
1140	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1141
1142		show_lusers(source_p);
1143		motd_signon(source_p);
#	Line 1249 | Line 1218 | oper_up(struct Client *source_p)
1218		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1219		get_oper_name(source_p));
1220		send_umode_out(source_p, source_p, old);
1221	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1221	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1222		}
1223
1224		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1450 | Line 1419 | rebuild_isupport_message_line(void)
1419		int n = 0;
1420		int tokens = 0;
1421		size_t len = 0;
1422	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1422	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1423
1424		DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1425		{

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)