--- gvpe/src/connection.h	2003/04/06 18:12:18	1.7
+++ gvpe/src/connection.h	2004/01/17 01:18:36	1.12
@@ -1,5 +1,6 @@
 /*
     connection.h -- header for connection.C
+    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,8 +37,8 @@
   u8 id[RSA_IDLEN]; // the challenge id
 };
 
-typedef u8 rsachallenge[RSA_KEYLEN - RSA_OVERHEAD]; // challenge data;
-typedef u8 rsaencrdata[RSA_KEYLEN]; // encrypted challenge
+typedef rsaclear rsachallenge;      // challenge data;
+typedef rsacrypt rsaencrdata;       // encrypted challenge
 typedef u8 rsaresponse[RSA_RESLEN]; // the encrypted ripemd160 hash
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -98,13 +99,13 @@
 // a very simple fifo pkt-queue
 class pkt_queue
   {
-    tap_packet *queue[QUEUEDEPTH];
+    net_packet *queue[QUEUEDEPTH];
     int i, j;
 
   public:
 
-    void put (tap_packet *p);
-    tap_packet *get ();
+    void put (net_packet *p);
+    net_packet *get ();
 
     pkt_queue ();
     ~pkt_queue ();
@@ -125,7 +126,7 @@
 
     u8 protocol;
 
-    pkt_queue queue;
+    pkt_queue data_queue, vpn_queue;
 
     crypto_ctx *octx, *ictx;
 
@@ -149,7 +150,7 @@
     void send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols);
     void send_reset (const sockinfo &dsi);
     void send_ping (const sockinfo &dsi, u8 pong = 0);
-    void send_data_packet (tap_packet *pkt, bool broadcast = false);
+    void send_data_packet (tap_packet *pkt);
 
     void inject_data_packet (tap_packet *pkt, bool broadcast = false);
     void inject_vpn_packet (vpn_packet *pkt, int tos = 0); // for forwarding