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 1623 by michael, Thu Nov 1 13:24:43 2012 UTC vs.
Revision 1628 by michael, Thu Nov 1 21:08:56 2012 UTC

# Line 107 | Line 107 | struct MatchItem
107    int count;            /* How many times this matchitem has been matched */
108    int ref_count;        /* How many times is this matchitem in use */
109    int illegal;          /* Should it be deleted when possible? */
110 +  unsigned int flags;
111    time_t           hold;     /* Hold action until this time (calendar time) */
112    time_t setat;
113   };
# Line 227 | Line 228 | struct CidrItem
228   /* server flags */
229   #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
230   #define CONF_FLAGS_ENCRYPTED            0x00004000
231 < #define CONF_FLAGS_TEMPORARY            0x00008000
231 > #define CONF_FLAGS_IN_DATABASE          0x00008000
232   #define CONF_FLAGS_EXEMPTRESV           0x00010000
233   #define CONF_FLAGS_SSL                  0x00020000
234   #define CONF_FLAGS_MAINCONF             0x00040000
# Line 252 | Line 253 | struct CidrItem
253   #define IsConfAllowAutoConn(x)  ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN)
254   #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN)
255   #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN)
255 – #define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
256 – #define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
256   #define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
257   #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
258   #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
259   #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
260 < #define IsConfMain(x)      ((x)->flags & CONF_FLAGS_MAINCONF)
261 < #define SetConfMain(x)     ((x)->flags |= CONF_FLAGS_MAINCONF)
262 < #define ClearConfMain(x)   ((x)->flags &= ~CONF_FLAGS_MAINCONF)
260 > #define IsConfDatabase(x)      ((x)->flags & CONF_FLAGS_IN_DATABASE)
261 > #define SetConfDatabase(x)     ((x)->flags |= CONF_FLAGS_IN_DATABASE)
262 >
263  
264   /* shared/cluster server entry types
265   * These defines are used for both shared and cluster.
# Line 455 | Line 454 | extern struct ConfItem *find_exact_name_
454   extern void delete_conf_item(struct ConfItem *);
455   extern void report_confitem_types(struct Client *, ConfType);
456   extern void yyerror(const char *);
458 – extern void write_conf_line(struct Client *, struct ConfItem *,
459 –                            const char *, time_t);
460 – extern int remove_conf_line(ConfType, struct Client *, const char *,
461 –                            const char *);
462 – extern void add_temp_line(struct ConfItem *);
457   extern void cleanup_tklines(void *);
458   extern int rehash(int);
459   extern int conf_add_server(struct ConfItem *, const char *);

Diff Legend

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