Change ISC_SOCKEVENTATTR_* defines into isc_sockeventattr_t enum

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 799a588b69f0af186d4ee21bec3df648ce6e537b..f31f208a8750110d551816c512a17ffea833187b 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -219,7 +219,7 @@ typedef struct query {
        isc_dscp_t                      dscp;
        int                             ednsversion;
        unsigned int                    options;
-       unsigned int                    attributes;
+       isc_sockeventattr_t             attributes;
        unsigned int                    sends;
        unsigned int                    connects;
        unsigned int                    udpsize;

diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 70b28e83a4df2a58f4fd9d3267404ad256e96117..e6f613b3292f4949e916f4028f41d4c5d13fc301 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -214,6 +214,31 @@ enum {
        isc_sockstatscounter_max = 62
 };
 
+/*@{*/
+/*!
+ * _ATTACHED:  Internal use only.
+ * _TRUNC:     Packet was truncated on receive.
+ * _CTRUNC:    Packet control information was truncated.  This can
+ *             indicate that the packet is not complete, even though
+ *             all the data is valid.
+ * _TIMESTAMP: The timestamp member is valid.
+ * _PKTINFO:   The pktinfo member is valid.
+ * _MULTICAST: The UDP packet was received via a multicast transmission.
+ * _DSCP:      The UDP DSCP value is valid.
+ * _USEMINMTU: Set the per packet IPV6_USE_MIN_MTU flag.
+ */
+typedef enum {
+       ISC_SOCKEVENTATTR_ATTACHED =    0x80000000U, /* internal */
+       ISC_SOCKEVENTATTR_TRUNC =       0x00800000U, /* public */
+       ISC_SOCKEVENTATTR_CTRUNC =      0x00400000U, /* public */
+       ISC_SOCKEVENTATTR_TIMESTAMP =   0x00200000U, /* public */
+       ISC_SOCKEVENTATTR_PKTINFO =     0x00100000U, /* public */
+       ISC_SOCKEVENTATTR_MULTICAST =   0x00080000U, /* public */
+       ISC_SOCKEVENTATTR_DSCP =        0x00040000U, /* public */
+       ISC_SOCKEVENTATTR_USEMINMTU =   0x00020000U  /* public */
+} isc_sockeventattr_t;
+/*@}*/
+
 /***
  *** Types
  ***/
@@ -229,7 +254,8 @@ struct isc_socketevent {
        isc_sockaddr_t          address;        /*%< source address */
        isc_time_t              timestamp;      /*%< timestamp of packet recv */
        struct in6_pktinfo      pktinfo;        /*%< ipv6 pktinfo */
-       isc_uint32_t            attributes;     /*%< see below */
+       isc_sockeventattr_t     attributes;     /*%< see isc_sockeventattr_t
+                                                    enum */
        isc_eventdestructor_t   destroy;        /*%< original destructor */
        unsigned int            dscp;           /*%< UDP dscp value */
 };
@@ -248,29 +274,6 @@ struct isc_socket_connev {
        isc_result_t            result;         /*%< OK, EOF, whatever else */
 };
 
-/*@{*/
-/*!
- * _ATTACHED:  Internal use only.
- * _TRUNC:     Packet was truncated on receive.
- * _CTRUNC:    Packet control information was truncated.  This can
- *             indicate that the packet is not complete, even though
- *             all the data is valid.
- * _TIMESTAMP: The timestamp member is valid.
- * _PKTINFO:   The pktinfo member is valid.
- * _MULTICAST: The UDP packet was received via a multicast transmission.
- * _DSCP:      The UDP DSCP value is valid.
- * _USEMINMTU: Set the per packet IPV6_USE_MIN_MTU flag.
- */
-#define ISC_SOCKEVENTATTR_ATTACHED             0x80000000U /* internal */
-#define ISC_SOCKEVENTATTR_TRUNC                        0x00800000U /* public */
-#define ISC_SOCKEVENTATTR_CTRUNC               0x00400000U /* public */
-#define ISC_SOCKEVENTATTR_TIMESTAMP            0x00200000U /* public */
-#define ISC_SOCKEVENTATTR_PKTINFO              0x00100000U /* public */
-#define ISC_SOCKEVENTATTR_MULTICAST            0x00080000U /* public */
-#define ISC_SOCKEVENTATTR_DSCP                 0x00040000U /* public */
-#define ISC_SOCKEVENTATTR_USEMINMTU            0x00020000U /* public */
-/*@}*/
-
 #define ISC_SOCKEVENT_ANYEVENT  (0)
 #define ISC_SOCKEVENT_RECVDONE (ISC_EVENTCLASS_SOCKET + 1)
 #define ISC_SOCKEVENT_SENDDONE (ISC_EVENTCLASS_SOCKET + 2)