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

Don't initialize the transport immmediately 

Do it only once we're actually connected.
This commit is contained in:
Přemysl Eric Janouch 2015-05-13 04:34:25 +02:00
parent ef8dd33edd
commit debebcde96
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ponymap.c
View File

@ -531,15 +531,15 @@ unit_abort (struct unit *u)
{ {
if (u->service->on_aborted) if (u->service->on_aborted)
u->service->on_aborted (u->service_data); u->service->on_aborted (u->service_data);
u->service->scan_free (u->service_data);
}
u->transport->cleanup (u); u->service->scan_free (u->service_data);
xclose (u->socket_fd); u->transport->cleanup (u);
}
poller_timer_reset (&u->timeout_event); poller_timer_reset (&u->timeout_event);
// This way we avoid a syscall with epoll // This way we avoid a syscall with epoll
xclose (u->socket_fd);
u->fd_event.closed = true; u->fd_event.closed = true;
poller_fd_reset (&u->fd_event); poller_fd_reset (&u->fd_event);
@ -626,6 +626,13 @@ abort:
static void static void
unit_start_scan (struct unit *u) unit_start_scan (struct unit *u)
{ {
if (!u->transport->init (u))
{
// TODO: maybe print a message with the problem?
unit_abort (u);
return;
}
u->scan_started = true; u->scan_started = true;
poller_timer_set (&u->timeout_event, u->target->ctx->scan_timeout * 1000); poller_timer_set (&u->timeout_event, u->target->ctx->scan_timeout * 1000);
@ -654,10 +661,9 @@ on_unit_connected (const struct pollfd *pfd, struct unit *u)
soft_assert (error != EADDRNOTAVAIL); soft_assert (error != EADDRNOTAVAIL);
unit_abort (u); unit_abort (u);
return;
} }
else
unit_start_scan (u); unit_start_scan (u);
} }
static struct unit * static struct unit *
@ -676,12 +682,6 @@ unit_new (struct target *target, int socket_fd, uint16_t port,
str_init (&u->write_buffer); str_init (&u->write_buffer);
str_vector_init (&u->info); str_vector_init (&u->info);
if (!transport->init (u))
{
unit_unref (u);
return NULL;
}
poller_timer_init (&u->timeout_event, &target->ctx->poller); poller_timer_init (&u->timeout_event, &target->ctx->poller);
u->timeout_event.dispatcher = (poller_timer_fn) unit_abort; u->timeout_event.dispatcher = (poller_timer_fn) unit_abort;
u->timeout_event.user_data = u; u->timeout_event.user_data = u;
@ -733,13 +733,7 @@ unit_make (struct target *target, uint32_t ip, uint16_t port,
: UNIT_MAKE_ERROR; : UNIT_MAKE_ERROR;
} }
struct unit *u; struct unit *u = unit_new (target, socket_fd, port, service, transport);
if (!(u = unit_new (target, socket_fd, port, service, transport)))
{
xclose (socket_fd);
return UNIT_MAKE_ERROR;
}
if (connected) if (connected)
unit_start_scan (u); unit_start_scan (u);
else else