Proxymode removed.

diff --git a/src/conf.c b/src/conf.c
index 90ad58f..6f949f5 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -59,7 +59,6 @@ static internal_config_t hazahaza[] = {
   { "PingTimeout",  pingtimeout,    TYPE_INT },
   { "TapDevice",    tapdevice,      TYPE_NAME },
   { "KeyExpire",    keyexpire,      TYPE_INT },
   { "PingTimeout",  pingtimeout,    TYPE_INT },
   { "TapDevice",    tapdevice,      TYPE_NAME },
   { "KeyExpire",    keyexpire,      TYPE_INT },

-  { "ProxyMode",    proxymode,      TYPE_BOOL },

   { NULL, 0, 0 }
 };
 
   { NULL, 0, 0 }
 };
 

diff --git a/src/conf.h b/src/conf.h
index 673573b..0d66313 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -40,8 +40,7 @@ typedef enum which_t {
   tapdevice,
   allowconnect,
   pingtimeout,
   tapdevice,
   allowconnect,
   pingtimeout,

-  keyexpire,
-  proxymode
+  keyexpire

 } which_t;
 
 typedef struct config_t {
 } which_t;
 
 typedef struct config_t {

diff --git a/src/net.c b/src/net.c
index 58f3e02..7b9133e 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -258,14 +258,8 @@ cp
 */
 int send_packet(ip_t to, vpn_packet_t *packet)
 {
 */
 int send_packet(ip_t to, vpn_packet_t *packet)
 {

-  config_t const *cfg;

   conn_list_t *cl;
 cp
   conn_list_t *cl;
 cp

-  if(!(cfg = get_config_val(proxymode)))               /* In case we are in proxy mode, just send everything to our uplink. */
-    cl = conn_list;
-  else
-    cl = lookup_conn(to);
-

   if((cl = lookup_conn(to)) == NULL)
     {
       if(debug_lvl > 2)
   if((cl = lookup_conn(to)) == NULL)
     {
       if(debug_lvl > 2)