ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/s_user.c (file contents):
Revision 2138 by michael, Wed May 29 21:14:02 2013 UTC vs.
Revision 2246 by michael, Sun Jun 16 10:48:39 2013 UTC

#	Line 52 | Line 52
52		#include "parse.h"
53		#include "watch.h"
54
55	–
55		static char umode_buffer[IRCD_BUFSIZE];
56
57		static void user_welcome(struct Client *);
#	Line 73 | Line 72 | struct Isupport
72		int number;
73		};
74
75	<	static dlink_list support_list = { NULL, NULL, 0 };
76	<	MessageFile *isupportFile;
75	>	static dlink_list support_list;
76	>	static dlink_list support_list_lines;
77
78		/* memory is cheap. map 0-255 to equivalent mode */
79		const unsigned int user_modes[256] =
#	Line 86 | Line 85 | const unsigned int user_modes[256] =
85		0,                  /* @ */
86		0,                  /* A */
87		0,                  /* B */
88	<	UMODE_CCONN_FULL,   /* C */
88	>	0,                  /* C */
89		UMODE_DEAF,         /* D */
90		0,                  /* E */
91		UMODE_FARCONNECT,   /* F */
#	Line 102 | Line 101 | const unsigned int user_modes[256] =
101		0,                  /* P */
102		0,                  /* Q */
103		UMODE_REGONLY,      /* R */
104	<	0,                  /* S */
104	>	UMODE_SSL,          /* S */
105		0,                  /* T */
106		0,                  /* U */
107		0,                  /* V */
#	Line 243 | Line 242 | show_lusers(struct Client *source_p)
242		void
243		show_isupport(struct Client *source_p)
244		{
245	<	send_message_file(source_p, isupportFile);
245	>	const dlink_node *ptr = NULL;
246	>
247	>	DLINK_FOREACH(ptr, support_list_lines.head)
248	>	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	>	source_p->name, ptr->data);
250		}
251
252		/*
#	Line 421 | Line 424 | register_local_user(struct Client *sourc
424		get_client_class(&source_p->localClient->confs),
425		source_p->info, source_p->id);
426
424	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
425	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
426	–	source_p->name, source_p->username, source_p->host,
427	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428	–	"255.255.255.255" : source_p->sockhost,
429	–	get_client_class(&source_p->localClient->confs),
430	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	–	"<hidden>" : source_p->localClient->client_host,
432	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
433	–	"<hidden>" : source_p->localClient->client_server,
434	–	source_p->info);
435	–
436	–
427		if (ConfigFileEntry.invisible_on_connect)
428		{
429		AddUMode(source_p, UMODE_INVISIBLE);
#	Line 633 | Line 623 | introduce_client(struct Client *source_p
623		ubuf, source_p->username, source_p->host,
624		source_p->servptr->name, source_p->info);
625		}
626	+
627	+	if (!EmptyString(source_p->certfp))
628	+	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629		}
630		}
631
#	Line 902 | Line 895 | set_user_mode(struct Client *client_p, s
895
896		break;
897
898	+	case 'S':  /* Only servers may set +S in a burst */
899		case 'r':  /* Only services may set +r */
900		case 'x':  /* Only services may set +x */
901		break;
#	Line 1055 | Line 1049 | send_umode_out(struct Client *client_p,
1049		void
1050		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1051		{
1052	<	if (IsUserHostIp(target_p))
1059	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1060	<
1061	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1052	>	dlink_node *ptr = NULL;
1053
1054	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1055	<	SetUserHost(target_p);
1054	>	if (!strcmp(target_p->host, hostname))
1055	>	return;
1056
1057		switch (what)
1058		{
#	Line 1072 | Line 1063 | user_set_hostmask(struct Client *target_
1063		case MODE_DEL:
1064		DelUMode(target_p, UMODE_HIDDENHOST);
1065
1066	<	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF));
1066	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1067		DelFlag(target_p, FLAGS_IP_SPOOFING);
1068		break;
1069	<	default: break;
1069	>	default: return;
1070		}
1071
1072	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1073	+	target_p->name, target_p->username, target_p->host);
1074	+
1075	+	if (IsUserHostIp(target_p))
1076	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1077	+
1078	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1079	+
1080	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1081	+	SetUserHost(target_p);
1082	+
1083		if (MyClient(target_p))
1084		{
1085		sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1086	<	target_p->name, target_p->username,
1085	<	target_p->host);
1086	>	target_p->name, target_p->host);
1087		clear_ban_cache_client(target_p);
1088		}
1089	+
1090	+	DLINK_FOREACH(ptr, target_p->channel.head)
1091	+	{
1092	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1093	+	char *p = modebuf;
1094	+	int len = 0;
1095	+	const struct Membership *ms = ptr->data;
1096	+
1097	+	if (has_member_flags(ms, CHFL_CHANOP)) {
1098	+	*p++ = 'o';
1099	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1100	+	}
1101	+
1102	+	if (has_member_flags(ms, CHFL_HALFOP)) {
1103	+	*p++ = 'h';
1104	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1105	+	}
1106	+
1107	+	if (has_member_flags(ms, CHFL_VOICE)) {
1108	+	*p++ = 'v';
1109	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1110	+	}
1111	+
1112	+	*p = '\0';
1113	+
1114	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1115	+	target_p->name, target_p->username, target_p->host,
1116	+	ms->chptr->chname);
1117	+	if (nickbuf[0])
1118	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1119	+	target_p->servptr->name, ms->chptr->chname,
1120	+	modebuf, nickbuf);
1121	+
1122	+	}
1123	+
1124	+	if (target_p->away[0])
1125	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1126	+	":%s!%s@%s AWAY :%s",
1127	+	target_p->name, target_p->username,
1128	+	target_p->host, target_p->away);
1129		}
1130
1131		/* user_welcome()
#	Line 1103 | Line 1144 | user_welcome(struct Client *source_p)
1144		#endif
1145
1146		#ifdef HAVE_LIBCRYPTO
1147	<	if (source_p->localClient->fd.ssl != NULL)
1147	>	if (HasFlag(source_p, FLAGS_SSL))
1148	>	{
1149	>	AddUMode(source_p, UMODE_SSL);
1150		sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1151		me.name, source_p->name,
1152		ssl_get_cipher(source_p->localClient->fd.ssl));
1153	+	}
1154		#endif
1155
1156		sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
#	Line 1124 | Line 1168 | user_welcome(struct Client *source_p)
1168		source_p->name, source_p->id);
1169
1170		show_lusers(source_p);
1171	<
1128	<	if (ConfigFileEntry.short_motd)
1129	<	{
1130	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1131	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1132	<	sendto_one(source_p,
1133	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1134	<	"read it", me.name, source_p->name);
1135	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1136	<	me.name, source_p->name, me.name);
1137	<	sendto_one(source_p, form_str(RPL_MOTD),
1138	<	me.name, source_p->name,
1139	<	"*** This is the short motd ***");
1140	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1141	<	me.name, source_p->name);
1142	<	}
1143	<	else
1144	<	send_message_file(source_p, &ConfigFileEntry.motd);
1171	>	motd_signon(source_p);
1172		}
1173
1174		/* check_xline()
#	Line 1323 | Line 1350 | uid_get(void)
1350		void
1351		init_isupport(void)
1352		{
1326	–	isupportFile = init_MessageLine();
1327	–
1353		add_isupport("CALLERID", NULL, -1);
1354		add_isupport("CASEMAPPING", CASEMAP, -1);
1355		add_isupport("DEAF", "D", -1);
#	Line 1337 | Line 1362 | init_isupport(void)
1362		add_isupport("PREFIX", "(ov)@+", -1);
1363		add_isupport("STATUSMSG", "@+", -1);
1364		#endif
1365	+	add_isupport("EXCEPTS", "e", -1);
1366	+	add_isupport("INVEX", "I", -1);
1367		}
1368
1369		/*
#	Line 1420 | Line 1447 | rebuild_isupport_message_line(void)
1447		{
1448		char isupportbuffer[IRCD_BUFSIZE];
1449		char *p = isupportbuffer;
1450	<	dlink_node *ptr = NULL;
1450	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1451		int n = 0;
1452		int tokens = 0;
1453		size_t len = 0;
1454		size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1455
1456	<	destroy_MessageLine(isupportFile);
1456	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1457	>	{
1458	>	dlinkDelete(ptr, &support_list_lines);
1459	>	MyFree(ptr->data);
1460	>	free_dlink_node(ptr);
1461	>	}
1462
1463		DLINK_FOREACH(ptr, support_list.head)
1464		{
#	Line 1456 | Line 1488 | rebuild_isupport_message_line(void)
1488		if (*--p == ' ')
1489		*p = '\0';
1490
1491	<	addto_MessageLine(isupportFile, isupportbuffer);
1491	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1492		p = isupportbuffer;
1493		len = 0;
1494		n = tokens = 0;
#	Line 1467 | Line 1499 | rebuild_isupport_message_line(void)
1499		{
1500		if (*--p == ' ')
1501		*p = '\0';
1502	<	addto_MessageLine(isupportFile, isupportbuffer);
1502	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1503		}
1504		}

Diff Legend

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