Changeset 104603 in vbox for trunk/src/VBox

Timestamp:

May 13, 2024 3:19:03 PM (7 months ago)

Author:

vboxsync

Message:

NetworkServices/NAT: Some unused variable fixes, bugref:3409

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• VBoxNetLwipNAT.cpp (modified) (6 diffs)
• proxy.c (modified) (3 diffs)
• proxy_dhcp6ds.c (modified) (2 diffs)
• proxy_pollmgr.c (modified) (4 diffs)
• pxping.c (modified) (7 diffs)
• pxtcp.c (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -257 +257 @@
 VBoxNetLwipNAT::VBoxNetLwipNAT()
   : m_uVerbosity(0),
-    m_hThrRecv(NIL_RTTHREAD)
+    m_hIf(NULL),
+    m_hThrRecv(NIL_RTTHREAD),
+    m_u16Mtu(1500)
 {
     LogFlowFuncEnter();
@@ -356 +358 @@
 {
     unsigned int uVerbosity = 0;
-    int rc;
 
     RTGETOPTSTATE State;
-    rc = RTGetOptInit(&State, argc, argv,
-                      s_aGetOptDef, RT_ELEMENTS(s_aGetOptDef),
-                      1, 0);
+    int rc = RTGetOptInit(&State, argc, argv,
+                          s_aGetOptDef, RT_ELEMENTS(s_aGetOptDef),
+                          1, 0);
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc", rc);
 
     int ch;
@@ -1347 +1350 @@
 VBoxNetLwipNAT::run()
 {
-    int rc;
-
     AssertReturn(m_hThrRecv == NIL_RTTHREAD, VERR_INVALID_STATE);
 
@@ -1355 +1356 @@
 
     /* spawn intnet input pump */
-    rc = RTThreadCreate(&m_hThrRecv,
-             VBoxNetLwipNAT::receiveThread, this,
-             0, /* :cbStack */
-             RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE,
-             "RECV");
+    int rc = RTThreadCreate(&m_hThrRecv,
+                            VBoxNetLwipNAT::receiveThread, this,
+                            0, /* :cbStack */
+                            RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE,
+                            "RECV");
     AssertRCReturn(rc, rc);
 
@@ -1400 +1401 @@
     m_hThrRecv = NIL_RTTHREAD;
 
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -2083 +2084 @@
         message.appendPrintf("%s" "callee %ls",
             pcszSeparator, info.getCalleeName().raw());
-        pcszSeparator = pcszComma;
+        //pcszSeparator = pcszComma; unused
     }
 

trunk/src/VBox/NetworkServices/NAT/proxy.c

@@ -468 +468 @@
     struct sockaddr *pdst_sa;
     socklen_t dst_sa_len;
-    void *pdst_addr;
     const struct sockaddr *psrc_sa;
     socklen_t src_sa_len;
@@ -481 +480 @@
     if (sdom == PF_INET6) {
         pdst_sa = (struct sockaddr *)&dst_sin6;
-        pdst_addr = (void *)&dst_sin6.sin6_addr;
 
         memset(&dst_sin6, 0, sizeof(dst_sin6));
@@ -496 +494 @@
     else { /* sdom = PF_INET */
         pdst_sa = (struct sockaddr *)&dst_sin;
-        pdst_addr = (void *)&dst_sin.sin_addr;
 
         memset(&dst_sin, 0, sizeof(dst_sin));

trunk/src/VBox/NetworkServices/NAT/proxy_dhcp6ds.c

@@ -177 +177 @@
 {
     u8_t msg_header[4];
-    unsigned int msg_type, msg_tid;
+    unsigned int msg_type;
     int copied;
     size_t roff;
@@ -195 +195 @@
 
     msg_type = msg_header[0];
-    msg_tid = (msg_header[1] << 16) | (msg_header[2] << 8) | msg_header[3];
-    DPRINTF(("%s: type %u, tid 0x%6x\n", __func__, msg_type, msg_tid));
+    DPRINTF(("%s: type %u, tid 0x%6x\n", __func__, msg_type,
+             (uint32_t)((msg_header[1] << 16) | (msg_header[2] << 8) | msg_header[3])));
     if (msg_type != DHCP6_INFORMATION_REQUEST) { /** @todo ? RELAY_FORW */
         pbuf_free(p);

trunk/src/VBox/NetworkServices/NAT/proxy_pollmgr.c

@@ -259 +259 @@
     SOCKET fd;
     ssize_t nsent;
-    int rc;
 
     AssertReturn(0 <= slot && slot < POLLMGR_CHAN_COUNT, -1);
@@ -276 +275 @@
     ptr = *(void **)buf;
 
-    rc = RTReqQueueCallEx(pollmgr.queue, NULL, 0,
-                          RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                          (PFNRT)pollmgr_chan_call_handler, 2,
-                          slot, ptr);
+    int rc = RTReqQueueCallEx(pollmgr.queue, NULL, 0,
+                              RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+                              (PFNRT)pollmgr_chan_call_handler, 2,
+                              slot, ptr);
+    if (RT_FAILURE(rc))
+    {
+        DPRINTF(("Queuing pollmgr_chan_call_handler() on poll manager queue failed with %Rrc\n", rc));
+        return -1;
+    }
 
     fd = pollmgr.chan[POLLMGR_QUEUE][POLLMGR_CHFD_WR];
@@ -304 +308 @@
 pollmgr_queue_callback(struct pollmgr_handler *handler, SOCKET fd, int revents)
 {
-    ssize_t nread;
-    int sockerr;
-    int rc;
-
     RT_NOREF(handler, revents);
     Assert(pollmgr.queue != NIL_RTREQQUEUE);
 
-    nread = recv(fd, (char *)pollmgr_udpbuf, sizeof(pollmgr_udpbuf), 0);
-    sockerr = SOCKERRNO();      /* save now, may be clobbered */
-
+    ssize_t nread = recv(fd, (char *)pollmgr_udpbuf, sizeof(pollmgr_udpbuf), 0);
     if (nread == SOCKET_ERROR) {
-        DPRINTF0(("%s: recv: %R[sockerr]\n", __func__, sockerr));
+        DPRINTF0(("%s: recv: %R[sockerr]\n", __func__, SOCKERRNO()));
         return POLLIN;
     }
@@ -324 +322 @@
     }
 
-    rc = RTReqQueueProcess(pollmgr.queue, 0);
+    int rc = RTReqQueueProcess(pollmgr.queue, 0);
     if (RT_UNLIKELY(rc != VERR_TIMEOUT && RT_FAILURE_NP(rc))) {
         DPRINTF0(("%s: RTReqQueueProcess: %Rrc\n", __func__, rc));

trunk/src/VBox/NetworkServices/NAT/pxping.c

@@ -686 +686 @@
     int hopl;
     u16_t iphlen;
-    u16_t id, seq;
+    u16_t id;
     int status;
 
@@ -695 +695 @@
 
     id  = icmph->id;
-    seq = icmph->seqno;
-
     pcb = pxping_pcb_for_request(pxping, 1,
                                  ipX_current_src_addr(),
@@ -708 +706 @@
     DPRINTF(("ping %p: %R[ping_pcb] seq %d len %u hopl %d\n",
              pcb, pcb,
-             ntohs(seq), (unsigned int)p->tot_len,
+             ntohs(icmph->seqno), (unsigned int)p->tot_len,
              IP6H_HOPLIM(iph)));
 
@@ -1259 +1257 @@
     struct ip_hdr *iph;
     struct icmp_echo_hdr *icmph;
-    u16_t id, seq;
+    u16_t id;
     ip_addr_t guest_ip, target_ip;
     int mapped;
@@ -1272 +1270 @@
 
     id  = icmph->id;
-    seq = icmph->seqno;
-
     DPRINTF(("<--- PING %RTnaipv4 id 0x%x seq %d\n",
-             peer->sin_addr.s_addr, ntohs(id), ntohs(seq)));
+             peer->sin_addr.s_addr, ntohs(id), ntohs(icmph->seqno)));
 
     /*
@@ -1362 +1358 @@
     struct icmp_echo_hdr *icmph, *oicmph;
     u16_t oipoff, oiphlen, oiplen;
-    u16_t id, seq;
+    u16_t id;
     ip_addr_t guest_ip, target_ip, error_ip;
     int target_mapped, error_mapped;
@@ -1424 +1420 @@
 
     id  = oicmph->id;
-    seq = oicmph->seqno;
 
     DPRINTF2(("%s: ping %RTnaipv4 id 0x%x seq %d",
-              __func__, ip4_addr_get_u32(&oiph->dest), ntohs(id), ntohs(seq)));
+              __func__, ip4_addr_get_u32(&oiph->dest), ntohs(id), ntohs(oicmph->seqno)));
     if (ICMPH_TYPE(icmph) == ICMP_DUR) {
         DPRINTF2((" unreachable (code %d)\n", ICMPH_CODE(icmph)));

trunk/src/VBox/NetworkServices/NAT/pxtcp.c

@@ -1748 +1748 @@
         nread = pxtcp_sock_read(pxtcp, &stop_pollin);
         if (nread < 0) {
-            sockerr = -(int)nread;
-            DPRINTF0(("sock %d: POLLIN: %R[sockerr]\n", fd, sockerr));
+            DPRINTF0(("sock %d: POLLIN: %R[sockerr]\n", fd, -(int)nread));
             return pxtcp_schedule_reset(pxtcp);
         }