Log message:
Discovered while trying to compile-check the events branch on Solaris: on
some systems, s_addr is a *macro*. It combines poorly with structures that
use that as an element name.
(pull-up from u2_10_11_alpha_events)
git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@460
c9e4aea6-c8fd-4c43-8297-
357d70d61c8c
+2001-05-21 Kevin L. Mitchell <klmitch@mit.edu>
+
+ * ircd/s_conf.c: change "s_addr" element accesses to "address"
+ element accesses
+
+ * include/s_conf.h: on some systems, "s_addr" is a macro; use
+ "address" instead
+
2001-05-07 Kevin L. Mitchell <klmitch@mit.edu>
* ircd/m_settime.c: include ircd_snprintf.h
2001-05-07 Kevin L. Mitchell <klmitch@mit.edu>
* ircd/m_settime.c: include ircd_snprintf.h
char* hostmask;
char* message;
char* usermask;
char* hostmask;
char* message;
char* usermask;
unsigned int flags;
char bits; /* Number of bits for ipkills */
};
unsigned int flags;
char bits; /* Number of bits for ipkills */
};
/*
* This ensures endian correctness
*/
/*
* This ensures endian correctness
*/
- conf->s_addr = inet_addr(ipname);
+ conf->address = inet_addr(ipname);
Debug((DEBUG_DEBUG, "IPkill: %s = %08x/%i (%08x)", ipname,
Debug((DEBUG_DEBUG, "IPkill: %s = %08x/%i (%08x)", ipname,
- conf->s_addr, conf->bits, NETMASK(conf->bits)));
+ conf->address, conf->bits, NETMASK(conf->bits)));
conf->flags |= DENY_FLAGS_IP;
}
conf->next = denyConfList;
conf->flags |= DENY_FLAGS_IP;
}
conf->next = denyConfList;
break;
} else if (deny->flags & DENY_FLAGS_IP) { /* k: by IP */
Debug((DEBUG_DEBUG, "ip: %08x network: %08x/%i mask: %08x",
break;
} else if (deny->flags & DENY_FLAGS_IP) { /* k: by IP */
Debug((DEBUG_DEBUG, "ip: %08x network: %08x/%i mask: %08x",
- cli_ip(cptr).s_addr, deny->s_addr, deny->bits, NETMASK(deny->bits)));
- if ((cli_ip(cptr).s_addr & NETMASK(deny->bits)) == deny->s_addr)
+ cli_ip(cptr).s_addr, deny->address, deny->bits, NETMASK(deny->bits)));
+ if ((cli_ip(cptr).s_addr & NETMASK(deny->bits)) == deny->address)
break;
}
else if (0 == match(deny->hostmask, host))
break;
}
else if (0 == match(deny->hostmask, host))