[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9335 - gnunet/src/nat/libnatpmp
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9335 - gnunet/src/nat/libnatpmp |
Date: |
Thu, 29 Oct 2009 01:48:30 -0600 |
Author: holindho
Date: 2009-10-29 01:48:30 -0600 (Thu, 29 Oct 2009)
New Revision: 9335
Modified:
gnunet/src/nat/libnatpmp/getgateway.c
gnunet/src/nat/libnatpmp/getgateway.h
gnunet/src/nat/libnatpmp/natpmp.c
gnunet/src/nat/libnatpmp/natpmp.h
Log:
standards compliance
Modified: gnunet/src/nat/libnatpmp/getgateway.c
===================================================================
--- gnunet/src/nat/libnatpmp/getgateway.c 2009-10-29 07:47:36 UTC (rev
9334)
+++ gnunet/src/nat/libnatpmp/getgateway.c 2009-10-29 07:48:30 UTC (rev
9335)
@@ -88,10 +88,10 @@
#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;
@@ -128,7 +128,7 @@
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;
@@ -136,7 +136,7 @@
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;
@@ -171,7 +171,7 @@
((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 ? */
@@ -239,9 +239,10 @@
&& 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;
@@ -271,7 +272,7 @@
} 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;
@@ -347,7 +348,7 @@
}
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;
}
@@ -360,7 +361,7 @@
#ifdef USE_WIN32_CODE
int
-getdefaultgateway (int *af, u_int8_t addr[16])
+getdefaultgateway (int *af, uint8_t addr[16])
{
HKEY networkCardsKey;
HKEY networkCardKey;
Modified: gnunet/src/nat/libnatpmp/getgateway.h
===================================================================
--- gnunet/src/nat/libnatpmp/getgateway.h 2009-10-29 07:47:36 UTC (rev
9334)
+++ gnunet/src/nat/libnatpmp/getgateway.h 2009-10-29 07:48:30 UTC (rev
9335)
@@ -27,6 +27,6 @@
* return value :
* 0 : success
* -1 : failure */
-LIBSPEC int getdefaultgateway (int *af, u_int8_t addr[16]);
+LIBSPEC int getdefaultgateway (int *af, uint8_t addr[16]);
#endif
Modified: gnunet/src/nat/libnatpmp/natpmp.c
===================================================================
--- gnunet/src/nat/libnatpmp/natpmp.c 2009-10-29 07:47:36 UTC (rev 9334)
+++ gnunet/src/nat/libnatpmp/natpmp.c 2009-10-29 07:48:30 UTC (rev 9335)
@@ -81,7 +81,7 @@
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
@@ -93,7 +93,7 @@
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
@@ -228,9 +228,9 @@
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
{
Modified: gnunet/src/nat/libnatpmp/natpmp.h
===================================================================
--- gnunet/src/nat/libnatpmp/natpmp.h 2009-10-29 07:47:36 UTC (rev 9334)
+++ gnunet/src/nat/libnatpmp/natpmp.h 2009-10-29 07:48:30 UTC (rev 9335)
@@ -20,6 +20,7 @@
/* NAT-PMP Port as defined by the NAT-PMP draft */
#define NATPMP_PORT (5351)
+#include <stdint.h>
#include <time.h>
#include <sys/time.h>
#ifdef WIN32
@@ -38,7 +39,7 @@
int s; /* socket */
struct sockaddr *addr;
socklen_t addrlen;
- u_int8_t gateway[16]; /* default gateway (IPv4 or IPv6) */
+ uint8_t gateway[16]; /* default gateway (IPv4 or IPv6) */
int has_pending_request;
unsigned char pending_request[12];
int pending_request_len;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9335 - gnunet/src/nat/libnatpmp,
gnunet <=