``struct tunnel_header'' -> u_int32_t in OpenBSD.

struct tunnel_header is going soon.

Suggested by: Theo

4 files changed, 7 insertions, 10 deletions

diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index d5ae0d5..78e8cb0 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bundle.c,v 1.22 1998/06/20 01:36:38 brian Exp $
+ *	$Id: bundle.c,v 1.23 1998/06/24 19:33:30 brian Exp $
  */
 
 #include <sys/param.h>
@@ -35,7 +35,6 @@
 #include <net/if_dl.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <net/if_tun.h>
 #include <sys/un.h>
 
 #include <errno.h>
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 318342f..9ed21ac 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ip.c,v 1.43 1998/06/15 19:06:45 brian Exp $
+ * $Id: ip.c,v 1.44 1998/06/16 19:40:37 brian Exp $
  *
  *	TODO:
  *		o Return ICMP message for filterd packet
@@ -32,7 +32,6 @@
 #include <netinet/udp.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include <net/if_tun.h>
 #include <sys/un.h>
 
 #ifndef NOALIAS
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 372fa67..570daef 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: main.c,v 1.135 1998/06/16 19:40:39 brian Exp $
+ * $Id: main.c,v 1.136 1998/06/24 19:33:32 brian Exp $
  *
  *	TODO:
  */
@@ -28,7 +28,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/un.h>
-#include <net/if_tun.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/ppp/tun.h b/usr.sbin/ppp/tun.h
index 2745686..0ed879f 100644
--- a/usr.sbin/ppp/tun.h
+++ b/usr.sbin/ppp/tun.h
@@ -23,19 +23,19 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tun.h,v 1.3.4.3 1998/05/06 23:50:25 brian Exp $
+ *	$Id: tun.h,v 1.4 1998/05/21 21:48:55 brian Exp $
  */
 
 struct tun_data {
 #ifdef __OpenBSD__
-  struct tunnel_header head;
+  u_int32_t head;
 #endif
   u_char data[MAX_MRU];
 };
 
 #ifdef __OpenBSD__
-#define tun_fill_header(f,proto) do { (f).head.tun_af = (proto); } while (0)
-#define tun_check_header(f,proto) ((f).head.tun_af == (proto))
+#define tun_fill_header(f,proto) do { (f).head = (proto); } while (0)
+#define tun_check_header(f,proto) ((f).head == (proto))
 #else
 #define tun_fill_header(f,proto) do { } while (0)
 #define tun_check_header(f,proto) (1)