X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=d72de1d7aca7849f6223e62f47668106a2e7951e;hp=0982020f2bf1e0c6d8a97951dfd1b7edb949edac;hb=d178b583df9fe2bf3ebb3a7377203efc5c46df32;hpb=042a6c139e1bf798511db3986a3d4a47e638e731 diff --git a/src/net.h b/src/net.h index 0982020f..d72de1d7 100644 --- a/src/net.h +++ b/src/net.h @@ -1,7 +1,10 @@ +#ifndef TINC_NET_H +#define TINC_NET_H + /* net.h -- header for net.c Copyright (C) 1998-2005 Ivo Timmermans - 2000-2012 Guus Sliepen + 2000-2015 Guus Sliepen 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 @@ -18,9 +21,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_NET_H__ -#define __TINC_NET_H__ - #include #include "ipv6.h" @@ -123,20 +123,6 @@ extern time_t now; extern int contradicting_add_edge; extern int contradicting_del_edge; -extern char *proxyhost; -extern char *proxyport; -extern char *proxyuser; -extern char *proxypass; -typedef enum proxytype_t { - PROXY_NONE = 0, - PROXY_SOCKS4, - PROXY_SOCKS4A, - PROXY_SOCKS5, - PROXY_HTTP, - PROXY_EXEC, -} proxytype_t; -extern proxytype_t proxytype; - extern volatile bool running; /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */ @@ -171,4 +157,4 @@ extern void load_all_subnets(void); extern CRITICAL_SECTION mutex; #endif -#endif /* __TINC_NET_H__ */ +#endif