Move value_box_t to value.h

diff --git a/src/include/pair.h b/src/include/pair.h
index 47d75881e34609e21ab8d184cc0f3a1195f3d191..0be7343a4ade1701dd211f9a7c9629f17affbc85 100644 (file)
--- a/src/include/pair.h
+++ b/src/include/pair.h
@@ -26,6 +26,7 @@
 RCSIDH(pair_h, "$Id$")
 
 #include <freeradius-devel/libradius.h>
+#include <freeradius-devel/value.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,62 +51,6 @@ extern "C" {
 #  define VERIFY_PACKET(_x)    fr_cond_assert(_x)
 #endif
 
-/** Union containing all data types supported by the server
- *
- * This union contains all data types that can be represented by VALUE_PAIRs. It may also be used in other parts
- * of the server where values of different types need to be stored.
- *
- * PW_TYPE should be an enumeration of the values in this union.
- */
-typedef struct value_box value_box_t;
-struct value_box {
-       union {
-               char const              *strvalue;              //!< Pointer to UTF-8 string.
-               uint8_t const           *octets;                //!< Pointer to binary string.
-               void                    *ptr;                   //!< generic pointer.
-
-               struct in_addr          ipaddr;                 //!< IPv4 Address.
-               uint8_t                 ipv4prefix[6];          //!< IPv4 prefix (should be struct?).
-               struct in6_addr         ipv6addr;               //!< IPv6 Address.
-               uint8_t                 ipv6prefix[18];         //!< IPv6 prefix (should be struct?).
-
-               fr_ipaddr_t             ipaddr2;                //!< IPv4/6 address/prefix.
-
-               uint8_t                 ifid[8];                //!< IPv6 interface ID (should be struct?).
-               uint8_t                 ether[6];               //!< Ethernet (MAC) address.
-
-               bool                    boolean;                //!< A truth value.
-
-               struct {
-                       union {
-                               uint8_t                 byte;           //!< 8bit unsigned integer.
-                               uint16_t                ushort;         //!< 16bit unsigned integer.
-                               uint32_t                integer;        //!< 32bit unsigned integer.
-                               uint64_t                integer64;      //!< 64bit unsigned integer.
-                               size_t                  size;           //!< System specific file/memory size.
-
-                               int32_t                 sinteger;       //!< 32bit signed integer.
-                       };
-                       fr_dict_attr_t const            *enumv;         //!< Enumeration values for integer type.
-               };
-
-               struct timeval          timeval;                //!< A time value with usec precision.
-               double                  decimal;                //!< Double precision float.
-               uint32_t                date;                   //!< Date (32bit Unix timestamp).
-
-               uint8_t                 filter[32];             //!< Ascend binary format (a packed data structure).
-
-       } datum;
-
-       PW_TYPE                         type;                   //!< Type of this value-box.
-
-       size_t                          length;                 //!< Length of value data.
-
-       bool                            tainted;                //!< i.e. did it come from an untrusted source
-
-       value_box_t                     *next;                  //!< Next in a series of value_box.
-};
-
 /** The type of value a VALUE_PAIR contains
  *
  * This is used to add structure to nested VALUE_PAIRs and specifies what type of node it is (set, list, data).

diff --git a/src/include/value.h b/src/include/value.h
index 5fbafb8bcbab19cdd7a66d58159cd089af20dbed..78b17388c6ce0ee6195e2ffdaf7b48052bbbd698 100644 (file)
--- a/src/include/value.h
+++ b/src/include/value.h
@@ -20,6 +20,62 @@ extern size_t const value_box_offsets[];
 
 #define value_box_foreach(_v, _iv) for (value_box_t *_iv = v; _iv; _iv = _iv->next)
 
+/** Union containing all data types supported by the server
+ *
+ * This union contains all data types that can be represented by VALUE_PAIRs. It may also be used in other parts
+ * of the server where values of different types need to be stored.
+ *
+ * PW_TYPE should be an enumeration of the values in this union.
+ */
+typedef struct value_box value_box_t;
+struct value_box {
+       union {
+               char const              *strvalue;              //!< Pointer to UTF-8 string.
+               uint8_t const           *octets;                //!< Pointer to binary string.
+               void                    *ptr;                   //!< generic pointer.
+
+               struct in_addr          ipaddr;                 //!< IPv4 Address.
+               uint8_t                 ipv4prefix[6];          //!< IPv4 prefix (should be struct?).
+               struct in6_addr         ipv6addr;               //!< IPv6 Address.
+               uint8_t                 ipv6prefix[18];         //!< IPv6 prefix (should be struct?).
+
+               fr_ipaddr_t             ipaddr2;                //!< IPv4/6 address/prefix.
+
+               uint8_t                 ifid[8];                //!< IPv6 interface ID (should be struct?).
+               uint8_t                 ether[6];               //!< Ethernet (MAC) address.
+
+               bool                    boolean;                //!< A truth value.
+
+               struct {
+                       union {
+                               uint8_t                 byte;           //!< 8bit unsigned integer.
+                               uint16_t                ushort;         //!< 16bit unsigned integer.
+                               uint32_t                integer;        //!< 32bit unsigned integer.
+                               uint64_t                integer64;      //!< 64bit unsigned integer.
+                               size_t                  size;           //!< System specific file/memory size.
+
+                               int32_t                 sinteger;       //!< 32bit signed integer.
+                       };
+                       fr_dict_attr_t const            *enumv;         //!< Enumeration values for integer type.
+               };
+
+               struct timeval          timeval;                //!< A time value with usec precision.
+               double                  decimal;                //!< Double precision float.
+               uint32_t                date;                   //!< Date (32bit Unix timestamp).
+
+               uint8_t                 filter[32];             //!< Ascend binary format (a packed data structure).
+
+       } datum;
+
+       PW_TYPE                         type;                   //!< Type of this value-box.
+
+       size_t                          length;                 //!< Length of value data.
+
+       bool                            tainted;                //!< i.e. did it come from an untrusted source
+
+       value_box_t                     *next;                  //!< Next in a series of value_box.
+};
+
 /*
  *     Allocation
  */