# HG changeset patch
# User gthomas
# Date 1064417414 0
# Node ID 4f0c5ba87a3a3f5062d1a45ca861cb1039b8a0ff
# Parent  bc69956ed7c9b5d5a7c54ec46d4243af9dffbeac
Fix more DHCP buglets

diff --git a/packages/redboot/current/ChangeLog b/packages/redboot/current/ChangeLog
--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-24  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/net/bootp.c (__bootp_find_local_ip): Forgot to unregister
+	UDP handler - could cause serious problems later!  Also, fix
+	problem with retries after DHCP discovery phase.
+
 2003-09-23  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/net/bootp.c (__bootp_find_local_ip): Handle retries on DHCP 
diff --git a/packages/redboot/current/src/net/bootp.c b/packages/redboot/current/src/net/bootp.c
--- a/packages/redboot/current/src/net/bootp.c
+++ b/packages/redboot/current/src/net/bootp.c
@@ -221,8 +221,8 @@ int
             dhcpState = DHCP_DISCOVER;
             break;
         case DHCP_OFFER:
+            retry = MAX_RETRIES;
         case DHCP_REQUEST:
-            retry = MAX_RETRIES;
             AddOption(p,dhcpCookie);
             AddOption(p,dhcpRequest);
             AddOption(p,dhcpRequestIP);
@@ -286,6 +286,7 @@ int
                     }
                     p += optlen;
                 }
+		__udp_remove_listener(IPPORT_BOOTPC);
                 return 0;
             }
 #else