forked from enlightenment/efl
efl_net_dialer_tcp: use libproxy settings.
libproxy allows various means to configure a proxy, will load from gnome and kde configuration settings, envvars, macos and even windows registry. curl still doesn't use it, but we can make that later.
This commit is contained in:
parent
696692ab90
commit
0d478c301f
13
configure.ac
13
configure.ac
|
@ -224,6 +224,7 @@ case "$host_os" in
|
||||||
;;
|
;;
|
||||||
freebsd*)
|
freebsd*)
|
||||||
have_freebsd="yes"
|
have_freebsd="yes"
|
||||||
|
want_libproxy="yes"
|
||||||
ELM_UNIX_DEF="#define"
|
ELM_UNIX_DEF="#define"
|
||||||
;;
|
;;
|
||||||
darwin*)
|
darwin*)
|
||||||
|
@ -234,6 +235,7 @@ case "$host_os" in
|
||||||
have_linux="yes"
|
have_linux="yes"
|
||||||
have_systemd_pkg="auto"
|
have_systemd_pkg="auto"
|
||||||
want_systemd="yes"
|
want_systemd="yes"
|
||||||
|
want_libproxy="yes"
|
||||||
ELM_UNIX_DEF="#define"
|
ELM_UNIX_DEF="#define"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
@ -3032,6 +3034,16 @@ EFL_LIB_START([Ecore_Con])
|
||||||
|
|
||||||
### Default values
|
### Default values
|
||||||
|
|
||||||
|
AC_ARG_ENABLE([libproxy],
|
||||||
|
[AS_HELP_STRING([--enable-libproxy],[Enable libproxy support. @<:@default=enabled@:>@])],
|
||||||
|
[
|
||||||
|
if test "x${enableval}" = "xyes" ; then
|
||||||
|
want_libproxy="yes"
|
||||||
|
else
|
||||||
|
want_libproxy="no"
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
want_ecore_con_local_sockets="yes"
|
want_ecore_con_local_sockets="yes"
|
||||||
want_ecore_con_abstract_sockets="yes"
|
want_ecore_con_abstract_sockets="yes"
|
||||||
|
|
||||||
|
@ -3068,6 +3080,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [emile])
|
||||||
EFL_ADD_LIBS([ECORE_CON], [-lm])
|
EFL_ADD_LIBS([ECORE_CON], [-lm])
|
||||||
|
|
||||||
EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd])
|
EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_systemd}], [SYSTEMD], [libsystemd])
|
||||||
|
EFL_OPTIONAL_DEPEND_PKG([ECORE_CON], [${want_libproxy}], [LIBPROXY], [libproxy-1.0])
|
||||||
|
|
||||||
EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}])
|
EFL_ADD_FEATURE([ECORE_CON], [local-sockets], [${want_ecore_con_local_sockets}])
|
||||||
EFL_ADD_FEATURE([ECORE_CON], [abstract-sockets], [${want_ecore_con_abstract_sockets}])
|
EFL_ADD_FEATURE([ECORE_CON], [abstract-sockets], [${want_ecore_con_abstract_sockets}])
|
||||||
|
|
|
@ -191,6 +191,10 @@ int _ecore_con_log_dom = -1;
|
||||||
Ecore_Con_Socks *_ecore_con_proxy_once = NULL;
|
Ecore_Con_Socks *_ecore_con_proxy_once = NULL;
|
||||||
Ecore_Con_Socks *_ecore_con_proxy_global = NULL;
|
Ecore_Con_Socks *_ecore_con_proxy_global = NULL;
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
pxProxyFactory *_ecore_con_libproxy_factory = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
EAPI int
|
EAPI int
|
||||||
ecore_con_init(void)
|
ecore_con_init(void)
|
||||||
{
|
{
|
||||||
|
@ -275,6 +279,14 @@ ecore_con_shutdown(void)
|
||||||
if (--_ecore_con_init_count != 0)
|
if (--_ecore_con_init_count != 0)
|
||||||
return _ecore_con_init_count;
|
return _ecore_con_init_count;
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
if (_ecore_con_libproxy_factory)
|
||||||
|
{
|
||||||
|
px_proxy_factory_free(_ecore_con_libproxy_factory);
|
||||||
|
_ecore_con_libproxy_factory = NULL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
eina_log_timing(_ecore_con_log_dom,
|
eina_log_timing(_ecore_con_log_dom,
|
||||||
EINA_LOG_STATE_START,
|
EINA_LOG_STATE_START,
|
||||||
EINA_LOG_STATE_SHUTDOWN);
|
EINA_LOG_STATE_SHUTDOWN);
|
||||||
|
@ -4432,12 +4444,32 @@ _efl_net_ip_connect_async_run_socks5h(Efl_Net_Ip_Connect_Async_Data *d, const ch
|
||||||
EINA_THREAD_CLEANUP_POP(EINA_TRUE); /* free(str) */
|
EINA_THREAD_CLEANUP_POP(EINA_TRUE); /* free(str) */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
static void
|
||||||
|
_cleanup_proxies(void *data)
|
||||||
|
{
|
||||||
|
char **proxies = data;
|
||||||
|
char **itr;
|
||||||
|
|
||||||
|
if (!proxies) return;
|
||||||
|
|
||||||
|
for (itr = proxies; *itr != NULL; itr++)
|
||||||
|
free(*itr);
|
||||||
|
free(proxies);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_efl_net_ip_connect_async_run(void *data, Ecore_Thread *thread EINA_UNUSED)
|
_efl_net_ip_connect_async_run(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Net_Ip_Connect_Async_Data *d = data;
|
Efl_Net_Ip_Connect_Async_Data *d = data;
|
||||||
const char *host, *port, *proxy;
|
const char *host, *port, *proxy;
|
||||||
char *addrcopy;
|
char *addrcopy;
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
char **proxies = NULL;
|
||||||
|
int proxies_idx = 0;
|
||||||
|
Eina_Bool is_libproxy = EINA_FALSE;
|
||||||
|
#endif
|
||||||
|
|
||||||
addrcopy = strdup(d->address);
|
addrcopy = strdup(d->address);
|
||||||
if (!addrcopy)
|
if (!addrcopy)
|
||||||
|
@ -4453,8 +4485,52 @@ _efl_net_ip_connect_async_run(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!port) port = "0";
|
if (!port) port = "0";
|
||||||
|
EINA_THREAD_CLEANUP_PUSH(free, addrcopy);
|
||||||
|
|
||||||
proxy = d->proxy;
|
proxy = d->proxy;
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
if ((!proxy) && (_ecore_con_libproxy_factory))
|
||||||
|
{
|
||||||
|
/* libproxy is thread-safe but not cancellable. the provided
|
||||||
|
* parameter must be a URL with schema, otherwise it won't
|
||||||
|
* return anything.
|
||||||
|
*/
|
||||||
|
char *url;
|
||||||
|
|
||||||
|
asprintf(&url, "%s://%s:%s", d->protocol == IPPROTO_UDP ? "udp" : "tcp", host, port);
|
||||||
|
proxies = px_proxy_factory_get_proxies(_ecore_con_libproxy_factory, url);
|
||||||
|
free(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
EINA_THREAD_CLEANUP_PUSH(_cleanup_proxies, proxies);
|
||||||
|
next_proxy:
|
||||||
|
if ((!proxy) && (proxies) && (proxies_idx >= 0))
|
||||||
|
{
|
||||||
|
proxy = proxies[proxies_idx];
|
||||||
|
if (!proxy)
|
||||||
|
{
|
||||||
|
is_libproxy = EINA_FALSE;
|
||||||
|
proxies_idx = -1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (strcmp(proxy, "direct://") == 0)
|
||||||
|
{
|
||||||
|
/* give a chance to try envvars */
|
||||||
|
proxy = NULL;
|
||||||
|
is_libproxy = EINA_FALSE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DBG("libproxy said %s for host='%s' port='%s'", proxy, host, port);
|
||||||
|
is_libproxy = EINA_TRUE;
|
||||||
|
}
|
||||||
|
proxies_idx++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!proxy)
|
if (!proxy)
|
||||||
{
|
{
|
||||||
proxy = d->proxy_env;
|
proxy = d->proxy_env;
|
||||||
|
@ -4464,10 +4540,11 @@ _efl_net_ip_connect_async_run(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||||
{
|
{
|
||||||
if (_efl_net_ip_no_proxy(host, d->no_proxy_strv))
|
if (_efl_net_ip_no_proxy(host, d->no_proxy_strv))
|
||||||
proxy = "";
|
proxy = "";
|
||||||
|
else
|
||||||
|
DBG("using proxy %s from envvar", proxy);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EINA_THREAD_CLEANUP_PUSH(free, addrcopy);
|
|
||||||
/* allows ecore_thread_cancel() to cancel at some points, see
|
/* allows ecore_thread_cancel() to cancel at some points, see
|
||||||
* man:pthreads(7).
|
* man:pthreads(7).
|
||||||
*/
|
*/
|
||||||
|
@ -4483,6 +4560,12 @@ _efl_net_ip_connect_async_run(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||||
_efl_net_ip_connect_async_run_socks4a(d, host, port, proxy + strlen("socks4a://"));
|
_efl_net_ip_connect_async_run_socks4a(d, host, port, proxy + strlen("socks4a://"));
|
||||||
else if (eina_str_has_prefix(proxy, "socks5h://"))
|
else if (eina_str_has_prefix(proxy, "socks5h://"))
|
||||||
_efl_net_ip_connect_async_run_socks5h(d, host, port, proxy + strlen("socks5h://"));
|
_efl_net_ip_connect_async_run_socks5h(d, host, port, proxy + strlen("socks5h://"));
|
||||||
|
else if (eina_str_has_prefix(proxy, "socks://"))
|
||||||
|
{
|
||||||
|
_efl_net_ip_connect_async_run_socks5(d, host, port, proxy + strlen("socks://"));
|
||||||
|
if (d->error)
|
||||||
|
_efl_net_ip_connect_async_run_socks4(d, host, port, proxy + strlen("socks://"));
|
||||||
|
}
|
||||||
else if (!strstr(proxy, "://"))
|
else if (!strstr(proxy, "://"))
|
||||||
{
|
{
|
||||||
_efl_net_ip_connect_async_run_socks5(d, host, port, proxy);
|
_efl_net_ip_connect_async_run_socks5(d, host, port, proxy);
|
||||||
|
@ -4498,6 +4581,14 @@ _efl_net_ip_connect_async_run(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
if (is_libproxy)
|
||||||
|
{
|
||||||
|
DBG("libproxy said %s but it's not supported, try next proxy", proxy);
|
||||||
|
proxy = NULL;
|
||||||
|
goto next_proxy;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
/* maybe bogus envvar, ignore it */
|
/* maybe bogus envvar, ignore it */
|
||||||
WRN("proxy protocol not supported '%s', connect directly", proxy);
|
WRN("proxy protocol not supported '%s', connect directly", proxy);
|
||||||
_efl_net_ip_connect_async_run_direct(d, host, port);
|
_efl_net_ip_connect_async_run_direct(d, host, port);
|
||||||
|
@ -4506,11 +4597,23 @@ _efl_net_ip_connect_async_run(void *data, Ecore_Thread *thread EINA_UNUSED)
|
||||||
|
|
||||||
if ((d->error) && (!d->proxy) && (proxy[0] != '\0'))
|
if ((d->error) && (!d->proxy) && (proxy[0] != '\0'))
|
||||||
{
|
{
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
if (is_libproxy)
|
||||||
|
{
|
||||||
|
DBG("libproxy said %s but it failed, try next proxy", proxy);
|
||||||
|
proxy = NULL;
|
||||||
|
goto next_proxy;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
WRN("error using proxy '%s' from environment, try direct connect", proxy);
|
WRN("error using proxy '%s' from environment, try direct connect", proxy);
|
||||||
_efl_net_ip_connect_async_run_direct(d, host, port);
|
_efl_net_ip_connect_async_run_direct(d, host, port);
|
||||||
}
|
}
|
||||||
|
|
||||||
eina_thread_cancellable_set(EINA_FALSE, NULL);
|
eina_thread_cancellable_set(EINA_FALSE, NULL);
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
EINA_THREAD_CLEANUP_POP(EINA_TRUE);
|
||||||
|
#endif
|
||||||
EINA_THREAD_CLEANUP_POP(EINA_TRUE);
|
EINA_THREAD_CLEANUP_POP(EINA_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4611,6 +4714,11 @@ efl_net_ip_connect_async_new(const char *address, const char *proxy, const char
|
||||||
d->sockfd = -1;
|
d->sockfd = -1;
|
||||||
d->error = 0;
|
d->error = 0;
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
if (!_ecore_con_libproxy_factory)
|
||||||
|
_ecore_con_libproxy_factory = px_proxy_factory_new();
|
||||||
|
#endif
|
||||||
|
|
||||||
return ecore_thread_run(_efl_net_ip_connect_async_run,
|
return ecore_thread_run(_efl_net_ip_connect_async_run,
|
||||||
_efl_net_ip_connect_async_end,
|
_efl_net_ip_connect_async_end,
|
||||||
_efl_net_ip_connect_async_cancel,
|
_efl_net_ip_connect_async_cancel,
|
||||||
|
|
|
@ -254,6 +254,11 @@ extern int sd_fd_index;
|
||||||
extern int sd_fd_max;
|
extern int sd_fd_max;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBPROXY
|
||||||
|
# include <proxy.h>
|
||||||
|
extern pxProxyFactory *_ecore_con_libproxy_factory;
|
||||||
|
#endif
|
||||||
|
|
||||||
extern Ecore_Con_Socks *_ecore_con_proxy_once;
|
extern Ecore_Con_Socks *_ecore_con_proxy_once;
|
||||||
extern Ecore_Con_Socks *_ecore_con_proxy_global;
|
extern Ecore_Con_Socks *_ecore_con_proxy_global;
|
||||||
void ecore_con_socks_init(void);
|
void ecore_con_socks_init(void);
|
||||||
|
|
Loading…
Reference in New Issue