[pisa-src] r1718 - in trunk/libpisa: util.c util.h
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 19 Nov 2009 15:43:26 +0100
Author: biurrun
Date: Thu Nov 19 15:43:26 2009
New Revision: 1718
Log:
Move IPV4_TO_IPV6_MAP macro to the only place where it is used.
Modified:
trunk/libpisa/util.c
trunk/libpisa/util.h
Modified: trunk/libpisa/util.c
==============================================================================
--- trunk/libpisa/util.c Thu Nov 19 15:41:13 2009 (r1717)
+++ trunk/libpisa/util.c Thu Nov 19 15:43:26 2009 (r1718)
@@ -14,6 +14,7 @@
#define _BSD_SOURCE
#define _XOPEN_SOURCE
+#include <netinet/in.h>
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>
@@ -275,6 +276,12 @@
if (err)
goto out_err;
+#define IPV4_TO_IPV6_MAP(in_addr_from, in6_addr_to) \
+ {(in6_addr_to)->s6_addr32[0] = 0; \
+ (in6_addr_to)->s6_addr32[1] = 0; \
+ (in6_addr_to)->s6_addr32[2] = htonl(0xffff); \
+ (in6_addr_to)->s6_addr32[3] = (uint32_t) ((in_addr_from)->s_addr);}
+
IPV4_TO_IPV6_MAP(&ip4, ip6);
PISA_DEBUG("Mapped v4 to v6.\n");
/* PISA_DEBUG_IN6ADDR("mapped v6", ip6);*/
Modified: trunk/libpisa/util.h
==============================================================================
--- trunk/libpisa/util.h Thu Nov 19 15:41:13 2009 (r1717)
+++ trunk/libpisa/util.h Thu Nov 19 15:43:26 2009 (r1718)
@@ -56,12 +56,6 @@
}
-#define IPV4_TO_IPV6_MAP(in_addr_from, in6_addr_to) \
- {(in6_addr_to)->s6_addr32[0] = 0; \
- (in6_addr_to)->s6_addr32[1] = 0; \
- (in6_addr_to)->s6_addr32[2] = htonl(0xffff); \
- (in6_addr_to)->s6_addr32[3] = (uint32_t) ((in_addr_from)->s_addr);}
-
/**
* wrapper functions for memory allocation.
* for malloc(), realloc() and free().
Other related posts:
- » [pisa-src] r1718 - in trunk/libpisa: util.c util.h - Diego Biurrun
