From 43ac8a5a364407f32b172b1e373eaf949f7fca1e Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Wed, 13 Aug 2014 12:03:40 +0000
Subject: [PATCH] Correctly set the rtable ID of the packet header when sending
 Active Discovery Terminate packets.

ok mikeb@, henning@, phessler@
---
 sys/net/if_pppoe.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c
index efa97fe3d85..507da6d4f91 100644
--- a/sys/net/if_pppoe.c
+++ b/sys/net/if_pppoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppoe.c,v 1.40 2014/07/12 18:44:22 tedu Exp $ */
+/* $OpenBSD: if_pppoe.c,v 1.41 2014/08/13 12:03:40 mpi Exp $ */
 /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */
 
 /*
@@ -1398,6 +1398,9 @@ pppoe_send_padt(struct ifnet *outgoing_if, u_int session, const u_int8_t *dest)
 	memcpy(&eh->ether_dhost, dest, ETHER_ADDR_LEN);
 
 	m0->m_flags &= ~(M_BCAST|M_MCAST);
+	/* encapsulated packet is forced into rdomain of physical interface */
+	m0->m_pkthdr.ph_rtableid = outgoing_if->if_rdomain;
+
 	return (outgoing_if->if_output(outgoing_if, m0, &dst, NULL));
 }
 
-- 
2.20.1