vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove RB_IPV6

Browse source
This commit is contained in:
Simon Arlott 2017-08-18 13:03:59 +01:00
parent f21ef0cebc
commit de2934965c
No known key found for this signature in database
GPG key ID: C8975F2043CA5D24
34 changed files with 15 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/m_dline.c
View file

@ -222,11 +222,9 @@ apply_dline(struct Client *source_p, const char *dlhost, int tdline_time, char *
sendto_one(source_p, ":%s NOTICE %s :Invalid D-Line", me.name, source_p->name);
return;
}
#ifdef RB_IPV6
if(ty == HM_IPV6)
t = AF_INET6;
else
#endif
t = AF_INET;
/* This means dlines wider than /16 cannot be set remotely */

4
modules/m_etrace.c
View file

@ -107,12 +107,10 @@ mo_etrace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
{
if(!irccmp(parv[1], "-full"))
do_etrace_full(source_p);
#ifdef RB_IPV6
else if(!irccmp(parv[1], "-v6"))
do_etrace(source_p, 0, 1);
else if(!irccmp(parv[1], "-v4"))
do_etrace(source_p, 1, 0);
#endif
else
{
struct Client *target_p = find_named_person(parv[1]);
@ -163,11 +161,9 @@ do_etrace(struct Client *source_p, int ipv4, int ipv6)
{
target_p = ptr->data;
#ifdef RB_IPV6
if((!ipv4 && GET_SS_FAMILY(&target_p->localClient->ip) == AF_INET) ||
(!ipv6 && GET_SS_FAMILY(&target_p->localClient->ip) == AF_INET6))
continue;
#endif
sendto_one(source_p, form_str(RPL_ETRACE),
me.name, source_p->name,

2
modules/m_kline.c
View file

@ -715,11 +715,9 @@ already_placed_kline(struct Client *source_p, const char *luser, const char *lho
bits = 0;
if((t = parse_netmask(lhost, &iphost, &bits)) != HM_HOST)
{
#ifdef RB_IPV6
if(t == HM_IPV6)
t = AF_INET6;
else
#endif
t = AF_INET;
piphost = &iphost;

4
modules/m_testline.c
View file

@ -123,11 +123,9 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
/* parses as an IP, check for a dline */
if((type = parse_netmask(host, &ip, &host_mask)) != HM_HOST)
{
#ifdef RB_IPV6
if(type == HM_IPV6)
aconf = find_dline((struct sockaddr *)&ip, AF_INET6);
else
#endif
aconf = find_dline((struct sockaddr *)&ip, AF_INET);
if(aconf && aconf->status & CONF_DLINE)
@ -175,9 +173,7 @@ mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
if((aconf = find_address_conf(host, NULL, user_trunc, notildeuser_trunc,
(type != HM_HOST) ? (struct sockaddr *)&ip : NULL,
(type != HM_HOST) ? (
#ifdef RB_IPV6
(type == HM_IPV6) ? AF_INET6 :
#endif
AF_INET) : 0, NULL)))
{
static char buf[HOSTLEN+USERLEN+2];

2
modules/m_version.c
View file

@ -140,9 +140,7 @@ confopts(void)
*p++ = 'Z';
#endif
#ifdef RB_IPV6
*p++ = '6';
#endif
*p = '\0';

4
modules/m_whois.c
View file

@ -233,9 +233,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
int tlen;
hook_data_client hdata;
int extra_space = 0;
#ifdef RB_IPV6
struct sockaddr_in ip4;
#endif
if(target_p->user == NULL)
{
@ -364,7 +362,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
form_str(RPL_WHOISACTUALLY),
target_p->name, target_p->sockhost);
#ifdef RB_IPV6
if (GET_SS_FAMILY(&target_p->localClient->ip) == AF_INET6 &&
(show_ip(source_p, target_p) ||
(source_p == target_p && !IsIPSpoof(target_p))) &&
@ -376,7 +373,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
"%s :Underlying IPv4 is %s",
target_p->name, buf);
}
#endif /* RB_IPV6 */
sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
target_p->name,