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-7.2/include/s_conf.h (file contents), Revision 967 by michael, Sun Aug 2 18:05:28 2009 UTC vs.
ircd-hybrid-8/include/s_conf.h (file contents), Revision 1176 by michael, Sun Aug 14 11:24:24 2011 UTC

# Line 33 | Line 33
33   #include "motd.h"               /* MessageFile */
34   #include "client.h"
35   #include "hook.h"
36 – #include "pcre.h"
36  
37  
38   #define CONF_SERVER_INFO_TLS_VERSION_SSLV3 0x1
39   #define CONF_SERVER_INFO_TLS_VERSION_TLSV1 0x2
40  
41   struct Client;
43 – struct DNSReply;
44 – struct hostent;
42  
43   extern struct Callback *client_check_cb;
44  
# Line 74 | Line 71 | typedef enum
71    GLINE_TYPE,
72    CRESV_TYPE,    
73    NRESV_TYPE,
74 <  GDENY_TYPE
74 >  GDENY_TYPE,
75 >  SERVICE_TYPE
76   } ConfType;
77  
78   struct split_nuh_item
# Line 93 | Line 91 | struct split_nuh_item
91  
92   struct ConfItem
93   {
94 +  dlink_node node;      /* link into known ConfItems of this type */
95 +
96    char *name;           /* Primary key */
97 <  pcre *regexpname;
98 <  dlink_node node;      /* link into known ConfItems of this type */
97 >  void *regexpname;
98    unsigned int flags;
99    ConfType type;
100   };
# Line 119 | Line 118 | struct MatchItem
118   struct AccessItem
119   {
120    dlink_node node;
121 +  unsigned int     dns_failed;
122 +  unsigned int     dns_pending;
123    unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
124    unsigned int     flags;
125    unsigned int     modes;
126 +  unsigned int     port;
127    int              clients;  /* Number of *LOCAL* clients using this */
128    struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
129    struct irc_ssaddr ipnum;      /* ip to connect to */
# Line 131 | Line 133 | struct AccessItem
133    char *           reason;
134    char *           oper_reason;
135    char *           user;     /* user part of user@host */
134 –  int              port;
135 –  char *           fakename;   /* Mask name */
136    time_t           hold;     /* Hold action until this time (calendar time) */
137    struct ConfItem *class_ptr;  /* Class of connection */
138 –  struct DNSQuery* dns_query;
138    int              aftype;
139   #ifdef HAVE_LIBCRYPTO
140    char *           rsa_public_key_file;
141    RSA *            rsa_public_key;
142    struct EncCapability *cipher_preference;
143   #endif
144 <  pcre *regexuser;
145 <  pcre *regexhost;
144 >  void *regexuser;
145 >  void *regexhost;
146   };
147  
148   struct ClassItem
149   {
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    int con_freq;
154    int ping_freq;
# Line 161 | Line 162 | struct ClassItem
162    int cidr_bitlen_ipv4;
163    int cidr_bitlen_ipv6;
164    int number_per_cidr;
164 –  dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
165 –  dlink_list list_ipv6;         /* base of per cidr ipv6 client link list */
165    int active;
166   };
167  
168   struct CidrItem
169   {
170 +  dlink_node node;
171    struct irc_ssaddr mask;
172    int number_on_this_cidr;
173 –  dlink_node node;
173   };
174  
175   #define ConFreq(x)      ((x)->con_freq)
# Line 208 | Line 207 | struct CidrItem
207   #define CONF_ULINE              0x00002000
208   #define CONF_EXEMPTDLINE        0x00004000
209   #define CONF_GLINE              0x00008000
210 + #define CONF_SERVICE            0x00010000
211  
212   #define CONF_SERVER_MASK       CONF_SERVER
213   #define CONF_CLIENT_MASK       (CONF_CLIENT | CONF_OPERATOR | CONF_SERVER_MASK)
# Line 245 | Line 245 | struct CidrItem
245   #define CONF_FLAGS_NOMATCH_IP           0x00000020
246   #define CONF_FLAGS_EXEMPTKLINE          0x00000040
247   #define CONF_FLAGS_NOLIMIT              0x00000080
248 < #define CONF_FLAGS_IDLE_LINED           0x00000100
248 > /*                                      0x00000100 */
249   #define CONF_FLAGS_SPOOF_IP             0x00000200
250   #define CONF_FLAGS_SPOOF_NOTICE         0x00000400
251   #define CONF_FLAGS_REDIR                0x00000800
252   #define CONF_FLAGS_EXEMPTGLINE          0x00001000
253 < #define CONF_FLAGS_RESTRICTED           0x00002000
253 > /*                                      0x00002000 */
254   #define CONF_FLAGS_CAN_FLOOD            0x00100000
255   #define CONF_FLAGS_NEED_PASSWORD        0x00200000
256   /* server flags */
257   #define CONF_FLAGS_ALLOW_AUTO_CONN      0x00004000
258 < #define CONF_FLAGS_LAZY_LINK            0x00008000
258 > /*                                      0x00008000 */
259   #define CONF_FLAGS_ENCRYPTED            0x00010000
260   #define CONF_FLAGS_COMPRESSED           0x00020000
261   #define CONF_FLAGS_TEMPORARY            0x00040000
# Line 275 | Line 275 | struct CidrItem
275   #define IsConfExemptLimits(x)   ((x)->flags & CONF_FLAGS_NOLIMIT)
276   #define IsConfExemptGline(x)    ((x)->flags & CONF_FLAGS_EXEMPTGLINE)
277   #define IsConfExemptResv(x)     ((x)->flags & CONF_FLAGS_EXEMPTRESV)
278 – #define IsConfIdlelined(x)      ((x)->flags & CONF_FLAGS_IDLE_LINED)
278   #define IsConfDoIdentd(x)       ((x)->flags & CONF_FLAGS_DO_IDENTD)
279   #define IsConfDoSpoofIp(x)      ((x)->flags & CONF_FLAGS_SPOOF_IP)
280   #define IsConfSpoofNotice(x)    ((x)->flags & CONF_FLAGS_SPOOF_NOTICE)
282 – #define IsConfRestricted(x)     ((x)->flags & CONF_FLAGS_RESTRICTED)
281   #define IsConfEncrypted(x)      ((x)->flags & CONF_FLAGS_ENCRYPTED)
282   #define SetConfEncrypted(x)     ((x)->flags |= CONF_FLAGS_ENCRYPTED)
283   #define ClearConfEncrypted(x)   ((x)->flags &= ~CONF_FLAGS_ENCRYPTED)
# Line 342 | Line 340 | struct config_file_entry
340  
341    char *servlink_path;
342    char *egdpool_path;
343 +  char *service_name;
344  
345    MessageFile motd;
346    MessageFile opermotd;
# Line 350 | Line 349 | struct config_file_entry
349    unsigned char compression_level;
350    int gline_min_cidr;
351    int gline_min_cidr6;
353 –  int dot_in_ip6_addr;
352    int dots_in_ident;
353    int failed_oper_notice;
354    int anti_spam_exit_message_time;
# Line 385 | Line 383 | struct config_file_entry
383    int pace_wait_simple;
384    int gline_time;
385    int gline_logging;
388 –  int idletime;
386    int oper_only_umodes;
387    int oper_umodes;
388    int max_targets;
# Line 428 | Line 425 | struct config_channel_entry
425  
426   struct config_server_hide
427   {
428 +  char *hidden_name;
429    int flatten_links;
430    int hide_servers;
433 –  char *hidden_name;
431    int links_delay;
432    int links_disabled;
433    int hidden;
# Line 440 | Line 437 | struct config_server_hide
437  
438   struct server_info
439   {
440 +  char *sid;
441    char *name;
442    char *description;
443    char *network_name;
# Line 451 | Line 449 | struct server_info
449    SSL_CTX *client_ctx;
450    unsigned int tls_version;
451   #endif
454 –  char *sid;
452    int hub;
453    struct irc_ssaddr ip;
454    struct irc_ssaddr ip6;
455 <  int max_clients;
455 >  unsigned int max_clients;
456    int specific_ipv4_vhost;
457    int specific_ipv6_vhost;
458    struct sockaddr_in dns_host;
# Line 482 | Line 479 | struct logging_entry
479    char failed_operlog[PATH_MAX + 1];
480   };
481  
482 < extern int ypass;
482 > extern dlink_list gdeny_items;
483   extern dlink_list class_items;
484   extern dlink_list server_items;
485   extern dlink_list cluster_items;
# Line 490 | Line 487 | extern dlink_list hub_items;
487   extern dlink_list rxconf_items;
488   extern dlink_list rkconf_items;
489   extern dlink_list leaf_items;
490 + extern dlink_list service_items;
491   extern dlink_list temporary_klines;
492   extern dlink_list temporary_dlines;
493   extern dlink_list temporary_glines;
# Line 548 | Line 546 | extern const char *get_conf_name(ConfTyp
546   extern int rehash(int);
547   extern int conf_add_server(struct ConfItem *, const char *);
548   extern void conf_add_class_to_conf(struct ConfItem *, const char *);
551 – extern void conf_add_d_conf(struct AccessItem *);
549  
550   /* XXX consider moving these into csvlib.h */
551   extern void parse_csv_file(FBFILE *, ConfType);
# Line 567 | Line 564 | extern int valid_comment(struct Client *
564  
565   #define TK_SECONDS 0
566   #define TK_MINUTES 1
567 < extern time_t valid_tkline(char *, int);
567 > extern time_t valid_tkline(const char *, int);
568   extern int match_conf_password(const char *, const struct AccessItem *);
569  
570   #define NOT_AUTHORIZED    (-1)

Diff Legend

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