Changeset 70842 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 31, 2018 6:10:17 PM (7 years ago)

Author:

vboxsync

Message:

slirp: Drop optimistic asserts about something we can't control.

File:

• trunk/src/VBox/Devices/Network/slirp/bootp.c (modified) (6 diffs)

trunk/src/VBox/Devices/Network/slirp/bootp.c

@@ -459 +459 @@
         }
         dhcp_stat = SELECTING;
-        Assert((bp->bp_ciaddr.s_addr == INADDR_ANY));
-#if 0
-        /* DSL xid in request differ from offer */
-        Assert((bp->bp_xid == bc->xid));
-#endif
+        /* Assert((bp->bp_ciaddr.s_addr == INADDR_ANY)); */
     }
     else
@@ -497 +493 @@
              *  ------------------------------
              */
-            Assert((server_ip == NULL && req_ip == NULL && bp->bp_ciaddr.s_addr != INADDR_ANY));
             if (   server_ip
                 || req_ip
@@ -507 +502 @@
             if (bc != NULL)
             {
-                Assert((bc->addr.s_addr == bp->bp_ciaddr.s_addr));
+                /* Assert((bc->addr.s_addr == bp->bp_ciaddr.s_addr)); */
                 /*if it already here well just do ack, we aren't aware of dhcp time expiration*/
             }
@@ -544 +539 @@
              *
              */
-            Assert(server_ip == NULL);
-            Assert(req_ip != NULL);
             if (   server_ip
                 || !req_ip
@@ -577 +570 @@
 
         case NONE:
-            Assert((dhcp_stat != NONE));
             if (dhcp_stat == REBINDING)
                 LogRel(("NAT: REBINDING state isn't impemented\n"));
@@ -819 +811 @@
 
         default:
-            AssertMsgFailed(("unsupported DHCP message type"));
+            /* unsupported DHCP message type */
+            break;
     }
     /* silently ignore */