Changeset 25276 in vbox

Timestamp:

Dec 9, 2009 4:23:51 PM (15 years ago)

Author:

vboxsync

Message:

NAT: force re-activation of port forwarding on link down; coding style; added some log statements

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (23 diffs)
• ip_input.c (modified) (1 diff)
• slirp.c (modified) (19 diffs)
• slirp_state.h (modified) (1 diff)

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

@@ -40 +40 @@
 /* XXX: only DHCP is supported */
 static const uint8_t rfc1533_cookie[] = { RFC1533_COOKIE };
-static void bootp_reply(PNATState pData, struct mbuf *m0, int off, uint16_t flags);
+
+static void bootp_reply(PNATState pData, struct mbuf *m0, int offReply, uint16_t flags);
 
 static uint8_t *dhcp_find_option(uint8_t *vend, uint8_t tag)
@@ -60 +61 @@
     return NULL;
 }
+
 static BOOTPClient *bc_alloc_client(PNATState pData)
 {
@@ -78 +80 @@
     return NULL;
 }
+
 static BOOTPClient *get_new_addr(PNATState pData, struct in_addr *paddr)
 {
     BOOTPClient *bc;
     bc = bc_alloc_client(pData);
-    if (bc == NULL)
+    if (!bc)
         return NULL;
+
     paddr->s_addr = htonl(ntohl(pData->special_addr.s_addr) | (bc->number + START_ADDR));
     bc->addr.s_addr = paddr->s_addr;
@@ -97 +101 @@
         {
             memset(&bootp_clients[i], 0, sizeof(BOOTPClient));
-            return 1;
-        }
-    }
-    return 0;
+            return VINF_SUCCESS;
+        }
+    }
+    return VERR_NOT_FOUND;
 }
 
@@ -205 +209 @@
 }
 
