Changeset 25301 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Dec 10, 2009 2:33:25 PM (15 years ago)

Author:

vboxsync

Message:

NAT: removed annoying warnings

Location:

trunk/src/VBox/Devices/Network/slirp/libalias

Files:

• alias_dns.c (modified) (3 diffs)
• alias_nbt.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/libalias/alias_dns.c

@@ -16 +16 @@
 {
     struct {
+#ifndef VBOX
         uint16_t id;
         uint16_t rd:1;
@@ -25 +26 @@
         uint16_t Z:3;
         uint16_t ra:1;
+#else
+        unsigned id:16;
+        unsigned rd:1;
+        unsigned tc:1;
+        unsigned aa:1;
+        unsigned opcode:4;
+        unsigned qr:1;
+        unsigned rcode:4;
+        unsigned Z:3;
+        unsigned ra:1;
+#endif
         uint16_t qdcount;
         uint16_t ancount;
@@ -32 +44 @@
     uint16_t raw[5];
 };
+AssertCompileSize(union dnsmsg_header, 12);
+
 struct dnsmsg_answer
 {

trunk/src/VBox/Devices/Network/slirp/libalias/alias_nbt.c

@@ -278 +278 @@
 #define OpRefresh   8
 typedef struct {
+#ifndef VBOX
     u_short     nametrid;
     u_short     dir:    1, opcode:4, nmflags:7, rcode:4;
+#else
+    unsigned    nametrid:16;
+    unsigned    dir:    1, opcode:4, nmflags:7, rcode:4;
+#endif
     u_short     qdcount;
     u_short     ancount;
@@ -285 +290 @@
     u_short     arcount;
 }       NbtNSHeader;
+AssertCompileSize(NbtNSHeader, 12);
 
 #define FMT_ERR     0x1
@@ -536 +542 @@
 #define SizeOfNsRNB         6
 typedef struct {
+#ifndef VBOX
     u_short     g:  1  , ont:2, resv:13;
+#else
+    unsigned    g:  1  , ont:2, resv:13;
+#endif
     struct in_addr  addr;
 }       NBTNsRNB;
+AssertCompileSize(NBTNsRNB, 8);
 
 static u_char  *
@@ -660 +671 @@
 
 typedef struct {
+#ifndef VBOX
     u_short     opcode:4, flags:8, resv:4;
+#else
+    u_short     hidden; /* obviously not needed */
+#endif
 }       NBTNsResourceNULL;
+AssertCompileSize(NBTNsResourceNULL, 2);
 
 static u_char  *