ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/include/conf.h
(Generate patch)

Comparing ircd-hybrid/trunk/include/conf.h (file contents):
Revision 1858 by michael, Thu Apr 25 15:00:52 2013 UTC vs.
Revision 1921 by michael, Tue Apr 30 14:54:20 2013 UTC

# Line 116 | Line 116 | enum maskitem_type
116    CONF_DLINE    = 1 <<  4,
117    CONF_EXEMPT   = 1 <<  5,
118    CONF_CLUSTER  = 1 <<  6,
119 <  CONF_RKLINE   = 1 <<  7,
120 <  CONF_RXLINE   = 1 <<  8,
121 <  CONF_XLINE    = 1 <<  9,
122 <  CONF_ULINE    = 1 << 10,
123 <  CONF_GLINE    = 1 << 11,
124 <  CONF_CRESV    = 1 << 12,
125 <  CONF_NRESV    = 1 << 13,
126 <  CONF_SERVICE  = 1 << 14,
127 <  CONF_OPER     = 1 << 15,
128 <  CONF_HUB      = 1 << 16, /* XXX There are no separate hub/leaf configs anymore. This is just for /stats h */
129 <  CONF_CLASS    = 1 << 17  /* XXX Same here; just for /stats Y|y */
119 >  CONF_XLINE    = 1 <<  7,
120 >  CONF_ULINE    = 1 <<  8,
121 >  CONF_GLINE    = 1 <<  9,
122 >  CONF_CRESV    = 1 << 10,
123 >  CONF_NRESV    = 1 << 11,
124 >  CONF_SERVICE  = 1 << 12,
125 >  CONF_OPER     = 1 << 13,
126 >  CONF_HUB      = 1 << 14, /* XXX There are no separate hub/leaf configs anymore. This is just for /stats h */
127 >  CONF_CLASS    = 1 << 15  /* XXX Same here; just for /stats Y|y */
128   };
129  
130   struct conf_parser_context
# Line 181 | Line 179 | struct MaskItem
179    char              *reason;
180    char              *cipher_list;
181    void              *rsa_public_key;
184 –  void              *regexuser;
185 –  void              *regexhost;
182   };
183  
184   struct exempt
# Line 335 | Line 331 | struct logging_entry
331   extern dlink_list server_items;
332   extern dlink_list cluster_items;
333   extern dlink_list xconf_items;
338 – extern dlink_list rxconf_items;
339 – extern dlink_list rkconf_items;
334   extern dlink_list service_items;
335   extern struct conf_parser_context conf_parser_ctx;
336   extern struct logging_entry ConfigLoggingEntry;

Diff Legend

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