Ticket #7346: net_server.patch

DHCPClient.cpp

@@ -422 +422 @@
     fConfiguration(kMsgConfigureInterface),
     fResolverConfiguration(kMsgConfigureResolver),
     fRunner(NULL),
+    fAssignedAddress(0),
     fServer(AF_INET, NULL, DHCP_SERVER_PORT),
     fLeaseTime(0)
 {
@@ -436 +437 @@
 
     memcpy(fMAC, link.LinkLevelAddress(), sizeof(fMAC));
 
+    if ((interface.Flags() & IFF_AUTO_CONFIGURED) != 0) {
+        // Check for interface previous auto-configured address, if any.
+        BNetworkInterfaceAddress interfaceAddress;
+        int index = interface.FindFirstAddress(AF_INET);
+        if (index >= 0
+            && interface.GetAddressAt(index, interfaceAddress) == B_OK) {
+            BNetworkAddress address = interfaceAddress.Address();
+            const sockaddr_in& addr = (sockaddr_in&)address.SockAddr();
+            fAssignedAddress = addr.sin_addr.s_addr;
+        }
+    }
+
     openlog_thread("DHCP", 0, LOG_DAEMON);
 }
 
@@ -466 +479 @@
 status_t
 DHCPClient::Initialize()
 {
-    fStatus = _Negotiate(INIT);
-    syslog(LOG_DEBUG, "DHCP for %s, status: %s\n", Device(), strerror(fStatus));
+    fStatus = _Negotiate(fAssignedAddress == 0 ? INIT : INIT_REBOOT);
+    syslog(LOG_DEBUG, "%s: DHCP status = %s\n", Device(), strerror(fStatus));
     return fStatus;
 }
 
@@ -527 +540 @@
 
     // send discover/request message
     _SendMessage(socket, state == INIT ? discover : request,
-        state != RENEWAL ? broadcast : fServer);
+        state != RENEWING ? broadcast : fServer);
         // no need to check the status; in case of an error we'll just send
         // the message again
 
     // receive loop until we've got an offer and acknowledged it
 
-    while (state != ACKNOWLEDGED) {
+    while (state != BOUND) {
         char buffer[2048];
         struct sockaddr_in from;
         socklen_t fromLength = sizeof(from);
@@ -546 +559 @@
                 return B_TIMED_OUT;
             }
 
-            if (state == INIT)
-                _SendMessage(socket, discover, broadcast);
-            else {
-                _SendMessage(socket, request,
-                    state != RENEWAL ? broadcast : fServer);
-            }
+            _SendMessage(socket, state == INIT ? discover : request,
+                state != RENEWING ? broadcast : fServer);
 
             continue;
         } else if (bytesReceived < 0)
@@ -566 +575 @@
             continue;
         }
 
-        syslog(LOG_DEBUG, "Received %s from %s for %s\n",
-            dhcp_message::TypeToString(message->Type()),
-                _AddressToString(from.sin_addr.s_addr).String(), Device());
+        // advance from startup state
+        if (state == INIT)
+            state = SELECTING;
+        else if (state == INIT_REBOOT)
+            state = REBOOTING;
 
+        syslog(LOG_DEBUG, "%s: Received %s from %s\n",
+            Device(), dhcp_message::TypeToString(message->Type()),
+            _AddressToString(from.sin_addr.s_addr).String());
+
         switch (message->Type()) {
             case DHCP_NONE:
             default:
@@ -579 +594 @@
             case DHCP_OFFER:
             {
                 // first offer wins
-                if (state != INIT)
+                if (state != SELECTING)
                     break;
 
                 // collect interface options
@@ -590 +605 @@
 
                 fConfiguration.MakeEmpty();
                 fConfiguration.AddString("device", Device());
-                fConfiguration.AddBool("auto", true);
+                fConfiguration.AddBool("auto_configured", true);
 
                 BMessage address;
                 address.AddString("family", "inet");
@@ -614 +629 @@
 
             case DHCP_ACK:
             {
-                if (state != REQUESTING && state != REBINDING
-                    && state != RENEWAL)
+                if (state != REQUESTING
+                    && state != REBOOTING
+                    && state != REBINDING
+                    && state != RENEWING)
                     continue;
 
                 // TODO: we might want to configure the stuff, don't we?
@@ -626 +643 @@
                     // way
 
                 // our address request has been acknowledged
-                state = ACKNOWLEDGED;
+                state = BOUND;
 
                 // configure interface
                 BMessage reply;
@@ -644 +661 @@
             }
 
             case DHCP_NACK:
-                if (state != REQUESTING)
+                if (state != REQUESTING
+                    && state != REBOOTING
+                    && state != REBINDING
+                    && state != RENEWING)
                     continue;
 
+                if (state == REBOOTING) {
+                    // server reject our request on previous assigned address
+                    // back to square one...
+                    fAssignedAddress = 0;
+                }
+
                 // try again (maybe we should prefer other servers if this
                 // happens more than once)
                 status = _SendMessage(socket, discover, broadcast);
@@ -819 +845 @@
                     (uint32)server.sin_addr.s_addr);
             }
 
