ViewVC Help

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

root/svn/ircd-hybrid/trunk/modules/m_svsmode.c

Comparing ircd-hybrid/trunk/modules/m_svsmode.c (file contents):
Revision 1662 by michael, Sat Nov 17 20:11:33 2012 UTC vs.
Revision 2025 by michael, Sun May 12 18:54:15 2013 UTC

#	Line 52 | Line 52
52		* \note Valid arguments for this command are:
53		*      - parv[0] = sender prefix
54		*      - parv[1] = nickname
55	<	*      - parv[2] = TS (or mode, depending on svs version)
56	<	*      - parv[3] = mode (or services id if old svs version)
57	<	*      - parv[4] = optional argument (services id)
55	>	*      - parv[2] = TS
56	>	*      - parv[3] = mode
57	>	*      - parv[4] = optional argument (services id, hostname)
58		*/
59		static void
60		ms_svsmode(struct Client *client_p, struct Client *source_p,
61		int parc, char *parv[])
62		{
63		struct Client *target_p = NULL;
64	+	const char *m = NULL, *extarg = NULL;
65		int what = MODE_ADD;
66		unsigned int flag = 0, setflags = 0;
66	–	char *m = NULL, *modes = NULL, *extarg = NULL;
67		time_t ts = 0;
68
69		if (!HasFlag(source_p, FLAGS_SERVICE))
70		return;
71
72	–	if ((parc >= 4) && ((*parv[3] == '+') || (*parv[3] == '-')))
73	–	{
74	–	ts     = atol(parv[2]);
75	–	modes  = parv[3];
76	–	extarg = (parc > 4) ? parv[4] : NULL;
77	–	}
78	–	else
79	–	{
80	–	modes  = parv[2];
81	–	extarg = (parc > 3) ? parv[3] : NULL;
82	–	}
83	–
72		if ((target_p = find_person(client_p, parv[1])) == NULL)
73		return;
74
75	<	if (ts && (ts != target_p->tsinfo))
75	>	if ((ts = atol(parv[2])) && (ts != target_p->tsinfo))
76		return;
77
78	+	if (parc > 4 && !EmptyString(parv[4]))
79	+	extarg = parv[4];
80	+
81		setflags = target_p->umodes;
82
83	<	for (m = modes; *m; ++m)
83	>	for (m = parv[3]; *m; ++m)
84		{
85		switch (*m)
86		{
#	Line 101 | Line 92 | ms_svsmode(struct Client *client_p, stru
92		break;
93
94		case 'd':
95	<	if (!EmptyString(extarg))
95	>	if (extarg)
96		strlcpy(target_p->svid, extarg, sizeof(target_p->svid));
97		break;
98
99	+	case 'x':
100	+	if (what == MODE_ADD && extarg)
101	+	user_set_hostmask(target_p, extarg);
102	+	break;
103	+
104		case 'o':
105		if (what == MODE_DEL && HasUMode(target_p, UMODE_OPER))
106		{
#	Line 141 | Line 137 | ms_svsmode(struct Client *client_p, stru
137
138		break;
139
144	–	case ' ':
145	–	case '\n':
146	–	case '\r':
147	–	case '\t':
148	–	break;
140		default:
141		if ((flag = user_modes[(unsigned char)*m]))
142	<	execute_callback(umode_cb, client_p, target_p, what, flag);
142	>	{
143	>	if (what == MODE_ADD)
144	>	AddUMode(target_p, flag);
145	>	else
146	>	DelUMode(target_p, flag);
147	>	}
148	>
149		break;
150		}
151		}
#	Line 157 | Line 154 | ms_svsmode(struct Client *client_p, stru
154		{
155		sendto_server(client_p, CAP_TS6, NOCAPS,
156		":%s SVSMODE %s %lu %s %s", ID(source_p),
157	<	ID(target_p), (unsigned long)target_p->tsinfo, modes, extarg);
157	>	ID(target_p), (unsigned long)target_p->tsinfo, parv[3], extarg);
158		sendto_server(client_p, NOCAPS, CAP_TS6,
159		":%s SVSMODE %s %lu %s %s", source_p->name,
160	<	target_p->name, (unsigned long)target_p->tsinfo, modes, extarg);
160	>	target_p->name, (unsigned long)target_p->tsinfo, parv[3], extarg);
161		}
162		else
163		{
164		sendto_server(client_p, CAP_TS6, NOCAPS,
165		":%s SVSMODE %s %lu %s", ID(source_p),
166	<	ID(target_p), (unsigned long)target_p->tsinfo, modes);
166	>	ID(target_p), (unsigned long)target_p->tsinfo, parv[3]);
167		sendto_server(client_p, NOCAPS, CAP_TS6,
168		":%s SVSMODE %s %lu %s", source_p->name,
169	<	target_p->name, (unsigned long)target_p->tsinfo, modes);
169	>	target_p->name, (unsigned long)target_p->tsinfo, parv[3]);
170		}
171
172		if (MyConnect(target_p) && (setflags != target_p->umodes))
#	Line 181 | Line 178 | ms_svsmode(struct Client *client_p, stru
178		}
179
180		static struct Message svsmode_msgtab = {
181	<	"SVSMODE", 0, 0, 3, MAXPARA, MFLG_SLOW, 0,
181	>	"SVSMODE", 0, 0, 4, MAXPARA, MFLG_SLOW, 0,
182		{m_ignore, m_ignore, ms_svsmode, m_ignore, m_ignore, m_ignore}
183		};
184

Diff Legend

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