Mercurial > flash_v2

changeset 1243:4f0c5ba87a3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix more DHCP buglets
author gthomas
date Wed, 24 Sep 2003 15:30:14 +0000
parents bc69956ed7c9
children 0c4f43524d06
files packages/redboot/current/ChangeLog packages/redboot/current/src/net/bootp.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 
--- 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