diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2012-11-01 21:08:56 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2012-11-01 21:08:56 +0000 |
| commit | 8d6a1a7177ccbb822872fa5a758f5c5c948cec2e (patch) | |
| tree | ccdc6f8902dd64d6da0e7441d0312a45697e420c /include | |
| parent | 5f1a24388ef9e957923bfd57711dd7448abb824b (diff) | |
- flesh out new *line database handling
- simplify temporary bans
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1628 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'include')
| -rw-r--r-- | include/conf.h | 16 | ||||
| -rw-r--r-- | include/resv.h | 2 |
2 files changed, 6 insertions, 12 deletions
diff --git a/include/conf.h b/include/conf.h index 42fb871..ac5766b 100644 --- a/include/conf.h +++ b/include/conf.h @@ -107,6 +107,7 @@ struct MatchItem int count; /* How many times this matchitem has been matched */ int ref_count; /* How many times is this matchitem in use */ int illegal; /* Should it be deleted when possible? */ + unsigned int flags; time_t hold; /* Hold action until this time (calendar time) */ time_t setat; }; @@ -227,7 +228,7 @@ struct CidrItem /* server flags */ #define CONF_FLAGS_ALLOW_AUTO_CONN 0x00002000 #define CONF_FLAGS_ENCRYPTED 0x00004000 -#define CONF_FLAGS_TEMPORARY 0x00008000 +#define CONF_FLAGS_IN_DATABASE 0x00008000 #define CONF_FLAGS_EXEMPTRESV 0x00010000 #define CONF_FLAGS_SSL 0x00020000 #define CONF_FLAGS_MAINCONF 0x00040000 @@ -252,15 +253,13 @@ struct CidrItem #define IsConfAllowAutoConn(x) ((x)->flags & CONF_FLAGS_ALLOW_AUTO_CONN) #define SetConfAllowAutoConn(x) ((x)->flags |= CONF_FLAGS_ALLOW_AUTO_CONN) #define ClearConfAllowAutoConn(x) ((x)->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN) -#define IsConfTemporary(x) ((x)->flags & CONF_FLAGS_TEMPORARY) -#define SetConfTemporary(x) ((x)->flags |= CONF_FLAGS_TEMPORARY) #define IsConfRedir(x) ((x)->flags & CONF_FLAGS_REDIR) #define IsConfSSL(x) ((x)->flags & CONF_FLAGS_SSL) #define SetConfSSL(x) ((x)->flags |= CONF_FLAGS_SSL) #define ClearConfSSL(x) ((x)->flags &= ~CONF_FLAGS_SSL) -#define IsConfMain(x) ((x)->flags & CONF_FLAGS_MAINCONF) -#define SetConfMain(x) ((x)->flags |= CONF_FLAGS_MAINCONF) -#define ClearConfMain(x) ((x)->flags &= ~CONF_FLAGS_MAINCONF) +#define IsConfDatabase(x) ((x)->flags & CONF_FLAGS_IN_DATABASE) +#define SetConfDatabase(x) ((x)->flags |= CONF_FLAGS_IN_DATABASE) + /* shared/cluster server entry types * These defines are used for both shared and cluster. @@ -455,11 +454,6 @@ extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, co extern void delete_conf_item(struct ConfItem *); extern void report_confitem_types(struct Client *, ConfType); extern void yyerror(const char *); -extern void write_conf_line(struct Client *, struct ConfItem *, - const char *, time_t); -extern int remove_conf_line(ConfType, struct Client *, const char *, - const char *); -extern void add_temp_line(struct ConfItem *); extern void cleanup_tklines(void *); extern int rehash(int); extern int conf_add_server(struct ConfItem *, const char *); diff --git a/include/resv.h b/include/resv.h index d40c2ea..2bba49a 100644 --- a/include/resv.h +++ b/include/resv.h @@ -33,7 +33,7 @@ struct ResvChannel time_t setat; char name[CHANNELLEN + 1]; char *reason; - int conf; /* 1 if set from ircd.conf, 0 if from elsewhere */ + unsigned int flags; }; extern dlink_list nresv_items; |