Changeset 107702 in vbox for trunk

Timestamp:

Jan 10, 2025 10:08:56 PM (4 weeks ago)

Author:

vboxsync

Message:

Devices/Network: Parfait fixes. Mostly signedness and precission fixes. Removed unused variables. bugref:3409

Location:

trunk/src

Files:

• VBox/Devices/Network/DrvNATlibslirp.cpp (modified) (10 diffs)
• libs/libslirp-4.8.0/src/libslirp.h (modified) (1 diff)
• libs/libslirp-4.8.0/src/slirp.c (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp

@@ -260 +260 @@
 *********************************************************************************************************************************/
 static void drvNATNotifyNATThread(PDRVNAT pThis, const char *pszWho);
-static void drvNAT_UpdateTimeout(uint32_t *uTimeout, void *opaque);
+static void drvNAT_UpdateTimeout(int *uTimeout, void *opaque);
 static void drvNAT_CheckTimeout(void *opaque);
 static DECLCALLBACK(int) drvNAT_AddPollCb(int iFd, int iEvents, void *opaque);
@@ -307 +307 @@
 
     STAM_COUNTER_INC(&pThis->StatNATRecvWakeups);
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -424 +424 @@
                     memcpy((uint8_t *)pvSeg + cbHdrs, pbFrame + offPayload, cbPayload);
 
+                    Assert((size_t)cbPayload > 0 && (size_t)cbHdrs > 0);
                     slirp_input(pThis->pNATState->pSlirp, (uint8_t const *)pvSeg, cbPayload + cbHdrs);
                     RTMemFree(pvSeg);
@@ -724 +725 @@
 #else
     unsigned int cPollNegRet = 0;
-    drvNAT_AddPollCb(RTPipeToNative(pThis->hPipeRead), SLIRP_POLL_IN | SLIRP_POLL_HUP, pThis);
-    pThis->pNATState->polls[0].fd = RTPipeToNative(pThis->hPipeRead);
+    RTHCINTPTR i64NativeReadPipe = RTPipeToNative(pThis->hPipeRead);
+    Assert(i64NativeReadPipe < INT_MAX);
+    drvNAT_AddPollCb(i64NativeReadPipe, SLIRP_POLL_IN | SLIRP_POLL_HUP, pThis);
+    pThis->pNATState->polls[0].fd = i64NativeReadPipe;
     pThis->pNATState->polls[0].events = POLLRDNORM | POLLPRI | POLLRDBAND;
     pThis->pNATState->polls[0].revents = 0;
@@ -747 +750 @@
          */
 
-        uint32_t uTimeout = DRVNAT_DEFAULT_TIMEOUT;
+        int uTimeout = DRVNAT_DEFAULT_TIMEOUT;
         pThis->pNATState->nsock = 1;
 
@@ -1087 +1090 @@
  * @thread  ?
  */
-static void drvNAT_UpdateTimeout(uint32_t *uTimeout, void *opaque)
+static void drvNAT_UpdateTimeout(int *uTimeout, void *opaque)
 {
     PDRVNAT pThis = (PDRVNAT)opaque;
@@ -1150 +1153 @@
  * @thread  ?
  */
-static int drvNAT_PollEventSlirpToHost(int iEvents) {
-    int iRet = 0;
+static short drvNAT_PollEventSlirpToHost(int iEvents) {
+    short iRet = 0;
 #ifndef RT_OS_WINDOWS
     if (iEvents & SLIRP_POLL_IN)  iRet |= POLLIN;
@@ -1394 +1397 @@
     if (pThis->pNATState->nsock + 1 >= pThis->pNATState->uPollCap)
     {
-        int cbNew = pThis->pNATState->uPollCap * 2 * sizeof(struct pollfd);
+        size_t cbNew = pThis->pNATState->uPollCap * 2 * sizeof(struct pollfd);
         struct pollfd *pvNew = (struct pollfd *)RTMemRealloc(pThis->pNATState->polls, cbNew);
         if (pvNew)
@@ -1405 +1408 @@
     }
 
-    int idx = pThis->pNATState->nsock;
+    unsigned int uIdx = pThis->pNATState->nsock;
+    Assert(uIdx < INT_MAX);
 #ifdef RT_OS_WINDOWS
-    pThis->pNATState->polls[idx].fd = libslirp_wrap_RTHandleTableLookup(iFd);
+    pThis->pNATState->polls[uIdx].fd = libslirp_wrap_RTHandleTableLookup(iFd);
 #else
-    pThis->pNATState->polls[idx].fd = iFd;
+    pThis->pNATState->polls[uIdx].fd = iFd;
 #endif
-    pThis->pNATState->polls[idx].events = drvNAT_PollEventSlirpToHost(iEvents);
-    pThis->pNATState->polls[idx].revents = 0;
+    pThis->pNATState->polls[uIdx].events = drvNAT_PollEventSlirpToHost(iEvents);
+    pThis->pNATState->polls[uIdx].revents = 0;
     pThis->pNATState->nsock += 1;
-    return idx;
+    return uIdx;
 }
 
@@ -1591 +1595 @@
     int MTU = 1500;
     GET_S32(rc, pDrvIns, pCfg, "SlirpMTU", MTU);
-    int i32AliasMode = 0;
-    int i32MainAliasMode = 0;
-    GET_S32(rc, pDrvIns, pCfg, "AliasMode", i32MainAliasMode);
     int iIcmpCacheLimit = 100;
     GET_S32(rc, pDrvIns, pCfg, "ICMPCacheLimit", iIcmpCacheLimit);
     bool fLocalhostReachable = false;
     GET_BOOL(rc, pDrvIns, pCfg, "LocalhostReachable", fLocalhostReachable);
-
-    i32AliasMode |= (i32MainAliasMode & 0x1 ? 0x1 : 0);
-    i32AliasMode |= (i32MainAliasMode & 0x2 ? 0x40 : 0);
-    i32AliasMode |= (i32MainAliasMode & 0x4 ? 0x4 : 0);
     int i32SoMaxConn = 10;
     GET_S32(rc, pDrvIns, pCfg, "SoMaxConnection", i32SoMaxConn);

trunk/src/libs/libslirp-4.8.0/src/libslirp.h

@@ -254 +254 @@
  * such to add_poll, and add_poll returns an index. */
 SLIRP_EXPORT
+#ifdef VBOX
+void slirp_pollfds_fill(Slirp *slirp, int *timeout,
+                        SlirpAddPollCb add_poll, void *opaque);
+#else
 void slirp_pollfds_fill(Slirp *slirp, uint32_t *timeout,
                         SlirpAddPollCb add_poll, void *opaque);
+#endif
 
 /* This is called by the application after sleeping, to report which file

trunk/src/libs/libslirp-4.8.0/src/slirp.c

@@ -773 +773 @@
     (((so)->so_state & (SS_FCANTRCVMORE | SS_ISFCONNECTED)) == SS_ISFCONNECTED)
 
+#ifdef VBOX
+static void slirp_update_timeout(Slirp *slirp, int *timeout)
+{
+    int t;
+#else
 static void slirp_update_timeout(Slirp *slirp, uint32_t *timeout)
 {
     uint32_t t;
+#endif
 
     if (*timeout <= TIMEOUT_FAST) {
@@ -796 +802 @@
 }
 
+#ifdef VBOX
+void slirp_pollfds_fill(Slirp *slirp, int *timeout,
+                        SlirpAddPollCb add_poll, void *opaque)
+#else
 void slirp_pollfds_fill(Slirp *slirp, uint32_t *timeout,
                         SlirpAddPollCb add_poll, void *opaque)
+#endif
 {
     struct socket *so, *so_next;