going less bitfield crazy

2 files changed, 11 insertions, 11 deletions

diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index 944b7ed46..d4ef371e7 100644
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -75,7 +75,7 @@ static struct answer_packet_list *head;
 static struct answer_packet_list *tail;
 
 /**
- * A structure containing a mapping from network-byte-ordered DNS-id to
+ * A structure containing a mapping from network-byte-ordered DNS-id (16 bit) to
  * some information needed to handle this query
  *
  * It currently allocates at least
@@ -86,12 +86,12 @@ static struct answer_packet_list *tail;
 static struct {
     unsigned valid:1;
     struct GNUNET_SERVER_Client* client;
-    unsigned local_ip:32;
-    unsigned remote_ip:32;
-    unsigned local_port:16;
+    uint32_t local_ip;
+    uint32_t remote_ip;
+    uint16_t local_port;
     char* name;
-    unsigned namelen:8;
-} query_states[65536];
+    uint8_t namelen;
+} query_states[UINT16_MAX];
 
 /**
  * A struct used to give more than one value as
diff --git a/src/vpn/gnunet-vpn-packet.h b/src/vpn/gnunet-vpn-packet.h
index 51cf4c4e8..87b12cb69 100644
--- a/src/vpn/gnunet-vpn-packet.h
+++ b/src/vpn/gnunet-vpn-packet.h
@@ -71,7 +71,7 @@ struct icmp_hdr {
 
 // DNS-Stuff
 struct dns_static {
-        unsigned short id GNUNET_PACKED;
+        uint16_t id GNUNET_PACKED;
 
         unsigned rd:1 GNUNET_PACKED; // recursion desired (client -> server)
         unsigned tc:1 GNUNET_PACKED; // message is truncated
@@ -88,10 +88,10 @@ struct dns_static {
         unsigned z:3 GNUNET_PACKED;  // reserved
         unsigned ra:1 GNUNET_PACKED; // recursion available (server -> client)
 
-        unsigned short qdcount GNUNET_PACKED; // number of questions
-        unsigned short ancount GNUNET_PACKED; // number of answers
-        unsigned short nscount GNUNET_PACKED; // number of authority-records
-        unsigned short arcount GNUNET_PACKED; // number of additional records
+        uint16_t qdcount GNUNET_PACKED; // number of questions
+        uint16_t ancount GNUNET_PACKED; // number of answers
+        uint16_t nscount GNUNET_PACKED; // number of authority-records
+        uint16_t arcount GNUNET_PACKED; // number of additional records
 };
 
 struct dns_pkt {