diff src/login-common/login-proxy.h @ 14576:fbb1ecb9b888

Merged changes from v2.1 tree.
author Timo Sirainen <tss@iki.fi>
date Sun, 20 May 2012 03:25:04 +0300
parents ba06ea38c722 773ca397d799
children 02451e967a06
line wrap: on
line diff
--- a/src/login-common/login-proxy.h	Sat May 19 22:40:08 2012 +0300
+++ b/src/login-common/login-proxy.h	Sun May 20 03:25:04 2012 +0300
@@ -1,6 +1,8 @@
 #ifndef LOGIN_PROXY_H
 #define LOGIN_PROXY_H
 
+#include "network.h"
+
 /* Max. number of embedded proxying connections until proxying fails.
    This is intended to avoid an accidental configuration where two proxies
    keep connecting to each others, both thinking the other one is supposed to
@@ -22,6 +24,7 @@
 
 struct login_proxy_settings {
 	const char *host;
+	struct ip_addr ip;
 	unsigned int port;
 	unsigned int connect_timeout_msecs;
 	/* send a notification about proxy connection to proxy-notify pipe