-static int dhcp_do_ack_offer(PNATState pData, struct mbuf *m, BOOTPClient *bc, int is_from_request)
-{
-    int off = 0;
+static int dhcp_do_ack_offer(PNATState pData, struct mbuf *m, BOOTPClient *bc, int fDhcpRequest)
+{
     struct bootp_t *rbp = NULL;
     uint8_t *q;
@@ -236 +239 @@
     rbp->bp_siaddr = pData->tftp_server; /* Next Server IP address, i.e. TFTP */
     Log(("NAT: DHCP: bp_siaddr:%R[IP4]\n", &rbp->bp_siaddr));
-    if (is_from_request)
+    if (fDhcpRequest)
     {
         rbp->bp_ciaddr.s_addr = bc->addr.s_addr; /* Client IP address */
@@ -331 +334 @@
 
     dhcp_create_msg(pData, bp, m, DHCPNAK);
-
     return 7;
 }
-static int dhcp_send_ack(PNATState pData, struct bootp_t *bp, BOOTPClient *bc, struct mbuf *m, int is_from_request)
+
+static int dhcp_send_ack(PNATState pData, struct bootp_t *bp, BOOTPClient *bc, struct mbuf *m, int fDhcpRequest)
 {
     struct bootp_t *rbp;
-    int off = 0; /* boot_reply will fill general options and add END before sending response*/
+    int offReply = 0; /* boot_reply will fill general options and add END before sending response */
 
     dhcp_create_msg(pData, bp, m, DHCPACK);
-    off = dhcp_do_ack_offer(pData, m, bc, is_from_request);
-    return off;
-}
+    offReply = dhcp_do_ack_offer(pData, m, bc, fDhcpRequest);
+    return offReply;
+}
+
 static int dhcp_send_offer(PNATState pData, struct bootp_t *bp, BOOTPClient *bc, struct mbuf *m)
 {
-    int off = 0; /* boot_reply will fill general options and add END before sending response*/
+    int offReply = 0; /* boot_reply will fill general options and add END before sending response */
 
     dhcp_create_msg(pData, bp, m, DHCPOFFER);
-    off = dhcp_do_ack_offer(pData, m, bc, 0);
-    return off;
+    offReply = dhcp_do_ack_offer(pData, m, bc, /* fDhcpRequest=*/ 0);
+    return offReply;
 }
 
@@ -364 +368 @@
  *
  */
-enum DHCP_REQUEST_STATES{INIT_REBOOT, SELECTING, RENEWING, REBINDING, NONE};
+
+enum DHCP_REQUEST_STATES
+{
+    INIT_REBOOT,
+    SELECTING,
+    RENEWING,
+    REBINDING,
+    NONE
+};
+
 static int dhcp_decode_request(PNATState pData, struct bootp_t *bp, const uint8_t *buf, int size, struct mbuf *m)
 {
     BOOTPClient *bc = NULL;
     struct in_addr daddr;
-    int off;
+    int offReply;
     uint8_t *opt;
     uint8_t *req_ip = NULL;
@@ -375 +388 @@
     uint32_t ui32;
     enum DHCP_REQUEST_STATES dhcp_stat = NONE;
-    /*need to understand which type of request we get */
+
+    /* need to understand which type of request we get */
     req_ip = dhcp_find_option(&bp->bp_vend[0], RFC2132_REQ_ADDR);
     server_ip = dhcp_find_option(&bp->bp_vend[0], RFC2132_SRV_ID);
@@ -382 +396 @@
     if (server_ip != NULL)
     {
-        /*selecting*/
+        /* selecting */
         if (!bc)
         {
-             LogRel(("NAT: DHCP no IP wasn't allocated\n"));
+             LogRel(("NAT: DHCP no IP was allocated\n"));
              return -1;
         }
+
         dhcp_stat = SELECTING;
         Assert((bp->bp_ciaddr.s_addr == INADDR_ANY));
@@ -412 +427 @@
         }
     }
-        /*?? renewing ??*/
+
+    /*?? renewing ??*/
     switch (dhcp_stat)
     {
         case RENEWING:
-        {
-            Assert((   server_ip == NULL
-                && req_ip == NULL
-                && bp->bp_ciaddr.s_addr != INADDR_ANY));
+            Assert((server_ip == NULL && req_ip == NULL && bp->bp_ciaddr.s_addr != INADDR_ANY));
             if (bc != NULL)
             {
@@ -429 +442 @@
                if ((bp->bp_ciaddr.s_addr & htonl(pData->netmask)) != pData->special_addr.s_addr)
                {
-                    off = dhcp_send_nack(pData, bp, bc, m);
-                    return off;
+                   LogRel(("NAT: Client %R[IP4] requested IP -- sending NAK\n", &bp->bp_ciaddr));
+                   offReply = dhcp_send_nack(pData, bp, bc, m);
+                   return offReply;
                }
+
                bc = bc_alloc_client(pData);
-               if (bc == NULL)
+               if (!bc)
                {
-                   LogRel(("NAT: can't alloc address. RENEW has been silently ignored\n"));
+                   LogRel(("NAT: can't alloc address. RENEW has been silently ignored.\n"));
                    return -1;
                }
+
                Assert((bp->bp_hlen == ETH_ALEN));
                memcpy(bc->macaddr, bp->bp_hwaddr, bp->bp_hlen);
@@ -443 +459 @@
                slirp_arp_cache_update(pData, bp->bp_ciaddr.s_addr, bp->bp_hwaddr);
             }
-        }
-        break;
+            break;
+
         case INIT_REBOOT:
             Assert(server_ip == NULL);
@@ -451 +467 @@
             if ((ui32 & htonl(pData->netmask)) != pData->special_addr.s_addr)
             {
-                LogRel(("NAT: address %R[IP4] has been req.\n", &ui32));
-                 off = dhcp_send_nack(pData, bp, bc, m);
-                 return off;
+                LogRel(("NAT: address %R[IP4] has been requested -- sending NAK\n", &ui32));
+                offReply = dhcp_send_nack(pData, bp, bc, m);
+                return offReply;
             }
+
             bc = bc_alloc_client(pData);
-            if (bc == NULL)
+            if (!bc)
             {
                 LogRel(("NAT: can't alloc address. RENEW has been silently ignored\n"));
@@ -465 +482 @@
             bc->addr.s_addr = ui32;
             slirp_arp_cache_update(pData, bp->bp_ciaddr.s_addr, bp->bp_hwaddr);
-        break;
+            break;
+
         case NONE:
             Assert((dhcp_stat != NONE));
             return -1;
+
         default:
-        break;
-    }
-    off = dhcp_send_ack(pData, bp, bc, m, 1);
-    return off;
-}
-
-static int dhcp_decode_discover(PNATState pData, struct bootp_t *bp, const uint8_t *buf, int size, int flag, struct mbuf *m)
+            break;
+    }
+
+    LogRel(("NAT: DHCP offered IP address %R[IP4]\n", &bc->addr));
+    offReply = dhcp_send_ack(pData, bp, bc, m, /* fDhcpRequest=*/ 1);
+    return offReply;
+}
+
+static int dhcp_decode_discover(PNATState pData, struct bootp_t *bp, const uint8_t *buf, int size, int fDhcpDiscover, struct mbuf *m)
 {
     BOOTPClient *bc;
     struct in_addr daddr;
-    int off;
-    /* flag == 1 discover */
-    if (flag == 1)
+    int offReply;
+
+    if (fDhcpDiscover)
     {
         bc = find_addr(pData, &daddr, bp->bp_hwaddr);
@@ -496 +517 @@
             memcpy(bc->macaddr, bp->bp_hwaddr, 6);
         }
+
         bc->xid = bp->bp_xid;
-        /*bc isn't NULL */
-        off = dhcp_send_offer(pData, bp, bc, m);
-        return off;
+        LogRel(("NAT: DHCP offered IP address %R[IP4]\n", &bc->addr));
+        offReply = dhcp_send_offer(pData, bp, bc, m);
+        return offReply;
     }
     else
     {
-        /* flag == 0 inform */
         bc = find_addr(pData, &daddr, bp->bp_hwaddr);
-        if (bc == NULL)
+        if (!bc)
         {
             LogRel(("NAT: DHCP Inform was ignored no boot client was found\n"));
             return -1;
         }
-        off = dhcp_send_ack(pData, bp, bc, m, 0);
-        return off;
-    }
+
+        LogRel(("NAT: DHCP offered IP address %R[IP4]\n", &bc->addr));
+        offReply = dhcp_send_ack(pData, bp, bc, m, /* fDhcpRequest=*/ 0);
+        return offReply;
+    }
+
     return -1;
 }
