From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 21 Oct 2012 12:31:21 +0000 (+0000)
Subject: Use the correct type for reusable_connection.forwarder_type
X-Git-Tag: v_3_0_20~243
X-Git-Url: http://www.privoxy.org/gitweb/-%22http:/sourceforge.net/static/git-logo.png?a=commitdiff_plain;h=1467dd53545f1bc77a771de22bfd96a22465fc26;p=privoxy.git

Use the correct type for reusable_connection.forwarder_type
---

diff --git a/project.h b/project.h
index a8fc9258..45cf1723 100644
--- a/project.h
+++ b/project.h
@@ -1,7 +1,7 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
 /** Version string. */
-#define PROJECT_H_VERSION "$Id: project.h,v 1.181 2012/10/17 18:19:29 fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.182 2012/10/17 18:19:59 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -639,6 +639,16 @@ struct url_actions
    struct url_actions *next;   /**< Next action section in file, or NULL. */
 };
 
+enum forwarder_type {
+   /**< Don't use a SOCKS server               */
+   SOCKS_NONE =  0,
+   /**< original SOCKS 4 protocol              */
+   SOCKS_4    = 40,
+   /**< SOCKS 4A, DNS resolution is done by the SOCKS server */
+   SOCKS_4A   = 41,
+   /**< SOCKS 5 with hostnames, DNS resolution is done by the SOCKS server */
+   SOCKS_5    = 50,
+};
 
 /*
  * Structure to hold the server socket and the information
@@ -662,7 +672,7 @@ struct reusable_connection
 
    char *host;
    int  port;
-   int  forwarder_type;
+   enum forwarder_type forwarder_type;
    char *gateway_host;
    int  gateway_port;
    char *forward_host;
@@ -1048,17 +1058,6 @@ struct block_spec
 
 #endif /* def FEATURE_TRUST */
 
-enum forwarder_type {
-   /**< Don't use a SOCKS server               */
-   SOCKS_NONE =  0,
-   /**< original SOCKS 4 protocol              */
-   SOCKS_4    = 40,
-   /**< SOCKS 4A, DNS resolution is done by the SOCKS server */
-   SOCKS_4A   = 41,
-   /**< SOCKS 5 with hostnames, DNS resolution is done by the SOCKS server */
-   SOCKS_5    = 50,
-};
-
 /**
  * How to forward a connection to a parent proxy.
  */