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 1005 by michael, Mon Aug 31 23:07:43 2009 UTC vs.
ircd-hybrid/include/s_conf.h (file contents), Revision 1028 by michael, Sun Nov 8 13:03:38 2009 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
# Line 91 | Line 90 | struct split_nuh_item
90  
91   struct ConfItem
92   {
93 +  dlink_node node;      /* link into known ConfItems of this type */
94 +
95    char *name;           /* Primary key */
96 <  pcre *regexpname;
96 <  dlink_node node;      /* link into known ConfItems of this type */
96 >  void *regexpname;
97    unsigned int flags;
98    ConfType type;
99   };
# Line 122 | Line 122 | struct AccessItem
122    unsigned int     status;   /* If CONF_ILLEGAL, delete when no clients */
123    unsigned int     flags;
124    unsigned int     modes;
125 +  unsigned int     port;
126    int              clients;  /* Number of *LOCAL* clients using this */
127    struct irc_ssaddr my_ipnum; /* ip to bind to for outgoing connect */
128    struct irc_ssaddr ipnum;      /* ip to connect to */
# Line 131 | Line 132 | struct AccessItem
132    char *           reason;
133    char *           oper_reason;
134    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 */
# Line 141 | Line 141 | struct AccessItem
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 160 | Line 162 | struct ClassItem
162    int cidr_bitlen_ipv4;
163    int cidr_bitlen_ipv6;
164    int number_per_cidr;
163 –  dlink_list list_ipv4;         /* base of per cidr ipv4 client link list */
164 –  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;
172 –  dlink_node node;
173   };
174  
175   #define ConFreq(x)      ((x)->con_freq)
# Line 427 | Line 427 | struct config_channel_entry
427  
428   struct config_server_hide
429   {
430 +  char *hidden_name;
431    int flatten_links;
432    int hide_servers;
432 –  char *hidden_name;
433    int links_delay;
434    int links_disabled;
435    int hidden;
# Line 439 | Line 439 | struct config_server_hide
439  
440   struct server_info
441   {
442 +  char *sid;
443    char *name;
444    char *description;
445    char *network_name;
# Line 450 | Line 451 | struct server_info
451    SSL_CTX *client_ctx;
452    unsigned int tls_version;
453   #endif
453 –  char *sid;
454    int hub;
455    struct irc_ssaddr ip;
456    struct irc_ssaddr ip6;
457 <  int max_clients;
457 >  unsigned int max_clients;
458    int specific_ipv4_vhost;
459    int specific_ipv6_vhost;
460    struct sockaddr_in dns_host;
# Line 481 | Line 481 | struct logging_entry
481    char failed_operlog[PATH_MAX + 1];
482   };
483  
484 + extern dlink_list gdeny_items;
485   extern dlink_list class_items;
486   extern dlink_list server_items;
487   extern dlink_list cluster_items;

Diff Legend

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