Changeset 36410 in vbox

Timestamp:

Mar 24, 2011 4:39:24 PM (14 years ago)

Author:

vboxsync

Message:

slipr: %R[ether] -> %RTmac.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• debug.c (modified) (2 diffs)
• slirp.c (modified) (3 diffs)

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

@@ -243 +243 @@
 
 static DECLCALLBACK(size_t)
-print_ether_address(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
-                   const char *pszType, void const *pvValue,
-                   int cchWidth, int cchPrecision, unsigned fFlags,
-                   void *pvUser)
-{
-    char *ether = (char *)pvValue;
-
-    AssertReturn(strcmp(pszType, "ether") == 0, 0);
-    if (ether)
-        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
-            "[ether %hhx:%hhx:%hhx:%hhx:%hhx:%hhx]",
-            ether[0], ether[1], ether[2],
-            ether[3], ether[4], ether[5]);
-    else
-        return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "[ether null]");
-}
-
-static DECLCALLBACK(size_t)
 print_socket(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
              const char *pszType, void const *pvValue,
@@ -390 +372 @@
     if (!g_fFormatRegistered)
     {
-        /*
-         * XXX(r - frank): Move this to IPRT using RTNETADDRIPV4.
-         * Use the specifier %RNAipv4.
+        /** @todo r=frank: XXX Move this to IPRT using RTNETADDRIPV4.
+         * Use the specifier %RTnaipv4 (tip: takes an "uint32_t" instead of an
+         * address).
          */
         rc = RTStrFormatTypeRegister("IP4", print_ipv4_address, NULL);
         AssertRC(rc);
-        rc = RTStrFormatTypeRegister("ether", print_ether_address, NULL);
-        AssertRC(rc);
+
         rc = RTStrFormatTypeRegister("natsock", print_socket, NULL);
         AssertRC(rc);
         rc = RTStrFormatTypeRegister("natwinnetevents",
-            print_networkevents, NULL);
+                                     print_networkevents, NULL);
         AssertRC(rc);
         rc = RTStrFormatTypeRegister("tcpcb793", printTcpcbRfc793, NULL);

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

@@ -1459 +1459 @@
                 if (!fGratuitousArpReported)
                 {
-                    LogRel(("NAT: Gratuitous ARP [IP:%R[IP4], ether:%R[ether]]\n",
+                    LogRel(("NAT: Gratuitous ARP [IP:%R[IP4], ether:%RTmac]\n",
                             ah->ar_sip, ah->ar_sha));
                     fGratuitousArpReported = true;
@@ -2073 +2073 @@
         if (!fBroadcastEtherAddReported)
         {
-            LogRel(("NAT: Attempt to add pair [%R[ether]:%R[IP4]] in ARP cache was ignored\n",
+            LogRel(("NAT: Attempt to add pair [%RTmac:%R[IP4]] in ARP cache was ignored\n",
                     mac, &dst));
             fBroadcastEtherAddReported = true;
@@ -2123 +2123 @@
     LIST_FOREACH(ac, &pData->arp_cache, list)
     {
-        pHlp->pfnPrintf(pHlp, " %R[IP4] %R[ether]\n", &ac->ip, &ac->ether);
+        pHlp->pfnPrintf(pHlp, " %R[IP4] %RTmac\n", &ac->ip, &ac->ether);
     }