p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 9 Wiki Activity

Get at least SOCKS4A working

This commit is contained in:
Přemysl Eric Janouch 2015-07-21 00:31:19 +02:00
parent 318b7400d1
commit 22d9e20b4a
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
common.c
View File

@ -390,6 +390,7 @@ struct socks_connector
struct poller_timer timeout; ///< Timeout timer struct poller_timer timeout; ///< Timeout timer
bool done; ///< We're connected
uint8_t bound_address_len; ///< Length of domain name uint8_t bound_address_len; ///< Length of domain name
struct socks_addr bound_address; ///< Bound address at the server struct socks_addr bound_address; ///< Bound address at the server
uint16_t bound_port; ///< Bound port at the server uint16_t bound_port; ///< Bound port at the server
@ -435,16 +436,6 @@ struct socks_connector
return false; \ return false; \
BLOCK_END BLOCK_END
// FIXME: we need to cancel all events
#define SOCKS_DONE() \
BLOCK_START \
int fd = self->socket_fd; \
set_blocking (fd, true); \
self->socket_fd = -1; \
self->on_connected (self->user_data, fd); \
return true; \
BLOCK_END
#define SOCKS_NEED_DATA(n) \ #define SOCKS_NEED_DATA(n) \
if (!socks_try_fill_read_buffer (self, (n))) \ if (!socks_try_fill_read_buffer (self, (n))) \
return false; \ return false; \
@ -521,7 +512,8 @@ socks_4a_finish (struct socks_connector *self)
switch (status) switch (status)
{ {
case 90: case 90:
SOCKS_DONE (); self->done = true;
return false;
case 91: case 91:
SOCKS_FAIL ("request rejected or failed"); SOCKS_FAIL ("request rejected or failed");
case 92: case 92:
@ -593,7 +585,8 @@ socks_5_request_port (struct socks_connector *self)
hard_assert (msg_unpacker_u16 (&unpacker, &self->bound_port)); hard_assert (msg_unpacker_u16 (&unpacker, &self->bound_port));
str_remove_slice (&self->read_buffer, 0, unpacker.offset); str_remove_slice (&self->read_buffer, 0, unpacker.offset);
SOCKS_DONE (); self->done = true;
return false;
} }
static bool static bool
@ -890,11 +883,20 @@ socks_connector_start (struct socks_connector *self)
connector_step (connector); connector_step (connector);
poller_timer_set (&self->timeout, 60 * 1000); poller_timer_set (&self->timeout, 60 * 1000);
self->done = false;
} }
static void static void
socks_connector_step (struct socks_connector *self) socks_connector_step (struct socks_connector *self)
{ {
// Close the socket if needed
if (self->socket_fd != -1)
{
poller_fd_reset (&self->socket_event);
xclose (self->socket_fd);
self->socket_fd = -1;
}
// Destroy current connector if needed // Destroy current connector if needed
if (self->connector) if (self->connector)
{ {
@ -931,18 +933,22 @@ socks_connector_on_ready
{ {
(void) pfd; (void) pfd;
if (!self->on_data (self) || !socks_try_flush_write_buffer (self)) if (self->on_data (self) && socks_try_flush_write_buffer (self))
{
// We've failed this target, let's try to move on
// FIXME: we need to cancel all events
socks_connector_step (self);
}
// If we successfully establish the connection, then the FD is reset to -1
else if (self->socket_fd != -1)
{ {
poller_fd_set (&self->socket_event, poller_fd_set (&self->socket_event,
self->write_buffer.len ? (POLLIN | POLLOUT) : POLLIN); self->write_buffer.len ? (POLLIN | POLLOUT) : POLLIN);
} }
else if (self->done)
{
int fd = self->socket_fd;
poller_fd_reset (&self->socket_event);
self->socket_fd = -1;
set_blocking (fd, true);
self->on_connected (self->user_data, fd);
}
else
// We've failed this target, let's try to move on
socks_connector_step (self);
} }
static void static void