ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/conf_parser.y

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 7208 by michael, Thu Jan 28 11:26:51 2016 UTC vs.
Revision 7209 by michael, Wed Feb 3 15:10:39 2016 UTC

#	Line 33 | Line 33
33		#include "list.h"
34		#include "conf.h"
35		#include "conf_class.h"
36	+	#include "conf_cluster.h"
37		#include "conf_pseudo.h"
38	+	#include "conf_shared.h"
39		#include "event.h"
40		#include "id.h"
41		#include "log.h"
#	Line 1819 | Line 1821 | shared_entry: T_SHARED
1821		block_state.flags.value = SHARED_ALL;
1822		} '{' shared_items '}' ';'
1823		{
1822	–	struct MaskItem *conf = NULL;
1823	–
1824		if (conf_parser_ctx.pass != 2)
1825		break;
1826
1827	<	conf = conf_make(CONF_SHARED);
1828	<	conf->modes = block_state.flags.value;
1829	<	conf->name = xstrdup(block_state.name.buf);
1830	<	conf->user = xstrdup(block_state.user.buf);
1831	<	conf->host = xstrdup(block_state.host.buf);
1827	>	struct SharedItem *shared = shared_make();
1828	>	shared->type = block_state.flags.value;
1829	>	shared->server = xstrdup(block_state.name.buf);
1830	>	shared->user = xstrdup(block_state.user.buf);
1831	>	shared->host = xstrdup(block_state.host.buf);
1832		};
1833
1834		shared_items: shared_items shared_item | shared_item;
#	Line 1920 | Line 1920 | cluster_entry: T_CLUSTER
1920		reset_block_state();
1921
1922		strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1923	<	block_state.flags.value = SHARED_ALL;
1923	>	block_state.flags.value = CLUSTER_ALL;
1924		} '{' cluster_items '}' ';'
1925		{
1926	–	struct MaskItem *conf = NULL;
1927	–
1926		if (conf_parser_ctx.pass != 2)
1927		break;
1928
1929	<	conf = conf_make(CONF_CLUSTER);
1930	<	conf->modes = block_state.flags.value;
1931	<	conf->name = xstrdup(block_state.name.buf);
1929	>	struct ClusterItem *cluster = cluster_make();
1930	>	cluster->type = block_state.flags.value;
1931	>	cluster->server = xstrdup(block_state.name.buf);
1932		};
1933
1934		cluster_items:  cluster_items cluster_item | cluster_item;
#	Line 1952 | Line 1950 | cluster_types:  cluster_types ',' cluste
1950		cluster_type_item: KLINE
1951		{
1952		if (conf_parser_ctx.pass == 2)
1953	<	block_state.flags.value |= SHARED_KLINE;
1953	>	block_state.flags.value |= CLUSTER_KLINE;
1954		} | UNKLINE
1955		{
1956		if (conf_parser_ctx.pass == 2)
1957	<	block_state.flags.value |= SHARED_UNKLINE;
1957	>	block_state.flags.value |= CLUSTER_UNKLINE;
1958		} | T_DLINE
1959		{
1960		if (conf_parser_ctx.pass == 2)
1961	<	block_state.flags.value |= SHARED_DLINE;
1961	>	block_state.flags.value |= CLUSTER_DLINE;
1962		} | T_UNDLINE
1963		{
1964		if (conf_parser_ctx.pass == 2)
1965	<	block_state.flags.value |= SHARED_UNDLINE;
1965	>	block_state.flags.value |= CLUSTER_UNDLINE;
1966		} | XLINE
1967		{
1968		if (conf_parser_ctx.pass == 2)
1969	<	block_state.flags.value |= SHARED_XLINE;
1969	>	block_state.flags.value |= CLUSTER_XLINE;
1970		} | T_UNXLINE
1971		{
1972		if (conf_parser_ctx.pass == 2)
1973	<	block_state.flags.value |= SHARED_UNXLINE;
1973	>	block_state.flags.value |= CLUSTER_UNXLINE;
1974		} | RESV
1975		{
1976		if (conf_parser_ctx.pass == 2)
1977	<	block_state.flags.value |= SHARED_RESV;
1977	>	block_state.flags.value |= CLUSTER_RESV;
1978		} | T_UNRESV
1979		{
1980		if (conf_parser_ctx.pass == 2)
1981	<	block_state.flags.value |= SHARED_UNRESV;
1981	>	block_state.flags.value |= CLUSTER_UNRESV;
1982		} | T_LOCOPS
1983		{
1984		if (conf_parser_ctx.pass == 2)
1985	<	block_state.flags.value |= SHARED_LOCOPS;
1985	>	block_state.flags.value |= CLUSTER_LOCOPS;
1986		} | T_ALL
1987		{
1988		if (conf_parser_ctx.pass == 2)
1989	<	block_state.flags.value = SHARED_ALL;
1989	>	block_state.flags.value = CLUSTER_ALL;
1990		};
1991
1992

Diff Legend

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