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 1446 by michael, Mon Jun 25 20:05:12 2012 UTC vs.
Revision 1547 by michael, Sun Sep 30 17:50:03 2012 UTC

# Line 67 | Line 67 | typedef enum
67    GLINE_TYPE,
68    CRESV_TYPE,    
69    NRESV_TYPE,
70 –  GDENY_TYPE,
70    SERVICE_TYPE
71   } ConfType;
72  
# Line 151 | Line 150 | struct ClassItem
150    dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
151    dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
152    unsigned int max_sendq;
153 +  unsigned int max_recvq;
154    int con_freq;
155    int ping_freq;
156    int ping_warning;
# Line 227 | Line 227 | struct CidrItem
227   #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
228   #define CONF_FLAGS_ENCRYPTED            0x00004000
229   #define CONF_FLAGS_TEMPORARY            0x00008000
230 < #define CONF_FLAGS_BURST_AWAY           0x00010000
231 < #define CONF_FLAGS_EXEMPTRESV           0x00020000
232 < #define CONF_FLAGS_TOPICBURST           0x00040000
233 < #define CONF_FLAGS_SSL                  0x00080000
230 > #define CONF_FLAGS_EXEMPTRESV           0x00010000
231 > #define CONF_FLAGS_SSL                  0x00020000
232  
233   /* Macros for struct AccessItem */
234   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
# Line 255 | Line 253 | struct CidrItem
253   #define IsConfTemporary(x)      ((x)->flags & CONF_FLAGS_TEMPORARY)
254   #define SetConfTemporary(x)     ((x)->flags |= CONF_FLAGS_TEMPORARY)
255   #define IsConfRedir(x)          ((x)->flags & CONF_FLAGS_REDIR)
258 – #define IsConfAwayBurst(x)      ((x)->flags & CONF_FLAGS_BURST_AWAY)
259 – #define SetConfAwayBurst(x)     ((x)->flags |= CONF_FLAGS_BURST_AWAY)
260 – #define ClearConfAwayBurst(x)   ((x)->flags &= ~CONF_FLAGS_BURST_AWAY)
261 – #define IsConfTopicBurst(x)     ((x)->flags & CONF_FLAGS_TOPICBURST)
262 – #define SetConfTopicBurst(x)    ((x)->flags |= CONF_FLAGS_TOPICBURST)
263 – #define ClearConfTopicBurst(x)  ((x)->flags &= ~CONF_FLAGS_TOPICBURST)
256   #define IsConfSSL(x)      ((x)->flags & CONF_FLAGS_SSL)
257   #define SetConfSSL(x)     ((x)->flags |= CONF_FLAGS_SSL)
258   #define ClearConfSSL(x)   ((x)->flags &= ~CONF_FLAGS_SSL)
# Line 282 | Line 274 | struct CidrItem
274                                   SHARED_RESV | SHARED_UNRESV |\
275                                   SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
276  
285 – /* gline acl entry actions */
286 – #define GDENY_BLOCK             0x1
287 – #define GDENY_REJECT            0x2
288 –
277   struct config_file_entry
278   {
279    const char *dpath;          /* DPATH if set from command line */
280    const char *configfile;
281    const char *klinefile;
282    const char *xlinefile;
295 –  const char *rxlinefile;
296 –  const char *rklinefile;
283    const char *dlinefile;
298 –  const char *glinefile;
284    const char *cresvfile;
285    const char *nresvfile;
286  
# Line 331 | Line 316 | struct config_file_entry
316    int oper_pass_resv;
317    int glines;
318    int hide_spoof_ips;
334 –  int burst_away;
335 –  int use_whois_actually;
319    int tkline_expire_notices;
320    int opers_bypass_callerid;
321    int ignore_bogus_ts;
# Line 340 | Line 323 | struct config_file_entry
323    int pace_wait;
324    int pace_wait_simple;
325    int gline_time;
326 <  int gline_logging;
326 >  int gline_request_time;
327    int oper_only_umodes;
328    int oper_umodes;
329    int max_targets;
# Line 349 | Line 332 | struct config_file_entry
332    int min_nonwildcard_simple;
333    int kill_chase_time_limit;
334    int default_floodcount;
352 –  int client_flood;
335    /* 0 == don't use throttle... */
336    int throttle_time;
337    int use_egd;
# Line 362 | Line 344 | struct config_channel_entry
344   {
345    int disable_fake_channels;
346    int restrict_channels;
365 –  int disable_local_channels;
366 –  int use_except;
367 –  int use_invex;
368 –  int use_knock;
347    int knock_delay;
348    int knock_delay_channel;
349    unsigned int max_bans;
# Line 386 | Line 364 | struct config_server_hide
364    int links_delay;
365    int links_disabled;
366    int hidden;
389 –  int disable_hidden;
367    int hide_server_ips;
368   };
369  
# Line 425 | Line 402 | struct logging_entry
402    unsigned int use_logging;
403   };
404  
428 – extern dlink_list gdeny_items;
405   extern dlink_list class_items;
406   extern dlink_list server_items;
407   extern dlink_list cluster_items;
# Line 445 | Line 421 | extern int valid_wild_card(struct Client
421   /* End GLOBAL section */
422  
423   extern unsigned int get_sendq(struct Client *);
424 + extern unsigned int get_recvq(struct Client *);
425   extern const char *get_client_class(struct Client *);
426   extern int get_client_ping(struct Client *, int *);
427   extern void check_class(void);
# Line 495 | Line 472 | extern void *map_to_conf(struct ConfItem
472   extern struct ConfItem *unmap_conf_item(void *);
473   /* XXX should the parse_aline stuff go into another file ?? */
474   #define AWILD 0x1               /* check wild cards */
498 – #define NOUSERLOOKUP 0x2 /* Don't lookup the user@host on /rkline nick */
475   extern int parse_aline(const char *, struct Client *, int, char **,
476                         int, char **, char **, time_t *, char **, char **);
477   extern int valid_comment(struct Client *, char *, int);

Diff Legend

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