@@ -518 +542 @@
 static int dhcp_decode_release(PNATState pData, struct bootp_t *bp, const uint8_t *buf, int size)
 {
-    release_addr(pData, &bp->bp_ciaddr);
+    int rc = release_addr(pData, &bp->bp_ciaddr);
+    LogRel(("NAT: %s %R[IP4]\n",
+            RT_SUCCESS(rc) ? "DHCP released IP address" : "Ignored DHCP release for IP address",
+            &bp->bp_ciaddr));
     return 0;
 }
@@ -592 +619 @@
     int pmsg_type;
     struct in_addr req_ip;
-    int flag = 0;
+    int fDhcpDiscover = 0;
     int len, tag;
     struct mbuf *m = NULL;
@@ -619 +646 @@
         return;
     }
+
     switch (*(p+2))
     {
         case DHCPDISCOVER:
-            flag = 1;
+            fDhcpDiscover = 1;
             /**/
         case DHCPINFORM:
-            rc = dhcp_decode_discover(pData, bp, buf, size, flag, m);
+            rc = dhcp_decode_discover(pData, bp, buf, size, fDhcpDiscover, m);
             if (rc > 0)
                 goto reply;
@@ -671 +699 @@
 }
 
-static void bootp_reply(PNATState pData, struct mbuf *m, int off, uint16_t flags)
+static void bootp_reply(PNATState pData, struct mbuf *m, int offReply, uint16_t flags)
 {
     struct sockaddr_in saddr, daddr;
@@ -682 +710 @@
     q = rbp->bp_vend;
     nack = (q[6] == DHCPNAK);
-    q += off;
+    q += offReply;
 
 #ifndef VBOX_WITH_NAT_SERVICE
@@ -692 +720 @@
     FILL_BOOTP_EXT(q, RFC2132_SRV_ID, 4, &saddr.sin_addr);
 
-
-    *q++ = RFC1533_END; /*end of message */
-
+    *q++ = RFC1533_END; /* end of message */
 
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
@@ -725 +751 @@
     int i;
 
-    if (ether == NULL || pip == NULL)
+    if (!ether || !pip)
         return VERR_INVALID_PARAMETER;
 

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

@@ -233 +233 @@
     STAM_PROFILE_STOP(&pData->StatIP_input, a);
     return;
+
 bad:
     Log2(("NAT: IP datagram to %R[IP4] with size(%d) claimed as bad\n",

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

@@ -194 +194 @@
 #define LOG_NAT_SOCK(so, proto, winevent, r_fdset, w_fdset, x_fdset) DO_LOG_NAT_SOCK((so), proto, (winevent), r_fdset, w_fdset, x_fdset)
 
-static void activate_port_forwarding(PNATState, struct ethhdr *);
+static void activate_port_forwarding(PNATState, uint8_t *pEther);
 
 static const uint8_t special_ethaddr[6] =
@@ -662 +662 @@
 {
     struct socket *so;
+    struct port_forward_rule *rule = NULL;
 
     while ((so = tcb.so_next) != &tcb)
@@ -673 +674 @@
     while ((so = udb.so_next) != &udb)
         udp_detach(pData, so);
+
+    /*
+     *  Clear the active state of port-forwarding rules to force
+     *  re-setup on restoration of communications.
+     */
+    LIST_FOREACH(rule, &pData->port_forward_rule_head, list)
+    {
+        rule->activated = 0;
+    }
+    pData->cRedirectionsActive = 0;
 
     link_up = 0;
@@ -1516 +1527 @@
                 slirp_arp_cache_add(pData, *(uint32_t *)ah->ar_tip, &eh->h_dest[0]);
                 /* good opportunity to activate port-forwarding on address (self)asignment*/
-                if (pData->port_forwarding_activated != pData->port_forwarding_count)
-                    activate_port_forwarding(pData, eh);
+                if (pData->cRedirectionsActive != pData->cRedirectionsStored)
+                    activate_port_forwarding(pData, eh->h_source);
             }
             break;
@@ -1529 +1540 @@
             slirp_arp_cache_add(pData, *(uint32_t *)ah->ar_sip, ah->ar_sha);
             /* after/save restore we need up port forwarding again */
-            if (pData->port_forwarding_activated != pData->port_forwarding_count)
-                activate_port_forwarding(pData, eh);
+            if (pData->cRedirectionsActive != pData->cRedirectionsStored)
+                activate_port_forwarding(pData, eh->h_source);
             m_free(pData, m);
             break;
@@ -1554 +1565 @@
     struct ethhdr *eh;
 #endif
+    uint8_t au8Ether[ETH_ALEN];
 
 #ifndef VBOX_WITH_SLIRP_BSD_MBUF
@@ -1607 +1619 @@
     /* Note: we add to align the IP header */
 
-    if (pData->port_forwarding_activated != pData->port_forwarding_count)
-        activate_port_forwarding(pData, mtod(m, struct ethhdr *));
+    memcpy(au8Ether, eh->h_source, ETH_ALEN);
 
     switch(proto)
@@ -1653 +1664 @@
     }
 
+    if (pData->cRedirectionsActive != pData->cRedirectionsStored)
+        activate_port_forwarding(pData, au8Ether);
+
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
     RTMemFree((void *)pkt);
@@ -1729 +1743 @@
     uint32_t ip = INADDR_ANY;
     int rc;
-    
+
     if (eth_addr == NULL)
         return INADDR_ANY;
@@ -1752 +1766 @@
  * @todo finish this for service case
  */
-static void activate_port_forwarding(PNATState pData, struct ethhdr *ethdr)
+static void activate_port_forwarding(PNATState pData, uint8_t *h_source)
 {
     struct port_forward_rule *rule = NULL;
@@ -1771 +1785 @@
 
         if (rule->activated)
-            continue; /*already activated */
+            continue;
+
 #ifdef VBOX_WITH_NAT_SERVICE
-        if (memcmp(rule->mac_address, ethdr->h_source, ETH_ALEN) != 0)
+        if (memcmp(rule->mac_address, h_source, ETH_ALEN) != 0)
             continue; /*not right mac, @todo: it'd be better do the list port forwarding per mac */
-        guest_addr = find_guest_ip(pData, ethdr->h_source);
+        guest_addr = find_guest_ip(pData, h_source);
 #else
 #if 0
-        if (memcmp(client_ethaddr, ethdr->h_source, ETH_ALEN) != 0)
+        if (memcmp(client_ethaddr, h_source, ETH_ALEN) != 0)
             continue;
 #endif
-        guest_addr = find_guest_ip(pData, ethdr->h_source);
+        guest_addr = find_guest_ip(pData, h_source);
 #endif
         if (guest_addr == INADDR_ANY)
@@ -1788 +1803 @@
             return;
         }
+
 #if !defined(VBOX_WITH_NAT_SERVICE)
         if (rule->guest_addr.s_addr != guest_addr)
@@ -1793 +1809 @@
 #endif
 
-        LogRel(("NAT: set redirect %s hp:%d gp:%d\n", (rule->proto == IPPROTO_UDP?"UDP":"TCP"),
-            rule->host_port, rule->guest_port));
+        LogRel(("NAT: set redirect %s host port %d => guest port %d @ %R[IP4]\n",
+               (rule->proto == IPPROTO_UDP?"UDP":"TCP"),
+               rule->host_port, rule->guest_port, &guest_addr));
 
         if (rule->proto == IPPROTO_UDP)
-        {
             so = udp_listen(pData, rule->bind_ip.s_addr, htons(rule->host_port), guest_addr,
                             htons(rule->guest_port), 0);
-            pData->port_forwarding_activated++;
-        }
         else
-        {
             so = solisten(pData, rule->bind_ip.s_addr, htons(rule->host_port), guest_addr,
                           htons(rule->guest_port), 0);
-            pData->port_forwarding_activated++;
-        }
 
         if (so == NULL)
-        {
-            LogRel(("NAT: failed redirect %s hp:%d gp:%d\n", (rule->proto == IPPROTO_UDP?"UDP":"TCP"),
-                rule->host_port, rule->guest_port));
             goto remove_port_forwarding;
-        }
 
         psin = (struct sockaddr_in *)&sa;
@@ -1824 +1831 @@
         rc = getsockname(so->s, &sa, &socketlen);
         if (rc < 0 || sa.sa_family != AF_INET)
-        {
-            LogRel(("NAT: failed redirect %s hp:%d gp:%d\n", (rule->proto == IPPROTO_UDP?"UDP":"TCP"),
-                rule->host_port, rule->guest_port));
             goto remove_port_forwarding;
-        }
 
         psin = (struct sockaddr_in *)&sa;
@@ -1844 +1847 @@
                                     rule->proto);
         if (!link)
-        {
-            LogRel(("NAT: failed redirect %s hp:%d gp:%d\n", (rule->proto == IPPROTO_UDP?"UDP":"TCP"),
-                   rule->host_port, rule->guest_port));
             goto remove_port_forwarding;
-        }
 
         so->so_la = lib;
         rule->activated = 1;
+        pData->cRedirectionsActive++;
         continue;
 
     remove_port_forwarding:
+        LogRel(("NAT: failed to redirect %s %d => %d\n",
+                (rule->proto == IPPROTO_UDP?"UDP":"TCP"), rule->host_port, rule->guest_port));
         LIST_REMOVE(rule, list);
-        pData->port_forwarding_count--;
+        pData->cRedirectionsStored--;
         RTMemFree(rule);
     }
