Changeset 29ff5c2 for lib/proxy.h

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feat/hip-cat

File:

• lib/proxy.h (modified) (2 diffs)

lib/proxy.h

@@ -40 +40 @@
 #define PROXY_SOCKS4 2
 #define PROXY_SOCKS5 3
+#define PROXY_SOCKS4A 4
 
 extern char proxyhost[128];
@@ -48 +49 @@
 
 G_MODULE_EXPORT int proxy_connect(const char *host, int port, b_event_handler func, gpointer data);
+G_MODULE_EXPORT void proxy_disconnect(int fd);
 
 #endif /* _PROXY_H_ */