summaryrefslogtreecommitdiff
path: root/common.c
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2015-07-23 04:07:30 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2015-07-23 04:26:59 +0200
commit4a8957208909ec9bd496af9455f2c6f65f470269 (patch)
tree5b87fe059713d78f3e2eaa3e5941a6666237ba99 /common.c
parentc34bb483cab1bffec6449c4363d5099114c5cbe5 (diff)
downloadxK-4a8957208909ec9bd496af9455f2c6f65f470269.tar.gz
xK-4a8957208909ec9bd496af9455f2c6f65f470269.tar.xz
xK-4a8957208909ec9bd496af9455f2c6f65f470269.zip
SOCKS: various fixes to API and code
Diffstat (limited to 'common.c')
-rw-r--r--common.c47
1 files changed, 35 insertions, 12 deletions
diff --git a/common.c b/common.c
index de00445..10db329 100644
--- a/common.c
+++ b/common.c
@@ -399,11 +399,11 @@ struct socks_connector
// Configuration:
- const char *hostname; ///< SOCKS server hostname
- const char *service; ///< SOCKS server service name or port
+ char *hostname; ///< SOCKS server hostname
+ char *service; ///< SOCKS server service name or port
- const char *username; ///< Username for authentication
- const char *password; ///< Password for authentication
+ char *username; ///< Username for authentication
+ char *password; ///< Password for authentication
struct socks_target *targets; ///< Targets
struct socks_target *targets_tail; ///< Tail of targets
@@ -835,12 +835,15 @@ socks_connector_on_error (void *user_data, const char *error)
{
struct socks_connector *self = user_data;
// TODO: skip protocol on protocol failure
- self->on_error (self->user_data, error);
+ if (self->on_error)
+ self->on_error (self->user_data, error);
}
static void
socks_connector_start (struct socks_connector *self)
{
+ hard_assert (!self->connector);
+
struct connector *connector =
self->connector = xcalloc (1, sizeof *connector);
connector_init (connector, self->socket_event.poller);
@@ -851,9 +854,17 @@ socks_connector_start (struct socks_connector *self)
connector->on_error = socks_connector_on_error;
connector->on_failure = socks_connector_on_failure;
- // TODO: let's rather call on_error and on_failure instead on error
- hard_assert (connector_add_target (connector,
- self->hostname, self->service, NULL));
+ struct error *e = NULL;
+ if (!connector_add_target (connector, self->hostname, self->service, &e))
+ {
+ if (self->on_error)
+ self->on_error (self->user_data, e->message);
+ error_free (e);
+
+ socks_connector_destroy_connector (self);
+ socks_connector_fail (self);
+ return;
+ }
poller_timer_set (&self->timeout, 60 * 1000);
connector_step (connector);
@@ -926,7 +937,6 @@ socks_try_flush_write_buffer (struct socks_connector *self)
continue;
SOCKS_FAIL ("%s: %s", "send", strerror (errno));
- return false;
}
return true;
}
@@ -987,6 +997,11 @@ socks_connector_free (struct socks_connector *self)
str_free (&self->read_buffer);
str_free (&self->write_buffer);
+ free (self->hostname);
+ free (self->service);
+ free (self->username);
+ free (self->password);
+
LIST_FOR_EACH (struct socks_target, iter, self->targets)
{
socks_addr_free (&iter->address);
@@ -1027,14 +1042,22 @@ socks_connector_add_target (struct socks_connector *self,
}
static void
-socks_connector_run (struct socks_connector *self)
+socks_connector_run (struct socks_connector *self,
+ const char *host, const char *service,
+ const char *username, const char *password)
{
- // XXX: do we need some better error checking in here?
- hard_assert (self->hostname);
hard_assert (self->targets);
+ hard_assert (host && service);
+
+ self->hostname = xstrdup (host);
+ self->service = xstrdup (service);
+
+ if (username) self->username = xstrdup (username);
+ if (password) self->password = xstrdup (password);
self->targets_iter = self->targets;
self->protocol_iter = 0;
+ // XXX: this can fail immediately from an error creating the connector
socks_connector_start (self);
}