@@ -44,7 +44,6 @@ EXTRA_DIST = \

 	sample-keys \

 	sample-scripts \

 	suse \

-	tap-win32 \

 	contrib \

 	debug \

 	plugins \

@@ -147,7 +146,7 @@ openvpn_SOURCES = \

 	ssl_verify_polarssl.c ssl_verify_polarssl.h \

 	status.c status.h \

 	syshead.h \

-	tun.c tun.h \

+	tun.c tun.h tap-windows.h \

 	win32.h win32.c \

 	cryptoapi.h cryptoapi.c

@@ -959,15 +959,15 @@ if test "$SELINUX" = "yes"; then

    )

 fi

-TAP_ID="PRODUCT_TAP_ID"

+TAP_COMPONENT_ID="PRODUCT_TAP_ID"

 TAP_WIN32_MIN_MAJOR="PRODUCT_TAP_WIN32_MIN_MAJOR"

 TAP_WIN32_MIN_MINOR="PRODUCT_TAP_WIN32_MIN_MINOR"

-AC_DEFINE_UNQUOTED(TAP_ID, "${TAP_ID}", [The TAP-Win32 id defined in tap-win32/SOURCES])

-AC_DEFINE_UNQUOTED(TAP_WIN32_MIN_MAJOR, ${TAP_WIN32_MIN_MAJOR}, [The TAP-Win32 version number is defined in tap-win32/SOURCES])

-AC_DEFINE_UNQUOTED(TAP_WIN32_MIN_MINOR, ${TAP_WIN32_MIN_MINOR}, [The TAP-Win32 version number is defined in tap-win32/SOURCES])

-AC_SUBST(TAP_ID)

-AC_SUBST(TAP_WIN32_MIN_MAJOR)

-AC_SUBST(TAP_WIN32_MIN_MINOR)

+AC_DEFINE_UNQUOTED([TAP_ID], ["${TAP_ID}"], [The TAP-Win32 id])

+AC_DEFINE_UNQUOTED([TAP_WIN32_MIN_MAJOR], [${TAP_WIN32_MIN_MAJOR}], [The TAP-Win32 version number is defined in tap-win32/SOURCES])

+AC_DEFINE_UNQUOTED([TAP_WIN32_MIN_MINOR], [${TAP_WIN32_MIN_MINOR}], [The TAP-Win32 version number is defined in tap-win32/SOURCES])

+AC_SUBST([TAP_COMPONENT_ID])

+AC_SUBST([TAP_WIN32_MIN_MAJOR])

+AC_SUBST([TAP_WIN32_MIN_MINOR])

 win32datadir="\${datadir}/${PACKAGE}-win32"

 AC_SUBST(win32datadir)

deleted file mode 100755

@@ -1,6 +0,0 @@

-#

-# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source

-# file to this component.  This file merely indirects to the real make file

-# that is shared by all the components of NT OS/2

-#

-!INCLUDE $(NTMAKEENV)\makefile.def

deleted file mode 100755

@@ -1,64 +0,0 @@

-# Build TAP-Win32 driver.

-# Build Command: build -cef

-

-MAJORCOMP=ntos

-MINORCOMP=ndis

-

-TARGETNAME=@@PRODUCT_TAP_ID@@

-TARGETTYPE=DRIVER

-TARGETPATH=.

-TARGETLIBS=$(DDK_LIB_PATH)\ndis.lib $(DDK_LIB_PATH)\ntstrsafe.lib

-INCLUDES=$(DDK_INCLUDE_PATH) ..

-

-# The TAP version numbers here must be >=

-# PRODUCT_TAP_WIN32_MIN_x values defined in version.m4

-C_DEFINES=

-C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MAJOR_VERSION=@@PRODUCT_TAP_MAJOR_VER@@

-C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=@@PRODUCT_TAP_MINOR_VER@@

-

-# Produce the same symbolic information for both free & checked builds.

-# This will allow us to perform full source-level debugging on both

-# builds without affecting the free build's performance.

