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 1383 by michael, Tue May 1 11:18:22 2012 UTC vs.
Revision 1490 by michael, Sat Jul 28 19:33:23 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 123 | Line 122 | struct AccessItem
122    int              clients;  /* Number of *LOCAL* clients using this */
123    int              bits;
124    int              type;
125 <  struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
126 <  struct irc_ssaddr ipnum;      /* ip to connect to */
125 >  struct irc_ssaddr bind;  /* ip to bind to for outgoing connect */
126 >  struct irc_ssaddr addr;  /* ip to connect to */
127    char *           host;     /* host part of user@host */
128    char *           passwd;
129    char *           spasswd;  /* Password to send. */
# Line 181 | Line 180 | struct CidrItem
180   #define CONF_OPERATOR           0x00000008
181   #define CONF_KLINE              0x00000010
182   #define CONF_CLASS              0x00000020
183 < #define CONF_LISTEN_PORT        0x00000040
184 < #define CONF_EXEMPTKLINE        0x00000080
185 < #define CONF_DLINE              0x00000100
186 < #define CONF_XLINE              0x00000200
187 < #define CONF_ULINE              0x00000400
188 < #define CONF_EXEMPTDLINE        0x00000800
190 < #define CONF_GLINE              0x00001000
191 < #define CONF_SERVICE            0x00002000
183 > #define CONF_DLINE              0x00000040
184 > #define CONF_XLINE              0x00000080
185 > #define CONF_ULINE              0x00000100
186 > #define CONF_EXEMPTDLINE        0x00000200
187 > #define CONF_GLINE              0x00000400
188 > #define CONF_SERVICE            0x00000800
189  
190   #define CONF_SERVER_MASK       CONF_SERVER
191   #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
# Line 204 | Line 201 | struct CidrItem
201   #define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
202   #define IsConfKill(x)           ((x)->status == CONF_KLINE)
203   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
207 – #define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
204   #define IsConfUline(x)          ((x)->status & CONF_ULINE)
205   #define IsConfXline(x)          ((x)->status & CONF_XLINE)
206   #define IsConfGline(x)          ((x)->status == CONF_GLINE)
# Line 285 | Line 281 | struct CidrItem
281                                   SHARED_RESV | SHARED_UNRESV |\
282                                   SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
283  
288 – /* gline acl entry actions */
289 – #define GDENY_BLOCK             0x1
290 – #define GDENY_REJECT            0x2
291 –
284   struct config_file_entry
285   {
286    const char *dpath;          /* DPATH if set from command line */
# Line 306 | Line 298 | struct config_file_entry
298    char *service_name;
299  
300    MessageFile motd;
309 –  MessageFile opermotd;
301    MessageFile linksfile;
302  
303    int gline_min_cidr;
# Line 344 | Line 335 | struct config_file_entry
335    int pace_wait;
336    int pace_wait_simple;
337    int gline_time;
338 <  int gline_logging;
338 >  int gline_request_time;
339    int oper_only_umodes;
340    int oper_umodes;
341    int max_targets;
# Line 366 | Line 357 | struct config_channel_entry
357   {
358    int disable_fake_channels;
359    int restrict_channels;
369 –  int disable_local_channels;
360    int use_except;
361    int use_invex;
362    int use_knock;
# Line 374 | Line 364 | struct config_channel_entry
364    int knock_delay_channel;
365    unsigned int max_bans;
366    unsigned int max_chans_per_user;
367 +  unsigned int max_chans_per_oper;
368    int no_create_on_split;
369    int no_join_on_split;
370    int quiet_on_ban;
380 –  int burst_topicwho;
371    int default_split_server_count;
372    int default_split_user_count;
373   };
# Line 390 | Line 380 | struct config_server_hide
380    int links_delay;
381    int links_disabled;
382    int hidden;
393 –  int disable_hidden;
383    int hide_server_ips;
384   };
385  
# Line 429 | Line 418 | struct logging_entry
418    unsigned int use_logging;
419   };
420  
432 – extern dlink_list gdeny_items;
421   extern dlink_list class_items;
422   extern dlink_list server_items;
423   extern dlink_list cluster_items;

Diff Legend

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