- Fixed ans_key_h

- Removed tapsubnet configuration option.

diff --git a/src/conf.c b/src/conf.c
index ca6640a..7780a0b 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: conf.c,v 1.9.4.18 2000/10/29 00:02:17 guus Exp $
+    $Id: conf.c,v 1.9.4.19 2000/10/29 00:24:31 guus Exp $

 */
 
 
 */
 
 


@@ -60,7 +60,6 @@ static internal_config_t hazahaza[] = {
   { "ConnectTo",    connectto,      TYPE_NAME },
   { "PingTimeout",  pingtimeout,    TYPE_INT },
   { "TapDevice",    tapdevice,      TYPE_NAME },
   { "ConnectTo",    connectto,      TYPE_NAME },
   { "PingTimeout",  pingtimeout,    TYPE_INT },
   { "TapDevice",    tapdevice,      TYPE_NAME },

-  { "TapSubnet",    tapsubnet,      TYPE_IP },

   { "PrivateKey",   privatekey,     TYPE_NAME },
   { "KeyExpire",    keyexpire,      TYPE_INT },
   { "Hostnames",    resolve_dns,    TYPE_BOOL },
   { "PrivateKey",   privatekey,     TYPE_NAME },
   { "KeyExpire",    keyexpire,      TYPE_INT },
   { "Hostnames",    resolve_dns,    TYPE_BOOL },

diff --git a/src/conf.h b/src/conf.h
index c1db544..c4c030a 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: conf.h,v 1.6.4.14 2000/10/24 15:46:16 guus Exp $
+    $Id: conf.h,v 1.6.4.15 2000/10/29 00:24:31 guus Exp $

 */
 
 #ifndef __TINC_CONF_H__
 */
 
 #ifndef __TINC_CONF_H__


@@ -37,7 +37,6 @@ typedef enum which_t {
   connectto,
   pingtimeout,
   tapdevice,
   connectto,
   pingtimeout,
   tapdevice,

-  tapsubnet,

   privatekey,
   keyexpire,
   resolve_dns,
   privatekey,
   keyexpire,
   resolve_dns,

diff --git a/src/protocol.c b/src/protocol.c
index 71b1367..1bb3734 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: protocol.c,v 1.28.4.47 2000/10/29 00:02:19 guus Exp $
+    $Id: protocol.c,v 1.28.4.48 2000/10/29 00:24:31 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -1074,8 +1074,8 @@ cp
       BF_set_key(cl->cipher_pktkey, keylength, pktkey);
 */
 
       BF_set_key(cl->cipher_pktkey, keylength, pktkey);
 */
 

-      cl->status.validkey = 1;
-      cl->status.waitingforkey = 0;
+      from->status.validkey = 1;
+      from->status.waitingforkey = 0;

     }
   else
     {
     }
   else
     {