-!IF "$(DDKBUILDENV)" != "chk"

-NTDEBUGTYPE=both

-USE_PDB=1

-!ELSE

-NTDEBUGTYPE=both

-USE_PDB=1

-!ENDIF

-

-# Set compiler optimizations:

-# /Ox - Full optimization enabled

-# /Os - favor speed over size when optimizing

-# /Od - Disable all optimizations

-# /Oi - Enable optimization for intrinsic functions

-# /Fc - Generate mixed assembler/source code files

-#

-# For both checked and free builds, make sure that any intrinsic

-# functions are compiled correctly. To do this, ensure that /Oi

-# is selected for both free and checked builds. There is a bug in

-# VC++ 6.0 (at least through SP4) where, if you specify any

-# intrinsic functions in your code with "#pragma intrinsic" but

-# you don't have the /Oi optimization enabled, neither a call

-# to the function, nor the intrinsic inline version of the function

-# will end up in your object code. This bug only applies to free

-# builds, but just to be safe we'll make sure that the flag is

-# enabled for all builds.

-

-!IF "$(DDKBUILDENV)" != "chk"

-MSC_OPTIMIZATION=/Ox /Oi /Fc

-!ELSE

-MSC_OPTIMIZATION=/Od /Oi /Fc

-!ENDIF

-

-# Generate a linker map file just in case we need one for debugging

-LINKER_FLAGS=$(LINKER_FLAGS) /INCREMENTAL:NO /MAP /MAPINFO:EXPORTS

-

-# Generate a browser information file for use in IDE development

-#BROWSER_INFO=1

-#BROWSERFILE=$(TARGETNAME).BSC -n

-

-# Abort compilation on warnings by adding /WX

-MSC_WARNING_LEVEL=/W3

-

-SOURCES=tapdrvr.c resource.rc

deleted file mode 100755

@@ -1,82 +0,0 @@

-/*

- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap

- *                         device functionality on Windows.

- *

- *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.

- *

- *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,

- *  and is released under the GPL version 2 (see below).

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2

- *  as published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program (see the file COPYING included with this

- *  distribution); if not, write to the Free Software Foundation, Inc.,

- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-//===============================================

-// This file is included both by OpenVPN and

-// the TAP-Win32 driver and contains definitions

-// common to both.

-//===============================================

-

-#ifndef HAVE_CONFIG_H

-#include "autodefs.h"

-#endif

-

-//=============

-// TAP IOCTLs

-//=============

-

-#define TAP_CONTROL_CODE(request,method) \

-  CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS)

-

-// Present in 8.1

-

-#define TAP_IOCTL_GET_MAC               TAP_CONTROL_CODE (1, METHOD_BUFFERED)

-#define TAP_IOCTL_GET_VERSION           TAP_CONTROL_CODE (2, METHOD_BUFFERED)

-#define TAP_IOCTL_GET_MTU               TAP_CONTROL_CODE (3, METHOD_BUFFERED)

-#define TAP_IOCTL_GET_INFO              TAP_CONTROL_CODE (4, METHOD_BUFFERED)

-#define TAP_IOCTL_CONFIG_POINT_TO_POINT TAP_CONTROL_CODE (5, METHOD_BUFFERED)

-#define TAP_IOCTL_SET_MEDIA_STATUS      TAP_CONTROL_CODE (6, METHOD_BUFFERED)

-#define TAP_IOCTL_CONFIG_DHCP_MASQ      TAP_CONTROL_CODE (7, METHOD_BUFFERED)

-#define TAP_IOCTL_GET_LOG_LINE          TAP_CONTROL_CODE (8, METHOD_BUFFERED)

-#define TAP_IOCTL_CONFIG_DHCP_SET_OPT   TAP_CONTROL_CODE (9, METHOD_BUFFERED)

-

-// Added in 8.2

-

-/* obsoletes TAP_IOCTL_CONFIG_POINT_TO_POINT */

