9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Missed some files in r520 commit.

Browse source
This commit is contained in:
Valery Yatsko 2008-04-05 21:20:48 +04:00
parent 0f6e881c65
commit 9ea3ea1085
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/hostmask.h
View file

@ -31,7 +31,7 @@ enum
{ {
HM_HOST, HM_HOST,
HM_IPV4 HM_IPV4
#ifdef IPV6 #ifdef RB_IPV6
, HM_IPV6 , HM_IPV6
#endif #endif
}; };
@ -64,7 +64,7 @@ struct ConfItem *find_dline(struct sockaddr *, int);
void report_Klines(struct Client *); void report_Klines(struct Client *);
void report_auth(struct Client *); void report_auth(struct Client *);
#ifdef IPV6 #ifdef RB_IPV6
int match_ipv6(struct sockaddr *, struct sockaddr *, int); int match_ipv6(struct sockaddr *, struct sockaddr *, int);
#endif #endif
int match_ipv4(struct sockaddr *, struct sockaddr *, int); int match_ipv4(struct sockaddr *, struct sockaddr *, int);

2
include/m_info.h
View file

@ -84,7 +84,7 @@ Info MyInformation[] = {
"Maximum Queue Length of Pending Connections"}, "Maximum Queue Length of Pending Connections"},
#endif /* SOMAXCONN */ #endif /* SOMAXCONN */
#ifdef IPV6 #ifdef RB_IPV6
{"IPV6", "ON", 0, "IPv6 Support"}, {"IPV6", "ON", 0, "IPv6 Support"},
#else #else
{"IPV6", "OFF", 0, "IPv6 Support"}, {"IPV6", "OFF", 0, "IPv6 Support"},

4
include/s_conf.h
View file

@ -271,11 +271,11 @@ struct server_info
char *network_desc; char *network_desc;
int hub; int hub;
struct sockaddr_in ip; struct sockaddr_in ip;
#ifdef IPV6 #ifdef RB_IPV6
struct sockaddr_in6 ip6; struct sockaddr_in6 ip6;
#endif #endif
int specific_ipv4_vhost; int specific_ipv4_vhost;
#ifdef IPV6 #ifdef RB_IPV6
int specific_ipv6_vhost; int specific_ipv6_vhost;
#endif #endif

2
modules/m_dline.c
View file

@ -154,7 +154,7 @@ mo_dline(struct Client *client_p, struct Client *source_p,
const char *creason; const char *creason;
int t = AF_INET, ty, b; int t = AF_INET, ty, b;
ty = parse_netmask(dlhost, (struct sockaddr *)&daddr, &b); ty = parse_netmask(dlhost, (struct sockaddr *)&daddr, &b);
#ifdef IPV6 #ifdef RB_IPV6
if(ty == HM_IPV6) if(ty == HM_IPV6)
t = AF_INET6; t = AF_INET6;
else else

16
src/listener.c
View file

@ -46,7 +46,7 @@
#define INADDR_NONE ((unsigned int) 0xffffffff) #define INADDR_NONE ((unsigned int) 0xffffffff)
#endif #endif
#if defined(NO_IN6ADDR_ANY) && defined(IPV6) #if defined(NO_IN6ADDR_ANY) && defined(RB_IPV6)
static const struct in6_addr in6addr_any = static const struct in6_addr in6addr_any =
{ { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }; { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
#endif #endif
@ -112,7 +112,7 @@ get_listener_name(const listener_t *listener)
if(listener == NULL) if(listener == NULL)
return NULL; return NULL;
#ifdef IPV6 #ifdef RB_IPV6
if(listener->addr.ss_family == AF_INET6) if(listener->addr.ss_family == AF_INET6)
port = ntohs(((const struct sockaddr_in6 *)&listener->addr)->sin6_port); port = ntohs(((const struct sockaddr_in6 *)&listener->addr)->sin6_port);
else else
@ -138,7 +138,7 @@ show_ports(struct Client *source_p)
{ {
sendto_one_numeric(source_p, RPL_STATSPLINE, sendto_one_numeric(source_p, RPL_STATSPLINE,
form_str(RPL_STATSPLINE), 'P', form_str(RPL_STATSPLINE), 'P',
#ifdef IPV6 #ifdef RB_IPV6
ntohs(listener->addr.ss_family == AF_INET ? ((struct sockaddr_in *)&listener->addr)->sin_port : ntohs(listener->addr.ss_family == AF_INET ? ((struct sockaddr_in *)&listener->addr)->sin_port :
((struct sockaddr_in6 *)&listener->addr)->sin6_port), ((struct sockaddr_in6 *)&listener->addr)->sin6_port),
#else #else
@ -175,7 +175,7 @@ inetport(listener_t *listener)
F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket"); F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket");
#ifdef IPV6 #ifdef RB_IPV6
if(listener->addr.ss_family == AF_INET6) if(listener->addr.ss_family == AF_INET6)
{ {
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr; struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr;
@ -270,7 +270,7 @@ find_listener(struct rb_sockaddr_storage *addr)
} }
break; break;
} }
#ifdef IPV6 #ifdef RB_IPV6
case AF_INET6: case AF_INET6:
{ {
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr; struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;
@ -323,7 +323,7 @@ add_listener(int port, const char *vhost_ip, int family)
if(inetpton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0) if(inetpton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
return; return;
} }
#ifdef IPV6 #ifdef RB_IPV6
else else
{ {
if(inetpton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0) if(inetpton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
@ -338,7 +338,7 @@ add_listener(int port, const char *vhost_ip, int family)
case AF_INET: case AF_INET:
((struct sockaddr_in *)&vaddr)->sin_addr.s_addr = INADDR_ANY; ((struct sockaddr_in *)&vaddr)->sin_addr.s_addr = INADDR_ANY;
break; break;
#ifdef IPV6 #ifdef RB_IPV6
case AF_INET6: case AF_INET6:
memcpy(&((struct sockaddr_in6 *)&vaddr)->sin6_addr, &in6addr_any, sizeof(struct in6_addr)); memcpy(&((struct sockaddr_in6 *)&vaddr)->sin6_addr, &in6addr_any, sizeof(struct in6_addr));
break; break;
@ -353,7 +353,7 @@ add_listener(int port, const char *vhost_ip, int family)
SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in)); SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in));
((struct sockaddr_in *)&vaddr)->sin_port = htons(port); ((struct sockaddr_in *)&vaddr)->sin_port = htons(port);
break; break;
#ifdef IPV6 #ifdef RB_IPV6
case AF_INET6: case AF_INET6:
SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in6)); SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in6));
((struct sockaddr_in6 *)&vaddr)->sin6_port = htons(port); ((struct sockaddr_in6 *)&vaddr)->sin6_port = htons(port);