Changeset 37724 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 1, 2011 9:45:11 AM (13 years ago)

Author:

vboxsync

Message:

NAT: todo (logging)

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (9 diffs)
• debug.c (modified) (4 diffs)
• dnsproxy/dnsproxy.c (modified) (2 diffs)
• ip_icmp.c (modified) (1 diff)
• ip_input.c (modified) (2 diffs)
• libalias/alias_dns.c (modified) (1 diff)
• slirp.c (modified) (7 diffs)
• udp.c (modified) (4 diffs)

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

@@ -256 +256 @@
     /* Address/port of the DHCP server. */
     rbp->bp_yiaddr = bc->addr; /* Client IP address */
-    Log(("NAT: DHCP: bp_yiaddr:%R[IP4]\n", &rbp->bp_yiaddr));
+    Log(("NAT: DHCP: bp_yiaddr:%R[naipv4]\n", &rbp->bp_yiaddr));
     rbp->bp_siaddr = pData->tftp_server; /* Next Server IP address, i.e. TFTP */
-    Log(("NAT: DHCP: bp_siaddr:%R[IP4]\n", &rbp->bp_siaddr));
+    Log(("NAT: DHCP: bp_siaddr:%R[naipv4]\n", &rbp->bp_siaddr));
     if (fDhcpRequest)
     {
@@ -268 +268 @@
     saddr.s_addr = pData->special_addr.s_addr;
 #endif
-    Log(("NAT: DHCP: s_addr:%R[IP4]\n", &saddr));
+    Log(("NAT: DHCP: s_addr:%R[naipv4]\n", &saddr));
 
 #define FILL_BOOTP_EXT(q, tag, len, pvalue)                     \
@@ -455 +455 @@
                if ((bp->bp_ciaddr.s_addr & RT_H2N_U32(pData->netmask)) != pData->special_addr.s_addr)
                {
-                   LogRel(("NAT: Client %R[IP4] requested IP -- sending NAK\n", &bp->bp_ciaddr));
+                   LogRel(("NAT: Client %R[naipv4] requested IP -- sending NAK\n", &bp->bp_ciaddr));
                    offReply = dhcp_send_nack(pData, bp, bc, m);
                    return offReply;
@@ -479 +479 @@
             if ((ui32 & RT_H2N_U32(pData->netmask)) != pData->special_addr.s_addr)
             {
-                LogRel(("NAT: address %R[IP4] has been requested -- sending NAK\n", &ui32));
+                LogRel(("NAT: address %R[naipv4] has been requested -- sending NAK\n", &ui32));
                 offReply = dhcp_send_nack(pData, bp, bc, m);
                 return offReply;
@@ -503 +503 @@
     }
 
-    LogRel(("NAT: DHCP offered IP address %R[IP4]\n", &bc->addr));
+    LogRel(("NAT: DHCP offered IP address %R[naipv4]\n", &bc->addr));
     offReply = dhcp_send_ack(pData, bp, bc, m, /* fDhcpRequest=*/ 1);
     return offReply;
@@ -530 +530 @@
 
         bc->xid = bp->bp_xid;
-        LogRel(("NAT: DHCP offered IP address %R[IP4]\n", &bc->addr));
+        LogRel(("NAT: DHCP offered IP address %R[naipv4]\n", &bc->addr));
         offReply = dhcp_send_offer(pData, bp, bc, m);
         return offReply;
@@ -543 +543 @@
         }
 
-        LogRel(("NAT: DHCP offered IP address %R[IP4]\n", &bc->addr));
+        LogRel(("NAT: DHCP offered IP address %R[naipv4]\n", &bc->addr));
         offReply = dhcp_send_ack(pData, bp, bc, m, /* fDhcpRequest=*/ 0);
         return offReply;
@@ -554 +554 @@
 {
     int rc = release_addr(pData, &bp->bp_ciaddr);
-    LogRel(("NAT: %s %R[IP4]\n",
+    LogRel(("NAT: %s %R[naipv4]\n",
             RT_SUCCESS(rc) ? "DHCP released IP address" : "Ignored DHCP release for IP address",
             &bp->bp_ciaddr));
@@ -710 +710 @@
                 bc->addr.s_addr = req_ip.s_addr;
                 slirp_arp_who_has(pData, bc->addr.s_addr);
-                LogRel(("NAT: %R[IP4] has been already registered\n", &req_ip));
+                LogRel(("NAT: %R[naipv4] has been already registered\n", &req_ip));
             }
             /* no response required */

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

@@ -35 +35 @@
 #endif
 
-#define IP4_ADDR_PRINTF_DECOMP(ip) ((ip) >> 24), ((ip) >> 16) & 0xff, ((ip) >> 8) & 0xff, (ip) & 0xff
-#define IP4_ADDR_PRINTF_FORMAT "%u.%u.%u.%u"
 /*
  * Dump a packet in the same format as tcpdump -x
@@ -228 +226 @@
 
 static DECLCALLBACK(size_t)
-print_ipv4_address(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
-                   const char *pszType, void const *pvValue,
-                   int cchWidth, int cchPrecision, unsigned fFlags,
-                   void *pvUser)
-{
-    uint32_t ip;
-
-    AssertReturn(strcmp(pszType, "IP4") == 0, 0);
-
-    ip = RT_N2H_U32(*(uint32_t*)pvValue);
-    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, IP4_ADDR_PRINTF_FORMAT,
-           IP4_ADDR_PRINTF_DECOMP(ip));
-}
-
-static DECLCALLBACK(size_t)
 print_socket(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
              const char *pszType, void const *pvValue,
@@ -273 +256 @@
     ip = RT_N2H_U32(so->so_faddr.s_addr);
     return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket %d:(proto:%u) "
-            "state=%04x ip=" IP4_ADDR_PRINTF_FORMAT ":%d "
-            "name=" IP4_ADDR_PRINTF_FORMAT ":%d",
-            so->s, so->so_type, so->so_state, IP4_ADDR_PRINTF_DECOMP(ip),
+            "state=%04x ip=%RTnaipv4 :%d "
+            "name=%RTnaipv4:%d",
+            so->s, so->so_type, so->so_state, ip,
             RT_N2H_U16(so->so_fport),
-            IP4_ADDR_PRINTF_DECOMP(RT_N2H_U32(in_addr->sin_addr.s_addr)),
+            in_addr->sin_addr.s_addr,
             RT_N2H_U16(in_addr->sin_port));
 }
@@ -372 +355 @@
     if (!g_fFormatRegistered)
     {
-        /** @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("natsock", print_socket, NULL);

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

@@ -358 +358 @@
         so->so_expire = curtime + recursive_timeout * 1000; /* let's slirp to care about expiration */
         /* send it to our authoritative server */
-        Log2(("NAT: request will be sent to %R[IP4] on %R[natsock]\n", &addr.sin_addr, so));
+        Log2(("NAT: request will be sent to %R[naipv4] on %R[natsock]\n", &addr.sin_addr, so));
         if ((byte = sendto(so->s, buf, (unsigned int)byte, 0,
                     (struct sockaddr *)&addr,
@@ -367 +367 @@
         }
         so->so_state = SS_ISFCONNECTED; /* now it's selected */
-        Log2(("NAT: request was sent to %R[IP4] on %R[natsock]\n", &addr.sin_addr, so));
+        Log2(("NAT: request was sent to %R[naipv4] on %R[natsock]\n", &addr.sin_addr, so));
 #endif
         ++authoritative_queries;

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

@@ -263 +263 @@
             {
                 /* Should be reaplaced by hash here */
-                Log(("trying:%R[natsock] against %R[IP4]:%d lport=%d hlport=%d\n", so, &faddr, fport, lport, so->so_hlport));
+                Log(("trying:%R[natsock] against %R[naipv4]:%d lport=%d hlport=%d\n", so, &faddr, fport, lport, so->so_hlport));
                 if (   so->so_faddr.s_addr == faddr.s_addr
                     && so->so_fport == fport

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

@@ -113 +113 @@
     LogFlow(("ip_input: m = %lx\n", (long)m));
     ip = mtod(m, struct ip *);
-    Log2(("ip_dst=%R[IP4](len:%d) m_len = %d\n", &ip->ip_dst, RT_N2H_U16(ip->ip_len), m->m_len));
+    Log2(("ip_dst=%R[naipv4](len:%d) m_len = %d\n", &ip->ip_dst, RT_N2H_U16(ip->ip_len), m->m_len));
 
     ipstat.ips_total++;
@@ -238 +238 @@
 
 bad_free_m:
-    Log2(("NAT: IP datagram to %R[IP4] with size(%d) claimed as bad\n",
+    Log2(("NAT: IP datagram to %R[naipv4] with size(%d) claimed as bad\n",
         &ip->ip_dst, ip->ip_len));
     m_freem(pData, m);

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

@@ -79 +79 @@
         return -1;
 
-    Log(("NAT:%s: ah(dport: %hd, sport: %hd) oaddr:%R[IP4] aaddr:%R[IP4]\n",
+    Log(("NAT:%s: ah(dport: %hd, sport: %hd) oaddr:%R[naipv4] aaddr:%R[naipv4]\n",
         __FUNCTION__, ntohs(*ah->dport), ntohs(*ah->sport),
         &ah->oaddr, &ah->aaddr));

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

@@ -335 +335 @@
             }
 
-            Log(("NAT: adding %R[IP4] to DNS server list\n", &InAddr));
+            Log(("NAT: adding %R[naipv4] to DNS server list\n", &InAddr));
             if ((InAddr.s_addr & RT_H2N_U32_C(IN_CLASSA_NET)) == RT_N2H_U32_C(INADDR_LOOPBACK & IN_CLASSA_NET))
                 pDns->de_addr.s_addr = RT_H2N_U32(RT_N2H_U32(pData->special_addr.s_addr) | CTL_ALIAS);
@@ -1470 +1470 @@
                 if (!fGratuitousArpReported)
                 {
-                    LogRel(("NAT: Gratuitous ARP [IP:%R[IP4], ether:%RTmac]\n",
+                    LogRel(("NAT: Gratuitous ARP [IP:%R[naipv4], ether:%RTmac]\n",
                             ah->ar_sip, ah->ar_sha));
                     fGratuitousArpReported = true;
@@ -1686 +1686 @@
 #endif
 
-        LogRel(("NAT: set redirect %s host port %d => guest port %d @ %R[IP4]\n",
+        LogRel(("NAT: set redirect %s host port %d => guest port %d @ %R[naipv4]\n",
                rule->proto == IPPROTO_UDP ? "UDP" : "TCP", rule->host_port, rule->guest_port, &guest_addr));
 
@@ -1800 +1800 @@
             && rule->activated)
         {
-            LogRel(("NAT: remove redirect %s host port %d => guest port %d @ %R[IP4]\n",
+            LogRel(("NAT: remove redirect %s host port %d => guest port %d @ %R[naipv4]\n",
                    rule->proto == IPPROTO_UDP ? "UDP" : "TCP", rule->host_port, rule->guest_port, &guest_addr));
 
@@ -2095 +2095 @@
         if (!fBroadcastEtherAddReported)
         {
-            LogRel(("NAT: Attempt to add pair [%RTmac:%R[IP4]] in ARP cache was ignored\n",
+            LogRel(("NAT: Attempt to add pair [%RTmac:%R[naipv4]] in ARP cache was ignored\n",
                     mac, &dst));
             fBroadcastEtherAddReported = true;
@@ -2145 +2145 @@
     LIST_FOREACH(ac, &pData->arp_cache, list)
     {
-        pHlp->pfnPrintf(pHlp, " %R[IP4] %RTmac\n", &ac->ip, &ac->ether);
+        pHlp->pfnPrintf(pHlp, " %R[naipv4] %RTmac\n", &ac->ip, &ac->ether);
     }
 
@@ -2151 +2151 @@
     LIST_FOREACH(rule, &pData->port_forward_rule_head, list)
     {
-        pHlp->pfnPrintf(pHlp, " %s %d => %R[IP4]:%d %c\n",
+        pHlp->pfnPrintf(pHlp, " %s %d => %R[naipv4]:%d %c\n",
                         rule->proto == IPPROTO_UDP ? "UDP" : "TCP",
                         rule->host_port, &rule->guest_addr.s_addr, rule->guest_port,

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

@@ -97 +97 @@
     LogFlow(("udp_input: m = %lx, iphlen = %d\n", (long)m, iphlen));
     ip = mtod(m, struct ip *);
-    Log2(("%R[IP4] iphlen = %d\n", &ip->ip_dst, iphlen));
+    Log2(("%R[naipv4] iphlen = %d\n", &ip->ip_dst, iphlen));
 
     udpstat.udps_ipackets++;
@@ -296 +296 @@
         m->m_data -= iphlen;
         *ip = save_ip;
-        Log2(("NAT: UDP tx errno = %d (%s) on sent to %R[IP4]\n",
+        Log2(("NAT: UDP tx errno = %d (%s) on sent to %R[naipv4]\n",
               errno, strerror(errno), &ip->ip_dst));
         icmp_error(pData, m, ICMP_UNREACH, ICMP_UNREACH_NET, 0, strerror(errno));
@@ -314 +314 @@
 
 bad_free_mbuf:
-    Log2(("NAT: UDP(id: %hd) datagram to %R[IP4] with size(%d) claimed as bad\n",
+    Log2(("NAT: UDP(id: %hd) datagram to %R[naipv4] with size(%d) claimed as bad\n",
         ip->ip_id, &ip->ip_dst, ip->ip_len));
 
@@ -518 +518 @@
     if (bind(so->s,(struct sockaddr *)&addr, addrlen) < 0)
     {
-        LogRel(("NAT: bind to %R[IP4] has been failed\n", &addr.sin_addr));
+        LogRel(("NAT: bind to %R[naipv4] has been failed\n", &addr.sin_addr));
         udp_detach(pData, so);
         return NULL;