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 4325 by michael, Fri Aug 1 18:06:07 2014 UTC vs.
Revision 4340 by michael, Sat Aug 2 16:53:22 2014 UTC

# Line 59 | Line 59
59   #define CONF_FLAGS_WEBIRC               0x00020000U
60  
61   /* Macros for struct MaskItem */
62 < #define IsConfWebIRC(x)         ((x)->flags & CONF_FLAGS_WEBIRC)
63 < #define IsNoTilde(x)            ((x)->flags & CONF_FLAGS_NO_TILDE)
64 < #define IsConfCanFlood(x)       ((x)->flags & CONF_FLAGS_CAN_FLOOD)
65 < #define IsNeedPassword(x)       ((x)->flags & CONF_FLAGS_NEED_PASSWORD)
66 < #define IsNeedIdentd(x)         ((x)->flags & CONF_FLAGS_NEED_IDENTD)
67 < #define IsConfExemptKline(x)    ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
68 < #define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
69 < #define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
70 < #define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
71 < #define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
72 < #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
73 < #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
74 < #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
75 < #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
62 > #define IsConfWebIRC(x)           ((x)->flags & CONF_FLAGS_WEBIRC)
63 > #define IsNoTilde(x)              ((x)->flags & CONF_FLAGS_NO_TILDE)
64 > #define IsConfCanFlood(x)         ((x)->flags & CONF_FLAGS_CAN_FLOOD)
65 > #define IsNeedPassword(x)         ((x)->flags & CONF_FLAGS_NEED_PASSWORD)
66 > #define IsNeedIdentd(x)           ((x)->flags & CONF_FLAGS_NEED_IDENTD)
67 > #define IsConfExemptKline(x)      ((x)->flags & CONF_FLAGS_EXEMPTKLINE)
68 > #define IsConfExemptLimits(x)     ((x)->flags & CONF_FLAGS_NOLIMIT)
69 > #define IsConfExemptGline(x)      ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
70 > #define IsConfExemptResv(x)       ((x)->flags & CONF_FLAGS_EXEMPTRESV)
71 > #define IsConfDoIdentd(x)         ((x)->flags & CONF_FLAGS_DO_IDENTD)
72 > #define IsConfDoSpoofIp(x)        ((x)->flags & CONF_FLAGS_SPOOF_IP)
73 > #define IsConfSpoofNotice(x)      ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
74 > #define IsConfAllowAutoConn(x)    ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
75 > #define SetConfAllowAutoConn(x)   ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
76   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
77 < #define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
78 < #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
79 < #define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
80 < #define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
77 > #define IsConfRedir(x)            ((x)->flags & CONF_FLAGS_REDIR)
78 > #define IsConfSSL(x)              ((x)->flags & CONF_FLAGS_SSL)
79 > #define IsConfDatabase(x)         ((x)->flags & CONF_FLAGS_IN_DATABASE)
80 > #define SetConfDatabase(x)        ((x)->flags |= CONF_FLAGS_IN_DATABASE)
81  
82  
83   /* shared/cluster server entry types
# Line 202 | Line 202 | struct
202  
203   struct
204   {
205 <  const char *dpath;          /* DPATH if set from command line */
205 >  const char *dpath;
206    const char *mpath;
207    const char *spath;
208    const char *configfile;
# Line 262 | Line 262 | struct
262    unsigned int ping_cookie;
263    unsigned int disable_auth;
264    unsigned int cycle_on_host_change;
265 < } ConfigFileEntry;
265 > } ConfigGeneral;
266  
267   struct
268   {
# Line 317 | Line 317 | struct
317    unsigned int specific_ipv6_vhost;
318    struct sockaddr_in dns_host;
319    unsigned int can_use_v6;
320 < } ServerInfo;
320 > } ConfigServerInfo;
321  
322   struct
323   {
324    char *name;
325    char *description;
326    char *email;
327 < } AdminInfo;
327 > } ConfigAdminInfo;
328  
329   struct
330   {
331    unsigned int use_logging;
332 < } ConfigLoggingEntry;
332 > } ConfigLog;
333  
334   extern dlink_list flatten_links;
335   extern dlink_list server_items;

Diff Legend

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