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-8/include/conf.h (file contents):
Revision 1324 by michael, Fri Mar 30 21:40:38 2012 UTC vs.
Revision 1369 by michael, Wed Apr 25 19:04:19 2012 UTC

# Line 28 | Line 28
28   #ifdef HAVE_LIBCRYPTO
29   #include <openssl/rsa.h>
30   #endif
31 – #include "fileio.h"             /* FBFILE */
31   #include "ircd_defs.h"
32   #include "motd.h"               /* MessageFile */
33   #include "client.h"
34   #include "hook.h"
35  
36  
38 – #define CONF_SERVER_INFO_TLS_VERSION_SSLV3 0x1
39 – #define CONF_SERVER_INFO_TLS_VERSION_TLSV1 0x2
40 –
37   struct Client;
38  
39   extern struct Callback *client_check_cb;
# Line 46 | Line 42 | struct conf_parser_context
42   {
43    unsigned int boot;
44    unsigned int pass;
45 <  FBFILE *conf_file;
45 >  FILE *conf_file;
46   };
47  
48   extern struct conf_parser_context conf_parser_ctx;
# Line 197 | Line 193 | struct CidrItem
193   #define CONF_CLIENT             0x00000002
194   #define CONF_SERVER             0x00000004
195   #define CONF_OPERATOR           0x00000008
196 < #define CONF_KILL               0x00000010
201 < #define CONF_KLINE              CONF_KILL
196 > #define CONF_KLINE              0x00000010
197   #define CONF_CLASS              0x00000020
198   #define CONF_LEAF               0x00000040
199   #define CONF_LISTEN_PORT        0x00000080
# Line 229 | Line 224 | struct CidrItem
224   #define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
225   #define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
226   #define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
227 < #define IsConfKill(x)           ((x)->status == CONF_KILL)
227 > #define IsConfKill(x)           ((x)->status == CONF_KLINE)
228   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
229   #define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
230   #define IsConfUline(x)          ((x)->status & CONF_ULINE)
# Line 244 | Line 239 | struct CidrItem
239   #define CONF_FLAGS_LIMIT_IP             0x00000002
240   #define CONF_FLAGS_NO_TILDE             0x00000004
241   #define CONF_FLAGS_NEED_IDENTD          0x00000008
242 < /*                                      0x00000010 */
243 < #define CONF_FLAGS_NOMATCH_IP           0x00000020
244 < #define CONF_FLAGS_EXEMPTKLINE          0x00000040
245 < #define CONF_FLAGS_NOLIMIT              0x00000080
246 < /*                                      0x00000100 */
247 < #define CONF_FLAGS_SPOOF_IP             0x00000200
248 < #define CONF_FLAGS_SPOOF_NOTICE         0x00000400
249 < #define CONF_FLAGS_REDIR                0x00000800
250 < #define CONF_FLAGS_EXEMPTGLINE          0x00001000
256 < /*                                      0x00002000 */
257 < #define CONF_FLAGS_CAN_FLOOD            0x00100000
258 < #define CONF_FLAGS_NEED_PASSWORD        0x00200000
242 > #define CONF_FLAGS_NOMATCH_IP           0x00000010
243 > #define CONF_FLAGS_EXEMPTKLINE          0x00000020
244 > #define CONF_FLAGS_NOLIMIT              0x00000040
245 > #define CONF_FLAGS_SPOOF_IP             0x00000080
246 > #define CONF_FLAGS_SPOOF_NOTICE         0x00000100
247 > #define CONF_FLAGS_REDIR                0x00000200
248 > #define CONF_FLAGS_EXEMPTGLINE          0x00000400
249 > #define CONF_FLAGS_CAN_FLOOD            0x00000800
250 > #define CONF_FLAGS_NEED_PASSWORD        0x00001000
251   /* server flags */
252 < #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
253 < /*                                      0x00008000 */
254 < #define CONF_FLAGS_ENCRYPTED            0x00010000
255 < #define CONF_FLAGS_UNUSED1___           0x00020000
256 < #define CONF_FLAGS_TEMPORARY            0x00040000
257 < #define CONF_FLAGS_UNUSED2___           0x00080000
258 < #define CONF_FLAGS_BURST_AWAY           0x00400000
267 < #define CONF_FLAGS_EXEMPTRESV           0x00800000
268 < #define CONF_FLAGS_TOPICBURST           0x01000000
269 < #define CONF_FLAGS_SSL                  0x02000000
252 > #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
253 > #define CONF_FLAGS_ENCRYPTED            0x00004000
254 > #define CONF_FLAGS_TEMPORARY            0x00008000
255 > #define CONF_FLAGS_BURST_AWAY           0x00010000
256 > #define CONF_FLAGS_EXEMPTRESV           0x00020000
257 > #define CONF_FLAGS_TOPICBURST           0x00040000
258 > #define CONF_FLAGS_SSL                  0x00080000
259  
260   /* Macros for struct AccessItem */
261   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
# Line 473 | Line 462 | extern dlink_list rxconf_items;
462   extern dlink_list rkconf_items;
463   extern dlink_list leaf_items;
464   extern dlink_list service_items;
476 – extern dlink_list temporary_klines;
477 – extern dlink_list temporary_dlines;
478 – extern dlink_list temporary_glines;
465   extern dlink_list temporary_xlines;
480 – extern dlink_list temporary_rxlines;
481 – extern dlink_list temporary_rklines;
466   extern struct logging_entry ConfigLoggingEntry;
467   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
468   extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
# Line 517 | Line 501 | extern struct ConfItem *find_matching_na
501   extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
502                                               const char *, const char *);
503   extern void delete_conf_item(struct ConfItem *);
504 < extern void report_confitem_types(struct Client *, ConfType, int);
504 > extern void report_confitem_types(struct Client *, ConfType);
505   extern void yyerror(const char *);
522 – extern int conf_yy_fatal_error(const char *);
523 – extern int conf_fbgets(char *, unsigned int, FBFILE *);
506   extern void write_conf_line(struct Client *, struct ConfItem *,
507                              const char *, time_t);
508   extern int remove_conf_line(ConfType, struct Client *, const char *,
# Line 533 | Line 515 | extern int conf_add_server(struct ConfIt
515   extern void conf_add_class_to_conf(struct ConfItem *, const char *);
516  
517   /* XXX consider moving these into csvlib.h */
518 < extern void parse_csv_file(FBFILE *, ConfType);
519 <
520 < extern char *get_oper_name(const struct Client *);
518 > extern void parse_csv_file(FILE *, ConfType);
519 > extern int find_and_delete_temporary(const char *, const char *, int);
520 > extern const char *get_oper_name(const struct Client *);
521  
522   extern void *map_to_conf(struct ConfItem *);
523   extern struct ConfItem *unmap_conf_item(void *);
# Line 558 | Line 540 | extern int match_conf_password(const cha
540   #define BANNED_CLIENT     (-4)
541   #define TOO_FAST          (-5)
542  
543 < #define CLEANUP_TKLINES_TIME 60
543 > #define CLEANUP_TKLINES_TIME 5
544  
545   extern void cluster_a_line(struct Client *,
546                             const char *, int, int, const char *,...);
547   extern void rebuild_cidr_class(struct ConfItem *, struct ClassItem *);
566 –
567 – /* XXX **/
568 – //extern int yylex(void);
569 –
548   #endif /* INCLUDED_s_conf_h */

Diff Legend

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