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 1335 by michael, Sun Apr 1 16:40:35 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 171 | Line 173 | struct CidrItem
173    int number_on_this_cidr;
174   };
175  
174 – #define ConFreq(x)      ((x)->con_freq)
175 – #define PingFreq(x)     ((x)->ping_freq)
176 – #define PingWarning(x)  ((x)->ping_warning)
177 – #define MaxTotal(x)     ((x)->max_total)
178 – #define MaxGlobal(x)    ((x)->max_global)
179 – #define MaxLocal(x)     ((x)->max_local)
180 – #define MaxIdent(x)     ((x)->max_ident)
181 – #define MaxPerIp(x)     ((x)->max_perip)
182 – #define MaxSendq(x)     ((x)->max_sendq)
183 – #define CurrUserCount(x) ((x)->curr_user_count)
184 – #define CidrBitlenIPV4(x)       ((x)->cidr_bitlen_ipv4)
185 – #define CidrBitlenIPV6(x)       ((x)->cidr_bitlen_ipv6)
186 – #define NumberPerCidr(x) ((x)->number_per_cidr)
187 –
188 – #define ClassPtr(x)      ((x)->class_ptr)
189 –
176  
177   #define CONF_ILLEGAL            0x80000000
178   #define CONF_RESERVED           0x00000001
179   #define CONF_CLIENT             0x00000002
180   #define CONF_SERVER             0x00000004
181   #define CONF_OPERATOR           0x00000008
182 < #define CONF_KILL               0x00000010
197 < #define CONF_KLINE              CONF_KILL
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
205 < #define CONF_XLINE              0x00001000
206 < #define CONF_ULINE              0x00002000
207 < #define CONF_EXEMPTDLINE        0x00004000
208 < #define CONF_GLINE              0x00008000
209 < #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 220 | 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)
203 < #define IsConfHub(x)            ((x)->status == CONF_HUB)
224 < #define SetConfHub(x)           ((x)->status = CONF_HUB)
225 < #define IsConfLeaf(x)           ((x)->status == CONF_LEAF)
226 < #define SetConfLeaf(x)          ((x)->status = CONF_LEAF)
227 < #define IsConfHubOrLeaf(x)      ((x)->status & (CONF_HUB|CONF_LEAF))
228 < #define IsConfKill(x)           ((x)->status == CONF_KILL)
203 > #define IsConfKill(x)           ((x)->status == CONF_KLINE)
204   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
230 – #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 325 | Line 299 | struct config_file_entry
299    const char *cresvfile;
300    const char *nresvfile;
301  
328 –  char *logpath;
329 –  char *operlog;
302    char *egdpool_path;
303    char *service_name;
304  
# Line 399 | 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;
405 –  int burst_topicwho;
378    int default_split_server_count;
379    int default_split_user_count;
380   };
# Line 463 | Line 435 | extern dlink_list rxconf_items;
435   extern dlink_list rkconf_items;
436   extern dlink_list leaf_items;
437   extern dlink_list service_items;
466 – extern dlink_list temporary_klines;
467 – extern dlink_list temporary_dlines;
468 – extern dlink_list temporary_glines;
438   extern dlink_list temporary_xlines;
470 – extern dlink_list temporary_rxlines;
471 – extern dlink_list temporary_rklines;
439   extern struct logging_entry ConfigLoggingEntry;
440   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
441   extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
# Line 507 | Line 474 | extern struct ConfItem *find_matching_na
474   extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
475                                               const char *, const char *);
476   extern void delete_conf_item(struct ConfItem *);
477 < extern void report_confitem_types(struct Client *, ConfType, int);
477 > extern void report_confitem_types(struct Client *, ConfType);
478   extern void yyerror(const char *);
512 – extern int conf_yy_fatal_error(const char *);
513 – extern int conf_fbgets(char *, unsigned int, FILE *);
479   extern void write_conf_line(struct Client *, struct ConfItem *,
480                              const char *, time_t);
481   extern int remove_conf_line(ConfType, struct Client *, const char *,
# Line 524 | Line 489 | extern void conf_add_class_to_conf(struc
489  
490   /* XXX consider moving these into csvlib.h */
491   extern void parse_csv_file(FILE *, ConfType);
492 <
493 < extern char *get_oper_name(const struct Client *);
492 > extern int find_and_delete_temporary(const char *, const char *, int);
493 > extern const char *get_oper_name(const struct Client *);
494  
495   extern void *map_to_conf(struct ConfItem *);
496   extern struct ConfItem *unmap_conf_item(void *);

Diff Legend

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