Changeset 57912 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin

Timestamp:

Sep 27, 2015 12:36:44 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102884

Message:

VBoxNetFlt/darwin, VBoxNetAdp/darwin: increment interface statistic
for packets to and from intnet.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp

@@ -941 +941 @@
              * A packet from the host to a guest.  As we won't pass it
              * to the drvier/wire we need to feed it to bpf ourselves.
+             *
+             * XXX: TODO: bpf should be done before; use pfnPreRecv?
              */
             if (fSrc == INTNETTRUNKDIR_HOST)
             {
                 bpf_tap_out(pThis->u.s.pIfNet, DLT_EN10MB, pMBuf, NULL, 0);
+                ifnet_stat_increment_out(pThis->u.s.pIfNet, 1, mbuf_len(pMBuf), 0);
             }
         }
@@ -1151 +1154 @@
         /*
          * Create a mbuf for the gather list and push it onto the wire.
+         * BPF tap and stats will be taken care of by the driver.
          */
         if (fDst & INTNETTRUNKDIR_WIRE)
@@ -1167 +1171 @@
         /*
          * Create a mbuf for the gather list and push it onto the host stack.
+         * BPF tap and stats are on us.
          */
         if (fDst & INTNETTRUNKDIR_HOST)
@@ -1175 +1180 @@
                 void *pvEthHdr = mbuf_data(pMBuf);
                 unsigned const cbEthHdr = 14;
+                struct ifnet_stat_increment_param stats;
+
+                RT_ZERO(stats);
+                stats.packets_in = 1;
+                stats.bytes_in = mbuf_len(pMBuf); /* full ethernet frame */
 
                 mbuf_pkthdr_setrcvif(pMBuf, pIfNet);
@@ -1181 +1191 @@
 
                 bpf_tap_in(pIfNet, DLT_EN10MB, pMBuf, pvEthHdr, cbEthHdr);
-                errno_t err = ifnet_input(pIfNet, pMBuf, NULL);
+                errno_t err = ifnet_input(pIfNet, pMBuf, &stats);
                 if (err)
                     rc = RTErrConvertFromErrno(err);