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 1377 by michael, Mon Apr 30 19:35:16 2012 UTC vs.
Revision 1432 by michael, Sat Jun 9 19:40:08 2012 UTC

# Line 123 | Line 123 | struct AccessItem
123    int              clients;  /* Number of *LOCAL* clients using this */
124    int              bits;
125    int              type;
126 <  struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
127 <  struct irc_ssaddr ipnum;      /* ip to connect to */
126 >  struct irc_ssaddr bind;  /* ip to bind to for outgoing connect */
127 >  struct irc_ssaddr addr;  /* ip to connect to */
128    char *           host;     /* host part of user@host */
129    char *           passwd;
130    char *           spasswd;  /* Password to send. */
# Line 142 | Line 142 | struct AccessItem
142   #endif
143    void *regexuser;
144    void *regexhost;
145 +  dlink_list leaf_list;
146 +  dlink_list hub_list;
147   };
148  
149   struct ClassItem
# Line 179 | Line 181 | struct CidrItem
181   #define CONF_OPERATOR           0x00000008
182   #define CONF_KLINE              0x00000010
183   #define CONF_CLASS              0x00000020
184 < #define CONF_LEAF               0x00000040
185 < #define CONF_LISTEN_PORT        0x00000080
186 < #define CONF_HUB                0x00000100
187 < #define CONF_EXEMPTKLINE        0x00000200
188 < #define CONF_NOLIMIT            0x00000400
189 < #define CONF_DLINE              0x00000800
188 < #define CONF_XLINE              0x00001000
189 < #define CONF_ULINE              0x00002000
190 < #define CONF_EXEMPTDLINE        0x00004000
191 < #define CONF_GLINE              0x00008000
192 < #define CONF_SERVICE            0x00010000
184 > #define CONF_DLINE              0x00000040
185 > #define CONF_XLINE              0x00000080
186 > #define CONF_ULINE              0x00000100
187 > #define CONF_EXEMPTDLINE        0x00000200
188 > #define CONF_GLINE              0x00000400
189 > #define CONF_SERVICE            0x00000800
190  
191   #define CONF_SERVER_MASK       CONF_SERVER
192   #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
# Line 203 | Line 200 | struct CidrItem
200   #define IsConfServer(x)         ((x)->status == CONF_SERVER)
201   #define SetConfServer(x)        ((x)->status = CONF_SERVER)
202   #define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
206 – #define IsConfHub(x)            ((x)->status == CONF_HUB)
207 – #define SetConfHub(x)           ((x)->status = CONF_HUB)
208 – #define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
209 – #define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
210 – #define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
203   #define IsConfKill(x)           ((x)->status == CONF_KLINE)
204   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
213 – #define IsConfTypeOfClient(x)   ((x)->status & CONF_CLIENT_MASK)
205   #define IsConfUline(x)          ((x)->status & CONF_ULINE)
206   #define IsConfXline(x)          ((x)->status & CONF_XLINE)
207   #define IsConfGline(x)          ((x)->status == CONF_GLINE)
# Line 308 | Line 299 | struct config_file_entry
299    const char *cresvfile;
300    const char *nresvfile;
301  
311 –  char *logpath;
312 –  char *operlog;
302    char *egdpool_path;
303    char *service_name;
304  
# Line 382 | Line 371 | struct config_channel_entry
371    int knock_delay_channel;
372    unsigned int max_bans;
373    unsigned int max_chans_per_user;
374 +  unsigned int max_chans_per_oper;
375    int no_create_on_split;
376    int no_join_on_split;
377    int quiet_on_ban;
388 –  int burst_topicwho;
378    int default_split_server_count;
379    int default_split_user_count;
380   };

Diff Legend

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