diff options
| -rw-r--r-- | src/libpttls/pt_tls_client.c | 38 | ||||
| -rw-r--r-- | src/libpttls/pt_tls_client.h | 9 |
2 files changed, 19 insertions, 28 deletions
diff --git a/src/libpttls/pt_tls_client.c b/src/libpttls/pt_tls_client.c index 59e5cd93f..948d92982 100644 --- a/src/libpttls/pt_tls_client.c +++ b/src/libpttls/pt_tls_client.c @@ -41,14 +41,14 @@ struct private_pt_tls_client_t { tls_socket_t *tls; /** - * Server address + * Server address/port */ - char *server; + host_t *address; /** - * Server port + * Server identity */ - u_int16_t port; + identification_t *id; /** * Current PT-TLS message identifier @@ -61,36 +61,23 @@ struct private_pt_tls_client_t { */ static bool make_connection(private_pt_tls_client_t *this) { - identification_t *id; - host_t *server; int fd; - server = host_create_from_dns(this->server, AF_UNSPEC, this->port); - if (!server) - { - return FALSE; - } - - fd = socket(server->get_family(server), SOCK_STREAM, 0); + fd = socket(this->address->get_family(this->address), SOCK_STREAM, 0); if (fd == -1) { DBG1(DBG_TNC, "opening PT-TLS socket failed: %s", strerror(errno)); - server->destroy(server); return FALSE; } - if (connect(fd, server->get_sockaddr(server), - *server->get_sockaddr_len(server)) == -1) + if (connect(fd, this->address->get_sockaddr(this->address), + *this->address->get_sockaddr_len(this->address)) == -1) { DBG1(DBG_TNC, "connecting to PT-TLS server failed: %s", strerror(errno)); - server->destroy(server); close(fd); return FALSE; } - server->destroy(server); - id = identification_create_from_string(this->server); - this->tls = tls_socket_create(FALSE, id, NULL, fd, NULL); - id->destroy(id); + this->tls = tls_socket_create(FALSE, this->id, NULL, fd, NULL); if (!this->tls) { close(fd); @@ -292,14 +279,15 @@ METHOD(pt_tls_client_t, destroy, void, close(this->tls->get_fd(this->tls)); this->tls->destroy(this->tls); } - free(this->server); + this->address->destroy(this->address); + this->id->destroy(this->id); free(this); } /** * See header */ -pt_tls_client_t *pt_tls_client_create(char *server, u_int16_t port) +pt_tls_client_t *pt_tls_client_create(host_t *address, identification_t *id) { private_pt_tls_client_t *this; @@ -308,8 +296,8 @@ pt_tls_client_t *pt_tls_client_create(char *server, u_int16_t port) .run_assessment = _run_assessment, .destroy = _destroy, }, - .server = strdup(server), - .port = port, + .address = address, + .id = id, ); return &this->public; diff --git a/src/libpttls/pt_tls_client.h b/src/libpttls/pt_tls_client.h index 36ab8c006..2e0553641 100644 --- a/src/libpttls/pt_tls_client.h +++ b/src/libpttls/pt_tls_client.h @@ -21,6 +21,9 @@ #ifndef PT_TLS_CLIENT_H_ #define PT_TLS_CLIENT_H_ +#include <networking/host.h> +#include <utils/identification.h> + #include <tnc/tnccs/tnccs.h> typedef struct pt_tls_client_t pt_tls_client_t; @@ -47,10 +50,10 @@ struct pt_tls_client_t { /** * Create a pt_tls_client instance. * - * @param server server address to run assessments against - * @param port server TCP port to connect to + * @param address address/port to run assessments against, gets owned + * @param id server identity to use for authentication, gets owned * @return PT-TLS context */ -pt_tls_client_t *pt_tls_client_create(char *server, u_int16_t port); +pt_tls_client_t *pt_tls_client_create(host_t *address, identification_t *id); #endif /** PT_TLS_CLIENT_H_ @}*/ |