Ticket #2531: dhcp.3.2.diff

src/servers/net/DHCPClient.cpp

@@ -21 +21 @@
 #include <sys/time.h>
 
 
+#define LND do { ktrace_printf("DHCP: %s: %s: %d\n", __FILE__, __func__, __LINE__); } while(0)
+
+void trace_dhcp_state(dhcp_state state)
+{
+    char *state_name=NULL;
+    switch(state)
+    {
+        case INIT: state_name = "INIT"; break;
+        case REQUESTING: state_name = "REQUESTING"; break;
+        case BOUND: state_name = "BOUND"; break;
+        case RENEWAL: state_name="RENEWAL"; break;
+        case REBINDING: state_name="REBINDING"; break;
+        case ACKNOWLEDGED: state_name="ACKNOWLEDGED"; break;
+        default: break;
+    }
+    if (state_name == NULL)
+        ktrace_printf("DHCP: state 0x%x\n", (unsigned)state);
+    else
+        ktrace_printf("DHCP: state %s\n", state_name);
+}
+
 // See RFC 2131 for DHCP, see RFC 1533 for BOOTP/DHCP options
 
 #define DHCP_CLIENT_PORT    68
@@ -336 +357 @@
     fRunner(NULL),
     fLeaseTime(0)
 {
+    LND;
     fStartTime = system_time();
     fTransactionID = (uint32)fStartTime;
 
     fStatus = get_mac_address(device, fMAC);
-    if (fStatus < B_OK)
+    if (fStatus < B_OK) {
+        LND;
         return;
+    }
 
     memset(&fServer, 0, sizeof(struct sockaddr_in));
     fServer.sin_family = AF_INET;
     fServer.sin_len = sizeof(struct sockaddr_in);
     fServer.sin_port = htons(DHCP_SERVER_PORT);
+    LND;
 }
 
 
 DHCPClient::~DHCPClient()
 {
+    LND;
     if (fStatus != B_OK)
         return;
 
@@ -374 +400 @@
 status_t
 DHCPClient::Initialize()
 {
+    LND;
+    trace_dhcp_state(INIT);
     fStatus = _Negotiate(INIT);
     printf("DHCP for %s, status: %s\n", fDevice.String(), strerror(fStatus));
     return fStatus;
 }
 
-
 status_t
 DHCPClient::_Negotiate(dhcp_state state)
 {
+    LND;
+    trace_dhcp_state(state);
     int socket = ::socket(AF_INET, SOCK_DGRAM, 0);
     if (socket < 0)
         return errno;
@@ -453 +482 @@
 
     // receive loop until we've got an offer and acknowledged it
 
+    LND;
+
     while (state != ACKNOWLEDGED) {
+        LND;
+        trace_dhcp_state(state);
         char buffer[2048];
         ssize_t bytesReceived = recvfrom(socket, buffer, sizeof(buffer),
             0, NULL, NULL);
         if (bytesReceived < 0 && errno == B_TIMED_OUT) {
+            LND;
             // depending on the state, we'll just try again
             if (!_TimeoutShift(socket, timeout, tries)) {
+                LND;
                 close(socket);
                 return B_TIMED_OUT;
             }
@@ -467 +502 @@
             if (state == INIT)
                 status = _SendMessage(socket, discover, broadcast);
             else {
+                LND;
                 status = _SendMessage(socket, request, state != RENEWAL
                     ? broadcast : fServer);
             }
 
             if (status < B_OK)
                 break;
+            LND;
         } else if (bytesReceived < B_OK)
             break;
+        LND;
 
         dhcp_message *message = (dhcp_message *)buffer;
         if (message->transaction_id != htonl(fTransactionID)
             || !message->HasOptions()
             || memcmp(message->mac_address, discover.mac_address,
                 discover.hardware_address_length)) {
+            LND;
             // this message is not for us
             continue;
         }
@@ -488 +527 @@
         switch (message->Type()) {
             case DHCP_NONE:
             default:
+                LND;
                 // ignore this message
                 break;
 
             case DHCP_OFFER:
             {
+                LND;
                 // first offer wins
                 if (state != INIT)
                     break;
@@ -526 +567 @@
 
             case DHCP_ACK:
             {
+                LND;
+                trace_dhcp_state(state);
                 if (state != REQUESTING && state != REBINDING
                     && state != RENEWAL)
                     continue;
+                LND;
 
                 // TODO: we might want to configure the stuff, don't we?
                 BMessage address;
@@ -548 +592 @@
             }
 
             case DHCP_NACK:
+            LND;
                 if (state != REQUESTING)
                     continue;
+                LND;
 
                 // try again (maybe we should prefer other servers if this
                 // happens more than once)
@@ -559 +605 @@
                 break;
         }
     }
+    LND;
+    trace_dhcp_state(state);
 
     close(socket);
 
@@ -582 +630 @@
         fRenewalTime = (fLeaseTime - now) * 2/3 + now;
         fRebindingTime = (fLeaseTime - now) * 5/6 + now;
     }
+    LND;
 
     return status;
 }
@@ -819 +868 @@
             dhcp_state state = _CurrentState();
 
             bigtime_t next;
+            LND;
+            trace_dhcp_state(state);
             if (_Negotiate(state) == B_OK) {
                 switch (state) {
                     case RENEWAL:

src/servers/net/NetServer.cpp

@@ -37 +37 @@
 #include <string.h>
 #include <unistd.h>
 
+#define LND do { ktrace_printf("DHCP: %s: %s: %d\n", __FILE__, __func__, __LINE__); } while(0)
 
+
 static const char *kSignature = "application/x-vnd.haiku-net_server";
 
 
@@ -485 +487 @@
 status_t
 NetServer::_ConfigureInterface(int socket, BMessage& interface, bool fromMessage)
 {
+    LND;
+
     const char *device;
     if (interface.FindString("device", &device) != B_OK)
         return B_BAD_VALUE;
@@ -675 +679 @@
         }
     }
 
+    LND;
     if (startAutoConfig) {
         // start auto configuration
+        LND;
         AutoconfigLooper* looper = new AutoconfigLooper(this, device);
         looper->Run();
 
@@ -725 +731 @@
     address.AddBool("auto config", true);
     interface.AddMessage("address", &address);
 
+    LND;
+
     return _ConfigureInterface(socket, interface);
 }
 
@@ -746 +754 @@
             continue;
 
         if (S_ISBLK(stat.st_mode) || S_ISCHR(stat.st_mode)) {
+            LND;
             if (suggestedInterface != NULL
                 && suggestedInterface->RemoveName("device") == B_OK
                 && suggestedInterface->AddString("device", path.Path()) == B_OK
@@ -782 +791 @@
             }
         }
 
+        LND;
         _ConfigureInterface(socket, interface);
     }
 }
@@ -817 +827 @@
         address.AddString("address", "127.0.0.1");
         interface.AddMessage("address", &address);
 
+        LND;
         _ConfigureInterface(socket, interface);
     }
 

src/servers/net/AutoconfigLooper.cpp

@@ -18 +18 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 
+#define LND do { ktrace_printf("DHCP: %s: %s: %d\n", __FILE__, __func__, __LINE__); } while(0)
 
+
 static const uint32 kMsgReadyToRun = 'rdyr';
 
 
@@ -27 +29 @@
     fTarget(target),
     fDevice(device)
 {
+    LND;
     BMessage ready(kMsgReadyToRun);
     PostMessage(&ready);
 }
@@ -40 +43 @@
 void
 AutoconfigLooper::_ReadyToRun()
 {
+    LND;
     ifreq request;
     if (!prepare_request(request, fDevice.String()))
         return;
+    LND;
 
     // set IFF_CONFIGURING flag on interface
 
@@ -58 +63 @@
     close(socket);
 
     // start with DHCP
+    LND;
 
     DHCPClient* client = new DHCPClient(fTarget, fDevice.String());
     AddHandler(client);