@@ -1878 +1880 @@
     struct port_forward_rule *rule = NULL;
     Assert(memcmp(ethaddr, zerro_ethaddr, ETH_ALEN) == 0);
+
     rule = RTMemAllocZ(sizeof(struct port_forward_rule));
     if (rule == NULL)
         return 1;
+
     rule->proto = (is_udp ? IPPROTO_UDP : IPPROTO_TCP);
     rule->host_port = host_port;
@@ -1891 +1895 @@
     /* @todo add mac address */
     LIST_INSERT_HEAD(&pData->port_forward_rule_head, rule, list);
-    pData->port_forwarding_count++;
+    pData->cRedirectionsStored++;
     return 0;
 }
 
 int slirp_add_exec(PNATState pData, int do_pty, const char *args, int addr_low_byte,
-                  int guest_port)
+                   int guest_port)
 {
     return add_exec(&exec_list, do_pty, (char *)args,
@@ -1999 +2003 @@
     }
     else
-    {
         LogRel(("NAT: Host Resolver conflicts with DNS proxy, the last one was forcely ignored\n"));
-    }
 }
 
@@ -2013 +2015 @@
         }                                                                           \
         else                                                                        \
-        {                                                                           \
             LogRel(("NAT: (" #name ":%d)\n", (val)));                               \
-        }                                                                           \
     } while (0)
 

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -318 +318 @@
     LIST_HEAD(handler_chain, proto_handler) handler_chain;
     struct port_forward_rule_list port_forward_rule_head;
-    int port_forwarding_activated;
-    int port_forwarding_count;
+    int cRedirectionsActive;
+    int cRedirectionsStored;
     struct arp_cache_head arp_cache;
     /*libalis modules' handlers*/