Changeset 52711 in vbox for trunk/src/VBox/Devices/Network/slirp/libalias/alias_db.c

Timestamp:

Sep 11, 2014 9:15:33 PM (10 years ago)

Author:

vboxsync

Message:

NAT: Convert NATState::curtime from milliseconds to seconds when we
assign it to libalias instance timeStamp and g/c ifdefed code to do
that when link expiration time is checked. Reduces diff with original.

File:

• trunk/src/VBox/Devices/Network/slirp/libalias/alias_db.c (modified) (3 diffs)

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

@@ -991 +991 @@
     LIST_FOREACH_SAFE(lnk, &la->linkTableOut[la->cleanupIndex++],
         list_out, lnk_tmp) {
-#ifndef VBOX
         if (la->timeStamp - lnk->timestamp > lnk->expire_time)
-#else
-        /* libalias counts time in seconds while slirp in millis */
-        if (la->timeStamp - lnk->timestamp > (1000 * lnk->expire_time))
-#endif
             DeleteLink(lnk);
     }
@@ -2399 +2394 @@
 #endif
 #else  /* VBOX */
-    la->timeStamp = la->curtime;
+    la->timeStamp = la->curtime / 1000; /* NB: la->pData->curtime (msec) */
 #endif
 
     /* Compute number of spokes (output table link chains) to cover */
-#ifndef VBOX
     n = LINK_TABLE_OUT_SIZE * (la->timeStamp - la->lastCleanupTime);
-#else
-    n = LINK_TABLE_OUT_SIZE * ((la->timeStamp - la->lastCleanupTime)/1000);
-#endif
     n /= ALIAS_CLEANUP_INTERVAL_SECS;
 
@@ -2736 +2727 @@
 #else  /* VBOX */
         la->pData = pData;
-        la->timeStamp = curtime;
-        la->lastCleanupTime = curtime;
+        la->timeStamp = la->curtime / 1000; /* NB: la->pData->curtime (msec) */
+        la->lastCleanupTime = la->timeStamp;
 #endif /* VBOX */