Virgin import of ISC-DHCP v2.0b1pl17

8 files changed, 116 insertions, 79 deletions

diff --git a/contrib/isc-dhcp/common/bpf.c b/contrib/isc-dhcp/common/bpf.c
index ba42a43..3823406 100644
--- a/contrib/isc-dhcp/common/bpf.c
+++ b/contrib/isc-dhcp/common/bpf.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: bpf.c,v 1.19.2.6 1999/02/09 04:46:59 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: bpf.c,v 1.19.2.8 1999/02/23 22:09:56 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -142,13 +142,14 @@ void if_register_send (info)
 	info -> wfdesc = info -> rfdesc;
 #endif
 	if (!quiet_interface_discovery)
-		note ("Sending on   BPF/%s/%s/%s",
+		note ("Sending on   BPF/%s/%s%s%s",
 		      info -> name,
 		      print_hw_addr (info -> hw_address.htype,
 				     info -> hw_address.hlen,
 				     info -> hw_address.haddr),
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_BPF_SEND */
 
@@ -250,13 +251,14 @@ void if_register_receive (info)
 	if (ioctl (info -> rfdesc, BIOCSETF, &p) < 0)
 		error ("Can't install packet filter program: %m");
 	if (!quiet_interface_discovery)
-		note ("Listening on BPF/%s/%s/%s",
+		note ("Listening on BPF/%s/%s%s%s",
 		      info -> name,
 		      print_hw_addr (info -> hw_address.htype,
 				     info -> hw_address.hlen,
 				     info -> hw_address.haddr),
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_BPF_RECEIVE */
 
@@ -273,6 +275,7 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	int bufp = 0;
 	unsigned char buf [256];
 	struct iovec iov [2];
+	int result;
 
 	if (!strcmp (interface -> name, "fallback"))
 		return send_fallback (interface, packet, raw,
@@ -290,7 +293,10 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	iov [1].iov_base = (char *)raw;
 	iov [1].iov_len = len;
 
-	return writev(interface -> wfdesc, iov, 2);
+	result = writev(interface -> wfdesc, iov, 2);
+	if (result < 0)
+		warn ("send_packet: %m");
+	return result;
 }
 #endif /* USE_BPF_SEND */
 
diff --git a/contrib/isc-dhcp/common/dispatch.c b/contrib/isc-dhcp/common/dispatch.c
index 0a383a0..becf4da 100644
--- a/contrib/isc-dhcp/common/dispatch.c
+++ b/contrib/isc-dhcp/common/dispatch.c
@@ -3,8 +3,8 @@
    Network input dispatcher... */
 
 /*
- * Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.
- * All rights reserved.
+ * Copyright (c) 1995, 1996, 1997, 1998, 1999
+ * The Internet Software Consortium.   All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dispatch.c,v 1.47.2.9 1999/02/05 20:23:50 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dispatch.c,v 1.47.2.12 1999/02/23 17:37:00 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -79,6 +79,7 @@ void discover_interfaces (state)
 	struct shared_network *share;
 	struct sockaddr_in foo;
 	int ir;
+	struct ifreq *tif;
 #ifdef ALIAS_NAMES_PERMUTED
 	char *s;
 #endif
@@ -110,7 +111,7 @@ void discover_interfaces (state)
 	for (i = 0; i < ic.ifc_len;) {
 		struct ifreq *ifp = (struct ifreq *)((caddr_t)ic.ifc_req + i);
 #ifdef HAVE_SA_LEN
-		if (ifp -> ifr_addr.sa_len)
+		if (ifp -> ifr_addr.sa_len > sizeof (struct sockaddr))
 			i += (sizeof ifp -> ifr_name) + ifp -> ifr_addr.sa_len;
 		else
 #endif
@@ -139,7 +140,7 @@ void discover_interfaces (state)
 		   except don't skip down interfaces if we're trying to
 		   get a list of configurable interfaces. */
 		if ((ifr.ifr_flags & IFF_LOOPBACK) ||
-#ifdef IFF_POINTOPOINT
+#ifdef HAVE_IFF_POINTOPOINT
 		    (ifr.ifr_flags & IFF_POINTOPOINT) ||
 #endif
 		    (!(ifr.ifr_flags & IFF_UP) &&
@@ -167,7 +168,7 @@ void discover_interfaces (state)
 
 		/* If we have the capability, extract link information
 		   and record it in a linked list. */
-#ifdef AF_LINK
+#ifdef HAVE_AF_LINK
 		if (ifp -> ifr_addr.sa_family == AF_LINK) {
 			struct sockaddr_dl *foo = ((struct sockaddr_dl *)
 						   (&ifp -> ifr_addr));
@@ -194,7 +195,6 @@ void discover_interfaces (state)
 			   found, keep a pointer to ifreq structure in
 			   which we found it. */
 			if (!tmp -> ifp) {
-				struct ifreq *tif;
 #ifdef HAVE_SA_LEN
 				int len = ((sizeof ifp -> ifr_name) +
 					   ifp -> ifr_addr.sa_len);
@@ -276,7 +276,6 @@ void discover_interfaces (state)
 	if (state == DISCOVER_UNCONFIGURED) {
 		FILE *proc_dev;
 		char buffer [256];
-		struct ifreq *tif;
 		int skip = 2;
 
 		proc_dev = fopen (PROCDEV_DEVICE, "r");
@@ -306,25 +305,10 @@ void discover_interfaces (state)
 				if (!strcmp (tmp -> name, name))
 					break;
 
-			/* If we found one, and it already has an ifreq
-			   structure, nothing more to do.. */
-			if (tmp && tmp -> ifp)
+			/* If we found one, nothing more to do.. */
+			if (tmp)
 				continue;
 
-			/* Make up an ifreq structure. */
-			tif = (struct ifreq *)malloc (sizeof (struct ifreq));
-			if (!tif)
-				error ("no space to remember ifp.");
-			memset (tif, 0, sizeof (struct ifreq));
-			strcpy (tif -> ifr_name, name);
-
-			/* Now, if we just needed the ifreq structure, hook
-			   it in and move on. */
-			if (tmp) {
-				tmp -> ifp = tif;
-				continue;
-			}
-
 			/* Otherwise, allocate one. */
 			tmp = ((struct interface_info *)
 			       dmalloc (sizeof *tmp, "discover_interfaces"));
@@ -334,7 +318,6 @@ void discover_interfaces (state)
 			memset (tmp, 0, sizeof *tmp);
 			strcpy (tmp -> name, name);
 
-			tmp -> ifp = tif;
 			tmp -> flags = ir;
 			tmp -> next = interfaces;
 			interfaces = tmp;
@@ -345,12 +328,22 @@ void discover_interfaces (state)
 
 	/* Now cycle through all the interfaces we found, looking for
 	   hardware addresses. */
-#if defined (SIOCGIFHWADDR) && !defined (AF_LINK)
+#if defined (HAVE_SIOCGIFHWADDR) && !defined (HAVE_AF_LINK)
 	for (tmp = interfaces; tmp; tmp = tmp -> next) {
 		struct ifreq ifr;
 		struct sockaddr sa;
 		int b, sk;
 		
+		if (!tmp -> ifp) {
+			/* Make up an ifreq structure. */
+			tif = (struct ifreq *)malloc (sizeof (struct ifreq));
+			if (!tif)
+				error ("no space to remember ifp.");
+			memset (tif, 0, sizeof (struct ifreq));
+			strcpy (tif -> ifr_name, tmp -> name);
+			tmp -> ifp = tif;
+		}
+
 		/* Read the hardware address from this interface. */
 		ifr = *tmp -> ifp;
 		if (ioctl (sock, SIOCGIFHWADDR, &ifr) < 0)
@@ -359,7 +352,11 @@ void discover_interfaces (state)
 		sa = *(struct sockaddr *)&ifr.ifr_hwaddr;
 		
 		switch (sa.sa_family) {
-#ifdef ARPHRD_LOOPBACK
+#ifdef HAVE_ARPHRD_TUNNEL
+		      case ARPHRD_TUNNEL:
+			/* ignore tunnel interfaces. */
+#endif
+#ifdef HAVE_ARPHRD_LOOPBACK
 		      case ARPHRD_LOOPBACK:
 			/* ignore loopback interface */
 			break;
@@ -389,7 +386,7 @@ void discover_interfaces (state)
 			memcpy (tmp -> hw_address.haddr, sa.sa_data, 16);
 			break;
 
-#ifdef ARPHRD_METRICOM
+#ifdef HAVE_ARPHRD_METRICOM
 		      case ARPHRD_METRICOM:
 			tmp -> hw_address.hlen = 6;
 			tmp -> hw_address.htype = ARPHRD_METRICOM;
@@ -402,7 +399,7 @@ void discover_interfaces (state)
 			       ifr.ifr_name, sa.sa_family);
 		}
 	}
-#endif /* defined (SIOCGIFHWADDR) && !defined (AF_LINK) */
+#endif /* defined (HAVE_SIOCGIFHWADDR) && !defined (HAVE_AF_LINK) */
 
 	/* If we're just trying to get a list of interfaces that we might
 	   be able to configure, we can quit now. */
@@ -437,9 +434,13 @@ void discover_interfaces (state)
 			sizeof tmp -> ifp -> ifr_addr);
 
 		/* We must have a subnet declaration for each interface. */
-		if (!tmp -> shared_network && (state == DISCOVER_SERVER))
-			error ("No subnet declaration for %s (%s).",
-			       tmp -> name, inet_ntoa (foo.sin_addr));
+		if (!tmp -> shared_network && (state == DISCOVER_SERVER)) {
+			warn ("No subnet declaration for %s (%s).",
+			      tmp -> name, inet_ntoa (foo.sin_addr));
+			warn ("Please write a subnet declaration for the %s",
+			      "network segment to");
+			error ("which interface %s is attached.", tmp -> name);
+		}
 
 		/* Find subnets that don't have valid interface
 		   addresses... */
diff --git a/contrib/isc-dhcp/common/lpf.c b/contrib/isc-dhcp/common/lpf.c
index 7c6ff74..d31d6f3 100644
--- a/contrib/isc-dhcp/common/lpf.c
+++ b/contrib/isc-dhcp/common/lpf.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: lpf.c,v 1.1.2.4 1999/02/09 04:51:05 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: lpf.c,v 1.1.2.6 1999/02/23 22:09:55 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -129,13 +129,14 @@ void if_register_send (info)
 	info -> wfdesc = info -> rfdesc;
 #endif
 	if (!quiet_interface_discovery)
-		note ("Sending on   LPF/%s/%s/%s",
+		note ("Sending on   LPF/%s/%s%s%s",
 		      info -> name,
 		      print_hw_addr (info -> hw_address.htype,
 				     info -> hw_address.hlen,
 				     info -> hw_address.haddr),
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_LPF_SEND */
 
@@ -174,13 +175,14 @@ void if_register_receive (info)
 		error ("Can't install packet filter program: %m");
 	}
 	if (!quiet_interface_discovery)
-		note ("Listening on LPF/%s/%s/%s",
+		note ("Listening on LPF/%s/%s%s%s",
 		      info -> name,
 		      print_hw_addr (info -> hw_address.htype,
 				     info -> hw_address.hlen,
 				     info -> hw_address.haddr),
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_LPF_RECEIVE */
 
@@ -197,6 +199,7 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	int bufp = 0;
 	unsigned char buf [1500];
 	struct sockaddr sa;
+	int result;
 
 	if (!strcmp (interface -> name, "fallback"))
 		return send_fallback (interface, packet, raw,
@@ -216,8 +219,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	strncpy (sa.sa_data,
 		 (const char *)interface -> ifp, sizeof sa.sa_data);
 
-	return sendto (interface -> wfdesc, buf, bufp + len, 0,
-		       &sa, sizeof sa);
+	result = sendto (interface -> wfdesc, buf, bufp + len, 0,
+			 &sa, sizeof sa);
+	if (result < 0)
+		warn ("send_packet: %m");
+	return result;
 }
 #endif /* USE_LPF_SEND */
 
diff --git a/contrib/isc-dhcp/common/nit.c b/contrib/isc-dhcp/common/nit.c
index 1801bb9..047f2a1 100644
--- a/contrib/isc-dhcp/common/nit.c
+++ b/contrib/isc-dhcp/common/nit.c
@@ -4,7 +4,7 @@
    with one crucial tidbit of help from Stu Grossmen. */
 
 /*
- * Copyright (c) 1996 The Internet Software Consortium.
+ * Copyright (c) 1996, 1998, 1999 The Internet Software Consortium.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: nit.c,v 1.15.2.1 1998/12/20 18:27:44 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: nit.c,v 1.15.2.3 1999/02/23 22:09:54 mellon Exp $ Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -155,12 +155,13 @@ void if_register_send (info)
 	info -> wfdesc = info -> rfdesc;
 #endif
         if (!quiet_interface_discovery)
-		note ("Sending on   NIT/%s/%s",
+		note ("Sending on   NIT/%s%s%s",
 		      print_hw_addr (info -> hw_address.htype,
 				     info -> hw_address.hlen,
 				     info -> hw_address.haddr),
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_NIT_SEND */
 
@@ -238,12 +239,13 @@ void if_register_receive (info)
 		error ("Can't set NIT filter on %s: %m", info -> name);
 
         if (!quiet_interface_discovery)
-		note ("Listening on NIT/%s/%s",
+		note ("Listening on NIT/%s%s%s",
 		      print_hw_addr (info -> hw_address.htype,
 				     info -> hw_address.hlen,
 				     info -> hw_address.haddr),
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_NIT_RECEIVE */
 
@@ -263,6 +265,7 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	struct strbuf ctl, data;
 	int hw_end;
 	struct sockaddr_in foo;
+	int result;
 
 	if (!strcmp (interface -> name, "fallback"))
 		return send_fallback (interface, packet, raw,
@@ -298,7 +301,10 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	data.buf = (char *)&buf [hw_end];
 	data.maxlen = data.len = bufp + len - hw_end;
 
-	return putmsg (interface -> wfdesc, &ctl, &data, 0);
+	result = putmsg (interface -> wfdesc, &ctl, &data, 0);
+	if (result < 0)
+		warn ("send_packet: %m");
+	return result;
 }
 #endif /* USE_NIT_SEND */
 
diff --git a/contrib/isc-dhcp/common/print.c b/contrib/isc-dhcp/common/print.c
index 4a2b464..d05af8d 100644
--- a/contrib/isc-dhcp/common/print.c
+++ b/contrib/isc-dhcp/common/print.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: print.c,v 1.16.2.2 1998/11/24 22:39:35 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: print.c,v 1.16.2.3 1999/02/13 19:19:03 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -80,15 +80,15 @@ void print_lease (lease)
 	       piaddr (lease -> ip_addr));
 	
 	t = gmtime (&lease -> starts);
-	strftime (tbuf, sizeof tbuf, "%D %H:%M:%S", t);
+	strftime (tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
 	debug ("        start %s", tbuf);
 	
 	t = gmtime (&lease -> ends);
-	strftime (tbuf, sizeof tbuf, "%D %H:%M:%S", t);
+	strftime (tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
 	debug ("        end %s", tbuf);
 	
 	t = gmtime (&lease -> timestamp);
-	strftime (tbuf, sizeof tbuf, "%D %H:%M:%S", t);
+	strftime (tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
 	debug ("        stamp %s", tbuf);
 	
 	debug ("        hardware addr = %s",
diff --git a/contrib/isc-dhcp/common/raw.c b/contrib/isc-dhcp/common/raw.c
index 973ede1..2740c49 100644
--- a/contrib/isc-dhcp/common/raw.c
+++ b/contrib/isc-dhcp/common/raw.c
@@ -16,7 +16,7 @@
    Sigh. */
 
 /*
- * Copyright (c) 1995, 1996 The Internet Software Consortium.
+ * Copyright (c) 1995, 1996, 1997, 1999 The Internet Software Consortium.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: raw.c,v 1.11 1997/10/20 21:47:14 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: raw.c,v 1.11.2.2 1999/02/23 22:09:54 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -97,10 +97,11 @@ void if_register_send (info)
 
 	info -> wfdesc = sock;
         if (!quiet_interface_discovery)
-		note ("Sending on   Raw/%s/%s",
+		note ("Sending on   Raw/%s%s%s",
 		      info -> name,
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 
 size_t send_packet (interface, packet, raw, len, from, to, hto)
@@ -115,6 +116,7 @@ size_t send_packet (interface, packet, raw, len, from, to, hto)
 	unsigned char buf [256];
 	int bufp = 0;
 	struct iovec iov [2];
+	int result;
 
 	/* Assemble the headers... */
 	assemble_udp_ip_header (interface, buf, &bufp, from.s_addr,
@@ -127,6 +129,9 @@ size_t send_packet (interface, packet, raw, len, from, to, hto)
 	iov [1].iov_base = (char *)raw;
 	iov [1].iov_len = len;
 
-	return writev(interface -> wfdesc, iov, 2);
+	result = writev(interface -> wfdesc, iov, 2);
+	if (result < 0)
+		warn ("send_packet: %m");
+	return result;
 }
 #endif /* USE_SOCKET_SEND */
diff --git a/contrib/isc-dhcp/common/socket.c b/contrib/isc-dhcp/common/socket.c
index b2ae5b4..8e1b274 100644
--- a/contrib/isc-dhcp/common/socket.c
+++ b/contrib/isc-dhcp/common/socket.c
@@ -50,7 +50,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: socket.c,v 1.26.2.6 1999/02/03 19:46:04 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: socket.c,v 1.26.2.10 1999/02/23 22:09:55 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -102,7 +102,7 @@ int if_register_socket (info)
 	int sock;
 	int flag;
 
-#if !defined (SO_BINDTODEVICE) && !defined (USE_FALLBACK)
+#if !defined (HAVE_SO_BINDTODEVICE) && !defined (USE_FALLBACK)
 	/* Make sure only one interface is registered. */
 	if (once)
 		error ("The standard socket API can only support %s",
@@ -136,12 +136,12 @@ int if_register_socket (info)
 	if (bind (sock, (struct sockaddr *)&name, sizeof name) < 0)
 		error ("Can't bind to dhcp address: %m");
 
-#if defined (SO_BINDTODEVICE)
+#if defined (HAVE_SO_BINDTODEVICE)
 	/* Bind this socket to this interface. */
 	if (info -> ifp &&
 	    setsockopt (sock, SOL_SOCKET, SO_BINDTODEVICE,
 			(char *)(info -> ifp), sizeof *(info -> ifp)) < 0) {
-		error("setting SO_BINDTODEVICE");
+		error("setsockopt: SO_BINDTODEVICE: %m");
 	}
 #endif
 
@@ -159,11 +159,11 @@ void if_register_send (info)
 	info -> wfdesc = info -> rfdesc;
 #endif
 	if (!quiet_interface_discovery)
-		note ("Sending on   Socket/%s/%s",
+		note ("Sending on   Socket/%s%s%s",
 		      info -> name,
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
-
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_SOCKET_SEND */
 
@@ -175,10 +175,11 @@ void if_register_receive (info)
 	   we don't need to register this interface twice. */
 	info -> rfdesc = if_register_socket (info);
 	if (!quiet_interface_discovery)
-		note ("Listening on Socket/%s/%s",
+		note ("Listening on Socket/%s%s%s",
 		      info -> name,
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_SOCKET_RECEIVE */
 
@@ -206,6 +207,12 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 		  errno == ECONNREFUSED) &&
 		 retry++ < 10);
 #endif
+	if (result < 0) {
+		warn ("send_packet: %m");
+		if (errno == ENETUNREACH)
+			warn ("send_packet: please consult README file %s",
+			      "regarding broadcast address.");
+	}
 	return result;
 }
 #endif /* USE_SOCKET_SEND */
diff --git a/contrib/isc-dhcp/common/upf.c b/contrib/isc-dhcp/common/upf.c
index 7da9aff..c172c62 100644
--- a/contrib/isc-dhcp/common/upf.c
+++ b/contrib/isc-dhcp/common/upf.c
@@ -3,8 +3,8 @@
    Ultrix PacketFilter interface code.
 
 /*
- * Copyright (c) 1995, 1996, 1997 The Internet Software Consortium.
- * All rights reserved.
+ * Copyright (c) 1995, 1996, 1997, 1998, 1999
+ * The Internet Software Consortium.   All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: upf.c,v 1.3.2.1 1998/12/20 18:29:48 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: upf.c,v 1.3.2.3 1999/02/23 22:09:56 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -143,13 +143,14 @@ void if_register_send (info)
 	info -> wfdesc = info -> rfdesc;
 #endif
         if (!quiet_interface_discovery)
-		note ("Sending on   UPF/%s/%s/%s",
+		note ("Sending on   UPF/%s/%s%s%s",
 		      info -> name,
 		      print_hw_addr (info -> hw_address.htype,
 				     info -> hw_address.hlen,
 				     info -> hw_address.haddr),
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_UPF_SEND */
 
@@ -208,13 +209,14 @@ void if_register_receive (info)
 	if (ioctl (info -> rfdesc, EIOCSETF, &pf) < 0)
 		error ("Can't install packet filter program: %m");
         if (!quiet_interface_discovery)
-		note ("Listening on UPF/%s/%s/%s",
+		note ("Listening on UPF/%s/%s%s%s",
 		      info -> name,
 		      print_hw_addr (info -> hw_address.htype,
 				     info -> hw_address.hlen,
 				     info -> hw_address.haddr),
+		      (info -> shared_network ? "/" : ""),
 		      (info -> shared_network ?
-		       info -> shared_network -> name : "unattached"));
+		       info -> shared_network -> name : ""));
 }
 #endif /* USE_UPF_RECEIVE */
 
@@ -231,6 +233,7 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	int bufp = 0;
 	unsigned char buf [256];
 	struct iovec iov [2];
+	int result;
 
 	if (!strcmp (interface -> name, "fallback"))
 		return send_fallback (interface, packet, raw,
@@ -248,7 +251,10 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	iov [1].iov_base = (char *)raw;
 	iov [1].iov_len = len;
 
-	return writev(interface -> wfdesc, iov, 2);
+	result = writev(interface -> wfdesc, iov, 2);
+	if (result < 0)
+		warn ("send_packet: %m");
+	return result;
 }
 #endif /* USE_UPF_SEND */