[pisa-src] r1010 - in trunk: community-operator include pairing
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Wed, 30 Sep 2009 18:17:32 +0200
Author: biurrun
Date: Wed Sep 30 18:17:31 2009
New Revision: 1010
Log:
Rename ipv6_addr_is_hit to pisa_ipv6_addr_is_hit.
This avoids a name clash when compiling with hipl support.
Modified:
trunk/community-operator/co_server.c
trunk/include/global.h
trunk/pairing/accept.c
trunk/pairing/common.c
trunk/pairing/management.c
Modified: trunk/community-operator/co_server.c
==============================================================================
--- trunk/community-operator/co_server.c Wed Sep 30 18:16:24 2009
(r1009)
+++ trunk/community-operator/co_server.c Wed Sep 30 18:17:31 2009
(r1010)
@@ -169,7 +169,7 @@
INET6_ADDRSTRLEN);
printf("received %i bytes from %s\n", received, addr_string);
- if (ipv6_addr_is_hit(&cl_addr.sin6_addr)) {
+ if (pisa_ipv6_addr_is_hit(&cl_addr.sin6_addr)) {
printf("sender was a HIT, processing request.\n");
answerCertificateQuery(&cl_addr);
} else {
Modified: trunk/include/global.h
==============================================================================
--- trunk/include/global.h Wed Sep 30 18:16:24 2009 (r1009)
+++ trunk/include/global.h Wed Sep 30 18:17:31 2009 (r1010)
@@ -352,7 +352,7 @@
#define HIT_MASK_INV 0xfffffff0
#define HIT_PREFIX 0x20010010
-static inline int ipv6_addr_is_hit(const struct in6_addr *hit)
+static inline int pisa_ipv6_addr_is_hit(const struct in6_addr *hit)
{
uint32_t begin;
Modified: trunk/pairing/accept.c
==============================================================================
--- trunk/pairing/accept.c Wed Sep 30 18:16:24 2009 (r1009)
+++ trunk/pairing/accept.c Wed Sep 30 18:17:31 2009 (r1010)
@@ -64,7 +64,7 @@
// Get peer address, determine if it's a HIT
inet_ntop(AF_INET6, &peer_addr.sin6_addr, address_string,
sizeof(address_string));
DEBUG("Address of sender is %s", address_string);
- if (!ipv6_addr_is_hit(&peer_addr.sin6_addr))
+ if (!pisa_ipv6_addr_is_hit(&peer_addr.sin6_addr))
DEBUG_HIGH("Address is IPv6.");
else
{
Modified: trunk/pairing/common.c
==============================================================================
--- trunk/pairing/common.c Wed Sep 30 18:16:24 2009 (r1009)
+++ trunk/pairing/common.c Wed Sep 30 18:17:31 2009 (r1010)
@@ -78,7 +78,7 @@
return -1;
}
- if (!ipv6_addr_is_hit(&hit1_addr.sin6_addr))
+ if (!pisa_ipv6_addr_is_hit(&hit1_addr.sin6_addr))
{
DEBUG_MED("First \"HIT\" was not actually a HIT.");
return -1;
@@ -95,7 +95,7 @@
return -1;
}
- if (!ipv6_addr_is_hit(&hit2_addr.sin6_addr))
+ if (!pisa_ipv6_addr_is_hit(&hit2_addr.sin6_addr))
{
DEBUG_MED("Second \"HIT\" was not actually a HIT.");
return -1;
Modified: trunk/pairing/management.c
==============================================================================
--- trunk/pairing/management.c Wed Sep 30 18:16:24 2009 (r1009)
+++ trunk/pairing/management.c Wed Sep 30 18:17:31 2009 (r1010)
@@ -149,7 +149,7 @@
{
PISA_ERROR("Invalid network address string:<%s>\n", buffer);
}
- else if (!ipv6_addr_is_hit(&addr))
+ else if (!pisa_ipv6_addr_is_hit(&addr))
{
PISA_ERROR("Invalid network address string:<%s>\n", buffer);
}
@@ -670,7 +670,7 @@
return 0;
}
- if (!ipv6_addr_is_hit(&addr))
+ if (!pisa_ipv6_addr_is_hit(&addr))
{
PISA_ERROR("Provided address is not a HIT\n");
return 0;
Other related posts:
- » [pisa-src] r1010 - in trunk: community-operator include pairing - Diego Biurrun
