Add EXTRACT_ macros/functions for IPv4 addresses, get rid of structure wrappers.

Add EXTRACT_IPV4_TO_HOST_ORDER() and EXTRACT_IPV4_TO_NETWORK_ORDER();
the former extracts a possibly-unaligned IPv4 address, in network byte
order, returning a uint32_t in host byte order, and the latter extracts
a possibly-unaligned IPv4 address, in network byte order, returning a
uint32_t in *network* byte order.  Some APIs take an address in network
byte order, and some operations are more easily done in host byte order,
so both are useful.

Remove the structure wrappers around nd_ipv4 and nd_ipv6; that makes it
easier to pass variables of those types to functions/macros that take a
byte pointer as an argument (because they might be used either with
pointers to structure members or raw buffer pointers), and the structure
probably wouldn't do much to prevent people from using EXTRACT_BE_U_4()
when they really want to extract the value in *network* byte order;
using the above EXTRACT_IPV4_ calls should do more to encourage that.

1 files changed, 1 insertions, 1 deletions

diff --git a/print-decnet.c b/print-decnet.c
index b86bd889..4ac74e11 100644
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -38,8 +38,8 @@ struct rtentry;
 #include <stdlib.h>
 #include <string.h>
 
-#include "extract.h"
 #include "netdissect.h"
+#include "extract.h"
 #include "addrtoname.h"
 
 static const char tstr[] = "[|decnet]";