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 1329 by michael, Sun Apr 1 12:02:12 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 142 | Line 141 | struct AccessItem
141   #endif
142    void *regexuser;
143    void *regexhost;
144 +  dlink_list leaf_list;
145 +  dlink_list hub_list;
146   };
147  
148   struct ClassItem
# Line 171 | Line 172 | struct CidrItem
172    int number_on_this_cidr;
173   };
174  
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 –
175  
176   #define CONF_ILLEGAL            0x80000000
177   #define CONF_RESERVED           0x00000001
178   #define CONF_CLIENT             0x00000002
179   #define CONF_SERVER             0x00000004
180   #define CONF_OPERATOR           0x00000008
181 < #define CONF_KILL               0x00000010
197 < #define CONF_KLINE              CONF_KILL
181 > #define CONF_KLINE              0x00000010
182   #define CONF_CLASS              0x00000020
183 < #define CONF_LEAF               0x00000040
184 < #define CONF_LISTEN_PORT        0x00000080
185 < #define CONF_HUB                0x00000100
186 < #define CONF_EXEMPTKLINE        0x00000200
187 < #define CONF_NOLIMIT            0x00000400
188 < #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
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 220 | Line 199 | struct CidrItem
199   #define IsConfServer(x)         ((x)->status == CONF_SERVER)
200   #define SetConfServer(x)        ((x)->status = CONF_SERVER)
201   #define IsConfOperator(x)       ((x)->status & CONF_OPERATOR)
202 < #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)
202 > #define IsConfKill(x)           ((x)->status == CONF_KLINE)
203   #define IsConfClient(x)         ((x)->status & CONF_CLIENT)
230 – #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 240 | Line 213 | struct CidrItem
213   #define CONF_FLAGS_LIMIT_IP             0x00000002
214   #define CONF_FLAGS_NO_TILDE             0x00000004
215   #define CONF_FLAGS_NEED_IDENTD          0x00000008
216 < /*                                      0x00000010 */
217 < #define CONF_FLAGS_NOMATCH_IP           0x00000020
218 < #define CONF_FLAGS_EXEMPTKLINE          0x00000040
219 < #define CONF_FLAGS_NOLIMIT              0x00000080
220 < /*                                      0x00000100 */
221 < #define CONF_FLAGS_SPOOF_IP             0x00000200
222 < #define CONF_FLAGS_SPOOF_NOTICE         0x00000400
223 < #define CONF_FLAGS_REDIR                0x00000800
224 < #define CONF_FLAGS_EXEMPTGLINE          0x00001000
252 < /*                                      0x00002000 */
253 < #define CONF_FLAGS_CAN_FLOOD            0x00100000
254 < #define CONF_FLAGS_NEED_PASSWORD        0x00200000
216 > #define CONF_FLAGS_NOMATCH_IP           0x00000010
217 > #define CONF_FLAGS_EXEMPTKLINE          0x00000020
218 > #define CONF_FLAGS_NOLIMIT              0x00000040
219 > #define CONF_FLAGS_SPOOF_IP             0x00000080
220 > #define CONF_FLAGS_SPOOF_NOTICE         0x00000100
221 > #define CONF_FLAGS_REDIR                0x00000200
222 > #define CONF_FLAGS_EXEMPTGLINE          0x00000400
223 > #define CONF_FLAGS_CAN_FLOOD            0x00000800
224 > #define CONF_FLAGS_NEED_PASSWORD        0x00001000
225   /* server flags */
226 < #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
227 < /*                                      0x00008000 */
228 < #define CONF_FLAGS_ENCRYPTED            0x00010000
229 < #define CONF_FLAGS_UNUSED1___           0x00020000
230 < #define CONF_FLAGS_TEMPORARY            0x00040000
231 < #define CONF_FLAGS_UNUSED2___           0x00080000
232 < #define CONF_FLAGS_BURST_AWAY           0x00400000
263 < #define CONF_FLAGS_EXEMPTRESV           0x00800000
264 < #define CONF_FLAGS_TOPICBURST           0x01000000
265 < #define CONF_FLAGS_SSL                  0x02000000
226 > #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00002000
227 > #define CONF_FLAGS_ENCRYPTED            0x00004000
228 > #define CONF_FLAGS_TEMPORARY            0x00008000
229 > #define CONF_FLAGS_BURST_AWAY           0x00010000
230 > #define CONF_FLAGS_EXEMPTRESV           0x00020000
231 > #define CONF_FLAGS_TOPICBURST           0x00040000
232 > #define CONF_FLAGS_SSL                  0x00080000
233  
234   /* Macros for struct AccessItem */
235   #define IsLimitIp(x)            ((x)->flags & CONF_FLAGS_LIMIT_IP)
# Line 314 | Line 281 | struct CidrItem
281                                   SHARED_RESV | SHARED_UNRESV |\
282                                   SHARED_LOCOPS | SHARED_DLINE | SHARED_UNDLINE)
283  
317 – /* gline acl entry actions */
318 – #define GDENY_BLOCK             0x1
319 – #define GDENY_REJECT            0x2
320 –
284   struct config_file_entry
285   {
286    const char *dpath;          /* DPATH if set from command line */
# Line 331 | Line 294 | struct config_file_entry
294    const char *cresvfile;
295    const char *nresvfile;
296  
334 –  char *logpath;
335 –  char *operlog;
297    char *egdpool_path;
298    char *service_name;
299  
300    MessageFile motd;
340 –  MessageFile opermotd;
301    MessageFile linksfile;
302  
303    int gline_min_cidr;
# Line 375 | 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 397 | Line 357 | struct config_channel_entry
357   {
358    int disable_fake_channels;
359    int restrict_channels;
400 –  int disable_local_channels;
360    int use_except;
361    int use_invex;
362    int use_knock;
# Line 405 | 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;
411 –  int burst_topicwho;
371    int default_split_server_count;
372    int default_split_user_count;
373   };
# Line 421 | Line 380 | struct config_server_hide
380    int links_delay;
381    int links_disabled;
382    int hidden;
424 –  int disable_hidden;
383    int hide_server_ips;
384   };
385  
# Line 460 | Line 418 | struct logging_entry
418    unsigned int use_logging;
419   };
420  
463 – extern dlink_list gdeny_items;
421   extern dlink_list class_items;
422   extern dlink_list server_items;
423   extern dlink_list cluster_items;
# Line 469 | Line 426 | extern dlink_list rxconf_items;
426   extern dlink_list rkconf_items;
427   extern dlink_list leaf_items;
428   extern dlink_list service_items;
472 – extern dlink_list temporary_klines;
473 – extern dlink_list temporary_dlines;
474 – extern dlink_list temporary_glines;
429   extern dlink_list temporary_xlines;
476 – extern dlink_list temporary_rxlines;
477 – extern dlink_list temporary_rklines;
430   extern struct logging_entry ConfigLoggingEntry;
431   extern struct config_file_entry ConfigFileEntry;/* defined in ircd.c*/
432   extern struct config_channel_entry ConfigChannel;/* defined in channel.c*/
# Line 513 | Line 465 | extern struct ConfItem *find_matching_na
465   extern struct ConfItem *find_exact_name_conf(ConfType, const struct Client *, const char *,
466                                               const char *, const char *);
467   extern void delete_conf_item(struct ConfItem *);
468 < extern void report_confitem_types(struct Client *, ConfType, int);
468 > extern void report_confitem_types(struct Client *, ConfType);
469   extern void yyerror(const char *);
518 – extern int conf_yy_fatal_error(const char *);
519 – extern int conf_fbgets(char *, unsigned int, FILE *);
470   extern void write_conf_line(struct Client *, struct ConfItem *,
471                              const char *, time_t);
472   extern int remove_conf_line(ConfType, struct Client *, const char *,
# Line 530 | Line 480 | extern void conf_add_class_to_conf(struc
480  
481   /* XXX consider moving these into csvlib.h */
482   extern void parse_csv_file(FILE *, ConfType);
483 <
484 < extern char *get_oper_name(const struct Client *);
483 > extern int find_and_delete_temporary(const char *, const char *, int);
484 > extern const char *get_oper_name(const struct Client *);
485  
486   extern void *map_to_conf(struct ConfItem *);
487   extern struct ConfItem *unmap_conf_item(void *);

Diff Legend

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