-            if (state == INIT || state == REQUESTING) {
+            if (state == INIT || state == INIT_REBOOT 
+                || state == REQUESTING) {
                 next = message.PutOption(next, OPTION_REQUEST_IP_ADDRESS,
                     (uint32)fAssignedAddress);
             } else
@@ -866 +893 @@
         if (++tries > 2)
             return false;
     }
-    syslog(LOG_DEBUG, "Timeout shift for %s: %lu secs (try %lu)\n",
+    syslog(LOG_DEBUG, "%s: Timeout shift: %lu secs (try %lu)\n",
         Device(), timeout, tries);
 
     struct timeval value;
@@ -898 +925 @@
 DHCPClient::_SendMessage(int socket, dhcp_message& message,
     const BNetworkAddress& address) const
 {
-    syslog(LOG_DEBUG, "Send %s to %s on %s\n",
-        dhcp_message::TypeToString(message.Type()),
-            address.ToString().String(), Device());
+    message_type type = message.Type();
+    BString text;
+    text << dhcp_message::TypeToString(type);
+ 
+    const uint8* requestAddress = message.FindOption(OPTION_REQUEST_IP_ADDRESS);
+    if (type == DHCP_REQUEST && requestAddress != NULL)
+        text << " for " << _AddressToString(requestAddress).String();
+    
+    syslog(LOG_DEBUG, "%s: Send %s to %s\n", Device(), text.String(), 
+        address.ToString().String());
 
     ssize_t bytesSent = sendto(socket, &message, message.Size(),
         address.IsBroadcast() ? MSG_BCAST : 0, address, address.Length());
@@ -921 +955 @@
     if (now >= fRebindingTime)
         return REBINDING;
     if (now >= fRenewalTime)
-        return RENEWAL;
+        return RENEWING;
 
     return BOUND;
 }
@@ -938 +972 @@
             bigtime_t next;
             if (_Negotiate(state) == B_OK) {
                 switch (state) {
-                    case RENEWAL:
+                    case RENEWING:
                         next = fRebindingTime;
                         break;
                     case REBINDING:
@@ -948 +982 @@
                 }
             } else {
                 switch (state) {
-                    case RENEWAL:
+                    case RENEWING:
                         next = (fLeaseTime - fRebindingTime) / 4 + system_time();
                         break;
                     case REBINDING:

NetServer.cpp

@@ -443 +443 @@
         flags = IFF_UP;
 
     bool autoConfigured;
-    if (message.FindBool("auto", &autoConfigured) == B_OK && autoConfigured)
+    if (message.FindBool("auto_configured", &autoConfigured) == B_OK && autoConfigured)
         flags |= IFF_AUTO_CONFIGURED;
 
     int32 mtu;
@@ -532 +532 @@
             if (addressMessage.FindString("broadcast", &string) == B_OK)
                 parse_address(family, string, broadcast);
         }
-
+        
         if (autoConfig) {
             _QuitLooperForDevice(name);
             startAutoConfig = true;

AutoconfigLooper.cpp

@@ -58 +58 @@
 void
 AutoconfigLooper::_Configure()
 {
+    // start with DHCP
+    
+    if (fCurrentClient == NULL) {
+        fCurrentClient = new DHCPClient(fTarget, fDevice.String());
+        AddHandler(fCurrentClient);
+    }
+    
     // set IFF_CONFIGURING flag on interface
 
     BNetworkInterface interface(fDevice.String());
     int32 flags = interface.Flags() & ~IFF_AUTO_CONFIGURED;
     interface.SetFlags(flags | IFF_CONFIGURING);
 
-    // remove current handler
-
-    _RemoveClient();
-
-    // start with DHCP
-
-    fCurrentClient = new DHCPClient(fTarget, fDevice.String());
-    AddHandler(fCurrentClient);
-
     if (fCurrentClient->Initialize() == B_OK)
         return;
 
@@ -91 +89 @@
 
     BMessage message(kMsgConfigureInterface);
     message.AddString("device", fDevice.String());
-    message.AddBool("auto", true);
+    message.AddBool("auto_configured", true);
 
     BNetworkAddress link;
     uint8 last = 56;

DHCPClient.h

@@ -22 +22 @@
 
 enum dhcp_state {
     INIT,
+    SELECTING,
+    INIT_REBOOT,
+    REBOOTING,
     REQUESTING,
     BOUND,
-    RENEWAL,
+    RENEWING,
     REBINDING,
-    ACKNOWLEDGED,
 };
 
 
@@ -55 +57 @@
             bool                _TimeoutShift(int socket, time_t& timeout,
                                     uint32& tries);
             void                _RestartLease(bigtime_t lease);
-            
+
     static  BString             _AddressToString(const uint8* data);
-    static  BString             _AddressToString(in_addr_t address);
+    static  BString             _AddressToString(in_addr_t address);
 
 private:
             BMessage            fConfiguration;