Mercurial > flash_v2

changeset 1583:3d8f3b1724be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/bootp_support.c (do_bootp): Return false when we should. * src/dhcp_prot.c (do_dhcp_down_net): correctly close the IPv6 socket.
author asl
date Tue, 13 Apr 2004 07:32:40 +0000
parents 410822b9fdd5
children 02c0aa987107
files packages/net/common/current/ChangeLog packages/net/common/current/src/bootp_support.c packages/net/common/current/src/dhcp_prot.c
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/net/common/current/ChangeLog
+++ b/packages/net/common/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-13  Jay Foster <jay.foster@systech.com>
+
+	* src/bootp_support.c (do_bootp): Return false when we should.
+	* src/dhcp_prot.c (do_dhcp_down_net): correctly close the IPv6 socket.
+
 2004-04-11  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/bootp_support.c: 
--- a/packages/net/common/current/src/bootp_support.c
+++ b/packages/net/common/current/src/bootp_support.c
@@ -242,6 +242,7 @@ do_bootp(const char *intf, struct bootp 
     ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING);
     if (ioctl(s, SIOCSIFFLAGS, &ifr)) {
         perror("SIOCSIFFLAGS");
+        retcode = false;
     }
 
  out:
--- a/packages/net/common/current/src/dhcp_prot.c
+++ b/packages/net/common/current/src/dhcp_prot.c
@@ -1374,8 +1374,8 @@ do_dhcp_down_net(const char *intf, struc
 	if (ioctl(s6, SIOCDLIFADDR, &ifr)) { /* delete IF addr */
 	  perror("SIOCDIFADDR_IN61");
 	}
-	close(s6);
       }
+      close(s6);
     }
 #endif /* IP6 */