-#define TAP_IOCTL_CONFIG_TUN            TAP_CONTROL_CODE (10, METHOD_BUFFERED)

-

-//=================

-// Registry keys

-//=================

-

-#define ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"

-

-#define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"

-

-//======================

-// Filesystem prefixes

-//======================

-

-#define USERMODEDEVICEDIR "\\\\.\\Global\\"

-#define SYSDEVICEDIR      "\\Device\\"

-#define USERDEVICEDIR     "\\DosDevices\\Global\\"

-#define TAPSUFFIX         ".tap"

-

-//=========================================================

-// TAP_COMPONENT_ID -- This string defines the TAP driver

-// type -- different component IDs can reside in the system

-// simultaneously.

-//=========================================================

-

-#define TAP_COMPONENT_ID TAP_ID

deleted file mode 100755

@@ -1,52 +0,0 @@

-/*

- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap

- *                         device functionality on Windows.

- *

- *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.

- *

- *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,

- *  and is released under the GPL version 2 (see below).

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2

- *  as published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program (see the file COPYING included with this

- *  distribution); if not, write to the Free Software Foundation, Inc.,

- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-//====================================================================

-//                        Product and Version public settings

-//====================================================================

-

-#define PRODUCT_STRING PRODUCT_TAP_DEVICE_DESCRIPTION

-

-#define TAP_NDIS_MAJOR_VERSION 5

-#define TAP_NDIS_MINOR_VERSION 0

-

-//===========================================================

-// Driver constants

-//===========================================================

-

-#define ETHERNET_HEADER_SIZE     (sizeof (ETH_HEADER))

-#define ETHERNET_MTU             1500

-#define ETHERNET_PACKET_SIZE     (ETHERNET_MTU + ETHERNET_HEADER_SIZE)

-#define DEFAULT_PACKET_LOOKAHEAD (ETHERNET_PACKET_SIZE)

-

-#define NIC_MAX_MCAST_LIST 32  // Max length of multicast address list

-

-#define MINIMUM_MTU 576        // USE TCP Minimum MTU

-#define MAXIMUM_MTU 65536      // IP maximum MTU

-

-#define PACKET_QUEUE_SIZE   64 // tap -> userspace queue size

-#define IRP_QUEUE_SIZE      16 // max number of simultaneous i/o operations from userspace

-#define INJECT_QUEUE_SIZE   16 // DHCP/ARP -> tap injection queue

-

-#define TAP_LITTLE_ENDIAN      // affects ntohs, htonl, etc. functions

deleted file mode 100755

@@ -1,599 +0,0 @@

-/*

- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap

- *                         device functionality on Windows.

- *

- *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.

- *

- *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,

- *  and is released under the GPL version 2 (see below).

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2

- *  as published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program (see the file COPYING included with this

- *  distribution); if not, write to the Free Software Foundation, Inc.,

- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-//=========================

-// Code to set DHCP options

-//=========================

-

-VOID

-SetDHCPOpt (DHCPMsg *m, void *data, unsigned int len)

-{

-  if (!m->overflow)

-    {

-      if (m->optlen + len <= DHCP_OPTIONS_BUFFER_SIZE)

-	{

-	  if (len)

-	    {

-	      NdisMoveMemory (m->msg.options + m->optlen, data, len);

-	      m->optlen += len;

-	    }

-	}

-      else

-	{

-	  m->overflow = TRUE;

-	}

-    }

-}

-

-VOID

-SetDHCPOpt0 (DHCPMsg *msg, int type)

-{

-  DHCPOPT0 opt;

-  opt.type = (UCHAR) type;

-  SetDHCPOpt (msg, &opt, sizeof (opt));

-}

-

-VOID

-SetDHCPOpt8 (DHCPMsg *msg, int type, ULONG data)

-{

-  DHCPOPT8 opt;

-  opt.type = (UCHAR) type;

-  opt.len = sizeof (opt.data);

-  opt.data = (UCHAR) data;

-  SetDHCPOpt (msg, &opt, sizeof (opt));

-}

-

-VOID

-SetDHCPOpt32 (DHCPMsg *msg, int type, ULONG data)

-{

-  DHCPOPT32 opt;

-  opt.type = (UCHAR) type;

-  opt.len = sizeof (opt.data);

-  opt.data = data;

-  SetDHCPOpt (msg, &opt, sizeof (opt));

-}

-

-//==============

-// Checksum code

-//==============

-

-USHORT

-ip_checksum (const UCHAR *buf, const int len_ip_header)

-{

-  USHORT word16;

-  ULONG sum = 0;

-  int i;

-    

-  // make 16 bit words out of every two adjacent 8 bit words in the packet

-  // and add them up

-  for (i = 0; i < len_ip_header - 1; i += 2) {

-    word16 = ((buf[i] << 8) & 0xFF00) + (buf[i+1] & 0xFF);

-    sum += (ULONG) word16;

-  }

-

-  // take only 16 bits out of the 32 bit sum and add up the carries

-  while (sum >> 16)

-    sum = (sum & 0xFFFF) + (sum >> 16);

-

-  // one's complement the result

-  return ((USHORT) ~sum);

-}

-

-USHORT

-udp_checksum (const UCHAR *buf,

-	      const int len_udp,

-	      const UCHAR *src_addr,

-	      const UCHAR *dest_addr)

-{

-  USHORT word16;

-  ULONG sum = 0;

-  int i;

-	

-  // make 16 bit words out of every two adjacent 8 bit words and 

-  // calculate the sum of all 16 bit words

-  for (i = 0; i < len_udp; i += 2){

-    word16 = ((buf[i] << 8) & 0xFF00) + ((i + 1 < len_udp) ? (buf[i+1] & 0xFF) : 0);

-    sum += word16;

-  }

-

-  // add the UDP pseudo header which contains the IP source and destination addresses

-  for (i = 0; i < 4; i += 2){

-    word16 =((src_addr[i] << 8) & 0xFF00) + (src_addr[i+1] & 0xFF);

-    sum += word16;

-  }

-  for (i = 0; i < 4; i += 2){

-    word16 =((dest_addr[i] << 8) & 0xFF00) + (dest_addr[i+1] & 0xFF);

-    sum += word16; 	

-  }

-

-  // the protocol number and the length of the UDP packet

-  sum += (USHORT) IPPROTO_UDP + (USHORT) len_udp;

-

-  // keep only the last 16 bits of the 32 bit calculated sum and add the carries

-  while (sum >> 16)

-    sum = (sum & 0xFFFF) + (sum >> 16);

-		

-  // Take the one's complement of sum

-  return ((USHORT) ~sum);

-}

-

-//================================

-// Set IP and UDP packet checksums

-//================================

-

-VOID

-SetChecksumDHCPMsg (DHCPMsg *m)

-{

-  // Set IP checksum

-  m->msg.pre.ip.check = htons (ip_checksum ((UCHAR *) &m->msg.pre.ip, sizeof (IPHDR)));

-

-  // Set UDP Checksum

-  m->msg.pre.udp.check = htons (udp_checksum ((UCHAR *) &m->msg.pre.udp, 

-					      sizeof (UDPHDR) + sizeof (DHCP) + m->optlen,

-					      (UCHAR *)&m->msg.pre.ip.saddr,

-					      (UCHAR *)&m->msg.pre.ip.daddr));

-}

-

-//===================

-// DHCP message tests

-//===================

-

-int

-GetDHCPMessageType (const DHCP *dhcp, const int optlen)

-{

-  const UCHAR *p = (UCHAR *) (dhcp + 1);

-  int i;

-

-  for (i = 0; i < optlen; ++i)

-    {

-      const UCHAR type = p[i];

-      const int room = optlen - i - 1;

-      if (type == DHCP_END)           // didn't find what we were looking for

-	return -1;

-      else if (type == DHCP_PAD)      // no-operation

-	;

-      else if (type == DHCP_MSG_TYPE) // what we are looking for

-	{

-	  if (room >= 2)

-	    {

-	      if (p[i+1] == 1)        // message length should be 1

-		return p[i+2];        // return message type

-	    }

-	  return -1;

-	}

-      else                            // some other message

-	{

-	  if (room >= 1)

-	    {

-	      const int len = p[i+1]; // get message length

-	      i += (len + 1);         // advance to next message

-	    }

-	}

-    }

-  return -1;

-}

-

-BOOLEAN

-DHCPMessageOurs (const TapAdapterPointer p_Adapter,

-		 const ETH_HEADER *eth,

-		 const IPHDR *ip,

-		 const UDPHDR *udp,

-		 const DHCP *dhcp)

-{

-  // Must be UDPv4 protocol

-  if (!(eth->proto == htons (ETH_P_IP) && ip->protocol == IPPROTO_UDP))

-    return FALSE;

-

-  // Source MAC must be our adapter

-  if (!MAC_EQUAL (eth->src, p_Adapter->m_MAC))

-    return FALSE;

-

-  // Dest MAC must be either broadcast or our virtual DHCP server

-  if (!(MAC_EQUAL (eth->dest, p_Adapter->m_MAC_Broadcast)

-	|| MAC_EQUAL (eth->dest, p_Adapter->m_dhcp_server_mac)))

-    return FALSE;

-

-  // Port numbers must be correct

-  if (!(udp->dest == htons (BOOTPS_PORT)

-	&& udp->source == htons (BOOTPC_PORT)))

-    return FALSE;

-

-  // Hardware address must be MAC addr sized

-  if (!(dhcp->hlen == sizeof (MACADDR)))

-    return FALSE;

-

-  // Hardware address must match our adapter

-  if (!MAC_EQUAL (eth->src, dhcp->chaddr))

-    return FALSE;

-

-  return TRUE;

-}

-

-

-//=====================================================

-// Build all of DHCP packet except for DHCP options.

-// Assume that *p has been zeroed before we are called.

-//=====================================================

-

-VOID

-BuildDHCPPre (const TapAdapterPointer a,

-	      DHCPPre *p,

-	      const ETH_HEADER *eth,

-	      const IPHDR *ip,

-	      const UDPHDR *udp,

-	      const DHCP *dhcp,

-	      const int optlen,

-	      const int type)

-{

-  // Should we broadcast or direct to a specific MAC / IP address?

-  const BOOLEAN broadcast = (type == DHCPNAK

-			     || MAC_EQUAL (eth->dest, a->m_MAC_Broadcast));

-  // Build ethernet header

-

-  COPY_MAC (p->eth.src, a->m_dhcp_server_mac);

-

-  if (broadcast)

-    COPY_MAC (p->eth.dest, a->m_MAC_Broadcast);

-  else

-    COPY_MAC (p->eth.dest, eth->src);

-

-  p->eth.proto = htons (ETH_P_IP);

-

-  // Build IP header

-

-  p->ip.version_len = (4 << 4) | (sizeof (IPHDR) >> 2);

-  p->ip.tos = 0;

-  p->ip.tot_len = htons (sizeof (IPHDR) + sizeof (UDPHDR) + sizeof (DHCP) + optlen);

-  p->ip.id = 0;

-  p->ip.frag_off = 0;

-  p->ip.ttl = 16;

-  p->ip.protocol = IPPROTO_UDP;

-  p->ip.check = 0;

-  p->ip.saddr = a->m_dhcp_server_ip;

-

-  if (broadcast)

-    p->ip.daddr = ~0;

-  else

-    p->ip.daddr = a->m_dhcp_addr;

-

-  // Build UDP header

-

-  p->udp.source = htons (BOOTPS_PORT);

-  p->udp.dest = htons (BOOTPC_PORT);

-  p->udp.len = htons (sizeof (UDPHDR) + sizeof (DHCP) + optlen);

-  p->udp.check = 0;

-

-  // Build DHCP response

-

-  p->dhcp.op = BOOTREPLY;

-  p->dhcp.htype = 1;

-  p->dhcp.hlen = sizeof (MACADDR);

-  p->dhcp.hops = 0;

-  p->dhcp.xid = dhcp->xid;

-  p->dhcp.secs = 0;

-  p->dhcp.flags = 0;

-  p->dhcp.ciaddr = 0;

-

-  if (type == DHCPNAK)

-    p->dhcp.yiaddr = 0;

-  else

-    p->dhcp.yiaddr = a->m_dhcp_addr;

-

-  p->dhcp.siaddr = a->m_dhcp_server_ip;

-  p->dhcp.giaddr = 0;

-  COPY_MAC (p->dhcp.chaddr, eth->src);

-  p->dhcp.magic = htonl (0x63825363);

-}

-//=============================

-// Build specific DHCP messages

-//=============================

-

-VOID

-SendDHCPMsg (const TapAdapterPointer a,

-	     const int type,

-	     const ETH_HEADER *eth,

-	     const IPHDR *ip,

-	     const UDPHDR *udp,

-	     const DHCP *dhcp)

-{

-  DHCPMsg *pkt;

-

-  if (!(type == DHCPOFFER || type == DHCPACK || type == DHCPNAK))

-    {

-      DEBUGP (("[TAP] SendDHCPMsg: Bad DHCP type: %d\n", type));

-      return;

-    }

-

-  pkt = (DHCPMsg *) MemAlloc (sizeof (DHCPMsg), TRUE);

-

-  if (pkt)

-    {

-      //-----------------------

-      // Build DHCP options

-      //-----------------------

-

-      // Message Type

-      SetDHCPOpt8 (pkt, DHCP_MSG_TYPE, type);

-

-      // Server ID

-      SetDHCPOpt32 (pkt, DHCP_SERVER_ID, a->m_dhcp_server_ip);

-

-      if (type == DHCPOFFER || type == DHCPACK)

-	{

-	  // Lease Time

-	  SetDHCPOpt32 (pkt, DHCP_LEASE_TIME, htonl (a->m_dhcp_lease_time));

-

-	  // Netmask

-	  SetDHCPOpt32 (pkt, DHCP_NETMASK, a->m_dhcp_netmask);

-

-	  // Other user-defined options

-	  SetDHCPOpt (pkt,

-		      a->m_dhcp_user_supplied_options_buffer,

-		      a->m_dhcp_user_supplied_options_buffer_len);

-	}

-

-      // End

-      SetDHCPOpt0 (pkt, DHCP_END);

-

-      if (!DHCPMSG_OVERFLOW (pkt))

-	{

-	  // The initial part of the DHCP message (not including options) gets built here

-	  BuildDHCPPre (a,

-			&pkt->msg.pre,

-			eth,

-			ip,

-			udp,

-			dhcp,

-			DHCPMSG_LEN_OPT (pkt),

-			type);

-

-	  SetChecksumDHCPMsg (pkt);

-

-	  DUMP_PACKET ("DHCPMsg",

-		       DHCPMSG_BUF (pkt),

-		       DHCPMSG_LEN_FULL (pkt));

-

-	  // Return DHCP response to kernel

-	  InjectPacketDeferred (a,

-				DHCPMSG_BUF (pkt),

-				DHCPMSG_LEN_FULL (pkt));

-	}

-      else

-	{

-	  DEBUGP (("[TAP] SendDHCPMsg: DHCP buffer overflow\n"));

-	}

-

-      MemFree (pkt, sizeof (DHCPMsg));

-    }

-}

-

-//===================================================================

-// Handle a BOOTPS packet produced by the local system to

-// resolve the address/netmask of this adapter.

-// If we are in TAP_IOCTL_CONFIG_DHCP_MASQ mode, reply

-// to the message.  Return TRUE if we processed the passed

-// message, so that downstream stages can ignore it.

-//===================================================================

-

-BOOLEAN

-ProcessDHCP (TapAdapterPointer p_Adapter,

-	     const ETH_HEADER *eth,

-	     const IPHDR *ip,

-	     const UDPHDR *udp,

-	     const DHCP *dhcp,

-	     int optlen)

-{

-  int msg_type;

-

-  // Sanity check IP header

-  if (!(ntohs (ip->tot_len) == sizeof (IPHDR) + sizeof (UDPHDR) + sizeof (DHCP) + optlen

-	&& (ntohs (ip->frag_off) & IP_OFFMASK) == 0))

-    return TRUE;

-

-  // Does this message belong to us?

-  if (!DHCPMessageOurs (p_Adapter, eth, ip, udp, dhcp))

-    return FALSE;

-

-  msg_type = GetDHCPMessageType (dhcp, optlen);

-

-  // Drop non-BOOTREQUEST messages

-  if (dhcp->op != BOOTREQUEST)

-    return TRUE;

-

-  // Drop any messages except DHCPDISCOVER or DHCPREQUEST

-  if (!(msg_type == DHCPDISCOVER || msg_type == DHCPREQUEST))

-    return TRUE;

-

-  // Should we reply with DHCPOFFER, DHCPACK, or DHCPNAK?

-  if (msg_type == DHCPREQUEST

-      && ((dhcp->ciaddr && dhcp->ciaddr != p_Adapter->m_dhcp_addr)

-	  || !p_Adapter->m_dhcp_received_discover

-	  || p_Adapter->m_dhcp_bad_requests >= BAD_DHCPREQUEST_NAK_THRESHOLD))

-    SendDHCPMsg (p_Adapter,

-		 DHCPNAK,

-		 eth, ip, udp, dhcp);

-  else

-    SendDHCPMsg (p_Adapter,

-		 (msg_type == DHCPDISCOVER ? DHCPOFFER : DHCPACK),

-		 eth, ip, udp, dhcp);

-

-  // Remember if we received a DHCPDISCOVER

-  if (msg_type == DHCPDISCOVER)

-    p_Adapter->m_dhcp_received_discover = TRUE;

-

-  // Is this a bad DHCPREQUEST?

-  if (msg_type == DHCPREQUEST && dhcp->ciaddr != p_Adapter->m_dhcp_addr)

-    ++p_Adapter->m_dhcp_bad_requests;

-

-  return TRUE;

-}

-

-#if DBG

-

-const char *

-message_op_text (int op)

-{

-  switch (op)

-    {

-    case BOOTREQUEST:

-      return "BOOTREQUEST";

-    case BOOTREPLY:

-      return "BOOTREPLY";

-    default:

-      return "???";

-    }

-}

-

-const char *

-message_type_text (int type)

-{

-  switch (type)

-    {

-    case DHCPDISCOVER:

-      return "DHCPDISCOVER";

-    case DHCPOFFER:

-      return "DHCPOFFER";

-    case DHCPREQUEST:

-      return "DHCPREQUEST";

-    case DHCPDECLINE:

-      return "DHCPDECLINE";

-    case DHCPACK:

-      return "DHCPACK";

-    case DHCPNAK:

-      return "DHCPNAK";

-    case DHCPRELEASE:

-      return "DHCPRELEASE";

-    case DHCPINFORM:

-      return "DHCPINFORM";

-    default:

-      return "???";

-    }

-}

-

-const char *

-port_name (int port)

-{

-  switch (port)

-    {

-    case BOOTPS_PORT:

-      return "BOOTPS";

-    case BOOTPC_PORT:

-      return "BOOTPC";

-    default:

-      return "unknown";

-    }

-}

-

-VOID

-DumpDHCP (const ETH_HEADER *eth,

-	  const IPHDR *ip,

-	  const UDPHDR *udp,

-	  const DHCP *dhcp,

-	  const int optlen)

-{

-  DEBUGP ((" %s", message_op_text (dhcp->op)));

-  DEBUGP ((" %s ", message_type_text (GetDHCPMessageType (dhcp, optlen))));

-  PrIP (ip->saddr);

-  DEBUGP ((":%s[", port_name (ntohs (udp->source))));

-  PrMac (eth->src);

-  DEBUGP (("] -> "));

-  PrIP (ip->daddr);

-  DEBUGP ((":%s[", port_name (ntohs (udp->dest))));

-  PrMac (eth->dest);

-  DEBUGP (("]"));

-  if (dhcp->ciaddr)

-    {

-      DEBUGP ((" ci="));

-      PrIP (dhcp->ciaddr);

-    }

-  if (dhcp->yiaddr)

-    {

-      DEBUGP ((" yi="));

-      PrIP (dhcp->yiaddr);

-    }

-  if (dhcp->siaddr)

-    {

-      DEBUGP ((" si="));

-      PrIP (dhcp->siaddr);

-    }

-  if (dhcp->hlen == sizeof (MACADDR))

-    {

-      DEBUGP ((" ch="));

-      PrMac (dhcp->chaddr);

-    }

-

-  DEBUGP ((" xid=0x%08x", ntohl (dhcp->xid)));

-

-  if (ntohl (dhcp->magic) != 0x63825363)

-    DEBUGP ((" ma=0x%08x", ntohl (dhcp->magic)));

-  if (dhcp->htype != 1)

-    DEBUGP ((" htype=%d", dhcp->htype));

-  if (dhcp->hops)

-    DEBUGP ((" hops=%d", dhcp->hops));

-  if (ntohs (dhcp->secs))

-    DEBUGP ((" secs=%d", ntohs (dhcp->secs)));

-  if (ntohs (dhcp->flags))

-    DEBUGP ((" flags=0x%04x", ntohs (dhcp->flags)));

-

-  // extra stuff

-  

-  if (ip->version_len != 0x45)

-    DEBUGP ((" vl=0x%02x", ip->version_len));

-  if (ntohs (ip->tot_len) != sizeof (IPHDR) + sizeof (UDPHDR) + sizeof (DHCP) + optlen)

-    DEBUGP ((" tl=%d", ntohs (ip->tot_len)));

-  if (ntohs (udp->len) != sizeof (UDPHDR) + sizeof (DHCP) + optlen)

-    DEBUGP ((" ul=%d", ntohs (udp->len)));

-

-  if (ip->tos)

-    DEBUGP ((" tos=0x%02x", ip->tos));

-  if (ntohs (ip->id))

-    DEBUGP ((" id=0x%04x", ntohs (ip->id)));

-  if (ntohs (ip->frag_off))

-    DEBUGP ((" frag_off=0x%04x", ntohs (ip->frag_off)));

-  

-  DEBUGP ((" ttl=%d", ip->ttl));

-  DEBUGP ((" ic=0x%04x [0x%04x]", ntohs (ip->check),

-	    ip_checksum ((UCHAR*)ip, sizeof (IPHDR))));

-  DEBUGP ((" uc=0x%04x [0x%04x/%d]", ntohs (udp->check),

-	    udp_checksum ((UCHAR *) udp,

-			  sizeof (UDPHDR) + sizeof (DHCP) + optlen,

-			  (UCHAR *) &ip->saddr,

-			  (UCHAR *) &ip->daddr),

-	    optlen));

-

-  // Options

-  {

-    const UCHAR *opt = (UCHAR *) (dhcp + 1);

-    int i;

-

-    DEBUGP ((" OPT"));

-    for (i = 0; i < optlen; ++i)

-      {

-	const UCHAR data = opt[i];

-	DEBUGP ((".%d", data));

-      }

-  }

-}

-

-#endif /* DBG */

deleted file mode 100755

@@ -1,164 +0,0 @@

-/*

- *  TAP-Win32/TAP-Win64 -- A kernel driver to provide virtual tap

- *                         device functionality on Windows.

- *

- *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.

- *

- *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,

- *  and is released under the GPL version 2 (see below).

- *