ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/modules/m_accept.c

Comparing:
ircd-hybrid/modules/m_accept.c (file contents), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid/branches/8.2.x/modules/m_accept.c (file contents), Revision 3604 by michael, Tue May 20 17:39:31 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  m_accept.c: Allows a user to talk to a +g user.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 2000-2014 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
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file m_accept.c
23	>	* \brief Includes required functions for processing the ACCEPT command.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
26	–	#include "handlers.h"
28		#include "client.h"
29		#include "irc_string.h"
29	–	#include "sprintf_irc.h"
30	–	#include "hash.h"       /* for find_client() */
30		#include "ircd.h"
31		#include "list.h"
32		#include "numeric.h"
33	<	#include "s_conf.h"
35	<	#include "s_serv.h"
33	>	#include "conf.h"
34		#include "send.h"
37	–	#include "msg.h"
35		#include "parse.h"
39	–	#include "s_user.h"
36		#include "modules.h"
37	+	#include "memory.h"
38
42	–	static void m_accept(struct Client *, struct Client *, int, char *[]);
43	–	static void build_nicklist(struct Client *, char *, char *, char *);
44	–	static void add_accept(struct Client *, struct Client *);
45	–	static void list_accepts(struct Client *);
46	–
47	–	struct Message accept_msgtab = {
48	–	"ACCEPT", 0, 0, 0, 0, MFLG_SLOW, 0,
49	–	{m_unregistered, m_accept, m_ignore, m_ignore, m_accept, m_ignore}
50	–	};
51	–
52	–	#ifndef STATIC_MODULES
53	–	void
54	–	_modinit(void)
55	–	{
56	–	mod_add_cmd(&accept_msgtab);
57	–	}
58	–
59	–	void
60	–	_moddeinit(void)
61	–	{
62	–	mod_del_cmd(&accept_msgtab);
63	–	}
39
40	<	const char *_version = "$Revision$";
41	<	#endif
42	<
43	<	/*
69	<	* m_accept - ACCEPT command handler
70	<	*      parv[0] = sender prefix
71	<	*      parv[1] = servername
40	>	/*! \brief Creates and sends a list of nick!user\@host masks a Client
41	>	*         has on its acceptlist.
42	>	*
43	>	* \param source_p The actual Client the list will be sent to.
44		*/
45		static void
46	<	m_accept(struct Client *client_p, struct Client *source_p,
75	<	int parc, char *parv[])
46	>	list_accepts(struct Client *source_p)
47		{
48	<	char *nick;
49	<	char *p = NULL;
50	<	char addbuf[IRCD_BUFSIZE] = { '\0' };
51	<	char delbuf[IRCD_BUFSIZE] = { '\0' };
81	<	struct Client *target_p = NULL;
82	<	int accept_num;
83	<
84	<	if ((parc < 2) || (*parv[1] == '*'))
85	<	{
86	<	list_accepts(source_p);
87	<	return;
88	<	}
48	>	int len = 0;
49	>	char nicks[IRCD_BUFSIZE] = "";
50	>	char *t = nicks;
51	>	const dlink_node *ptr = NULL;
52
53	<	build_nicklist(source_p, addbuf, delbuf, parv[1]);
53	>	len = strlen(me.name) + strlen(source_p->name) + 12;
54
55	<	/* parse the delete list */
93	<	for (nick = strtoken(&p, delbuf, ","); nick != NULL;
94	<	nick = strtoken(&p, NULL, ","))
55	>	DLINK_FOREACH(ptr, source_p->localClient->acceptlist.head)
56		{
57	<	/* shouldnt happen, but lets be paranoid */
58	<	if (((target_p = find_client(nick)) == NULL) || !IsClient(target_p))
59	<	{
60	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
100	<	me.name, source_p->name, nick);
101	<	continue;
102	<	}
57	>	const struct split_nuh_item *accept_p = ptr->data;
58	>	size_t masklen = strlen(accept_p->nickptr) +
59	>	strlen(accept_p->userptr) +
60	>	strlen(accept_p->hostptr) + 2 /* +2 for !@ */ ;
61
62	<	/* user isnt on clients accept list */
105	<	if (!accept_message(target_p, source_p))
62	>	if ((t - nicks) + masklen + len  > IRCD_BUFSIZE)
63		{
64	<	sendto_one(source_p, form_str(ERR_ACCEPTNOT),
65	<	me.name, source_p->name, target_p->name);
66	<	continue;
64	>	*(t - 1) = '\0';
65	>	sendto_one_numeric(source_p, &me, RPL_ACCEPTLIST, nicks);
66	>	t = nicks;
67		}
68
69	<	del_from_accept(target_p, source_p);
69	>	t += sprintf(t, "%s!%s@%s ",
70	>	accept_p->nickptr,
71	>	accept_p->userptr, accept_p->hostptr);
72		}
73
74	<	/* get the number of accepts they have */
116	<	accept_num = dlink_list_length(&source_p->allow_list);
117	<
118	<	/* parse the add list */
119	<	for (nick = strtoken(&p, addbuf, ","); nick;
120	<	nick = strtoken(&p, NULL, ","), accept_num++)
74	>	if (nicks[0])
75		{
76	<	/* shouldnt happen, but lets be paranoid */
77	<	if (((target_p = find_client(nick)) == NULL) || !IsClient(target_p))
124	<	{
125	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
126	<	me.name, source_p->name, nick);
127	<	continue;
128	<	}
129	<
130	<	/* user is already on clients accept list */
131	<	if (accept_message(target_p, source_p))
132	<	{
133	<	sendto_one(source_p, form_str(ERR_ACCEPTEXIST),
134	<	me.name, source_p->name, target_p->name);
135	<	continue;
136	<	}
137	<
138	<	if (accept_num >= ConfigFileEntry.max_accept)
139	<	{
140	<	sendto_one(source_p, form_str(ERR_ACCEPTFULL),
141	<	me.name, source_p->name);
142	<	return;
143	<	}
144	<
145	<	/* why is this here? */
146	<	/* del_from accept(target_p, source_p); */
147	<	add_accept(source_p, target_p);
76	>	*(t - 1) = '\0';
77	>	sendto_one_numeric(source_p, &me, RPL_ACCEPTLIST, nicks);
78		}
79	+
80	+	sendto_one_numeric(source_p, &me, RPL_ENDOFACCEPT);
81		}
82
83	<	/* build_nicklist()
83	>	/*! \brief Allocates and adds a split_nuh_item holding a nick!user\@host
84	>	*         mask to a Client's acceptlist.
85		*
86	<	* input        - pointer to client
87	<	*              - pointer to addbuffer
155	<	*              - pointer to remove buffer
156	<	*              - pointer to list of nicks
157	<	* output       -
158	<	* side effects - addbuf/delbuf are modified to give valid nicks
86	>	* \param nuh      A split_nuh_item already prepared with required masks.
87	>	* \param source_p The actual Client the new accept is added to.
88		*/
89		static void
90	<	build_nicklist(struct Client *source_p, char *addbuf,
162	<	char *delbuf, char *nicks)
90	>	add_accept(const struct split_nuh_item *nuh, struct Client *source_p)
91		{
92	<	char *name = NULL;
165	<	char *p = NULL;
166	<	char *buf_p = NULL;
167	<	struct Client *target_p = NULL;
92	>	struct split_nuh_item *accept_p = MyCalloc(sizeof(*accept_p));
93
94	<	/* build list of clients to add into addbuf, clients to remove in delbuf */
95	<	for (name = strtoken(&p, nicks, ","); name;
96	<	name = strtoken(&p, NULL, ","))
172	<	{
173	<	if (*name == '-')
174	<	buf_p = delbuf, ++name;
175	<	else
176	<	buf_p = addbuf;
94	>	accept_p->nickptr = xstrdup(nuh->nickptr);
95	>	accept_p->userptr = xstrdup(nuh->userptr);
96	>	accept_p->hostptr = xstrdup(nuh->hostptr);
97
98	<	if (((target_p = find_client(name)) == NULL) || !IsClient(target_p))
179	<	{
180	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
181	<	me.name, source_p->name, name);
182	<	continue;
183	<	}
184	<
185	<	if (*buf_p)
186	<	strlcat(buf_p, ",", IRCD_BUFSIZE);
187	<	strlcat(buf_p, name, IRCD_BUFSIZE);
188	<	}
189	<	}
98	>	dlinkAdd(accept_p, &accept_p->node, &source_p->localClient->acceptlist);
99
191	–	/* add_accept()
192	–	*
193	–	* input        - pointer to clients accept list to add to
194	–	*              - pointer to client to add
195	–	* output       - none
196	–	* side effects - target is added to clients list
197	–	*/
198	–	static void
199	–	add_accept(struct Client *source_p, struct Client *target_p)
200	–	{
201	–	dlinkAdd(target_p, make_dlink_node(), &source_p->allow_list);
202	–	dlinkAdd(source_p, make_dlink_node(), &target_p->on_allow_list);
100		list_accepts(source_p);
101		}
102
103	<	/* list_accepts()
103	>	/*! \brief ACCEPT command handler
104		*
105	<	* input        - pointer to client
106	<	* output       - none
107	<	* side effects - print accept list to client
105	>	* \param source_p Pointer to allocated Client struct from which the message
106	>	*                 originally comes from.  This can be a local or remote client.
107	>	* \param parc     Integer holding the number of supplied arguments.
108	>	* \param parv     Argument vector where parv[0] .. parv[parc-1] are non-NULL
109	>	*                 pointers.
110	>	* \note Valid arguments for this command are:
111	>	*      - parv[0] = command
112	>	*      - parv[1] = comma-separated list of masks to be accepted or removed
113		*/
114	<	static void
115	<	list_accepts(struct Client *source_p)
114	>	static int
115	>	m_accept(struct Client *source_p, int parc, char *parv[])
116		{
117	<	int len = 0;
118	<	char nicks[IRCD_BUFSIZE] = { '\0' };
119	<	char *t = nicks;
120	<	const dlink_node *ptr = NULL;
121	<
122	<	len = strlen(me.name) + strlen(source_p->name) + 12;
117	>	char *mask = NULL;
118	>	char *p = NULL;
119	>	char nick[NICKLEN + 1] = "";
120	>	char user[USERLEN + 1] = "";
121	>	char host[HOSTLEN + 1] = "";
122	>	struct split_nuh_item nuh;
123	>	struct split_nuh_item *accept_p = NULL;
124
125	<	DLINK_FOREACH(ptr, source_p->allow_list.head)
125	>	if (EmptyString(parv[1]) || !strcmp(parv[1], "*"))
126		{
127	<	const struct Client *target_p = ptr->data;
127	>	list_accepts(source_p);
128	>	return 0;
129	>	}
130
131	<	if ((t - nicks) + strlen(target_p->name) + len > IRCD_BUFSIZE)
131	>	for (mask = strtoken(&p, parv[1], ","); mask;
132	>	mask = strtoken(&p,    NULL, ","))
133	>	{
134	>	if (*mask == '-' && *++mask)
135		{
136	<	*(t - 1) = '\0';
137	<	sendto_one(source_p, form_str(RPL_ACCEPTLIST),
138	<	me.name, source_p->name, nicks);
139	<	t = nicks;
136	>	nuh.nuhmask  = mask;
137	>	nuh.nickptr  = nick;
138	>	nuh.userptr  = user;
139	>	nuh.hostptr  = host;
140	>
141	>	nuh.nicksize = sizeof(nick);
142	>	nuh.usersize = sizeof(user);
143	>	nuh.hostsize = sizeof(host);
144	>
145	>	split_nuh(&nuh);
146	>
147	>	if ((accept_p = find_accept(nick, user, host, source_p, irccmp)) == NULL)
148	>	{
149	>	sendto_one_numeric(source_p, &me, ERR_ACCEPTNOT, nick, user, host);
150	>	continue;
151	>	}
152	>
153	>	del_accept(accept_p, source_p);
154		}
155	+	else if (*mask)
156	+	{
157	+	if (dlink_list_length(&source_p->localClient->acceptlist) >=
158	+	ConfigFileEntry.max_accept)
159	+	{
160	+	sendto_one_numeric(source_p, &me, ERR_ACCEPTFULL);
161	+	return 0;
162	+	}
163
164	<	t += ircsprintf(t, "%s ", target_p->name);
165	<	}
164	>	nuh.nuhmask  = mask;
165	>	nuh.nickptr  = nick;
166	>	nuh.userptr  = user;
167	>	nuh.hostptr  = host;
168
169	<	if (nicks[0] != '\0')
170	<	{
171	<	*(t - 1) = '\0';
172	<	sendto_one(source_p, form_str(RPL_ACCEPTLIST),
173	<	me.name, source_p->name, nicks);
169	>	nuh.nicksize = sizeof(nick);
170	>	nuh.usersize = sizeof(user);
171	>	nuh.hostsize = sizeof(host);
172	>
173	>	split_nuh(&nuh);
174	>
175	>	if ((accept_p = find_accept(nick, user, host, source_p, irccmp)))
176	>	{
177	>	sendto_one_numeric(source_p, &me, ERR_ACCEPTEXIST, nick, user, host);
178	>	continue;
179	>	}
180	>
181	>	add_accept(&nuh, source_p);
182	>	}
183		}
184
185	<	sendto_one(source_p, form_str(RPL_ENDOFACCEPT),
186	<	me.name, source_p->name);
185	>	return 0;
186	>	}
187	>
188	>	static struct Message accept_msgtab =
189	>	{
190	>	"ACCEPT", 0, 0, 0, MAXPARA, MFLG_SLOW, 0,
191	>	{ m_unregistered, m_accept, m_ignore, m_ignore, m_accept, m_ignore }
192	>	};
193	>
194	>	static void
195	>	module_init(void)
196	>	{
197	>	mod_add_cmd(&accept_msgtab);
198		}
199	+
200	+	static void
201	+	module_exit(void)
202	+	{
203	+	mod_del_cmd(&accept_msgtab);
204	+	}
205	+
206	+	struct module module_entry =
207	+	{
208	+	.node    = { NULL, NULL, NULL },
209	+	.name    = NULL,
210	+	.version = "$Revision$",
211	+	.handle  = NULL,
212	+	.modinit = module_init,
213	+	.modexit = module_exit,
214	+	.flags   = 0
215	+	};

Comparing:
ircd-hybrid/modules/m_accept.c (property svn:keywords), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid/branches/8.2.x/modules/m_accept.c (property svn:keywords), Revision 3604 by michael, Tue May 20 17:39:31 2014 UTC

#	Line 1 | Line 1
1	<	"Id Revision"
1	>	Id Revision

Diff Legend

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