#ifdef USE_PROC_NET_ROUTE
int
-getdefaultgateway (int *af, u_int8_t addr[16])
+getdefaultgateway (int *af, uint8_t addr[16])
{
unsigned int tmp;
- u_int8_t d[16];
+ uint8_t d[16];
char buf[256];
int line = 0;
FILE *f;
d[i+12] = d[i];
d[i] = 0;
}
- memcpy (addr, d, 16 * sizeof (u_int8_t));
+ memcpy (addr, d, 16 * sizeof (uint8_t));
*af = AF_INET;
fclose (f);
return SUCCESS;
else if (i == 16) /* IPv6 address on 16 hex chars,
* or IPv4 address padded with 0 */
{
- memcpy (addr, d, 16 * sizeof (u_int8_t));
+ memcpy (addr, d, 16 * sizeof (uint8_t));
/* Check at what byte the actual address starts */
for (i = 0; i <= 12; i++)
if (addr[i]) break;
((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
int
-getdefaultgateway (int *af, u_int8_t addr[16])
+getdefaultgateway (int *af, uint8_t addr[16])
{
#if 0
/* net.route.0.inet.dump.0.0 ? */
&& sa_tab[RTAX_DST]->sa_family == AF_INET6
&& sa_tab[RTAX_GATEWAY]->sa_family == AF_INET6)
{
- if (((struct sockaddr_in6 *) sa_tab[RTAX_DST])->sin6_addr == 0)
+ if (IN6_IS_ADDR_UNSPECIFIED (&(((struct sockaddr_in6 *)
+ sa_tab[RTAX_DST])->sin6_addr)))
{
- *addr =
+ *(struct in6_addr *)addr =
((struct sockaddr_in6 *) (sa_tab[RTAX_GATEWAY]))->sin6_addr;
*af = AF_INET6;
r = SUCCESS;
} m_rtmsg;
int
-getdefaultgateway (int *af, u_int8_t addr[16])
+getdefaultgateway (int *af, uint8_t addr[16])
{
int s, seq, l, rtm_addrs, i;
pid_t pid;
}
else if (gate != NULL && gate->sa_family == AF_INET6)
{
- memcpy (addr, ((struct sockaddr_in6 *) gate)->sin6_addr.s6_addr, 16 * sizeof (u_int8_t));
+ memcpy (addr, ((struct sockaddr_in6 *) gate)->sin6_addr.s6_addr, 16 * sizeof (uint8_t));
*af = AF_INET6;
return SUCCESS;
}
#ifdef USE_WIN32_CODE
int
-getdefaultgateway (int *af, u_int8_t addr[16])
+getdefaultgateway (int *af, uint8_t addr[16])
{
HKEY networkCardsKey;
HKEY networkCardKey;
memset (&addr, 0, sizeof (addr));
addr.sin_family = AF_INET;
addr.sin_port = htons (NATPMP_PORT);
- memcpy (&addr.sin_addr.s_addr, p->gateway, 4 * sizeof (u_int8_t));
+ memcpy (&addr.sin_addr.s_addr, p->gateway, 4 * sizeof (uint8_t));
#ifdef HAVE_SOCKADDR_IN_SIN_LEN
addr.sin_len = sizeof (addr);
#endif
memset (&addr6, 0, sizeof (addr6));
addr6.sin6_family = AF_INET6;
addr6.sin6_port = htons (NATPMP_PORT);
- memcpy (addr6.sin6_addr.s6_addr, p->gateway, 16 * sizeof (u_int8_t));
+ memcpy (addr6.sin6_addr.s6_addr, p->gateway, 16 * sizeof (uint8_t));
#ifdef HAVE_SOCKADDR_IN_SIN_LEN
addr6.sin6_len = sizeof (addr6);
#endif
n = NATPMP_ERR_RECVFROM;
}
/* check that addr is correct (= gateway) */
- else if (addr.ss_family == AF_INET && memcmp (&((struct sockaddr_in *) &addr)->sin_addr.s_addr, p->gateway, 4 * sizeof (u_int8_t)) == 0)
+ else if (addr.ss_family == AF_INET && memcmp (&((struct sockaddr_in *) &addr)->sin_addr.s_addr, p->gateway, 4 * sizeof (uint8_t)) == 0)
n = NATPMP_ERR_WRONGPACKETSOURCE;
- else if (addr.ss_family == AF_INET6 && memcmp (((struct sockaddr_in6 *) &addr)->sin6_addr.s6_addr, p->gateway, 16 * sizeof (u_int8_t)) == 0)
+ else if (addr.ss_family == AF_INET6 && memcmp (((struct sockaddr_in6 *) &addr)->sin6_addr.s6_addr, p->gateway, 16 * sizeof (uint8_t)) == 0)
n = NATPMP_ERR_WRONGPACKETSOURCE;
else
{