X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Feui64.h;h=c48d689eda7b0dcf40df2e0bd83c7199d66705b0;hp=f29200b818d7efd0fbfb1e2914a39255f99954b6;hb=HEAD;hpb=c0d579b8423ef278c204b6db60615c88eea9c870

diff --git a/pppd/eui64.h b/pppd/eui64.h
index f29200b..c24733d 100644
--- a/pppd/eui64.h
+++ b/pppd/eui64.h
@@ -38,9 +38,40 @@
 
 #include "pppdconf.h"
 
-#if !defined(PPP_WITH_IPV6CP)
-#error	"this file should only be included when PPP_WITH_IPV6CP is defined"
-#endif /* not defined(PPP_WITH_IPV6CP) */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(SOL2)
+#include <netinet/in.h>
+
+typedef union {
+    uint8_t	e8[8];		/* lower 64-bit IPv6 address */
+    uint32_t	e32[2];		/* lower 64-bit IPv6 address */
+} eui64_t;
+
+/*
+ * Declare the two below, since in.h only defines them when _KERNEL
+ * is declared - which shouldn't be true when dealing with user-land programs
+ */
+#define	s6_addr8	_S6_un._S6_u8
+#define	s6_addr32	_S6_un._S6_u32
+
+#else /* else if not defined(SOL2) */
+
+/*
+ * TODO:
+ *
+ * Maybe this should be done by processing struct in6_addr directly...
+ */
+typedef union
+{
+    u_int8_t e8[8];
+    u_int16_t e16[4];
+    u_int32_t e32[2];
+} eui64_t;
+
+#endif /* defined(SOL2) */
 
 #define eui64_iszero(e)		(((e).e32[0] | (e).e32[1]) == 0)
 #define eui64_equals(e, o)	(((e).e32[0] == (o).e32[0]) && \
@@ -79,4 +110,8 @@
 
 char *eui64_ntoa(eui64_t);	/* Returns ascii representation of id */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* PPP_EUI64_H */