[people/stevee/ipfire-3.x.git] / dhcp / patches / 0019-dhcp-PPP.patch

diff -up dhcp-4.3.4/client/dhc6.c.PPP dhcp-4.3.4/client/dhc6.c
--- dhcp-4.3.4/client/dhc6.c.PPP	2016-04-29 12:46:29.824988665 +0200
+++ dhcp-4.3.4/client/dhc6.c	2016-04-29 12:46:29.828988666 +0200
@@ -5641,7 +5641,8 @@ make_client6_options(struct client_state
 	 */
 	if ((oc = lookup_option(&dhcpv6_universe, *op,
 				D6O_CLIENTID)) == NULL) {
-		if (!option_cache(&oc, &default_duid, NULL, clientid_option,
+		if (default_duid.len == 0 ||
+		    !option_cache(&oc, &default_duid, NULL, clientid_option,
 				  MDL))
 			log_fatal("Failure assembling a DUID.");
 
diff -up dhcp-4.3.4/client/dhclient.c.PPP dhcp-4.3.4/client/dhclient.c
--- dhcp-4.3.4/client/dhclient.c.PPP	2016-04-29 12:46:29.815988664 +0200
+++ dhcp-4.3.4/client/dhclient.c	2016-04-29 12:46:29.830988666 +0200
@@ -1077,8 +1077,8 @@ main(int argc, char **argv) {
 			if (default_duid.buffer != NULL)
 				data_string_forget(&default_duid, MDL);
 
-			form_duid(&default_duid, MDL);
-			write_duid(&default_duid);
+			if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS)
+				write_duid(&default_duid);
 		}
 	}
 
@@ -3808,7 +3808,7 @@ write_options(struct client_state *clien
  * is not how it is intended.  Upcoming rearchitecting the client should
  * address this "one daemon model."
  */
-void
+isc_result_t
 form_duid(struct data_string *duid, const char *file, int line)
 {
 	struct interface_info *ip;
@@ -3821,6 +3821,15 @@ form_duid(struct data_string *duid, cons
 	if (ip == NULL)
 		log_fatal("Impossible condition at %s:%d.", MDL);
 
+	while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) {
+		/* Try the other interfaces */
+		log_debug("Cannot form default DUID from interface %s.", ip->name);
+		ip = ip->next;
+	}
+	if (ip == NULL) {
+		return ISC_R_UNEXPECTED;
+	}
+
 	if ((ip->hw_address.hlen == 0) ||
 	    (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
 		log_fatal("Impossible hardware address length at %s:%d.", MDL);
@@ -3866,6 +3875,8 @@ form_duid(struct data_string *duid, cons
 		log_info("Created duid %s.", str);
 		dfree(str, MDL);
 	}
+	
+	return ISC_R_SUCCESS;
 }
 
 /* Write the default DUID to the lease store. */
diff -up dhcp-4.3.4/common/bpf.c.PPP dhcp-4.3.4/common/bpf.c
--- dhcp-4.3.4/common/bpf.c.PPP	2016-04-29 12:46:29.794988660 +0200
+++ dhcp-4.3.4/common/bpf.c	2016-04-29 12:46:29.830988666 +0200
@@ -599,6 +599,22 @@ get_hw_addr(const char *name, struct har
                         memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);
                         break;
 #endif /* IFT_FDDI */
+#if defined(IFT_PPP)
+                case IFT_PPP:
+                        if (local_family != AF_INET6)
+                             log_fatal("Unsupported device type %d for \"%s\"",
+                                        sa->sdl_type, name);
+                        hw->hlen = 0;
+                        hw->hbuf[0] = HTYPE_RESERVED;
+                        /* 0xdeadbeef should never occur on the wire,
+                         *  and is a signature that something went wrong.
+                         */
+                        hw->hbuf[1] = 0xde;
+                        hw->hbuf[2] = 0xad;
+                        hw->hbuf[3] = 0xbe;
+                        hw->hbuf[4] = 0xef;
+                        break;
+#endif
                 default:
                         log_fatal("Unsupported device type %d for \"%s\"",
                                   sa->sdl_type, name);
diff -up dhcp-4.3.4/common/lpf.c.PPP dhcp-4.3.4/common/lpf.c
--- dhcp-4.3.4/common/lpf.c.PPP	2016-03-22 14:16:51.000000000 +0100
+++ dhcp-4.3.4/common/lpf.c	2016-04-29 12:46:29.830988666 +0200
@@ -548,6 +548,22 @@ get_hw_addr(const char *name, struct har
 			hw->hbuf[0] = HTYPE_FDDI;
 			memcpy(&hw->hbuf[1], sa->sa_data, 6);
 			break;
+#if defined(ARPHRD_PPP)
+		case ARPHRD_PPP:
+			if (local_family != AF_INET6)
+				log_fatal("Unsupported device type %d for \"%s\"",
+				           sa->sa_family, name);
+			hw->hlen = 0;
+			hw->hbuf[0] = HTYPE_RESERVED;
+			/* 0xdeadbeef should never occur on the wire,
+			 * and is a signature that something went wrong.
+			 */
+			hw->hbuf[1] = 0xde;
+			hw->hbuf[2] = 0xad;
+			hw->hbuf[3] = 0xbe;
+			hw->hbuf[4] = 0xef;
+			break;
+#endif
 		default:
 			log_fatal("Unsupported device type %ld for \"%s\"",
 				  (long int)sa->sa_family, name);
diff -up dhcp-4.3.4/includes/dhcpd.h.PPP dhcp-4.3.4/includes/dhcpd.h
--- dhcp-4.3.4/includes/dhcpd.h.PPP	2016-04-29 12:46:29.831988667 +0200
+++ dhcp-4.3.4/includes/dhcpd.h	2016-04-29 12:47:13.167995959 +0200
@@ -2990,7 +2990,7 @@ void client_dns_remove(struct client_sta
 
 void dhcpv4_client_assignments(void);
 void dhcpv6_client_assignments(void);
-void form_duid(struct data_string *duid, const char *file, int line);
+isc_result_t form_duid(struct data_string *duid, const char *file, int line);
 
 void dhcp4o6_start(void);
 
diff -up dhcp-4.3.4/includes/dhcp.h.PPP dhcp-4.3.4/includes/dhcp.h
--- dhcp-4.3.4/includes/dhcp.h.PPP	2016-04-29 12:46:29.822988665 +0200
+++ dhcp-4.3.4/includes/dhcp.h	2016-04-29 12:46:29.832988667 +0200
@@ -81,6 +81,8 @@ struct dhcp_packet {
 					 * is no standard for this so we
 					 * just steal a type            */
 
+#define HTYPE_RESERVED	0		/* RFC 5494 */
+
 /* Magic cookie validating dhcp options field (and bootp vendor
    extensions field). */
 #define DHCP_OPTIONS_COOKIE	"\143\202\123\143"
diff -up dhcp-4.3.4/server/dhcpv6.c.PPP dhcp-4.3.4/server/dhcpv6.c
--- dhcp-4.3.4/server/dhcpv6.c.PPP	2016-03-22 14:16:51.000000000 +0100
+++ dhcp-4.3.4/server/dhcpv6.c	2016-04-29 12:46:29.833988667 +0200
@@ -454,6 +454,9 @@ generate_new_server_duid(void) {
 		if (p->hw_address.hlen > 0) {
 			break;
 		}
+		if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) {
+			log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!");
+		}
 	}
 	if (p == NULL) {
 		return ISC_R_UNEXPECTED;
Commit	Line	Data
d8feb2d7 SS	1	diff -up dhcp-4.3.4/client/dhc6.c.PPP dhcp-4.3.4/client/dhc6.c
	2	--- dhcp-4.3.4/client/dhc6.c.PPP 2016-04-29 12:46:29.824988665 +0200
	3	+++ dhcp-4.3.4/client/dhc6.c 2016-04-29 12:46:29.828988666 +0200
	4	@@ -5641,7 +5641,8 @@ make_client6_options(struct client_state
	5	*/
	6	if ((oc = lookup_option(&dhcpv6_universe, *op,
	7	D6O_CLIENTID)) == NULL) {
	8	- if (!option_cache(&oc, &default_duid, NULL, clientid_option,
	9	+ if (default_duid.len == 0 \|\|
	10	+ !option_cache(&oc, &default_duid, NULL, clientid_option,
	11	MDL))
	12	log_fatal("Failure assembling a DUID.");
	13
	14	diff -up dhcp-4.3.4/client/dhclient.c.PPP dhcp-4.3.4/client/dhclient.c
	15	--- dhcp-4.3.4/client/dhclient.c.PPP 2016-04-29 12:46:29.815988664 +0200
	16	+++ dhcp-4.3.4/client/dhclient.c 2016-04-29 12:46:29.830988666 +0200
	17	@@ -1077,8 +1077,8 @@ main(int argc, char **argv) {
	18	if (default_duid.buffer != NULL)
	19	data_string_forget(&default_duid, MDL);
	20
	21	- form_duid(&default_duid, MDL);
	22	- write_duid(&default_duid);
	23	+ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS)
	24	+ write_duid(&default_duid);
	25	}
	26	}
	27
	28	@@ -3808,7 +3808,7 @@ write_options(struct client_state *clien
6df985df SS	29	* is not how it is intended. Upcoming rearchitecting the client should
	30	* address this "one daemon model."
	31	*/
	32	-void
	33	+isc_result_t
	34	form_duid(struct data_string duid, const char file, int line)
	35	{
	36	struct interface_info *ip;
d8feb2d7	37	@@ -3821,6 +3821,15 @@ form_duid(struct data_string *duid, cons
6df985df SS	38	if (ip == NULL)
	39	log_fatal("Impossible condition at %s:%d.", MDL);
	40
	41	+ while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) {
	42	+ /* Try the other interfaces */
	43	+ log_debug("Cannot form default DUID from interface %s.", ip->name);
	44	+ ip = ip->next;
	45	+ }
	46	+ if (ip == NULL) {
	47	+ return ISC_R_UNEXPECTED;
	48	+ }
	49	+
	50	if ((ip->hw_address.hlen == 0) \|\|
	51	(ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
	52	log_fatal("Impossible hardware address length at %s:%d.", MDL);
d8feb2d7 SS	53	@@ -3866,6 +3875,8 @@ form_duid(struct data_string *duid, cons
	54	log_info("Created duid %s.", str);
	55	dfree(str, MDL);
6df985df	56	}
d8feb2d7	57	+
6df985df SS	58	+ return ISC_R_SUCCESS;
	59	}
	60
d8feb2d7 SS	61	/* Write the default DUID to the lease store. */
	62	diff -up dhcp-4.3.4/common/bpf.c.PPP dhcp-4.3.4/common/bpf.c
	63	--- dhcp-4.3.4/common/bpf.c.PPP 2016-04-29 12:46:29.794988660 +0200
	64	+++ dhcp-4.3.4/common/bpf.c 2016-04-29 12:46:29.830988666 +0200
6df985df SS	65	@@ -599,6 +599,22 @@ get_hw_addr(const char *name, struct har
	66	memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);
	67	break;
	68	#endif /* IFT_FDDI */
	69	+#if defined(IFT_PPP)
	70	+ case IFT_PPP:
	71	+ if (local_family != AF_INET6)
	72	+ log_fatal("Unsupported device type %d for \"%s\"",
	73	+ sa->sdl_type, name);
	74	+ hw->hlen = 0;
	75	+ hw->hbuf[0] = HTYPE_RESERVED;
	76	+ /* 0xdeadbeef should never occur on the wire,
	77	+ * and is a signature that something went wrong.
	78	+ */
	79	+ hw->hbuf[1] = 0xde;
	80	+ hw->hbuf[2] = 0xad;
	81	+ hw->hbuf[3] = 0xbe;
	82	+ hw->hbuf[4] = 0xef;
	83	+ break;
	84	+#endif
	85	default:
	86	log_fatal("Unsupported device type %d for \"%s\"",
	87	sa->sdl_type, name);
d8feb2d7 SS	88	diff -up dhcp-4.3.4/common/lpf.c.PPP dhcp-4.3.4/common/lpf.c
	89	--- dhcp-4.3.4/common/lpf.c.PPP 2016-03-22 14:16:51.000000000 +0100
	90	+++ dhcp-4.3.4/common/lpf.c 2016-04-29 12:46:29.830988666 +0200
	91	@@ -548,6 +548,22 @@ get_hw_addr(const char *name, struct har
6df985df	92	hw->hbuf[0] = HTYPE_FDDI;
177b938a	93	memcpy(&hw->hbuf[1], sa->sa_data, 6);
6df985df SS	94	break;
	95	+#if defined(ARPHRD_PPP)
	96	+ case ARPHRD_PPP:
	97	+ if (local_family != AF_INET6)
	98	+ log_fatal("Unsupported device type %d for \"%s\"",
	99	+ sa->sa_family, name);
	100	+ hw->hlen = 0;
	101	+ hw->hbuf[0] = HTYPE_RESERVED;
	102	+ /* 0xdeadbeef should never occur on the wire,
	103	+ * and is a signature that something went wrong.
	104	+ */
	105	+ hw->hbuf[1] = 0xde;
	106	+ hw->hbuf[2] = 0xad;
	107	+ hw->hbuf[3] = 0xbe;
	108	+ hw->hbuf[4] = 0xef;
	109	+ break;
	110	+#endif
	111	default:
	112	log_fatal("Unsupported device type %ld for \"%s\"",
	113	(long int)sa->sa_family, name);
d8feb2d7 SS	114	diff -up dhcp-4.3.4/includes/dhcpd.h.PPP dhcp-4.3.4/includes/dhcpd.h
	115	--- dhcp-4.3.4/includes/dhcpd.h.PPP 2016-04-29 12:46:29.831988667 +0200
	116	+++ dhcp-4.3.4/includes/dhcpd.h 2016-04-29 12:47:13.167995959 +0200
	117	@@ -2990,7 +2990,7 @@ void client_dns_remove(struct client_sta
6df985df	118
d8feb2d7 SS	119	void dhcpv4_client_assignments(void);
d8feb2d7 SS	120	void dhcpv6_client_assignments(void);
6df985df SS	121	-void form_duid(struct data_string duid, const char file, int line);
6df985df SS	122	+isc_result_t form_duid(struct data_string duid, const char file, int line);
d8feb2d7 SS	123
	124	void dhcp4o6_start(void);
	125
	126	diff -up dhcp-4.3.4/includes/dhcp.h.PPP dhcp-4.3.4/includes/dhcp.h
	127	--- dhcp-4.3.4/includes/dhcp.h.PPP 2016-04-29 12:46:29.822988665 +0200
	128	+++ dhcp-4.3.4/includes/dhcp.h 2016-04-29 12:46:29.832988667 +0200
	129	@@ -81,6 +81,8 @@ struct dhcp_packet {
444c1184 MT	130	* is no standard for this so we
444c1184 MT	131	* just steal a type */
6df985df	132
444c1184	133	+#define HTYPE_RESERVED 0 /* RFC 5494 */
6df985df SS	134	+
	135	/* Magic cookie validating dhcp options field (and bootp vendor
	136	extensions field). */
	137	#define DHCP_OPTIONS_COOKIE "\143\202\123\143"
d8feb2d7 SS	138	diff -up dhcp-4.3.4/server/dhcpv6.c.PPP dhcp-4.3.4/server/dhcpv6.c
	139	--- dhcp-4.3.4/server/dhcpv6.c.PPP 2016-03-22 14:16:51.000000000 +0100
	140	+++ dhcp-4.3.4/server/dhcpv6.c 2016-04-29 12:46:29.833988667 +0200
	141	@@ -454,6 +454,9 @@ generate_new_server_duid(void) {
6df985df SS	142	if (p->hw_address.hlen > 0) {
	143	break;
	144	}
	145	+ if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) {
	146	+ log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!");
	147	+ }
	148	}
	149	if (p == NULL) {
	150	return ISC_R_UNEXPECTED;