* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: hostmask.h 2757 2006-11-10 22:58:15Z jilles $
*/
#ifndef INCLUDE_hostmask_h
enum
{
HM_HOST,
- HM_IPV4
-#ifdef IPV6
- , HM_IPV6
-#endif
+ HM_IPV4,
+ HM_IPV6,
};
-int parse_netmask(const char *, struct sockaddr *, int *);
+int parse_netmask(const char *, struct rb_sockaddr_storage *, int *);
struct ConfItem *find_conf_by_address(const char *host, const char *sockhost,
const char *orighost, struct sockaddr *,
- int, int, const char *);
-void add_conf_by_address(const char *, int, const char *, struct ConfItem *);
+ int, int, const char *, const char *);
+struct ConfItem *find_exact_conf_by_address(const char *address, int type,
+ const char *username);
+void add_conf_by_address(const char *, int, const char *, const char *, struct ConfItem *);
void delete_one_address_conf(const char *, struct ConfItem *);
void clear_out_address_conf(void);
void clear_out_address_conf_bans(void);
void init_host_hash(void);
-struct ConfItem *find_address_conf(const char *host, const char *sockhost,
+struct ConfItem *find_address_conf(const char *host, const char *sockhost,
const char *, const char *, struct sockaddr *,
- int);
+ int, char *);
struct ConfItem *find_dline(struct sockaddr *, int);
#define find_kline(x) (find_conf_by_address((x)->host, (x)->sockhost, \
(x)->orighost, \
(struct sockaddr *)&(x)->localClient->ip, CONF_KILL,\
- (x)->localClient->ip.ss_family, (x)->username))
-#define find_gline(x) (find_conf_by_address((x)->host, (x)->sockhost, \
- (x)->orighost, \
- (struct sockaddr *)&(x)->localClient->ip, CONF_GLINE,\
- (x)->localClient->ip.ss_family, (x)->username))
+ GET_SS_FAMILY(&(x)->localClient->ip), (x)->username, NULL))
-void report_Klines(struct Client *);
void report_auth(struct Client *);
-#ifdef IPV6
int match_ipv6(struct sockaddr *, struct sockaddr *, int);
-#endif
int match_ipv4(struct sockaddr *, struct sockaddr *, int);
/* Hashtable stuff... */
struct
{
/* Pointer into ConfItem... -A1kmm */
- struct irc_sockaddr_storage addr;
+ struct rb_sockaddr_storage addr;
int bits;
}
ipa;
/* Only checked if !(type & 1)... */
const char *username;
+ /* Only checked if type == CONF_CLIENT */
+ const char *auth_user;
struct ConfItem *aconf;
/* The next record in this hash bucket. */