ViewVC Help

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

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

Comparing:
ircd-hybrid-8/modules/m_svsmode.c (file contents), Revision 1474 by michael, Sun Jul 22 14:44:07 2012 UTC vs.
ircd-hybrid/trunk/modules/m_svsmode.c (file contents), Revision 1809 by michael, Wed Apr 10 16:51:34 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)
55	>	*      - parv[2] = TS
56	>	*      - parv[3] = mode
57		*      - parv[4] = optional argument (services id)
58		*/
59		static void
#	Line 61 | Line 61 | ms_svsmode(struct Client *client_p, stru
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;
66	>	unsigned int flag = 0, setmodes = 0;
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	<	setflags = target_p->umodes;
78	>	if (parc > 4 && !EmptyString(parv[4]))
79	>	extarg = parv[4];
80	>
81	>	setmodes = 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 (extarg && IsDigit(*extarg))
96	<	target_p->servicestamp = strtoul(extarg, NULL, 0);
95	>	if (extarg)
96	>	strlcpy(target_p->svid, extarg, sizeof(target_p->svid));
97		break;
98
99		case 'o':
#	Line 115 | Line 106 | ms_svsmode(struct Client *client_p, stru
106		{
107		dlink_node *dm = NULL;
108
109	<	detach_conf(target_p, OPER_TYPE);
109	>	detach_conf(target_p, CONF_OPER);
110		ClrOFlag(target_p);
111		DelUMode(target_p, ConfigFileEntry.oper_only_umodes);
112
#	Line 157 | Line 148 | ms_svsmode(struct Client *client_p, stru
148		{
149		sendto_server(client_p, CAP_TS6, NOCAPS,
150		":%s SVSMODE %s %lu %s %s", ID(source_p),
151	<	ID(target_p), (unsigned long)target_p->tsinfo, modes, extarg);
151	>	ID(target_p), (unsigned long)target_p->tsinfo, parv[3], extarg);
152		sendto_server(client_p, NOCAPS, CAP_TS6,
153		":%s SVSMODE %s %lu %s %s", source_p->name,
154	<	target_p->name, (unsigned long)target_p->tsinfo, modes, extarg);
154	>	target_p->name, (unsigned long)target_p->tsinfo, parv[3], extarg);
155		}
156		else
157		{
158		sendto_server(client_p, CAP_TS6, NOCAPS,
159		":%s SVSMODE %s %lu %s", ID(source_p),
160	<	ID(target_p), (unsigned long)target_p->tsinfo, modes);
160	>	ID(target_p), (unsigned long)target_p->tsinfo, parv[3]);
161		sendto_server(client_p, NOCAPS, CAP_TS6,
162		":%s SVSMODE %s %lu %s", source_p->name,
163	<	target_p->name, (unsigned long)target_p->tsinfo, modes);
163	>	target_p->name, (unsigned long)target_p->tsinfo, parv[3]);
164		}
165
166	<	if (MyConnect(target_p) && (setflags != target_p->umodes))
166	>	if (MyConnect(target_p) && (setmodes != target_p->umodes))
167		{
168		char modebuf[IRCD_BUFSIZE];
169
170	<	send_umode(target_p, target_p, setflags, 0xffffffff, modebuf);
170	>	send_umode(target_p, target_p, setmodes, 0xffffffff, modebuf);
171		}
172		}
173
174		static struct Message svsmode_msgtab = {
175	<	"SVSMODE", 0, 0, 3, MAXPARA, MFLG_SLOW | MFLG_UNREG, 0,
175	>	"SVSMODE", 0, 0, 4, MAXPARA, MFLG_SLOW, 0,
176		{m_ignore, m_ignore, ms_svsmode, m_ignore, m_ignore, m_ignore}
177		};
178

Comparing:
ircd-hybrid-8/modules/m_svsmode.c (property svn:eol-style), Revision 1474 by michael, Sun Jul 22 14:44:07 2012 UTC vs.
ircd-hybrid/trunk/modules/m_svsmode.c (property svn:eol-style), Revision 1809 by michael, Wed Apr 10 16:51:34 2013 UTC

#	Line 0 | Line 1
1	+	native

Diff Legend

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