No OneTemporary
Actions

Size

290 KB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/libknet/handle.c b/libknet/handle.c
	index a8e5b3fa..bb9979bf 100644
	--- a/libknet/handle.c
	+++ b/libknet/handle.c
	@@ -1,1455 +1,1464 @@
	/*
	* Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	* Federico Simoncelli <fsimon@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>
	#include <errno.h>
	#include <pthread.h>
	#include <sys/epoll.h>
	#include <sys/uio.h>
	#include <math.h>
	#include <sys/time.h>
	#include <sys/resource.h>

	#include "internals.h"
	#include "crypto.h"
	#include "common.h"
	#include "threads_common.h"
	#include "threads_heartbeat.h"
	#include "threads_pmtud.h"
	#include "threads_dsthandler.h"
	#include "threads_send_recv.h"
	#include "transports.h"
	#include "logging.h"

	static pthread_mutex_t handle_config_mutex = PTHREAD_MUTEX_INITIALIZER;

	static int _init_locks(knet_handle_t knet_h)
	{
	int savederrno = 0;

	savederrno = pthread_rwlock_init(&knet_h->global_rwlock, NULL);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize list rwlock: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	knet_h->lock_init_done = 1;

	savederrno = pthread_rwlock_init(&knet_h->listener_rwlock, NULL);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize listener rwlock: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_rwlock_init(&knet_h->host_rwlock, NULL);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize host rwlock: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_mutex_init(&knet_h->host_mutex, NULL);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize host mutex: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_cond_init(&knet_h->host_cond, NULL);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize host conditional mutex: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_mutex_init(&knet_h->pmtud_mutex, NULL);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize pmtud mutex: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_cond_init(&knet_h->pmtud_cond, NULL);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize pmtud conditional mutex: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_mutex_init(&knet_h->tx_mutex, NULL);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize tx_thread mutex: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	return 0;

	exit_fail:
	errno = savederrno;
	return -1;
	}

	static void _destroy_locks(knet_handle_t knet_h)
	{
	knet_h->lock_init_done = 0;
	pthread_rwlock_destroy(&knet_h->global_rwlock);
	pthread_rwlock_destroy(&knet_h->listener_rwlock);
	pthread_rwlock_destroy(&knet_h->host_rwlock);
	pthread_mutex_destroy(&knet_h->host_mutex);
	pthread_cond_destroy(&knet_h->host_cond);
	pthread_mutex_destroy(&knet_h->pmtud_mutex);
	pthread_cond_destroy(&knet_h->pmtud_cond);
	pthread_mutex_destroy(&knet_h->tx_mutex);
	}

	static int _init_socketpair(knet_handle_t knet_h, int *sock)
	{
	int savederrno = 0;
	int value;
	int i;

	if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sock) != 0) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize socketpair: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	for (i = 0; i < 2; i++) {

	if (_fdset_cloexec(sock[i])) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to set CLOEXEC on sock[%d]: %s",
	i, strerror(savederrno));
	goto exit_fail;
	}

	if (_fdset_nonblock(sock[i])) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to set NONBLOCK on sock[%d]: %s",
	i, strerror(savederrno));
	goto exit_fail;
	}

	value = KNET_RING_RCVBUFF;
	if (setsockopt(sock[i], SOL_SOCKET, SO_RCVBUFFORCE, &value, sizeof(value)) < 0) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to set receive buffer on sock[%d]: %s",
	i, strerror(savederrno));
	goto exit_fail;
	}

	value = KNET_RING_RCVBUFF;
	if (setsockopt(sock[i], SOL_SOCKET, SO_SNDBUFFORCE, &value, sizeof(value)) < 0) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to set send buffer on sock[%d]: %s",
	i, strerror(savederrno));
	goto exit_fail;
	}

	}

	return 0;

	exit_fail:
	errno = savederrno;
	return -1;
	}

	static void _close_socketpair(knet_handle_t knet_h, int *sock)
	{
	int i;

	for (i = 0; i < 2; i++) {
	if (sock[i]) {
	close(sock[i]);
	sock[i] = 0;
	}
	}
	}

	static int _init_socks(knet_handle_t knet_h)
	{
	int savederrno = 0;

	if (_init_socketpair(knet_h, knet_h->hostsockfd)) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize internal hostsockpair: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	if (_init_socketpair(knet_h, knet_h->dstsockfd)) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to initialize internal dstsockpair: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	return 0;

	exit_fail:
	errno = savederrno;
	return -1;
	}

	static void _close_socks(knet_handle_t knet_h)
	{
	_close_socketpair(knet_h, knet_h->dstsockfd);
	_close_socketpair(knet_h, knet_h->hostsockfd);
	}

	static int _init_buffers(knet_handle_t knet_h)
	{
	int savederrno = 0;
	int i;
	size_t bufsize;

	for (i = 0; i < PCKT_FRAG_MAX; i++) {
	bufsize = ceil((float)KNET_MAX_PACKET_SIZE / (i + 1)) + KNET_HEADER_ALL_SIZE;
	knet_h->send_to_links_buf[i] = malloc(bufsize);
	if (!knet_h->send_to_links_buf[i]) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory datafd to link buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->send_to_links_buf[i], 0, bufsize);

	knet_h->recv_from_sock_buf[i] = malloc(KNET_DATABUFSIZE);
	if (!knet_h->recv_from_sock_buf[i]) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for app to datafd buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->recv_from_sock_buf[i], 0, KNET_DATABUFSIZE);

	knet_h->recv_from_links_buf[i] = malloc(KNET_DATABUFSIZE);
	if (!knet_h->recv_from_links_buf[i]) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for link to datafd buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->recv_from_links_buf[i], 0, KNET_DATABUFSIZE);
	}

	knet_h->pingbuf = malloc(KNET_HEADER_PING_SIZE);
	if (!knet_h->pingbuf) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for hearbeat buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->pingbuf, 0, KNET_HEADER_PING_SIZE);

	knet_h->pmtudbuf = malloc(KNET_PMTUD_SIZE_V6);
	if (!knet_h->pmtudbuf) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for pmtud buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->pmtudbuf, 0, KNET_PMTUD_SIZE_V6);

	for (i = 0; i < PCKT_FRAG_MAX; i++) {
	bufsize = ceil((float)KNET_MAX_PACKET_SIZE / (i + 1)) + KNET_HEADER_ALL_SIZE + KNET_DATABUFSIZE_CRYPT_PAD;
	knet_h->send_to_links_buf_crypt[i] = malloc(bufsize);
	if (!knet_h->send_to_links_buf_crypt[i]) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for crypto datafd to link buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->send_to_links_buf_crypt[i], 0, bufsize);
	}

	knet_h->recv_from_links_buf_decrypt = malloc(KNET_DATABUFSIZE_CRYPT);
	if (!knet_h->recv_from_links_buf_decrypt) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_CRYPTO, "Unable to allocate memory for crypto link to datafd buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->recv_from_links_buf_decrypt, 0, KNET_DATABUFSIZE_CRYPT);

	knet_h->recv_from_links_buf_crypt = malloc(KNET_DATABUFSIZE_CRYPT);
	if (!knet_h->recv_from_links_buf_crypt) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_CRYPTO, "Unable to allocate memory for crypto link to datafd buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->recv_from_links_buf_crypt, 0, KNET_DATABUFSIZE_CRYPT);

	knet_h->pingbuf_crypt = malloc(KNET_DATABUFSIZE_CRYPT);
	if (!knet_h->pingbuf_crypt) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_CRYPTO, "Unable to allocate memory for crypto hearbeat buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->pingbuf_crypt, 0, KNET_DATABUFSIZE_CRYPT);

	knet_h->pmtudbuf_crypt = malloc(KNET_DATABUFSIZE_CRYPT);
	if (!knet_h->pmtudbuf_crypt) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to allocate memory for crypto pmtud buffer: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	memset(knet_h->pmtudbuf_crypt, 0, KNET_DATABUFSIZE_CRYPT);

	return 0;

	exit_fail:
	errno = savederrno;
	return -1;
	}

	static void _destroy_buffers(knet_handle_t knet_h)
	{
	int i;

	for (i = 0; i < PCKT_FRAG_MAX; i++) {
	free(knet_h->send_to_links_buf[i]);
	free(knet_h->recv_from_sock_buf[i]);
	free(knet_h->send_to_links_buf_crypt[i]);
	free(knet_h->recv_from_links_buf[i]);
	}
	free(knet_h->recv_from_links_buf_decrypt);
	free(knet_h->recv_from_links_buf_crypt);
	free(knet_h->pingbuf);
	free(knet_h->pingbuf_crypt);
	free(knet_h->pmtudbuf);
	free(knet_h->pmtudbuf_crypt);
	}

	static int _init_epolls(knet_handle_t knet_h)
	{
	struct epoll_event ev;
	int savederrno = 0;

	/*
	* even if the kernel does dynamic allocation with epoll_ctl
	* we need to reserve one extra for host to host communication
	*/
	knet_h->send_to_links_epollfd = epoll_create(KNET_EPOLL_MAX_EVENTS + 1);
	if (knet_h->send_to_links_epollfd < 0) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to create epoll datafd to link fd: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	knet_h->recv_from_links_epollfd = epoll_create(KNET_EPOLL_MAX_EVENTS);
	if (knet_h->recv_from_links_epollfd < 0) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to create epoll link to datafd fd: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	knet_h->dst_link_handler_epollfd = epoll_create(KNET_EPOLL_MAX_EVENTS);
	if (knet_h->dst_link_handler_epollfd < 0) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to create epoll dst cache fd: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	if (_fdset_cloexec(knet_h->send_to_links_epollfd)) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to set CLOEXEC on datafd to link epoll fd: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	if (_fdset_cloexec(knet_h->recv_from_links_epollfd)) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to set CLOEXEC on link to datafd epoll fd: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	if (_fdset_cloexec(knet_h->dst_link_handler_epollfd)) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to set CLOEXEC on dst cache epoll fd: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	memset(&ev, 0, sizeof(struct epoll_event));
	ev.events = EPOLLIN;
	ev.data.fd = knet_h->hostsockfd[0];

	if (epoll_ctl(knet_h->send_to_links_epollfd,
	EPOLL_CTL_ADD, knet_h->hostsockfd[0], &ev)) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to add hostsockfd[0] to epoll pool: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	memset(&ev, 0, sizeof(struct epoll_event));
	ev.events = EPOLLIN;
	ev.data.fd = knet_h->dstsockfd[0];

	if (epoll_ctl(knet_h->dst_link_handler_epollfd,
	EPOLL_CTL_ADD, knet_h->dstsockfd[0], &ev)) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to add dstsockfd[0] to epoll pool: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	return 0;

	exit_fail:
	errno = savederrno;
	return -1;
	}

	static void _close_epolls(knet_handle_t knet_h)
	{
	struct epoll_event ev;
	int i;

	memset(&ev, 0, sizeof(struct epoll_event));

	for (i = 0; i < KNET_DATAFD_MAX; i++) {
	if (knet_h->sockfd[i].in_use) {
	epoll_ctl(knet_h->send_to_links_epollfd, EPOLL_CTL_DEL, knet_h->sockfd[i].sockfd[knet_h->sockfd[i].is_created], &ev);
	if (knet_h->sockfd[i].sockfd[knet_h->sockfd[i].is_created]) {
	_close_socketpair(knet_h, knet_h->sockfd[i].sockfd);
	}
	}
	}

	epoll_ctl(knet_h->send_to_links_epollfd, EPOLL_CTL_DEL, knet_h->hostsockfd[0], &ev);
	epoll_ctl(knet_h->dst_link_handler_epollfd, EPOLL_CTL_DEL, knet_h->dstsockfd[0], &ev);
	close(knet_h->send_to_links_epollfd);
	close(knet_h->recv_from_links_epollfd);
	close(knet_h->dst_link_handler_epollfd);
	}

	static int _start_threads(knet_handle_t knet_h)
	{
	int savederrno = 0;

	savederrno = pthread_create(&knet_h->pmtud_link_handler_thread, 0,
	_handle_pmtud_link_thread, (void *) knet_h);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to start pmtud link thread: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_create(&knet_h->dst_link_handler_thread, 0,
	_handle_dst_link_handler_thread, (void *) knet_h);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to start dst cache thread: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_create(&knet_h->send_to_links_thread, 0,
	_handle_send_to_links_thread, (void *) knet_h);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to start datafd to link thread: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_create(&knet_h->recv_from_links_thread, 0,
	_handle_recv_from_links_thread, (void *) knet_h);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to start link to datafd thread: %s",
	strerror(savederrno));
	goto exit_fail;
	}

	savederrno = pthread_create(&knet_h->heartbt_thread, 0,
	_handle_heartbt_thread, (void *) knet_h);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to start heartbeat thread: %s",
	strerror(savederrno));
	goto exit_fail;
	}
	return 0;

	exit_fail:
	errno = savederrno;
	return -1;
	}


	static void _stop_transports(knet_handle_t knet_h)
	{
	+ int i;
	knet_transport_ops_t *ops = NULL;

	- ops = get_udp_transport();
	- ops->handle_free(knet_h, knet_h->transport);
	+ for (i=0; i<KNET_MAX_TRANSPORTS; i++) {
	+ switch (i) {
	+ case KNET_TRANSPORT_UDP:
	+ ops = get_udp_transport();
	+ break;
	+ }
	+ if (ops) {
	+ ops->handle_free(knet_h, knet_h->transports[i]);
	+ }
	+ }
	}

	static void _stop_threads(knet_handle_t knet_h)
	{
	void *retval;

	/*
	* allow threads to catch on shutdown request
	* and release locks before we stop them.
	* this isn't the most efficent way to handle it
	* but it works good enough for now
	*/

	sleep(1);

	pthread_mutex_lock(&knet_h->host_mutex);
	pthread_cond_signal(&knet_h->host_cond);
	pthread_mutex_unlock(&knet_h->host_mutex);

	if (knet_h->heartbt_thread) {
	pthread_cancel(knet_h->heartbt_thread);
	pthread_join(knet_h->heartbt_thread, &retval);
	}

	if (knet_h->send_to_links_thread) {
	pthread_cancel(knet_h->send_to_links_thread);
	pthread_join(knet_h->send_to_links_thread, &retval);
	}

	if (knet_h->recv_from_links_thread) {
	pthread_cancel(knet_h->recv_from_links_thread);
	pthread_join(knet_h->recv_from_links_thread, &retval);
	}

	if (knet_h->dst_link_handler_thread) {
	pthread_cancel(knet_h->dst_link_handler_thread);
	pthread_join(knet_h->dst_link_handler_thread, &retval);
	}

	pthread_mutex_lock(&knet_h->pmtud_mutex);
	pthread_cond_signal(&knet_h->pmtud_cond);
	pthread_mutex_unlock(&knet_h->pmtud_mutex);

	sleep(1);

	if (knet_h->pmtud_link_handler_thread) {
	pthread_cancel(knet_h->pmtud_link_handler_thread);
	pthread_join(knet_h->pmtud_link_handler_thread, &retval);
	}
	}

	knet_handle_t knet_handle_new(uint16_t host_id,
	int log_fd,
	uint8_t default_log_level)
	{
	knet_handle_t knet_h;
	int savederrno = 0;
	struct rlimit cur;

	if (getrlimit(RLIMIT_NOFILE, &cur) < 0) {
	return NULL;
	}

	if ((log_fd < 0) \|\| (log_fd >= cur.rlim_max)) {
	errno = EINVAL;
	return NULL;
	}

	/*
	* validate incoming request
	*/

	if ((log_fd) && (default_log_level > KNET_LOG_DEBUG)) {
	errno = EINVAL;
	return NULL;
	}

	/*
	* allocate handle
	*/

	knet_h = malloc(sizeof(struct knet_handle));
	if (!knet_h) {
	errno = ENOMEM;
	return NULL;
	}
	memset(knet_h, 0, sizeof(struct knet_handle));

	savederrno = pthread_mutex_lock(&handle_config_mutex);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get handle mutex lock: %s",
	strerror(savederrno));
	errno = savederrno;
	goto exit_fail;
	}

	/*
	* copy config in place
	*/

	knet_h->host_id = host_id;
	knet_h->logfd = log_fd;
	if (knet_h->logfd > 0) {
	memset(&knet_h->log_levels, default_log_level, KNET_MAX_SUBSYSTEMS);
	}

	/*
	* set pmtud default timers
	*/
	knet_h->pmtud_interval = KNET_PMTUD_DEFAULT_INTERVAL;

	/*
	* init main locking structures
	*/

	if (_init_locks(knet_h)) {
	savederrno = errno;
	goto exit_fail;
	}

	/*
	* init sockets
	*/

	if (_init_socks(knet_h)) {
	savederrno = errno;
	goto exit_fail;
	}

	/*
	* allocate packet buffers
	*/

	if (_init_buffers(knet_h)) {
	savederrno = errno;
	goto exit_fail;
	}

	/*
	* create epoll fds
	*/

	if (_init_epolls(knet_h)) {
	savederrno = errno;
	goto exit_fail;
	}

	/*
	* start internal threads
	*/

	if (_start_threads(knet_h)) {
	savederrno = errno;
	goto exit_fail;
	}

	pthread_mutex_unlock(&handle_config_mutex);
	return knet_h;

	exit_fail:
	pthread_mutex_unlock(&handle_config_mutex);
	knet_handle_free(knet_h);
	errno = savederrno;
	return NULL;
	}

	int knet_handle_free(knet_handle_t knet_h)
	{
	int savederrno = 0;

	savederrno = pthread_mutex_lock(&handle_config_mutex);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get handle mutex lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	if (!knet_h) {
	pthread_mutex_unlock(&handle_config_mutex);
	errno = EINVAL;
	return -1;
	}

	if (!knet_h->lock_init_done) {
	goto exit_nolock;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	pthread_mutex_unlock(&handle_config_mutex);
	errno = savederrno;
	return -1;
	}

	if (knet_h->host_head != NULL) {
	savederrno = EBUSY;
	log_err(knet_h, KNET_SUB_HANDLE,
	"Unable to free handle: host(s) or listener(s) are still active: %s",
	strerror(savederrno));
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	pthread_mutex_unlock(&handle_config_mutex);
	errno = savederrno;
	return -1;
	}

	knet_h->fini_in_progress = 1;

	pthread_rwlock_unlock(&knet_h->global_rwlock);

	_stop_transports(knet_h);
	_stop_threads(knet_h);
	_close_epolls(knet_h);
	_destroy_buffers(knet_h);
	_close_socks(knet_h);
	crypto_fini(knet_h);

	_destroy_locks(knet_h);

	exit_nolock:
	free(knet_h);
	knet_h = NULL;
	pthread_mutex_unlock(&handle_config_mutex);
	return 0;
	}

	int knet_handle_enable_sock_notify(knet_handle_t knet_h,
	void *sock_notify_fn_private_data,
	void (*sock_notify_fn) (
	void *private_data,
	int datafd,
	int8_t channel,
	uint8_t tx_rx,
	int error,
	int errorno))
	{
	int savederrno = 0, err = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (!sock_notify_fn) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	knet_h->sock_notify_fn_private_data = sock_notify_fn_private_data;
	knet_h->sock_notify_fn = sock_notify_fn;
	log_debug(knet_h, KNET_SUB_HANDLE, "sock_notify_fn enabled");

	pthread_rwlock_unlock(&knet_h->global_rwlock);

	return err;
	}

	int knet_handle_add_datafd(knet_handle_t knet_h, int datafd, int8_t channel)
	{
	int err = 0, savederrno = 0;
	int i;
	struct epoll_event ev;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (datafd == NULL) {
	errno = EINVAL;
	return -1;
	}

	if (channel == NULL) {
	errno = EINVAL;
	return -1;
	}

	if (*channel >= KNET_DATAFD_MAX) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	if (!knet_h->sock_notify_fn) {
	log_err(knet_h, KNET_SUB_HANDLE, "Adding datafd requires sock notify callback enabled!");
	savederrno = EINVAL;
	err = -1;
	goto out_unlock;
	}

	if (*datafd > 0) {
	for (i = 0; i < KNET_DATAFD_MAX; i++) {
	if ((knet_h->sockfd[i].in_use) && (knet_h->sockfd[i].sockfd[0] == *datafd)) {
	log_err(knet_h, KNET_SUB_HANDLE, "requested datafd: %d already exist in index: %d", *datafd, i);
	savederrno = EEXIST;
	err = -1;
	goto out_unlock;
	}
	}
	}

	/*
	* auto allocate a channel
	*/
	if (*channel < 0) {
	for (i = 0; i < KNET_DATAFD_MAX; i++) {
	if (!knet_h->sockfd[i].in_use) {
	*channel = i;
	break;
	}
	}
	if (*channel < 0) {
	savederrno = EBUSY;
	err = -1;
	goto out_unlock;
	}
	} else {
	if (knet_h->sockfd[*channel].in_use) {
	savederrno = EBUSY;
	err = -1;
	goto out_unlock;
	}
	}

	knet_h->sockfd[*channel].is_created = 0;
	knet_h->sockfd[*channel].is_socket = 0;
	knet_h->sockfd[*channel].has_error = 0;

	if (*datafd > 0) {
	int sockopt;
	socklen_t sockoptlen = sizeof(sockopt);

	if (_fdset_cloexec(*datafd)) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to set CLOEXEC on datafd: %s",
	strerror(savederrno));
	goto out_unlock;
	}

	if (_fdset_nonblock(*datafd)) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to set NONBLOCK on datafd: %s",
	strerror(savederrno));
	goto out_unlock;
	}

	knet_h->sockfd[channel].sockfd[0] = datafd;
	knet_h->sockfd[*channel].sockfd[1] = 0;

	if (!getsockopt(knet_h->sockfd[*channel].sockfd[0], SOL_SOCKET, SO_TYPE, &sockopt, &sockoptlen)) {
	knet_h->sockfd[*channel].is_socket = 1;
	}
	} else {
	if (_init_socketpair(knet_h, knet_h->sockfd[*channel].sockfd)) {
	savederrno = errno;
	err = -1;
	goto out_unlock;
	}

	knet_h->sockfd[*channel].is_created = 1;
	knet_h->sockfd[*channel].is_socket = 1;
	datafd = knet_h->sockfd[channel].sockfd[0];
	}

	memset(&ev, 0, sizeof(struct epoll_event));
	ev.events = EPOLLIN;
	ev.data.fd = knet_h->sockfd[channel].sockfd[knet_h->sockfd[channel].is_created];

	if (epoll_ctl(knet_h->send_to_links_epollfd,
	EPOLL_CTL_ADD, knet_h->sockfd[channel].sockfd[knet_h->sockfd[channel].is_created], &ev)) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to add datafd %d to linkfd epoll pool: %s",
	knet_h->sockfd[channel].sockfd[knet_h->sockfd[channel].is_created], strerror(savederrno));
	if (knet_h->sockfd[*channel].is_created) {
	_close_socketpair(knet_h, knet_h->sockfd[*channel].sockfd);
	}
	goto out_unlock;
	}

	knet_h->sockfd[*channel].in_use = 1;

	out_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_handle_remove_datafd(knet_handle_t knet_h, int datafd)
	{
	int err = 0, savederrno = 0;
	int8_t channel = -1;
	int i;
	struct epoll_event ev;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (datafd <= 0) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	for (i = 0; i < KNET_DATAFD_MAX; i++) {
	if ((knet_h->sockfd[i].in_use) &&
	(knet_h->sockfd[i].sockfd[0] == datafd)) {
	channel = i;
	break;
	}
	}

	if (channel < 0) {
	savederrno = EINVAL;
	err = -1;
	goto out_unlock;
	}

	if (!knet_h->sockfd[channel].has_error) {
	memset(&ev, 0, sizeof(struct epoll_event));

	if (epoll_ctl(knet_h->send_to_links_epollfd,
	EPOLL_CTL_DEL, knet_h->sockfd[channel].sockfd[knet_h->sockfd[channel].is_created], &ev)) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to del datafd %d from linkfd epoll pool: %s",
	knet_h->sockfd[channel].sockfd[0], strerror(savederrno));
	goto out_unlock;
	}
	}

	if (knet_h->sockfd[channel].is_created) {
	_close_socketpair(knet_h, knet_h->sockfd[channel].sockfd);
	}

	memset(&knet_h->sockfd[channel], 0, sizeof(struct knet_sock));

	out_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_handle_get_datafd(knet_handle_t knet_h, const int8_t channel, int *datafd)
	{
	int err = 0, savederrno = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if ((channel < 0) \|\| (channel >= KNET_DATAFD_MAX)) {
	errno = EINVAL;
	return -1;
	}

	if (datafd == NULL) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	if (!knet_h->sockfd[channel].in_use) {
	savederrno = EINVAL;
	err = -1;
	goto out_unlock;
	}

	*datafd = knet_h->sockfd[channel].sockfd[0];

	out_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_handle_get_channel(knet_handle_t knet_h, const int datafd, int8_t *channel)
	{
	int err = 0, savederrno = 0;
	int i;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (datafd <= 0) {
	errno = EINVAL;
	return -1;
	}

	if (channel == NULL) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	*channel = -1;

	for (i = 0; i < KNET_DATAFD_MAX; i++) {
	if ((knet_h->sockfd[i].in_use) &&
	(knet_h->sockfd[i].sockfd[0] == datafd)) {
	*channel = i;
	break;
	}
	}

	if (*channel < 0) {
	savederrno = EINVAL;
	err = -1;
	goto out_unlock;
	}

	out_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_handle_enable_filter(knet_handle_t knet_h,
	void *dst_host_filter_fn_private_data,
	int (*dst_host_filter_fn) (
	void *private_data,
	const unsigned char *outdata,
	ssize_t outdata_len,
	uint8_t tx_rx,
	uint16_t this_host_id,
	uint16_t src_node_id,
	int8_t *channel,
	uint16_t *dst_host_ids,
	size_t *dst_host_ids_entries))
	{
	int savederrno = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	knet_h->dst_host_filter_fn_private_data = dst_host_filter_fn_private_data;
	knet_h->dst_host_filter_fn = dst_host_filter_fn;
	if (knet_h->dst_host_filter_fn) {
	log_debug(knet_h, KNET_SUB_HANDLE, "dst_host_filter_fn enabled");
	} else {
	log_debug(knet_h, KNET_SUB_HANDLE, "dst_host_filter_fn disabled");
	}

	pthread_rwlock_unlock(&knet_h->global_rwlock);

	return 0;
	}

	int knet_handle_setfwd(knet_handle_t knet_h, unsigned int enabled)
	{
	int savederrno = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if ((enabled < 0) \|\| (enabled > 1)) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	knet_h->enabled = enabled;

	if (enabled) {
	log_debug(knet_h, KNET_SUB_HANDLE, "Data forwarding is enabled");
	} else {
	log_debug(knet_h, KNET_SUB_HANDLE, "Data forwarding is disabled");
	}

	pthread_rwlock_unlock(&knet_h->global_rwlock);

	return 0;
	}

	int knet_handle_pmtud_getfreq(knet_handle_t knet_h, unsigned int *interval)
	{
	int savederrno = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (!interval) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	*interval = knet_h->pmtud_interval;

	pthread_rwlock_unlock(&knet_h->global_rwlock);

	return 0;
	}

	int knet_handle_pmtud_setfreq(knet_handle_t knet_h, unsigned int interval)
	{
	int savederrno = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if ((!interval) \|\| (interval > 86400)) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	knet_h->pmtud_interval = interval;
	log_debug(knet_h, KNET_SUB_HANDLE, "PMTUd interval set to: %u seconds", interval);

	pthread_rwlock_unlock(&knet_h->global_rwlock);

	return 0;
	}

	int knet_handle_enable_pmtud_notify(knet_handle_t knet_h,
	void *pmtud_notify_fn_private_data,
	void (*pmtud_notify_fn) (
	void *private_data,
	unsigned int data_mtu))
	{
	int savederrno = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	knet_h->pmtud_notify_fn_private_data = pmtud_notify_fn_private_data;
	knet_h->pmtud_notify_fn = pmtud_notify_fn;
	if (knet_h->pmtud_notify_fn) {
	log_debug(knet_h, KNET_SUB_HANDLE, "pmtud_notify_fn enabled");
	} else {
	log_debug(knet_h, KNET_SUB_HANDLE, "pmtud_notify_fn disabled");
	}

	pthread_rwlock_unlock(&knet_h->global_rwlock);

	return 0;
	}

	int knet_handle_pmtud_get(knet_handle_t knet_h,
	unsigned int *data_mtu)
	{
	int savederrno = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (!data_mtu) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	*data_mtu = knet_h->data_mtu;

	pthread_rwlock_unlock(&knet_h->global_rwlock);

	return 0;
	}

	int knet_handle_crypto(knet_handle_t knet_h, struct knet_handle_crypto_cfg *knet_handle_crypto_cfg)
	{
	int savederrno = 0;
	int err = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (!knet_handle_crypto_cfg) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	crypto_fini(knet_h);

	if ((!strncmp("none", knet_handle_crypto_cfg->crypto_model, 4)) \|\|
	((!strncmp("none", knet_handle_crypto_cfg->crypto_cipher_type, 4)) &&
	(!strncmp("none", knet_handle_crypto_cfg->crypto_hash_type, 4)))) {
	log_debug(knet_h, KNET_SUB_CRYPTO, "crypto is not enabled");
	err = 0;
	goto exit_unlock;
	}

	if (knet_handle_crypto_cfg->private_key_len < KNET_MIN_KEY_LEN) {
	log_debug(knet_h, KNET_SUB_CRYPTO, "private key len too short (min %u): %u",
	KNET_MIN_KEY_LEN, knet_handle_crypto_cfg->private_key_len);
	savederrno = EINVAL;
	err = -1;
	goto exit_unlock;
	}

	if (knet_handle_crypto_cfg->private_key_len > KNET_MAX_KEY_LEN) {
	log_debug(knet_h, KNET_SUB_CRYPTO, "private key len too long (max %u): %u",
	KNET_MAX_KEY_LEN, knet_handle_crypto_cfg->private_key_len);
	savederrno = EINVAL;
	err = -1;
	goto exit_unlock;
	}

	err = crypto_init(knet_h, knet_handle_crypto_cfg);

	if (err) {
	err = -2;
	}

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	ssize_t knet_recv(knet_handle_t knet_h, char *buff, const size_t buff_len, const int8_t channel)
	{
	int savederrno = 0;
	ssize_t err = 0;
	struct iovec iov_in;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (buff == NULL) {
	errno = EINVAL;
	return -1;
	}

	if (buff_len <= 0) {
	errno = EINVAL;
	return -1;
	}

	if (buff_len > KNET_MAX_PACKET_SIZE) {
	errno = EINVAL;
	return -1;
	}

	if (channel < 0) {
	errno = EINVAL;
	return -1;
	}

	if (channel >= KNET_DATAFD_MAX) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	if (!knet_h->sockfd[channel].in_use) {
	savederrno = EINVAL;
	err = -1;
	goto out_unlock;
	}

	memset(&iov_in, 0, sizeof(iov_in));
	iov_in.iov_base = (void *)buff;
	iov_in.iov_len = buff_len;

	err = readv(knet_h->sockfd[channel].sockfd[0], &iov_in, 1);
	savederrno = errno;

	out_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	ssize_t knet_send(knet_handle_t knet_h, const char *buff, const size_t buff_len, const int8_t channel)
	{
	int savederrno = 0;
	ssize_t err = 0;
	struct iovec iov_out[1];

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (buff == NULL) {
	errno = EINVAL;
	return -1;
	}

	if (buff_len <= 0) {
	errno = EINVAL;
	return -1;
	}

	if (buff_len > KNET_MAX_PACKET_SIZE) {
	errno = EINVAL;
	return -1;
	}

	if (channel < 0) {
	errno = EINVAL;
	return -1;
	}

	if (channel >= KNET_DATAFD_MAX) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_HANDLE, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	if (!knet_h->sockfd[channel].in_use) {
	savederrno = EINVAL;
	err = -1;
	goto out_unlock;
	}

	memset(iov_out, 0, sizeof(iov_out));

	iov_out[0].iov_base = (void *)buff;
	iov_out[0].iov_len = buff_len;

	err = writev(knet_h->sockfd[channel].sockfd[0], iov_out, 1);
	savederrno = errno;

	out_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}
	diff --git a/libknet/internals.h b/libknet/internals.h
	index 95db8994..b29461d8 100644
	--- a/libknet/internals.h
	+++ b/libknet/internals.h
	@@ -1,234 +1,235 @@
	/*
	* Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	* Federico Simoncelli <fsimon@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#ifndef __INTERNALS_H__
	#define __INTERNALS_H__

	/*
	* NOTE: you shouldn't need to include this header normally
	*/

	#include "libknet.h"
	#include "onwire.h"

	#define KNET_DATABUFSIZE KNET_MAX_PACKET_SIZE + KNET_HEADER_ALL_SIZE
	#define KNET_DATABUFSIZE_CRYPT_PAD 1024
	#define KNET_DATABUFSIZE_CRYPT KNET_DATABUFSIZE + KNET_DATABUFSIZE_CRYPT_PAD

	#define KNET_RING_RCVBUFF 8388608

	#define PCKT_FRAG_MAX UINT8_MAX

	#define KNET_EPOLL_MAX_EVENTS KNET_DATAFD_MAX

	typedef void knet_transport_link_t; / per link transport handle */
	typedef void knet_transport_t; / per knet_h transport handle */
	struct knet_transport_ops; /* Forward because of circular dependancy */


	struct knet_listener {
	int sock;
	struct sockaddr_storage address;
	struct knet_listener *next;
	};

	struct knet_link {
	/* required */
	struct sockaddr_storage src_addr;
	struct sockaddr_storage dst_addr;
	/* configurable */
	unsigned int dynamic; /* see KNET_LINK_DYN_ define above */
	uint8_t priority; /* higher priority == preferred for A/P */
	unsigned long long ping_interval; /* interval */
	unsigned long long pong_timeout; /* timeout */
	unsigned int latency_fix; /* precision */
	uint8_t pong_count; /* how many ping/pong to send/receive before link is up */
	/* status */
	struct knet_link_status status;
	/* internals */
	uint8_t link_id;
	+ uint8_t transport_type; /* #defined constant from API */
	knet_transport_link_t transport;
	int outsock;
	int listener_sock;
	unsigned int configured:1; /* set to 1 if src/dst have been configured */
	unsigned int remoteconnected:1; /* link is enabled for data (peer view) */
	unsigned int donnotremoteupdate:1; /* define source of the update */
	unsigned int host_info_up_sent:1; /* 0 if we need to notify remote that link is up */
	unsigned int latency_exp;
	uint8_t received_pong;
	struct timespec ping_last;
	/* used by PMTUD thread as temp per-link variables and should always contain the onwire_len value! */
	struct timespec pmtud_last;
	uint32_t last_ping_size;
	uint32_t last_good_mtu;
	uint32_t last_bad_mtu;
	uint32_t last_sent_mtu;
	uint32_t last_recv_mtu;
	uint8_t has_valid_mtu;
	};

	#define KNET_CBUFFER_SIZE 4096

	struct knet_host_defrag_buf {
	char buf[KNET_MAX_PACKET_SIZE];
	uint8_t in_use; /* 0 buffer is free, 1 is in use */
	seq_num_t pckt_seq; /* identify the pckt we are receiving */
	uint8_t frag_recv; /* how many frags did we receive */
	uint8_t frag_map[PCKT_FRAG_MAX];/* bitmap of what we received? */
	uint8_t last_first; /* special case if we receive the last fragment first */
	uint16_t frag_size; /* normal frag size (not the last one) */
	uint16_t last_frag_size; /* the last fragment might not be aligned with MTU size */
	struct timespec last_update; /* keep time of the last pckt */
	};

	struct knet_host {
	/* required */
	uint16_t host_id;
	/* configurable */
	uint8_t link_handler_policy;
	char name[KNET_MAX_HOST_LEN];
	/* status */
	struct knet_host_status status;
	/* internals */
	char bcast_circular_buffer[KNET_CBUFFER_SIZE];
	seq_num_t bcast_seq_num_rx;
	char ucast_circular_buffer[KNET_CBUFFER_SIZE];
	seq_num_t ucast_seq_num_tx;
	seq_num_t ucast_seq_num_rx;
	/* defrag/(reassembly buffers */
	struct knet_host_defrag_buf defrag_buf[KNET_MAX_LINK];
	char bcast_circular_buffer_defrag[KNET_CBUFFER_SIZE];
	char ucast_circular_buffer_defrag[KNET_CBUFFER_SIZE];
	/* link stuff */
	struct knet_link link[KNET_MAX_LINK];
	uint8_t active_link_entries;
	uint8_t active_links[KNET_MAX_LINK];
	struct knet_host *next;
	};

	struct knet_sock {
	int sockfd[2]; /* sockfd[0] will always be application facing
	* and sockfd[1] internal if sockpair has been created by knet */
	int is_socket; /* check if it's a socket for recvmmsg usage */
	int is_created; /* knet created this socket and has to clean up on exit/del */
	int in_use; /* set to 1 if it's use, 0 if free */
	int has_error; /* set to 1 if there were errors reading from the sock
	* and socket has been removed from epoll */
	};

	struct knet_handle {
	uint16_t host_id;
	unsigned int enabled:1;
	struct knet_sock sockfd[KNET_DATAFD_MAX];
	int logfd;
	uint8_t log_levels[KNET_MAX_SUBSYSTEMS];
	int hostsockfd[2];
	int dstsockfd[2];
	int send_to_links_epollfd;
	int recv_from_links_epollfd;
	int dst_link_handler_epollfd;
	unsigned int pmtud_interval;
	unsigned int data_mtu; /* contains the max data size that we can send onwire
	* without frags */
	struct knet_host *host_head;
	struct knet_host *host_tail;
	struct knet_host *host_index[KNET_MAX_HOST];
	- knet_transport_t transport;
	- struct knet_transport_ops *transport_ops;
	+ knet_transport_t transports[KNET_MAX_TRANSPORTS];
	+ struct knet_transport_ops *transport_ops[KNET_MAX_TRANSPORTS];
	uint16_t host_ids[KNET_MAX_HOST];
	size_t host_ids_entries;
	struct knet_listener *listener_head;
	struct knet_header *recv_from_sock_buf[PCKT_FRAG_MAX];
	struct knet_header *send_to_links_buf[PCKT_FRAG_MAX];
	struct knet_header *recv_from_links_buf[PCKT_FRAG_MAX];
	struct knet_header *pingbuf;
	struct knet_header *pmtudbuf;
	pthread_t send_to_links_thread;
	pthread_t recv_from_links_thread;
	pthread_t heartbt_thread;
	pthread_t dst_link_handler_thread;
	pthread_t pmtud_link_handler_thread;
	int lock_init_done;
	pthread_rwlock_t global_rwlock; /* global config lock */
	pthread_rwlock_t listener_rwlock; /* listener add/rm lock, can switch to mutex? */
	pthread_rwlock_t host_rwlock; /* send_host_info lock, can switch to mutex? */
	pthread_mutex_t host_mutex; /* host mutex for cond wait on pckt send, switch to mutex/sync_send ? */
	pthread_cond_t host_cond; /* conditional for above */
	pthread_mutex_t pmtud_mutex; /* pmtud mutex to handle conditional send/recv + timeout */
	pthread_cond_t pmtud_cond; /* conditional for above */
	pthread_mutex_t tx_mutex;
	struct crypto_instance *crypto_instance;
	uint16_t sec_header_size;
	uint16_t sec_block_size;
	uint16_t sec_hash_size;
	uint16_t sec_salt_size;
	unsigned char *send_to_links_buf_crypt[PCKT_FRAG_MAX];
	unsigned char *recv_from_links_buf_crypt;
	unsigned char *recv_from_links_buf_decrypt;
	unsigned char *pingbuf_crypt;
	unsigned char *pmtudbuf_crypt;
	seq_num_t bcast_seq_num_tx;
	void *dst_host_filter_fn_private_data;
	int (*dst_host_filter_fn) (
	void *private_data,
	const unsigned char *outdata,
	ssize_t outdata_len,
	uint8_t tx_rx,
	uint16_t this_host_id,
	uint16_t src_node_id,
	int8_t *channel,
	uint16_t *dst_host_ids,
	size_t *dst_host_ids_entries);
	void *pmtud_notify_fn_private_data;
	void (*pmtud_notify_fn) (
	void *private_data,
	unsigned int data_mtu);
	void *host_status_change_notify_fn_private_data;
	void (*host_status_change_notify_fn) (
	void *private_data,
	uint16_t host_id,
	uint8_t reachable,
	uint8_t remote,
	uint8_t external);
	void *sock_notify_fn_private_data;
	void (*sock_notify_fn) (
	void *private_data,
	int datafd,
	int8_t channel,
	uint8_t tx_rx,
	int error,
	int errorno);
	int fini_in_progress;
	};

	typedef void knet_transport_link_t; / per link transport handle */
	typedef void knet_transport_t; / per knet_h transport handle */

	typedef struct knet_transport_ops {

	int (handle_allocate)(knet_handle_t knet_h, knet_transport_t transport);
	int (*handle_free)(knet_handle_t knet_h, knet_transport_t transport);
	int (*handle_fd_eof)(knet_handle_t knet_h, int sockfd);
	int (handle_fd_notification)(knet_handle_t knet_h, int sockfd, struct iovec iov, size_t iovlen);

	int (*link_allocate)(knet_handle_t knet_h, knet_transport_t transport,
	struct knet_link *link,
	knet_transport_link_t *transport_link,
	uint8_t link_id, struct sockaddr_storage *src_address,
	struct sockaddr_storage dst_address, int listen_sock);
	int (*link_listener_start)(knet_handle_t knet_h, knet_transport_link_t transport_link,
	uint8_t link_id,
	struct sockaddr_storage address, struct sockaddr_storage dst_address);
	int (*link_free)(knet_transport_link_t transport_link);
	int (*link_get_mtu_overhead)(knet_transport_link_t transport_link);

	const char *transport_name;
	} knet_transport_ops_t;

	#endif
	diff --git a/libknet/libknet.h b/libknet/libknet.h
	index 520b270d..cde0ca27 100644
	--- a/libknet/libknet.h
	+++ b/libknet/libknet.h
	@@ -1,1324 +1,1333 @@
	/*
	* Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	* Federico Simoncelli <fsimon@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#ifndef __LIBKNET_H__
	#define __LIBKNET_H__

	#include <stdint.h>
	#include <netinet/in.h>

	/*
	* libknet limits
	*/

	/*
	* Maximum number of hosts
	*/

	#define KNET_MAX_HOST 65536

	/*
	* Maximum number of links between 2 hosts
	*/

	#define KNET_MAX_LINK 8

	/*
	* Maximum packet size that should be written to datafd
	* see knet_handle_new for details
	*/

	#define KNET_MAX_PACKET_SIZE 65536

	/*
	* Buffers used for pretty logging
	* host is used to store both ip addresses and hostnames
	*/

	#define KNET_MAX_HOST_LEN 64
	#define KNET_MAX_PORT_LEN 6

	/*
	* Some notifications can be generated either on TX or RX
	*/

	#define KNET_NOTIFY_TX 0
	#define KNET_NOTIFY_RX 1

	typedef struct knet_handle *knet_handle_t;

	/*
	* Handle structs/API calls
	*/

	/*
	* knet_handle_new
	*
	* host_id - Each host in a knet is identified with a unique
	* ID. when creating a new handle local host_id
	* must be specified (0 to UINT16T_MAX are all valid).
	* It is the user's responsibility to check that the value
	* is unique, or bad things might happen.
	*
	* log_fd - Write file descriptor. If set to a value > 0, it will be used
	* to write log packets (see below) from libknet to the application.
	* Setting to 0 will disable logging from libknet.
	* It is possible to enable logging at any given time (see logging API
	* below).
	* Make sure to either read from this filedescriptor properly and/or
	* mark it O_NONBLOCK, otherwise if the fd becomes full, libknet could
	* block.
	*
	* default_log_level -
	* If logfd is specified, it will initialize all subsystems to log
	* at default_log_level value. (see logging API below)
	*
	* on success, a new knet_handle_t is returned.
	* on failure, NULL is returned and errno is set.
	*/

	knet_handle_t knet_handle_new(uint16_t host_id,
	int log_fd,
	uint8_t default_log_level);

	/*
	* knet_handle_free
	*
	* knet_h - pointer to knet_handle_t
	*
	* Destroy a knet handle, free all resources
	*
	* knet_handle_free returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_handle_free(knet_handle_t knet_h);

	/*
	* knet_handle_enable_sock_notify
	*
	* knet_h - pointer to knet_handle_t
	*
	* sock_notify_fn_private_data
	* void pointer to data that can be used to identify
	* the callback.
	*
	* sock_notify_fn
	* A callback function that is invoked every time
	* a socket in the datafd pool will report an error (-1)
	* or an end of read (0) (see socket.7).
	* This function MUST NEVER block or add substantial delays.
	* The callback is invoked in an internal unlocked area
	* to allow calls to knet_handle_add_datafd/knet_handle_remove_datafd
	* to swap/replace the bad fd.
	* if both err and errno are 0, it means that the socket
	* has received a 0 byte packet (EOF?).
	* The callback function must either remove the fd from knet
	* (by calling knet_handle_remove_fd()) or dup a new fd in its place.
	* Failure to do this can cause problems.
	*
	* knet_handle_enable_sock_notify returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_handle_enable_sock_notify(knet_handle_t knet_h,
	void *sock_notify_fn_private_data,
	void (*sock_notify_fn) (
	void *private_data,
	int datafd,
	int8_t channel,
	uint8_t tx_rx,
	int error,
	int errorno)); /* sorry! can't call it errno ;) */

	/*
	* knet_handle_add_datafd
	*
	* IMPORTANT: In order to add datafd to knet, knet_handle_enable_sock_notify
	* _MUST_ be set and be able to handle both errors (-1) and
	* 0 bytes read / write from the provided datafd.
	* On read error (< 0) from datafd, the socket is automatically
	* removed from polling to avoid spinning on dead sockets.
	* It is safe to call knet_handle_remove_datafd even on sockets
	* that have been removed.
	*
	* knet_h - pointer to knet_handle_t
	*
	* *datafd - read/write file descriptor.
	* knet will read data here to send to the other hosts
	* and will write data received from the network.
	* Each data packet can be of max size KNET_MAX_PACKET_SIZE!
	* Applications using knet_send/knet_recv will receive a
	* proper error if the packet size is not within boundaries.
	* Applications using their own functions to write to the
	* datafd should NOT write more than KNET_MAX_PACKET_SIZE.
	*
	* Please refer to handle.c on how to set up a socketpair.
	*
	* datafd can be 0, and knet_handle_add_datafd will create a properly
	* populated socket pair the same way as ping_test, or a value
	* higher than 0. A negative number will return an error.
	* On exit knet_handle_free will take care to cleanup the
	* socketpair only if they have been created by knet_handle_add_datafd.
	*
	* It is possible to pass either sockets or normal fds.
	* User provided datafd will be marked as non-blocking and close-on-exit.
	*
	* *channel - This value has the same effect of VLAN tagging.
	* A negative value will auto-allocate a channel.
	* Setting a value between 0 and 31 will try to allocate that
	* specific channel (unless already in use).
	*
	* It is possible to add up to 32 datafds but be aware that each
	* one of them must have a receiving end on the other host.
	*
	* Example:
	* hostA channel 0 will be delivered to datafd on hostB channel 0
	* hostA channel 1 to hostB channel 1.
	*
	* Each channel must have a unique file descriptor.
	*
	* If your application could have 2 channels on one host and one
	* channel on another host, then you can use dst_host_filter
	* to manipulate channel values on TX and RX.
	*
	* knet_handle_add_datafd returns:
	*
	* 0 on success
	* *datafd will be populated with a socket if the original value was 0
	* or if a specific fd was set, the value is untouched.
	* *channel will be populated with a channel number if the original value
	* was negative or the value is untouched if a specific channel
	* was requested.
	*
	* -1 on error and errno is set.
	* datafd and channel are untouched or empty.
	*/

	#define KNET_DATAFD_MAX 32

	int knet_handle_add_datafd(knet_handle_t knet_h, int datafd, int8_t channel);

	/*
	* knet_handle_remove_datafd
	*
	* knet_h - pointer to knet_handle_t
	*
	* datafd - file descriptor to remove.
	* NOTE that if the socket/fd was created by knet_handle_add_datafd,
	* the socket will be closed by libknet.
	*
	* knet_handle_remove_datafd returns:
	*
	* 0 on success
	*
	* -1 on error and errno is set.
	*/

	int knet_handle_remove_datafd(knet_handle_t knet_h, int datafd);

	/*
	* knet_handle_enable_sock_notify
	*
	* knet_h - pointer to knet_handle_t
	*
	* sock_notify_fn_private_data
	* void pointer to data that can be used to identify
	* the callback.
	*
	* sock_notify_fn
	* A callback function that is invoked every time
	* a socket in the datafd pool will report an error (-1)
	* or an end of read (0) (see socket.7).
	* This function MUST NEVER block or add substantial delays.
	* The callback is invoked in an internal unlocked area
	* to allow calls to knet_handle_add_datafd/knet_handle_remove_datafd
	* to swap/replace the bad fd.
	* if both err and errno are 0, it means that the socket
	* has received a 0 byte packet (EOF?).
	* The callback function must either remove the fd from knet
	* (by calling knet_handle_remove_fd()) or dup a new fd in its place.
	* Failure to do this can cause problems.
	*
	* knet_handle_enable_sock_notify returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_handle_get_channel(knet_handle_t knet_h, const int datafd, int8_t *channel);

	/*
	* knet_handle_get_datafd
	*
	* knet_h - pointer to knet_handle_t
	*
	* channel - get the datafd associated to this channel
	*
	* *datafd - will contain the result
	*
	* knet_handle_get_datafd returns:
	*
	* 0 on success
	* and *datafd will contain the results
	*
	* -1 on error and errno is set.
	* and *datafd content is meaningless
	*/

	int knet_handle_get_datafd(knet_handle_t knet_h, const int8_t channel, int *datafd);

	/*
	* knet_recv
	*
	* knet_h - pointer to knet_handle_t
	*
	* buff - pointer to buffer to store the received data
	*
	* buff_len - buffer lenght
	*
	* knet_recv is a commodity function to wrap iovec operations
	* around a socket. It returns a call to readv(2).
	*/

	ssize_t knet_recv(knet_handle_t knet_h,
	char *buff,
	const size_t buff_len,
	const int8_t channel);

	/*
	* knet_send
	*
	* knet_h - pointer to knet_handle_t
	*
	* buff - pointer to the buffer of data to send
	*
	* buff_len - length of data to send
	*
	* knet_send is a commodity function to wrap iovec operations
	* around a socket. It returns a call to writev(2).
	*/

	ssize_t knet_send(knet_handle_t knet_h,
	const char *buff,
	const size_t buff_len,
	const int8_t channel);

	/*
	* knet_send_sync
	*
	* knet_h - pointer to knet_handle_t
	*
	* buff - pointer to the buffer of data to send
	*
	* buff_len - length of data to send
	*
	* channel - data channel to use (see knet_handle_add_datafd)
	*
	* All knet RX/TX operations are async for performance reasons.
	* There are applications that might need a sync version of data
	* transmission and receive errors in case of failure to deliver
	* to another host.
	* knet_send_sync bypasses the whole TX async layer and delivers
	* data directly to the link layer, and returns errors accordingly.
	* knet_send_sync allows to send only one packet to one host at
	* a time. It does NOT support multiple destinations or multicast
	* packets. Decision is still based on dst_host_filter_fn.
	*
	* knet_send_sync returns 0 on success and -1 on error.
	*
	* In addition to normal sendmmsg errors, knet_send_sync can fail
	* due to:
	*
	* ECANCELED - data forward is disabled
	* EFAULT - dst_host_filter fatal error
	* EINVAL - dst_host_filter did not provide
	* dst_host_ids_entries on unicast pckts
	* E2BIG - dst_host_filter did return more than one
	* dst_host_ids_entries on unicast pckts
	* ENOMSG - received unknown message type
	* EHOSTDOWN - unicast pckt cannot be delivered because
	* dest host is not connected yet
	* ECHILD - crypto failed
	* EAGAIN - sendmmsg was unable to send all messages and
	* there was no progress during retry
	*/

	int knet_send_sync(knet_handle_t knet_h,
	const char *buff,
	const size_t buff_len,
	const int8_t channel);

	/*
	* knet_handle_enable_filter
	*
	* knet_h - pointer to knet_handle_t
	*
	* dst_host_filter_fn_private_data
	* void pointer to data that can be used to identify
	* the callback.
	*
	* dst_host_filter_fn -
	* is a callback function that is invoked every time
	* a packet hits datafd (see knet_handle_new).
	* the function allows users to tell libknet where the
	* packet has to be delivered.
	*
	* const unsigned char *outdata - is a pointer to the
	* current packet
	* ssize_t outdata_len - lenght of the above data
	* uint8_t tx_rx - filter is called on tx or rx
	* (see defines below)
	* uint16_t this_host_id - host_id processing the packet
	* uint16_t src_host_id - host_id that generated the
	* packet
	* uint16_t *dst_host_ids - array of KNET_MAX_HOST uint16_t
	* where to store the destinations
	* size_t *dst_host_ids_entries - number of hosts to send the message
	*
	* dst_host_filter_fn should return
	* -1 on error, packet is discarded.
	* 0 packet is unicast and should be sent to dst_host_ids and there are
	* dst_host_ids_entries in the buffer.
	* 1 packet is broadcast/multicast and is sent all hosts.
	* contents of dst_host_ids and dst_host_ids_entries are ignored.
	* (see also kronosnetd/etherfilter.* for an example that filters based
	* on ether protocol)
	*
	* knet_handle_enable_filter returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_handle_enable_filter(knet_handle_t knet_h,
	void *dst_host_filter_fn_private_data,
	int (*dst_host_filter_fn) (
	void *private_data,
	const unsigned char *outdata,
	ssize_t outdata_len,
	uint8_t tx_rx,
	uint16_t this_host_id,
	uint16_t src_host_id,
	int8_t *channel,
	uint16_t *dst_host_ids,
	size_t *dst_host_ids_entries));

	/*
	* knet_handle_setfwd
	*
	* knet_h - pointer to knet_handle_t
	*
	* enable - set to 1 to allow data forwarding, 0 to disable data forwarding.
	*
	* knet_handle_setfwd returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*
	* By default data forwarding is off and no traffic will pass through knet until
	* it is set on.
	*/

	int knet_handle_setfwd(knet_handle_t knet_h, unsigned int enabled);

	/*
	* knet_handle_pmtud_setfreq
	*
	* knet_h - pointer to knet_handle_t
	*
	* interval - define the interval in seconds between PMTUd scans
	* range from 1 to 86400 (24h)
	*
	* knet_handle_pmtud_setfreq returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*
	* default interval is 60.
	*/

	#define KNET_PMTUD_DEFAULT_INTERVAL 60

	int knet_handle_pmtud_setfreq(knet_handle_t knet_h, unsigned int interval);

	/*
	* knet_handle_pmtud_getfreq
	*
	* knet_h - pointer to knet_handle_t
	*
	* interval - pointer where to store the current interval value
	*
	* knet_handle_pmtud_setfreq returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/


	int knet_handle_pmtud_getfreq(knet_handle_t knet_h, unsigned int *interval);

	/*
	* knet_handle_enable_pmtud_notify
	*
	* knet_h - pointer to knet_handle_t
	*
	* pmtud_notify_fn_private_data
	* void pointer to data that can be used to identify
	* the callback.
	*
	* pmtud_notify_fn
	* is a callback function that is invoked every time
	* a path MTU size change is detected.
	* The function allows libknet to notify the user
	* of data MTU, that's the max value that can be send
	* onwire without fragmentation. The data MTU will always
	* be lower than real link MTU because it accounts for
	* protocol overhead, knet packet header and (if configured)
	* crypto overhead,
	* This function MUST NEVER block or add substantial delays.
	*
	* knet_handle_enable_pmtud_notify returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_handle_enable_pmtud_notify(knet_handle_t knet_h,
	void *pmtud_notify_fn_private_data,
	void (*pmtud_notify_fn) (
	void *private_data,
	unsigned int data_mtu));

	/*
	* knet_handle_pmtud_get
	*
	* knet_h - pointer to knet_handle_t
	*
	* data_mtu - pointer where to store data_mtu (see above)
	*
	* knet_handle_pmtud_get returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_handle_pmtud_get(knet_handle_t knet_h,
	unsigned int *data_mtu);

	/*
	* knet_handle_crypto
	*
	* knet_h - pointer to knet_handle_t
	*
	* knet_handle_crypto_cfg -
	* pointer to a knet_handle_crypto_cfg structure
	*
	* crypto_model should contain the model name.
	* Currently only "nss" is supported.
	* Setting to "none" will disable crypto.
	*
	* crypto_cipher_type
	* should contain the cipher algo name.
	* It can be set to "none" to disable
	* encryption.
	* Currently supported by "nss" model:
	* "3des", "aes128", "aes192" and "aes256".
	*
	* crypto_hash_type
	* should contain the hashing algo name.
	* It can be set to "none" to disable
	* hashing.
	* Currently supported by "nss" model:
	* "md5", "sha1", "sha256", "sha384" and "sha512".
	*
	* private_key will contain the private shared key.
	* It has to be at least KNET_MIN_KEY_LEN long.
	*
	* private_key_len
	* length of the provided private_key.
	*
	* Implementation notes/current limitations:
	* - enabling crypto, will increase latency as packets have
	* to processed.
	* - enabling crypto might reduce the overall throughtput
	* due to crypto data overhead.
	* - re-keying is not implemented yet.
	* - private/public key encryption/hashing is not currently
	* planned.
	* - crypto key must be the same for all hosts in the same
	* knet instance.
	* - it is safe to call knet_handle_crypto multiple times at runtime.
	* The last config will be used.
	* IMPORTANT: a call to knet_handle_crypto can fail due to:
	* 1) failure to obtain locking
	* 2) errors to initializing the crypto level.
	* This can happen even in subsequent calls to knet_handle_crypto.
	* A failure in crypto init, might leave your traffic unencrypted!
	* It's best to stop data forwarding (see above), change crypto config,
	* start forward again.
	*
	* knet_handle_crypto returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	* -2 on crypto subsystem initialization error. No errno is provided at the moment (yet).
	*/

	#define KNET_MIN_KEY_LEN 1024
	#define KNET_MAX_KEY_LEN 4096

	struct knet_handle_crypto_cfg {
	char crypto_model[16];
	char crypto_cipher_type[16];
	char crypto_hash_type[16];
	unsigned char private_key[KNET_MAX_KEY_LEN];
	unsigned int private_key_len;
	};

	int knet_handle_crypto(knet_handle_t knet_h,
	struct knet_handle_crypto_cfg *knet_handle_crypto_cfg);

	/*
	* host structs/API calls
	*/

	/*
	* knet_host_add
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - each host in a knet is identified with a unique ID
	* (see also knet_handle_new documentation above)
	*
	* knet_host_add returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_host_add(knet_handle_t knet_h, uint16_t host_id);

	/*
	* knet_host_remove
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - each host in a knet is identified with a unique ID
	* (see also knet_handle_new documentation above)
	*
	* knet_host_remove returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_host_remove(knet_handle_t knet_h, uint16_t host_id);

	/*
	* knet_host_set_name
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* name - this name will be used for pretty logging and eventually
	* search for hosts (see also get_name and get_id below).
	* Only up to KNET_MAX_HOST_LEN - 1 bytes will be accepted and
	* name has to be unique for each host.
	*
	* knet_host_set_name returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_host_set_name(knet_handle_t knet_h, uint16_t host_id,
	const char *name);

	/*
	* knet_host_get_name_by_host_id
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* name - pointer to a preallocated buffer of at least size KNET_MAX_HOST_LEN
	* where the current host name will be stored
	* (as set by knet_host_set_name or default by knet_host_add)
	*
	* knet_host_get_name_by_host_id returns:
	*
	* 0 on success
	* -1 on error and errno is set (name is left untouched)
	*/

	int knet_host_get_name_by_host_id(knet_handle_t knet_h, uint16_t host_id,
	char *name);

	/*
	* knet_host_get_id_by_host_name
	*
	* knet_h - pointer to knet_handle_t
	*
	* name - name to lookup, max len KNET_MAX_HOST_LEN
	*
	* host_id - where to store the result
	*
	* knet_host_get_id_by_host_name returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_host_get_id_by_host_name(knet_handle_t knet_h, const char *name,
	uint16_t *host_id);

	/*
	* knet_host_get_host_list
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_ids - array of at lest KNET_MAX_HOST size
	*
	* host_ids_entries -
	* number of entries writted in host_ids
	*
	* knet_host_get_host_list returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_host_get_host_list(knet_handle_t knet_h,
	uint16_t host_ids, size_t host_ids_entries);

	/*
	* define switching policies
	*/

	#define KNET_LINK_POLICY_PASSIVE 0
	#define KNET_LINK_POLICY_ACTIVE 1
	#define KNET_LINK_POLICY_RR 2

	/*
	* knet_host_set_policy
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* policy - there are currently 3 kind of simple switching policies
	* as defined above, based on link configuration.
	* KNET_LINK_POLICY_PASSIVE - the active link with the lowest
	* priority will be used.
	* if one or more active links share
	* the same priority, the one with
	* lowest link_id will be used.
	*
	* KNET_LINK_POLICY_ACTIVE - all active links will be used
	* simultaneously to send traffic.
	* link priority is ignored.
	*
	* KNET_LINK_POLICY_RR - round-robin policy, every packet
	* will be send on a different active
	* link.
	*
	* knet_host_set_policy returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_host_set_policy(knet_handle_t knet_h, uint16_t host_id,
	uint8_t policy);

	/*
	* knet_host_get_policy
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* policy - will contain the current configured switching policy.
	* Default is passive when creating a new host.
	*
	* knet_host_get_policy returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_host_get_policy(knet_handle_t knet_h, uint16_t host_id,
	uint8_t *policy);

	/*
	* knet_host_enable_status_change_notify
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_status_change_notify_fn_private_data
	* void pointer to data that can be used to identify
	* the callback.
	*
	* host_status_change_notify_fn
	* is a callback function that is invoked every time
	* there is a change in the host status.
	* host status is identified by:
	* - reachable, this host can send/receive data to/from host_id
	* - remote, 0 if the host_id is connected locally or 1 if
	* the there is one or more knet host(s) in between.
	* NOTE: re-switching is NOT currently implemented,
	* but this is ready for future and can avoid
	* an API/ABI breakage later on.
	* - external, 0 if the host_id is configured locally or 1 if
	* it has been added from remote nodes config.
	* NOTE: dynamic topology is NOT currently implemented,
	* but this is ready for future and can avoid
	* an API/ABI breakage later on.
	* This function MUST NEVER block or add substantial delays.
	*
	* knet_host_status_change_notify returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_host_enable_status_change_notify(knet_handle_t knet_h,
	void *host_status_change_notify_fn_private_data,
	void (*host_status_change_notify_fn) (
	void *private_data,
	uint16_t host_id,
	uint8_t reachable,
	uint8_t remote,
	uint8_t external));

	/*
	* define host status structure for quick lookup
	* struct is in flux as more stats will be added soon
	*
	* reachable host_id can be seen either directly connected
	* or via another host_id
	*
	* remote 0 = node is connected locally, 1 is visible via
	* via another host_id
	*
	* external 0 = node is configured/known locally,
	* 1 host_id has been received via another host_id
	*/

	struct knet_host_status {
	uint8_t reachable;
	uint8_t remote;
	uint8_t external;
	/* add host statistics */
	};

	/*
	* knet_host_status_get
	*
	* knet_h - pointer to knet_handle_t
	*
	* status - pointer to knet_host_status struct (see above)
	*
	* knet_handle_pmtud_get returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_host_get_status(knet_handle_t knet_h, uint16_t host_id,
	struct knet_host_status *status);

	/*
	* link structs/API calls
	*
	* every host allocated/managed by knet_host_* has
	* KNET_MAX_LINK structures to define the network
	* paths that connect 2 hosts.
	*
	* Each link is identified by a link_id that has a
	* values between 0 and KNET_MAX_LINK - 1.
	*
	* KNOWN LIMITATIONS:
	*
	* - let's assume the scenario where two hosts are connected
	* with any number of links. link_id must match on both sides.
	* If host_id 0 link_id 0 is configured to connect IP1 to IP2 and
	* host_id 0 link_id 1 is configured to connect IP3 to IP4,
	* host_id 1 link_id 0 _must_ connect IP2 to IP1 and likewise
	* host_id 1 link_id 1 _must_ connect IP4 to IP3.
	* We might be able to lift this restriction in future, by using
	* other data to determine src/dst link_id, but for now, deal with it.
	*
	* -
	*/

	+#define KNET_TRANSPORT_UDP 0
	+#define KNET_MAX_TRANSPORTS 1
	+
	/*
	* knet_link_set_config
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	+ * transport - one of the above KNET_TRANSPORT_xxx constants
	+ *
	* src_addr - sockaddr_storage that can be either IPv4 or IPv6
	*
	* dst_addr - sockaddr_storage that can be either IPv4 or IPv6
	* this can be null if we don't know the incoming
	* IP address/port and the link will remain quiet
	* till the node on the other end will initiate a
	* connection
	*
	* knet_link_set_config returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_link_set_config(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	+ uint8_t transport,
	struct sockaddr_storage *src_addr,
	struct sockaddr_storage *dst_addr);

	/*
	* knet_link_get_config
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	+ * transport - see above
	+ *
	* src_addr - sockaddr_storage that can be either IPv4 or IPv6
	*
	* dst_addr - sockaddr_storage that can be either IPv4 or IPv6
	*
	* dynamic - 0 if dst_addr is static or 1 if dst_addr is dynamic.
	* In case of 1, dst_addr can be NULL and it will be left
	* untouched.
	*
	* knet_link_set_config returns:
	*
	* 0 on success.
	* -1 on error and errno is set.
	*/

	int knet_link_get_config(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	+ uint8_t *transport,
	struct sockaddr_storage *src_addr,
	struct sockaddr_storage *dst_addr,
	uint8_t *dynamic);

	/*
	* knet_link_set_enable
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	* enabled - 0 disable the link, 1 enable the link
	*
	* knet_link_set_enable returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_link_set_enable(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	unsigned int enabled);

	/*
	* knet_link_get_enable
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	* enabled - 0 disable the link, 1 enable the link
	*
	* knet_link_get_enable returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_link_get_enable(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	unsigned int *enabled);

	/*
	* knet_link_set_ping_timers
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	* interval - specify the ping interval
	*
	* timeout - if no pong is received within this time,
	* the link is declared dead
	*
	* precision - how many values of latency are used to calculate
	* the average link latency (see also get_status below)
	*
	* knet_link_set_ping_timers returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	#define KNET_LINK_DEFAULT_PING_INTERVAL 1000 /* 1 second */
	#define KNET_LINK_DEFAULT_PING_TIMEOUT 2000 /* 2 seconds */
	#define KNET_LINK_DEFAULT_PING_PRECISION 2048 /* samples */

	int knet_link_set_ping_timers(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	time_t interval, time_t timeout, unsigned int precision);

	/*
	* knet_link_get_ping_timers
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	* interval - ping intervall
	*
	* timeout - if no pong is received within this time,
	* the link is declared dead
	*
	* precision - how many values of latency are used to calculate
	* the average link latency (see also get_status below)
	*
	* knet_link_get_ping_timers returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_link_get_ping_timers(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	time_t interval, time_t timeout, unsigned int *precision);

	/*
	* knet_link_set_pong_count
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	* pong_count - how many valid ping/pongs before a link is marked UP.
	* default: 5, value should be > 0
	*
	* knet_link_set_pong_count returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	#define KNET_LINK_DEFAULT_PONG_COUNT 5

	int knet_link_set_pong_count(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	uint8_t pong_count);

	/*
	* knet_link_get_pong_count
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	* pong_count - see above
	*
	* knet_link_get_pong_count returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_link_get_pong_count(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	uint8_t *pong_count);

	/*
	* knet_link_set_priority
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	* priority - specify the switching priority for this link
	* see also knet_host_set_policy
	*
	* knet_link_set_priority returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_link_set_priority(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	uint8_t priority);

	/*
	* knet_link_get_priority
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	* priority - gather the switching priority for this link
	* see also knet_host_set_policy
	*
	* knet_link_get_priority returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_link_get_priority(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	uint8_t *priority);

	/*
	* knet_link_get_link_list
	*
	* knet_h - pointer to knet_handle_t
	*
	* link_ids - array of at lest KNET_MAX_LINK size
	* with the list of configured links for a certain host.
	*
	* link_ids_entries -
	* number of entries contained in link_ids
	*
	* knet_link_get_link_list returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_link_get_link_list(knet_handle_t knet_h, uint16_t host_id,
	uint8_t link_ids, size_t link_ids_entries);

	/*
	* define link status structure for quick lookup
	* struct is in flux as more stats will be added soon
	*
	* src/dst_{ipaddr,port} strings are filled by
	* getnameinfo(3) when configuring the link.
	* if the link is dynamic (see knet_link_set_config)
	* dst_ipaddr/port will contain ipaddr/port of the currently
	* connected peer or "Unknown" if it was not possible
	* to determine the ipaddr/port at runtime.
	*
	* enabled see also knet_link_set/get_enable.
	*
	* connected the link is connected to a peer and ping/pong traffic
	* is flowing.
	*
	* dynconnected the link has dynamic ip on the other end, and
	* we can see the other host is sending pings to us.
	*
	* latency average latency of this link
	* see also knet_link_set/get_timeout.
	*
	* pong_last if the link is down, this value tells us how long
	* ago this link was active. A value of 0 means that the link
	* has never been active.
	*/

	struct knet_link_status {
	char src_ipaddr[KNET_MAX_HOST_LEN];
	char src_port[KNET_MAX_PORT_LEN];
	char dst_ipaddr[KNET_MAX_HOST_LEN];
	char dst_port[KNET_MAX_PORT_LEN];
	unsigned int enabled:1; /* link is configured and admin enabled for traffic */
	unsigned int connected:1; /* link is connected for data (local view) */
	unsigned int dynconnected:1; /* link has been activated by remote dynip */
	unsigned long long latency; /* average latency computed by fix/exp */
	struct timespec pong_last;
	unsigned int mtu; /* current detected MTU on this link */
	unsigned int proto_overhead; /* contains the size of the IP protocol, knet headers and
	* crypto headers (if configured). This value is filled in
	* ONLY after the first PMTUd run on that given link,
	* and can change if link configuration or crypto configuration
	* changes at runtime.
	* WARNING: in general mtu + proto_overhead might or might
	* not match the output of ifconfig mtu due to crypto
	* requirements to pad packets to some specific boundaries. */
	/* add link statistics */
	};

	/*
	* knet_link_get_status
	*
	* knet_h - pointer to knet_handle_t
	*
	* host_id - see above
	*
	* link_id - see above
	*
	* status - pointer to knet_link_status struct (see above)
	*
	* knet_link_get_status returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_link_get_status(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	struct knet_link_status *status);

	/*
	* logging structs/API calls
	*/

	/*
	* libknet is composed of several subsystems. In order
	* to easily distinguish log messages coming from different
	* places, each subsystem has its own ID.
	*/

	#define KNET_SUB_COMMON 0 /* common.c */
	#define KNET_SUB_HANDLE 1 /* handle.c alloc/dealloc config changes */
	#define KNET_SUB_HOST 2 /* host add/del/modify */
	#define KNET_SUB_LISTENER 3 /* listeners add/del/modify... */
	#define KNET_SUB_LINK 4 /* link add/del/modify */
	#define KNET_SUB_PMTUD 5 /* Path MTU Discovery */
	#define KNET_SUB_SEND_T 6 /* send to link thread */
	#define KNET_SUB_LINK_T 7 /* recv from link thread */
	#define KNET_SUB_SWITCH_T 8 /* switching thread */
	#define KNET_SUB_HB_T 9 /* heartbeat thread */
	#define KNET_SUB_PMTUD_T 10 /* Path MTU Discovery thread */
	#define KNET_SUB_TRANSPORT_T 11 /* Transport common */
	#define KNET_SUB_UDP_LINK_T 12 /* UDP Transport */
	#define KNET_SUB_FILTER 15 /* (ether)filter errors */
	#define KNET_SUB_CRYPTO 16 /* crypto.c generic layer */
	#define KNET_SUB_NSSCRYPTO 17 /* nsscrypto.c */
	#define KNET_SUB_LAST KNET_SUB_NSSCRYPTO
	#define KNET_MAX_SUBSYSTEMS KNET_SUB_LAST + 1

	/*
	* Convert between subsystem IDs and names
	*/

	/*
	* knet_log_get_subsystem_name
	*
	* return internal name of the subsystem or "common"
	*/

	const char *knet_log_get_subsystem_name(uint8_t subsystem);

	/*
	* knet_log_get_subsystem_id
	*
	* return internal ID of the subsystem or KNET_SUB_COMMON
	*/

	uint8_t knet_log_get_subsystem_id(const char *name);

	/*
	* 4 log levels are enough for everybody
	*/

	#define KNET_LOG_ERR 0 /* unrecoverable errors/conditions */
	#define KNET_LOG_WARN 1 /* recoverable errors/conditions */
	#define KNET_LOG_INFO 2 /* info, link up/down, config changes.. */
	#define KNET_LOG_DEBUG 3

	/*
	* Convert between log level values and names
	*/

	/*
	* knet_log_get_loglevel_name
	*
	* return internal name of the log level or "ERROR" for unknown values
	*/

	const char *knet_log_get_loglevel_name(uint8_t level);

	/*
	* knet_log_get_loglevel_id
	*
	* return internal log level ID or KNET_LOG_ERR for invalid names
	*/

	uint8_t knet_log_get_loglevel_id(const char *name);

	/*
	* every log message is composed by a text message (including a trailing \n)
	* and message level/subsystem IDs.
	* In order to make debugging easier it is possible to send those packets
	* straight to stdout/stderr (see ping_test.c stdout option).
	*/

	#define KNET_MAX_LOG_MSG_SIZE 256

	struct knet_log_msg {
	char msg[KNET_MAX_LOG_MSG_SIZE - (sizeof(uint8_t)*2)];
	uint8_t subsystem; /* KNET_SUB_* */
	uint8_t msglevel; /* KNET_LOG_* */
	};

	/*
	* knet_log_set_log_level
	*
	* knet_h - same as above
	*
	* subsystem - same as above
	*
	* level - same as above
	*
	* knet_log_set_loglevel allows fine control of log levels by subsystem.
	* See also knet_handle_new for defaults.
	*
	* knet_log_set_loglevel returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_log_set_loglevel(knet_handle_t knet_h, uint8_t subsystem,
	uint8_t level);

	/*
	* knet_log_get_log_level
	*
	* knet_h - same as above
	*
	* subsystem - same as above
	*
	* level - same as above
	*
	* knet_log_get_loglevel returns:
	*
	* 0 on success
	* -1 on error and errno is set.
	*/

	int knet_log_get_loglevel(knet_handle_t knet_h, uint8_t subsystem,
	uint8_t *level);

	#endif
	diff --git a/libknet/link.c b/libknet/link.c
	index 9f70d2a2..95cc0971 100644
	--- a/libknet/link.c
	+++ b/libknet/link.c
	@@ -1,952 +1,972 @@
	/*
	* Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	* Federico Simoncelli <fsimon@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <netdb.h>
	#include <string.h>
	#include <stdio.h>
	#include <pthread.h>

	#include "internals.h"
	#include "logging.h"
	#include "link.h"
	#include "listener.h"
	#include "transports.h"
	#include "host.h"

	int _link_updown(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	unsigned int enabled, unsigned int connected)
	{
	struct knet_link *link = &knet_h->host_index[host_id]->link[link_id];

	if ((link->status.enabled == enabled) &&
	(link->status.connected == connected))
	return 0;

	link->status.enabled = enabled;
	link->status.connected = connected;

	_host_dstcache_update_sync(knet_h, knet_h->host_index[host_id]);

	if ((link->status.dynconnected) &&
	(!link->status.connected))
	link->status.dynconnected = 0;

	return 0;
	}

	int knet_link_set_config(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	+ uint8_t transport,
	struct sockaddr_storage *src_addr,
	struct sockaddr_storage *dst_addr)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (!src_addr) {
	errno = EINVAL;
	return -1;
	}

	+ if (transport != KNET_TRANSPORT_UDP) {
	+ errno = EINVAL;
	+ return -1;
	+ }
	+
	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (link->status.enabled != 0) {
	err =-1;
	savederrno = EBUSY;
	log_err(knet_h, KNET_SUB_LINK, "Host %u link %u is currently in use: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	memmove(&link->src_addr, src_addr, sizeof(struct sockaddr_storage));

	err = getnameinfo((const struct sockaddr *)src_addr, sizeof(struct sockaddr_storage),
	link->status.src_ipaddr, KNET_MAX_HOST_LEN,
	link->status.src_port, KNET_MAX_PORT_LEN,
	NI_NUMERICHOST \| NI_NUMERICSERV);
	if (err) {
	if (err == EAI_SYSTEM) {
	savederrno = errno;
	log_warn(knet_h, KNET_SUB_LINK,
	"Unable to resolve host: %u link: %u source addr/port: %s",
	host_id, link_id, strerror(savederrno));
	} else {
	savederrno = EINVAL;
	log_warn(knet_h, KNET_SUB_LINK,
	"Unable to resolve host: %u link: %u source addr/port: %s",
	host_id, link_id, gai_strerror(err));
	}
	err = -1;
	goto exit_unlock;
	}

	if (!dst_addr) {
	link->dynamic = KNET_LINK_DYNIP;
	err = 0;
	goto exit_unlock;
	}

	+ link->transport_type = transport;
	link->dynamic = KNET_LINK_STATIC;

	memmove(&link->dst_addr, dst_addr, sizeof(struct sockaddr_storage));
	err = getnameinfo((const struct sockaddr *)dst_addr, sizeof(struct sockaddr_storage),
	link->status.dst_ipaddr, KNET_MAX_HOST_LEN,
	link->status.dst_port, KNET_MAX_PORT_LEN,
	NI_NUMERICHOST \| NI_NUMERICSERV);
	if (err) {
	if (err == EAI_SYSTEM) {
	savederrno = errno;
	log_warn(knet_h, KNET_SUB_LINK,
	"Unable to resolve host: %u link: %u destination addr/port: %s",
	host_id, link_id, strerror(savederrno));
	} else {
	savederrno = EINVAL;
	log_warn(knet_h, KNET_SUB_LINK,
	"Unable to resolve host: %u link: %u destination addr/port: %s",
	host_id, link_id, gai_strerror(err));
	}
	err = -1;
	}


	- knet_h->transport_ops = get_udp_transport();
	+ switch (transport) {
	+ case KNET_TRANSPORT_UDP:
	+ knet_h->transport_ops[link->transport_type] = get_udp_transport();
	+ break;
	+ default:
	+ errno = EINVAL;
	+ err = -1;
	+ goto exit_unlock;
	+ }

	/* First time we've used this transport for this handle */
	- if (!knet_h->transport) {
	- knet_h->transport_ops->handle_allocate(knet_h, &knet_h->transport);
	+ if (!knet_h->transports[transport]) {
	+ knet_h->transport_ops[link->transport_type]->handle_allocate(knet_h, &knet_h->transports[transport]);
	}
	- if (!knet_h->transport) {
	+ if (!knet_h->transports[transport]) {
	savederrno = errno;
	log_err(knet_h, KNET_SUB_LISTENER, "Failed to allocate transport handle for %s: %s",
	- knet_h->transport_ops->transport_name,
	+ knet_h->transport_ops[link->transport_type]->transport_name,
	strerror(savederrno));
	err = -1;
	goto exit_unlock;
	}


	exit_unlock:
	if (!err) {
	link->configured = 1;
	link->pong_count = KNET_LINK_DEFAULT_PONG_COUNT;
	link->has_valid_mtu = 0;
	link->ping_interval = KNET_LINK_DEFAULT_PING_INTERVAL * 1000; /* microseconds */
	link->pong_timeout = KNET_LINK_DEFAULT_PING_TIMEOUT * 1000; /* microseconds */
	link->latency_fix = KNET_LINK_DEFAULT_PING_PRECISION;
	link->latency_exp = KNET_LINK_DEFAULT_PING_PRECISION - \
	((link->ping_interval * KNET_LINK_DEFAULT_PING_PRECISION) / 8000000);
	}
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_get_config(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	+ uint8_t *transport,
	struct sockaddr_storage *src_addr,
	struct sockaddr_storage *dst_addr,
	uint8_t *dynamic)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (!src_addr) {
	errno = EINVAL;
	return -1;
	}

	if (!dynamic) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	if ((link->dynamic == KNET_LINK_STATIC) && (!dst_addr)) {
	savederrno = EINVAL;
	err = -1;
	goto exit_unlock;
	}

	memmove(src_addr, &link->src_addr, sizeof(struct sockaddr_storage));

	+ if (transport) {
	+ *transport = link->transport_type;
	+ }
	+
	if (link->dynamic == KNET_LINK_STATIC) {
	*dynamic = 0;
	memmove(dst_addr, &link->dst_addr, sizeof(struct sockaddr_storage));
	} else {
	*dynamic = 1;
	}

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_set_enable(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	unsigned int enabled)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (enabled > 1) {
	errno = EINVAL;
	return -1;
	}

	/*
	* this read lock might appear as an API violation, but be
	* very careful because we cannot use a write lock (yet).
	* the _send_host_info requires threads to be operational.
	* a write lock here would deadlock.
	* a read lock is sufficient as all functions invoked by
	* this code are already thread safe.
	*/
	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	if (link->status.enabled == enabled) {
	err = 0;
	goto exit_unlock;
	}

	if (enabled) {
	- if (knet_h->transport_ops->link_allocate(
	- knet_h, knet_h->transport,
	+ if (knet_h->transport_ops[link->transport_type]->link_allocate(
	+ knet_h, knet_h->transports[link->transport_type],
	link,
	&link->transport, link_id,
	&link->src_addr, &link->dst_addr,
	&link->outsock) < 0) {
	err = -1;
	goto exit_unlock;
	}

	if (_listener_add(knet_h, host_id, link_id) < 0) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_LINK, "Unable to setup listener for this link");
	goto exit_unlock;
	}
	log_debug(knet_h, KNET_SUB_LINK, "host: %u link: %u is enabled",
	host_id, link_id);
	}

	if (!enabled) {
	struct knet_hostinfo knet_hostinfo;

	knet_hostinfo.khi_type = KNET_HOSTINFO_TYPE_LINK_UP_DOWN;
	knet_hostinfo.khi_bcast = KNET_HOSTINFO_UCAST;
	knet_hostinfo.khi_dst_node_id = host_id;
	knet_hostinfo.khip_link_status_link_id = link_id;
	knet_hostinfo.khip_link_status_status = KNET_HOSTINFO_LINK_STATUS_DOWN;
	_send_host_info(knet_h, &knet_hostinfo, KNET_HOSTINFO_LINK_STATUS_SIZE);
	}

	err = _link_updown(knet_h, host_id, link_id, enabled, link->status.connected);
	savederrno = errno;

	if ((!err) && (enabled)) {
	err = 0;
	goto exit_unlock;
	}

	if (err) {
	err = -1;
	goto exit_unlock;
	}

	err = _listener_remove(knet_h, host_id, link_id);
	savederrno = errno;

	if ((err) && (savederrno != EBUSY)) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to remove listener for this link");
	if (_link_updown(knet_h, host_id, link_id, 1, link->status.connected)) {
	/* force link status the hard way */
	link->status.enabled = 1;
	}
	log_debug(knet_h, KNET_SUB_LINK, "host: %u link: %u is NOT disabled",
	host_id, link_id);
	err = -1;
	goto exit_unlock;
	} else {
	err = 0;
	savederrno = 0;
	}

	log_debug(knet_h, KNET_SUB_LINK, "host: %u link: %u is disabled",
	host_id, link_id);
	link->host_info_up_sent = 0;

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_get_enable(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	unsigned int *enabled)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (!enabled) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	*enabled = link->status.enabled;

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_set_pong_count(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	uint8_t pong_count)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (pong_count < 1) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	link->pong_count = pong_count;

	log_debug(knet_h, KNET_SUB_LINK,
	"host: %u link: %u pong count update: %u",
	host_id, link_id, link->pong_count);

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_get_pong_count(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	uint8_t *pong_count)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (!pong_count) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	*pong_count = link->pong_count;

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_set_ping_timers(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	time_t interval, time_t timeout, unsigned int precision)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (!interval) {
	errno = EINVAL;
	return -1;
	}

	if (!timeout) {
	errno = EINVAL;
	return -1;
	}

	if (!precision) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	link->ping_interval = interval * 1000; /* microseconds */
	link->pong_timeout = timeout * 1000; /* microseconds */
	link->latency_fix = precision;
	link->latency_exp = precision - \
	((link->ping_interval * precision) / 8000000);

	log_debug(knet_h, KNET_SUB_LINK,
	"host: %u link: %u timeout update - interval: %llu timeout: %llu precision: %d",
	host_id, link_id, link->ping_interval, link->pong_timeout, precision);

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_get_ping_timers(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	time_t interval, time_t timeout, unsigned int *precision)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (!interval) {
	errno = EINVAL;
	return -1;
	}

	if (!timeout) {
	errno = EINVAL;
	return -1;
	}

	if (!precision) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	interval = link->ping_interval / 1000; / microseconds */
	*timeout = link->pong_timeout / 1000;
	*precision = link->latency_fix;

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_set_priority(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	uint8_t priority)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;
	uint8_t old_priority;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_wrlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	old_priority = link->priority;

	if (link->priority == priority) {
	err = 0;
	goto exit_unlock;
	}

	link->priority = priority;

	if (_host_dstcache_update_async(knet_h, host)) {
	savederrno = errno;
	log_debug(knet_h, KNET_SUB_LINK,
	"Unable to update link priority (host: %u link: %u priority: %u): %s",
	host_id, link_id, link->priority, strerror(savederrno));
	link->priority = old_priority;
	err = -1;
	goto exit_unlock;
	}

	log_debug(knet_h, KNET_SUB_LINK,
	"host: %u link: %u priority set to: %u",
	host_id, link_id, link->priority);

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_get_priority(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	uint8_t *priority)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (!priority) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	*priority = link->priority;

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_get_link_list(knet_handle_t knet_h, uint16_t host_id,
	uint8_t link_ids, size_t link_ids_entries)
	{
	int savederrno = 0, err = 0, i, count = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (!link_ids) {
	errno = EINVAL;
	return -1;
	}

	if (!link_ids_entries) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	for (i = 0; i < KNET_MAX_LINK; i++) {
	link = &host->link[i];
	if (!link->configured) {
	continue;
	}
	link_ids[count] = i;
	count++;
	}

	*link_ids_entries = count;

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}

	int knet_link_get_status(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id,
	struct knet_link_status *status)
	{
	int savederrno = 0, err = 0;
	struct knet_host *host;
	struct knet_link *link;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (link_id >= KNET_MAX_LINK) {
	errno = EINVAL;
	return -1;
	}

	if (!status) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LINK, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	host = knet_h->host_index[host_id];
	if (!host) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "Unable to find host %u: %s",
	host_id, strerror(savederrno));
	goto exit_unlock;
	}

	link = &host->link[link_id];

	if (!link->configured) {
	err = -1;
	savederrno = EINVAL;
	log_err(knet_h, KNET_SUB_LINK, "host %u link %u is not configured: %s",
	host_id, link_id, strerror(savederrno));
	goto exit_unlock;
	}

	memmove(status, &link->status, sizeof(struct knet_link_status));

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	errno = savederrno;
	return err;
	}
	diff --git a/libknet/listener.c b/libknet/listener.c
	index 7ed0bfe0..f766e5e6 100644
	--- a/libknet/listener.c
	+++ b/libknet/listener.c
	@@ -1,185 +1,185 @@
	/*
	* Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	* Federico Simoncelli <fsimon@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <unistd.h>
	#include <errno.h>
	#include <pthread.h>
	#include <sys/epoll.h>
	#include <string.h>
	#include <stdlib.h>

	#include "internals.h"
	#include "common.h"
	#include "logging.h"
	#include "listener.h"
	#include "transports.h"

	int _listener_add(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id)
	{
	int count = 0;
	int savederrno = 0, err = 0;
	struct knet_link *lnk = &knet_h->host_index[host_id]->link[link_id];
	struct knet_listener *listener = NULL;

	savederrno = pthread_rwlock_wrlock(&knet_h->listener_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LISTENER, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	listener = knet_h->listener_head;

	while (listener) {
	count++;
	log_debug(knet_h, KNET_SUB_LISTENER, "checking listener: %d", count);
	if (!memcmp(&lnk->src_addr, &listener->address, sizeof(struct sockaddr_storage))) {
	log_debug(knet_h, KNET_SUB_LISTENER, "found active listener");
	break;
	}
	listener = listener->next;
	}

	if (!listener) {
	listener = malloc(sizeof(struct knet_listener));
	if (!listener) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_LISTENER, "out of memory to allocate listener: %s",
	strerror(savederrno));
	goto exit_unlock;
	}

	memset(listener, 0, sizeof(struct knet_listener));
	memmove(&listener->address, &lnk->src_addr, sizeof(struct sockaddr_storage));
	- knet_h->transport_ops->link_listener_start(knet_h, lnk->transport, link_id,
	- &lnk->src_addr, &lnk->dst_addr);
	+ knet_h->transport_ops[lnk->transport_type]->link_listener_start(knet_h, lnk->transport, link_id,
	+ &lnk->src_addr, &lnk->dst_addr);

	/* pushing new host to the front */
	listener->next = knet_h->listener_head;
	knet_h->listener_head = listener;
	}
	lnk->listener_sock = listener->sock;

	exit_unlock:
	if ((err) && (listener)) {
	if (listener->sock >= 0) {
	close(listener->sock);
	}
	free(listener);
	listener = NULL;
	}

	pthread_rwlock_unlock(&knet_h->listener_rwlock);
	errno = savederrno;
	return err;
	}

	int _listener_remove(knet_handle_t knet_h, uint16_t host_id, uint8_t link_id)
	{
	int err = 0, savederrno = 0;
	int link_idx;
	struct epoll_event ev; /* kernel < 2.6.9 bug (see epoll_ctl man) */
	struct knet_host *host;
	struct knet_link *lnk = &knet_h->host_index[host_id]->link[link_id];
	struct knet_listener *tmp_listener;
	struct knet_listener *listener;
	int listener_cnt = 0;

	savederrno = pthread_rwlock_wrlock(&knet_h->listener_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_LISTENER, "Unable to get write lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	/* checking if listener is in use */
	for (host = knet_h->host_head; host != NULL; host = host->next) {
	for (link_idx = 0; link_idx < KNET_MAX_LINK; link_idx++) {
	if (host->link[link_idx].status.enabled != 1)
	continue;

	if (host->link[link_idx].listener_sock == lnk->listener_sock) {
	listener_cnt++;
	}
	}
	}

	if (listener_cnt) {
	lnk->listener_sock = 0;
	log_debug(knet_h, KNET_SUB_LISTENER, "listener_remove: listener still in use");
	savederrno = EBUSY;
	err = -1;
	goto exit_unlock;
	}

	listener = knet_h->listener_head;
	while (listener) {
	if (listener->sock == lnk->listener_sock)
	break;
	listener = listener->next;
	}

	/* TODO: use a doubly-linked list? */
	if (listener == knet_h->listener_head) {
	knet_h->listener_head = knet_h->listener_head->next;
	} else {
	for (tmp_listener = knet_h->listener_head; tmp_listener != NULL; tmp_listener = tmp_listener->next) {
	if (listener == tmp_listener->next) {
	tmp_listener->next = tmp_listener->next->next;
	break;
	}
	}
	}

	- knet_h->transport_ops->link_free(lnk->transport);
	+ knet_h->transport_ops[lnk->transport_type]->link_free(lnk->transport);
	lnk->transport = NULL;

	epoll_ctl(knet_h->recv_from_links_epollfd, EPOLL_CTL_DEL, listener->sock, &ev);
	close(listener->sock);
	free(listener);

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->listener_rwlock);

	errno = savederrno;
	return err;
	}

	#if 0
	void socket_debug(knet_handle_t knet_h, int sockfd)
	{
	struct sockaddr_storage sock;
	char host[KNET_MAX_HOST_LEN];
	char port[KNET_MAX_PORT_LEN];
	socklen_t socklen = sizeof(struct sockaddr_storage);
	int err;

	memset(&host, 0, KNET_MAX_HOST_LEN);
	memset(&port, 0, KNET_MAX_PORT_LEN);

	if (getsockname(sockfd, (struct sockaddr *)&sock, &socklen) < 0) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Unable to getsockname: %s", strerror(errno));
	} else {
	err = getnameinfo((const struct sockaddr *)&sock, sizeof(struct sockaddr_storage),
	(char )&host, KNET_MAX_HOST_LEN, (char )&port, KNET_MAX_PORT_LEN, NI_NUMERICHOST \| NI_NUMERICSERV);
	if (err) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Unable to getnameinfo: %d", err);
	} else {
	log_debug(knet_h, KNET_SUB_LINK_T, "Sock host: %s port: %s", host, port);
	}
	}

	return;
	}
	#endif
	diff --git a/libknet/tests/api_knet_host_remove.c b/libknet/tests/api_knet_host_remove.c
	index 1f7d23ed..82834bb5 100644
	--- a/libknet/tests/api_knet_host_remove.c
	+++ b/libknet/tests/api_knet_host_remove.c
	@@ -1,160 +1,160 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	uint16_t host_ids[KNET_MAX_HOST];
	size_t host_ids_entries;
	struct sockaddr_storage ss;

	printf("Test knet_host_add incorrect knet_h\n");

	if ((!knet_host_remove(NULL, 1)) \|\| (errno != EINVAL)) {
	printf("knet_host_remove accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_host_remove with unconfigured host_id\n");

	if ((!knet_host_remove(knet_h, 1)) \|\| (errno != EINVAL)) {
	printf("knet_host_remove accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_host_remove with configured host_id and links\n");

	memset(&ss, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.0", "50000", (struct sockaddr *)&ss, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert str to sockaddr: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	- if (knet_link_set_config(knet_h, 1, 0, &ss, NULL) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &ss, NULL) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_enable(knet_h, 1, 0, 1) < 0) {
	printf("Unable to enable link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_host_remove(knet_h, 1)) \|\| (errno != EBUSY)) {
	printf("knet_host_remove accepted invalid request to remove host with link enabled or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_enable(knet_h, 1, 0, 0) < 0) {
	printf("Unable to disable link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_host_remove with configured host_id (no links)\n");

	if (knet_host_remove(knet_h, 1) < 0) {
	printf("knet_host_remove didn't remove host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_host_get_host_list(knet_h, host_ids, &host_ids_entries) < 0) {
	printf("Unable to get host list: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (host_ids_entries) {
	printf("Too many hosts?\n");
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_get_config.c b/libknet/tests/api_knet_link_get_config.c
	index 258edaf1..694b9780 100644
	--- a/libknet/tests/api_knet_link_get_config.c
	+++ b/libknet/tests/api_knet_link_get_config.c
	@@ -1,262 +1,262 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst, get_src, get_dst;
	- uint8_t dynamic = 0;
	+ uint8_t dynamic = 0, transport = 0;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_get_config incorrect knet_h\n");

	memset(&get_src, 0, sizeof(struct sockaddr_storage));
	memset(&get_dst, 0, sizeof(struct sockaddr_storage));

	- if ((!knet_link_get_config(NULL, 1, 0, &get_src, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_get_config(NULL, 1, 0, &transport, &get_src, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_config accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_get_config with unconfigured host_id\n");

	memset(&get_src, 0, sizeof(struct sockaddr_storage));
	memset(&get_dst, 0, sizeof(struct sockaddr_storage));

	- if ((!knet_link_get_config(knet_h, 1, 0, &get_src, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_get_config(knet_h, 1, 0, &transport, &get_src, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_config accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_config with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	memset(&get_src, 0, sizeof(struct sockaddr_storage));
	memset(&get_dst, 0, sizeof(struct sockaddr_storage));

	- if ((!knet_link_get_config(knet_h, 1, KNET_MAX_LINK, &get_src, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_get_config(knet_h, 1, KNET_MAX_LINK, &transport, &get_src, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_config accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_config with incorrect src_addr\n");

	memset(&get_src, 0, sizeof(struct sockaddr_storage));
	memset(&get_dst, 0, sizeof(struct sockaddr_storage));

	- if ((!knet_link_get_config(knet_h, 1, 0, NULL, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_get_config(knet_h, 1, 0, &transport, NULL, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_config accepted invalid src_addr or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_config with incorrect dynamic\n");

	memset(&get_src, 0, sizeof(struct sockaddr_storage));
	memset(&get_dst, 0, sizeof(struct sockaddr_storage));

	- if ((!knet_link_get_config(knet_h, 1, 0, &get_src, &get_dst, NULL)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_get_config(knet_h, 1, 0, &transport, &get_src, &get_dst, NULL)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_config accepted invalid dynamic or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_config with unconfigured link\n");

	memset(&get_src, 0, sizeof(struct sockaddr_storage));
	memset(&get_dst, 0, sizeof(struct sockaddr_storage));

	- if ((!knet_link_get_config(knet_h, 1, 0, &get_src, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_get_config(knet_h, 1, 0, &transport, &get_src, &get_dst, &dynamic)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_config accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_config with incorrect dst_addr\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	memset(&get_src, 0, sizeof(struct sockaddr_storage));
	memset(&get_dst, 0, sizeof(struct sockaddr_storage));

	- if ((!knet_link_get_config(knet_h, 1, 0, &get_src, NULL, &dynamic)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_get_config(knet_h, 1, 0, &transport, &get_src, NULL, &dynamic)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_config accepted invalid dst_addr or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (dynamic) {
	printf("knet_link_get_config returned invalid dynamic status\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_config with correct parameters for static link\n");

	memset(&get_src, 0, sizeof(struct sockaddr_storage));
	memset(&get_dst, 0, sizeof(struct sockaddr_storage));

	- if (knet_link_get_config(knet_h, 1, 0, &get_src, &get_dst, &dynamic) < 0) {
	+ if (knet_link_get_config(knet_h, 1, 0, &transport, &get_src, &get_dst, &dynamic) < 0) {
	printf("knet_link_get_config failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((dynamic) \|\|
	(memcmp(&src, &get_src, sizeof(struct sockaddr_storage))) \|\|
	(memcmp(&dst, &get_dst, sizeof(struct sockaddr_storage)))) {
	printf("knet_link_get_config returned invalid data\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_config with correct parameters for dynamic link\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, NULL) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, NULL) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	memset(&get_src, 0, sizeof(struct sockaddr_storage));
	memset(&get_dst, 0, sizeof(struct sockaddr_storage));

	- if (knet_link_get_config(knet_h, 1, 0, &get_src, &get_dst, &dynamic) < 0) {
	+ if (knet_link_get_config(knet_h, 1, 0, &transport, &get_src, &get_dst, &dynamic) < 0) {
	printf("knet_link_get_config failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!dynamic) \|\|
	(memcmp(&src, &get_src, sizeof(struct sockaddr_storage)))) {
	printf("knet_link_get_config returned invalid data\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_get_enable.c b/libknet/tests/api_knet_link_get_enable.c
	index e0bb1c4d..076c8cb9 100644
	--- a/libknet/tests/api_knet_link_get_enable.c
	+++ b/libknet/tests/api_knet_link_get_enable.c
	@@ -1,199 +1,199 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;
	unsigned int enabled;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_get_enable incorrect knet_h\n");

	if ((!knet_link_get_enable(NULL, 1, 0, &enabled)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_enable accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_get_enable with unconfigured host_id\n");

	if ((!knet_link_get_enable(knet_h, 1, 0, &enabled)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_enable accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_enable with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_get_enable(knet_h, 1, KNET_MAX_LINK, &enabled)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_enable accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_enable with unconfigured link\n");

	if ((!knet_link_get_enable(knet_h, 1, 0, &enabled)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_enable accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_enable without enabled\n");

	if ((!knet_link_get_enable(knet_h, 1, 0, NULL)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_enable accepted NULL enabled or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_enable with disabled link\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_enable(knet_h, 1, 0, &enabled) < 0) {
	printf("knet_link_get_enable failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (enabled) {
	printf("knet_link_get_enable returned incorrect value");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_enable with enabled link\n");

	if (knet_link_set_enable(knet_h, 1, 0, 1) < 0) {
	printf("knet_link_get_enable failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_enable(knet_h, 1, 0, &enabled) < 0) {
	printf("knet_link_get_enable failed: %s\n", strerror(errno));
	knet_link_get_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (!enabled) {
	printf("knet_link_get_enable returned incorrect value");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_get_link_list.c b/libknet/tests/api_knet_link_get_link_list.c
	index 993941db..4901ff7f 100644
	--- a/libknet/tests/api_knet_link_get_link_list.c
	+++ b/libknet/tests/api_knet_link_get_link_list.c
	@@ -1,179 +1,179 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;
	uint8_t link_ids[KNET_MAX_LINK];
	size_t link_ids_entries = 0;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&link_ids, 1, sizeof(link_ids));

	printf("Test knet_link_get_link_list incorrect knet_h\n");

	if ((!knet_link_get_link_list(NULL, 1, link_ids, &link_ids_entries)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_link_list accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_get_link_list with unconfigured host_id\n");

	if ((!knet_link_get_link_list(knet_h, 1, link_ids, &link_ids_entries)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_link_list accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_link_list with incorrect link_id\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_get_link_list(knet_h, 1, NULL, &link_ids_entries)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_link_list accepted invalid link_ids or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_link_list with incorrect link_ids_entries\n");

	if ((!knet_link_get_link_list(knet_h, 1, link_ids, NULL)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_link_list accepted invalid link_ids_entries or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_link_list with no links\n");

	if (knet_link_get_link_list(knet_h, 1, link_ids, &link_ids_entries) < 0) {
	printf("knet_link_get_link_list failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (link_ids_entries != 0) {
	printf("knet_link_get_link_list returned incorrect number of links");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);

	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_link_list with 1 link\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_link_list(knet_h, 1, link_ids, &link_ids_entries) < 0) {
	printf("knet_link_get_link_list failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((link_ids_entries != 1) \|\| (link_ids[0] != 0)) {
	printf("knet_link_get_link_list returned incorrect values");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_get_ping_timers.c b/libknet/tests/api_knet_link_get_ping_timers.c
	index 746494ae..0d2d7deb 100644
	--- a/libknet/tests/api_knet_link_get_ping_timers.c
	+++ b/libknet/tests/api_knet_link_get_ping_timers.c
	@@ -1,197 +1,197 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;
	time_t interval = 0, timeout = 0;
	unsigned int precision = 0;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_get_ping_timers incorrect knet_h\n");

	if ((!knet_link_get_ping_timers(NULL, 1, 0, &interval, &timeout, &precision)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_ping_timers accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_get_ping_timers with unconfigured host_id\n");

	if ((!knet_link_get_ping_timers(knet_h, 1, 0, &interval, &timeout, &precision)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_ping_timers accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_ping_timers with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_get_ping_timers(knet_h, 1, KNET_MAX_LINK, &interval, &timeout, &precision)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_ping_timers accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_ping_timers with incorrect interval\n");

	if ((!knet_link_get_ping_timers(knet_h, 1, 0, NULL, &timeout, &precision)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_ping_timers accepted invalid interval or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_ping_timers with incorrect timeout\n");

	if ((!knet_link_get_ping_timers(knet_h, 1, 0, &interval, NULL, &precision)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_ping_timers accepted invalid timeout or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_ping_timers with incorrect interval\n");

	if ((!knet_link_get_ping_timers(knet_h, 1, 0, &interval, &timeout, NULL)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_ping_timers accepted invalid interval or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_ping_timers with unconfigured link\n");

	if ((!knet_link_get_ping_timers(knet_h, 1, 0, &interval, &timeout, &precision)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_ping_timers accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_ping_timers with correct values\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_ping_timers(knet_h, 1, 0, &interval, &timeout, &precision) < 0) {
	printf("knet_link_get_ping_timers failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("DEFAULT: int: %zu timeout: %zu prec: %u\n", interval, timeout, precision);

	if ((interval != KNET_LINK_DEFAULT_PING_INTERVAL) \|\|
	(timeout != KNET_LINK_DEFAULT_PING_TIMEOUT) \|\|
	(precision != KNET_LINK_DEFAULT_PING_PRECISION)) {
	printf("knet_link_get_ping_timers failed to set values\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_get_pong_count.c b/libknet/tests/api_knet_link_get_pong_count.c
	index 03149556..6faf0da8 100644
	--- a/libknet/tests/api_knet_link_get_pong_count.c
	+++ b/libknet/tests/api_knet_link_get_pong_count.c
	@@ -1,173 +1,173 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;
	uint8_t pong_count = 0;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_get_pong_count incorrect knet_h\n");

	if ((!knet_link_get_pong_count(NULL, 1, 0, &pong_count)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_pong_count accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_get_pong_count with unconfigured host_id\n");

	if ((!knet_link_get_pong_count(knet_h, 1, 0, &pong_count)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_pong_count accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_pong_count with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_get_pong_count(knet_h, 1, KNET_MAX_LINK, &pong_count)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_pong_count accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_pong_count with incorrect pong count\n");

	if ((!knet_link_get_pong_count(knet_h, 1, 0, NULL)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_pong_count accepted invalid pong count or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_pong_count with unconfigured link\n");

	if ((!knet_link_get_pong_count(knet_h, 1, 0, &pong_count)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_pong_count accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_pong_count with correct values\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_pong_count(knet_h, 1, 0, 3) < 0) {
	printf("knet_link_set_pong_count failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_pong_count(knet_h, 1, 0, &pong_count) < 0) {
	printf("knet_link_get_pong_count failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (pong_count != 3) {
	printf("knet_link_get_pong_count failed to get correct values\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_get_priority.c b/libknet/tests/api_knet_link_get_priority.c
	index 64bbc1a3..c85e5c07 100644
	--- a/libknet/tests/api_knet_link_get_priority.c
	+++ b/libknet/tests/api_knet_link_get_priority.c
	@@ -1,173 +1,173 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;
	uint8_t priority = 0;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_get_priority incorrect knet_h\n");

	if ((!knet_link_get_priority(NULL, 1, 0, &priority)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_priority accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_get_priority with unconfigured host_id\n");

	if ((!knet_link_get_priority(knet_h, 1, 0, &priority)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_priority accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_priority with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_get_priority(knet_h, 1, KNET_MAX_LINK, &priority)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_priority accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_priority with unconfigured link\n");

	if ((!knet_link_get_priority(knet_h, 1, 0, &priority)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_priority accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_priority with incorrect priority\n");

	if ((!knet_link_get_priority(knet_h, 1, 0, NULL)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_priority accepted incorrect priority or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_priority with correct values\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_priority(knet_h, 1, 0, 1) < 0) {
	printf("knet_link_set_priority failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_priority(knet_h, 1, 0, &priority) < 0) {
	printf("knet_link_get_priority failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (priority != 1) {
	printf("knet_link_get_priority failed to get correct values\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_get_status.c b/libknet/tests/api_knet_link_get_status.c
	index fc79d310..c85df92f 100644
	--- a/libknet/tests/api_knet_link_get_status.c
	+++ b/libknet/tests/api_knet_link_get_status.c
	@@ -1,159 +1,159 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;
	struct knet_link_status status;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_get_status incorrect knet_h\n");

	memset(&status, 0, sizeof(struct knet_link_status));

	if ((!knet_link_get_status(NULL, 1, 0, &status)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_status accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_get_status with unconfigured host_id\n");

	if ((!knet_link_get_status(knet_h, 1, 0, &status)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_status accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_status with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_get_status(knet_h, 1, KNET_MAX_LINK, &status)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_status accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_status with incorrect status\n");

	if ((!knet_link_get_status(knet_h, 1, 0, NULL)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_status accepted invalid status or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_status with unconfigured link\n");

	if ((!knet_link_get_status(knet_h, 1, 0, &status)) \|\| (errno != EINVAL)) {
	printf("knet_link_get_status accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_get_status with correct values\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_status(knet_h, 1, 0, &status) < 0) {
	printf("knet_link_get_status failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_set_config.c b/libknet/tests/api_knet_link_set_config.c
	index ca9ef43b..e0f3652e 100644
	--- a/libknet/tests/api_knet_link_set_config.c
	+++ b/libknet/tests/api_knet_link_set_config.c
	@@ -1,232 +1,232 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;
	struct knet_link_status link_status;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_set_config incorrect knet_h\n");

	- if ((!knet_link_set_config(NULL, 1, 0, &src, &dst)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_set_config(NULL, 1, 0, KNET_TRANSPORT_UDP, &src, &dst)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_config accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_set_config with unconfigured host_id\n");

	- if ((!knet_link_set_config(knet_h, 1, 0, &src, &dst)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_config accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_config with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	- if ((!knet_link_set_config(knet_h, 1, KNET_MAX_LINK, &src, &dst)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_set_config(knet_h, 1, KNET_MAX_LINK, KNET_TRANSPORT_UDP, &src, &dst)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_config accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_config with incorrect src_addr\n");

	- if ((!knet_link_set_config(knet_h, 1, 0, NULL, &dst)) \|\| (errno != EINVAL)) {
	+ if ((!knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, NULL, &dst)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_config accepted invalid src_addr or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_config with dynamic dst_addr\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, NULL) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, NULL) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_status(knet_h, 1, 0, &link_status) < 0) {
	printf("Unable to get link status: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((link_status.enabled != 0) \|\|
	(strcmp(link_status.src_ipaddr, "127.0.0.1")) \|\|
	(strcmp(link_status.src_port, "50000")) \|\|
	(knet_h->host_index[1]->link[0].dynamic != KNET_LINK_DYNIP)) {
	printf("knet_link_set_config failed to set configuration. enabled: %u src_addr %s src_port %s dynamic %u\n",
	link_status.enabled, link_status.src_ipaddr, link_status.src_port, knet_h->host_index[1]->link[0].dynamic);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_config with link enabled\n");

	if (knet_link_set_enable(knet_h, 1, 0, 1) < 0) {
	printf("Unable to enable link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_status(knet_h, 1, 0, &link_status) < 0) {
	printf("Unable to get link status: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	- if ((!knet_link_set_config(knet_h, 1, 0, &src, NULL)) \|\| (errno != EBUSY)) {
	+ if ((!knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, NULL)) \|\| (errno != EBUSY)) {
	printf("knet_link_set_config accepted request while link enabled or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_enable(knet_h, 1, 0, 0) < 0) {
	printf("Unable to disable link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_set_config with static dst_addr\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_get_status(knet_h, 1, 0, &link_status) < 0) {
	printf("Unable to get link status: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((link_status.enabled != 0) \|\|
	(strcmp(link_status.src_ipaddr, "127.0.0.1")) \|\|
	(strcmp(link_status.src_port, "50000")) \|\|
	(strcmp(link_status.dst_ipaddr, "127.0.0.1")) \|\|
	(strcmp(link_status.dst_port, "50001")) \|\|
	(knet_h->host_index[1]->link[0].dynamic != KNET_LINK_STATIC)) {
	printf("knet_link_set_config failed to set configuration. enabled: %u src_addr %s src_port %s dst_addr %s dst_port %s dynamic %u\n",
	link_status.enabled, link_status.src_ipaddr, link_status.src_port, link_status.dst_ipaddr, link_status.dst_port, knet_h->host_index[1]->link[0].dynamic);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_set_enable.c b/libknet/tests/api_knet_link_set_enable.c
	index 3a1a4461..a83e6182 100644
	--- a/libknet/tests/api_knet_link_set_enable.c
	+++ b/libknet/tests/api_knet_link_set_enable.c
	@@ -1,186 +1,186 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_set_enable incorrect knet_h\n");

	if ((!knet_link_set_enable(NULL, 1, 0, 1)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_enable accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_set_enable with unconfigured host_id\n");

	if ((!knet_link_set_enable(knet_h, 1, 0, 1)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_enable accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_enable with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_set_enable(knet_h, 1, KNET_MAX_LINK, 1)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_enable accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_enable with unconfigured link\n");

	if ((!knet_link_set_enable(knet_h, 1, 0, 1)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_enable accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_enable with incorrect values\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_set_enable(knet_h, 1, 0, 2)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_enable accepted incorrect value for enabled or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_enable with correct values (1)\n");

	if (knet_link_set_enable(knet_h, 1, 0, 1) < 0) {
	printf("knet_link_set_enable failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_h->host_index[1]->link[0].status.enabled != 1) {
	printf("knet_link_set_enable failed to set correct values\n");
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_set_enable with correct values (0)\n");

	if (knet_link_set_enable(knet_h, 1, 0, 0) < 0) {
	printf("knet_link_set_enable failed: %s\n", strerror(errno));
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_h->host_index[1]->link[0].status.enabled != 0) {
	printf("knet_link_set_enable failed to set correct values\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_set_ping_timers.c b/libknet/tests/api_knet_link_set_ping_timers.c
	index 133abff7..77bccb75 100644
	--- a/libknet/tests/api_knet_link_set_ping_timers.c
	+++ b/libknet/tests/api_knet_link_set_ping_timers.c
	@@ -1,193 +1,193 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_set_ping_timers incorrect knet_h\n");

	if ((!knet_link_set_ping_timers(NULL, 1, 0, 1000, 2000, 2048)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_ping_timers accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_set_ping_timers with unconfigured host_id\n");

	if ((!knet_link_set_ping_timers(knet_h, 1, 0, 1000, 2000, 2048)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_ping_timers accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_ping_timers with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_set_ping_timers(knet_h, 1, KNET_MAX_LINK, 1000, 2000, 2048)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_ping_timers accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_ping_timers with incorrect interval\n");

	if ((!knet_link_set_ping_timers(knet_h, 1, 0, 0, 2000, 2048)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_ping_timers accepted invalid interval or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_ping_timers with incorrect timeout\n");

	if ((!knet_link_set_ping_timers(knet_h, 1, 0, 1000, 0, 2048)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_ping_timers accepted invalid timeout or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_ping_timers with incorrect interval\n");

	if ((!knet_link_set_ping_timers(knet_h, 1, 0, 1000, 2000, 0)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_ping_timers accepted invalid interval or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_ping_timers with unconfigured link\n");

	if ((!knet_link_set_ping_timers(knet_h, 1, 0, 1000, 2000, 2048)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_ping_timers accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_ping_timers with correct values\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_ping_timers(knet_h, 1, 0, 1000, 2000, 2048) < 0) {
	printf("knet_link_set_ping_timers failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((knet_h->host_index[1]->link[0].ping_interval != 1000000) \|\|
	(knet_h->host_index[1]->link[0].pong_timeout != 2000000) \|\|
	(knet_h->host_index[1]->link[0].latency_fix != 2048)) {
	printf("knet_link_set_ping_timers failed to set values\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_set_pong_count.c b/libknet/tests/api_knet_link_set_pong_count.c
	index 968f20e7..0929b458 100644
	--- a/libknet/tests/api_knet_link_set_pong_count.c
	+++ b/libknet/tests/api_knet_link_set_pong_count.c
	@@ -1,163 +1,163 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_set_pong_count incorrect knet_h\n");

	if ((!knet_link_set_pong_count(NULL, 1, 0, 2)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_pong_count accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_set_pong_count with unconfigured host_id\n");

	if ((!knet_link_set_pong_count(knet_h, 1, 0, 2)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_pong_count accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_pong_count with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_set_pong_count(knet_h, 1, KNET_MAX_LINK, 2)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_pong_count accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_pong_count with incorrect pong count\n");

	if ((!knet_link_set_pong_count(knet_h, 1, 0, 0)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_pong_count accepted invalid pong count or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_pong_count with unconfigured link\n");

	if ((!knet_link_set_pong_count(knet_h, 1, 0, 2)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_pong_count accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_pong_count with correct values\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_pong_count(knet_h, 1, 0, 3) < 0) {
	printf("knet_link_set_pong_count failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_h->host_index[1]->link[0].pong_count != 3) {
	printf("knet_link_set_pong_count failed to set correct values\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_link_set_priority.c b/libknet/tests/api_knet_link_set_priority.c
	index 5179a9a9..83ebf36b 100644
	--- a/libknet/tests/api_knet_link_set_priority.c
	+++ b/libknet/tests/api_knet_link_set_priority.c
	@@ -1,150 +1,150 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "link.h"
	#include "netutils.h"
	#include "test-common.h"

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	struct sockaddr_storage src, dst;

	memset(&src, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&src, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert src to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(&dst, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50001", (struct sockaddr *)&dst, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert dst to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	printf("Test knet_link_set_priority incorrect knet_h\n");

	if ((!knet_link_set_priority(NULL, 1, 0, 1)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_priority accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_link_set_priority with unconfigured host_id\n");

	if ((!knet_link_set_priority(knet_h, 1, 0, 1)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_priority accepted invalid host_id or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_priority with incorrect linkid\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("Unable to add host_id 1: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((!knet_link_set_priority(knet_h, 1, KNET_MAX_LINK, 2)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_priority accepted invalid linkid or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_priority with unconfigured link\n");

	if ((!knet_link_set_priority(knet_h, 1, 0, 1)) \|\| (errno != EINVAL)) {
	printf("knet_link_set_priority accepted unconfigured link or returned incorrect error: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_link_set_priority with correct values\n");

	- if (knet_link_set_config(knet_h, 1, 0, &src, &dst) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &src, &dst) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_priority(knet_h, 1, 0, 3) < 0) {
	printf("knet_link_set_priority failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_h->host_index[1]->link[0].priority != 3) {
	printf("knet_link_set_priority failed to set correct values\n");
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_send.c b/libknet/tests/api_knet_send.c
	index 081718dd..da64d83d 100644
	--- a/libknet/tests/api_knet_send.c
	+++ b/libknet/tests/api_knet_send.c
	@@ -1,287 +1,287 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "netutils.h"
	#include "test-common.h"

	static int private_data;

	static void sock_notify(void *pvt_data,
	int datafd,
	int8_t channel,
	uint8_t tx_rx,
	int error,
	int errorno)
	{
	return;
	}

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	int datafd = 0;
	int8_t channel = 0;
	char send_buff[KNET_MAX_PACKET_SIZE];
	char recv_buff[KNET_MAX_PACKET_SIZE];
	ssize_t send_len = 0, recv_len = 0;
	struct sockaddr_storage lo;

	memset(&lo, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&lo, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert loopback to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(send_buff, 0, sizeof(send_buff));

	printf("Test knet_send incorrect knet_h\n");

	if ((!knet_send(NULL, send_buff, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_send with no send_buff\n");

	if ((!knet_send(knet_h, NULL, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send accepted invalid send_buff or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send with invalid send_buff len (0)\n");

	if ((!knet_send(knet_h, send_buff, 0, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send accepted invalid send_buff len (0) or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send with invalid send_buff len (> KNET_MAX_PACKET_SIZE)\n");

	if ((!knet_send(knet_h, send_buff, KNET_MAX_PACKET_SIZE + 1, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send accepted invalid send_buff len (> KNET_MAX_PACKET_SIZE) or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send with invalid channel (-1)\n");

	channel = -1;

	if ((!knet_send(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send accepted invalid channel (-1) or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send with invalid channel (KNET_DATAFD_MAX)\n");

	channel = KNET_DATAFD_MAX;

	if ((!knet_send(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send accepted invalid channel (KNET_DATAFD_MAX) or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send with unconfigured channel\n");

	channel = 0;

	if ((!knet_send(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send accepted invalid unconfigured channel or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send with valid data\n");

	if (knet_handle_enable_sock_notify(knet_h, &private_data, sock_notify) < 0) {
	printf("knet_handle_enable_sock_notify failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	datafd = 0;
	channel = -1;

	if (knet_handle_add_datafd(knet_h, &datafd, &channel) < 0) {
	printf("knet_handle_add_datafd failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (is_helgrind()) {
	goto dont_wait_helgrind;
	}

	if (knet_host_add(knet_h, 1) < 0) {
	printf("knet_host_add failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	- if (knet_link_set_config(knet_h, 1, 0, &lo, &lo) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &lo, &lo) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_enable(knet_h, 1, 0, 1) < 0) {
	printf("knet_link_set_enable failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_handle_setfwd(knet_h, 1) < 0) {
	printf("knet_handle_setfwd failed: %s\n", strerror(errno));
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	while(knet_h->host_index[1]->status.reachable != 1) {
	printf("waiting host to be reachable\n");
	sleep(1);
	}

	dont_wait_helgrind:

	send_len = knet_send(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel);
	if (send_len <= 0) {
	printf("knet_send failed: %s\n", strerror(errno));
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (send_len != sizeof(send_buff)) {
	printf("knet_send sent only %zu bytes: %s\n", send_len, strerror(errno));
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	if (is_helgrind()) {
	goto no_helgrind;
	}

	sleep(1);

	recv_len = knet_recv(knet_h, recv_buff, KNET_MAX_PACKET_SIZE, channel);
	if (recv_len != send_len) {
	printf("knet_recv received only %zu bytes: %s\n", recv_len, strerror(errno));
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (memcmp(recv_buff, send_buff, KNET_MAX_PACKET_SIZE)) {
	printf("recv and send buffers are different!\n");
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	no_helgrind:

	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/api_knet_send_sync.c b/libknet/tests/api_knet_send_sync.c
	index bab9df6d..be41881a 100644
	--- a/libknet/tests/api_knet_send_sync.c
	+++ b/libknet/tests/api_knet_send_sync.c
	@@ -1,397 +1,397 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>

	#include "libknet.h"

	#include "internals.h"
	#include "netutils.h"
	#include "test-common.h"

	static int private_data;

	static void sock_notify(void *pvt_data,
	int datafd,
	int8_t channel,
	uint8_t tx_rx,
	int error,
	int errorno)
	{
	return;
	}

	static int dhost_filter_ret = 0;

	static int dhost_filter(void *pvt_data,
	const unsigned char *outdata,
	ssize_t outdata_len,
	uint8_t tx_rx,
	uint16_t this_host_id,
	uint16_t src_host_id,
	int8_t *dst_channel,
	uint16_t *dst_host_ids,
	size_t *dst_host_ids_entries)
	{
	dst_host_ids[0] = 0;

	/*
	* fatal fault
	*/
	if (dhost_filter_ret < 0) {
	return -1;
	}

	/*
	* trigger EINVAL
	* no ids found
	*/
	if (dhost_filter_ret == 0) {
	*dst_host_ids_entries = 0;
	return 0;
	}

	/*
	* send correct info back
	*/

	if (dhost_filter_ret == 1) {
	dst_host_ids[0] = 1;
	*dst_host_ids_entries = 1;
	return 0;
	}

	/*
	* trigger E2BIG
	* mcast destinations
	*/
	if (dhost_filter_ret == 2) {
	dst_host_ids[0] = 1;
	*dst_host_ids_entries = 2;
	return 0;
	}

	/*
	* return mcast
	*/
	if (dhost_filter_ret == 3) {
	return 1;
	}

	return dhost_filter_ret;
	}

	static void test(void)
	{
	knet_handle_t knet_h;
	int logfds[2];
	int datafd = 0;
	int8_t channel = 0;
	char send_buff[KNET_MAX_PACKET_SIZE];
	struct sockaddr_storage lo;

	memset(&lo, 0, sizeof(struct sockaddr_storage));

	if (strtoaddr("127.0.0.1", "50000", (struct sockaddr *)&lo, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert loopback to sockaddr: %s\n", strerror(errno));
	exit(FAIL);
	}

	memset(send_buff, 0, sizeof(send_buff));

	printf("Test knet_send_sync incorrect knet_h\n");

	if ((!knet_send_sync(NULL, send_buff, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send_sync accepted invalid knet_h or returned incorrect error: %s\n", strerror(errno));
	exit(FAIL);
	}

	setup_logpipes(logfds);

	knet_h = knet_handle_new(1, logfds[1], KNET_LOG_DEBUG);

	if (!knet_h) {
	printf("knet_handle_new failed: %s\n", strerror(errno));
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	printf("Test knet_send_sync with no send_buff\n");

	if ((!knet_send_sync(knet_h, NULL, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send_sync accepted invalid send_buff or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with invalid send_buff len (0)\n");

	if ((!knet_send_sync(knet_h, send_buff, 0, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send_sync accepted invalid send_buff len (0) or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with invalid send_buff len (> KNET_MAX_PACKET_SIZE)\n");

	if ((!knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE + 1, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send_sync accepted invalid send_buff len (> KNET_MAX_PACKET_SIZE) or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with invalid channel (-1)\n");

	channel = -1;

	if ((!knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send_sync accepted invalid channel (-1) or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with invalid channel (KNET_DATAFD_MAX)\n");

	channel = KNET_DATAFD_MAX;

	if ((!knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send_sync accepted invalid channel (KNET_DATAFD_MAX) or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with unconfigured channel\n");

	channel = 0;

	if ((!knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel)) \|\| (errno != EINVAL)) {
	printf("knet_send_sync accepted invalid unconfigured channel or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with data forwarding disabled\n");

	if (knet_handle_enable_sock_notify(knet_h, &private_data, sock_notify) < 0) {
	printf("knet_handle_enable_sock_notify failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	datafd = 0;
	channel = -1;

	if (knet_handle_add_datafd(knet_h, &datafd, &channel) < 0) {
	printf("knet_handle_add_datafd failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if ((knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel) == sizeof(send_buff)) \|\| (errno != ECANCELED)) {
	printf("knet_send_sync didn't detect datafwd disabled or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with broken dst_host_filter\n");

	if (knet_handle_setfwd(knet_h, 1) < 0) {
	printf("knet_handle_setfwd failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_handle_enable_filter(knet_h, NULL, dhost_filter) < 0) {
	printf("knet_handle_enable_filter failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	dhost_filter_ret = -1;

	if ((knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel) == sizeof(send_buff)) \|\| (errno != EFAULT)) {
	printf("knet_send_sync didn't detect fatal error from dst_host_filter or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with dst_host_filter returning no host_ids_entries\n");

	dhost_filter_ret = 0;

	if ((knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel) == sizeof(send_buff)) \|\| (errno != EINVAL)) {
	printf("knet_send_sync didn't detect 0 host_ids from dst_host_filter or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with host down\n");

	dhost_filter_ret = 1;

	if ((knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel) == sizeof(send_buff)) \|\| (errno != EHOSTDOWN)) {
	printf("knet_send_sync didn't detect hostdown or returned incorrect error: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with dst_host_filter returning too many host_ids_entries\n");

	if (knet_host_add(knet_h, 1) < 0) {
	printf("knet_host_add failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	- if (knet_link_set_config(knet_h, 1, 0, &lo, &lo) < 0) {
	+ if (knet_link_set_config(knet_h, 1, 0, KNET_TRANSPORT_UDP, &lo, &lo) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (knet_link_set_enable(knet_h, 1, 0, 1) < 0) {
	printf("knet_link_set_enable failed: %s\n", strerror(errno));
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	if (is_helgrind()) {
	goto no_helgrind;
	}

	while(knet_h->host_index[1]->status.reachable != 1) {
	printf("waiting host to be reachable\n");
	sleep(1);
	}

	dhost_filter_ret = 2;

	if ((knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel) == sizeof(send_buff)) \|\| (errno != E2BIG)) {
	printf("knet_send_sync didn't detect 2+ host_ids from dst_host_filter or returned incorrect error: %s\n", strerror(errno));
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with dst_host_filter returning mcast packets\n");

	dhost_filter_ret = 3;

	if ((knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel) == sizeof(send_buff)) \|\| (errno != E2BIG)) {
	printf("knet_send_sync didn't detect mcast packet from dst_host_filter or returned incorrect error: %s\n", strerror(errno));
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	printf("Test knet_send_sync with valid data\n");

	dhost_filter_ret = 1;

	if (knet_send_sync(knet_h, send_buff, KNET_MAX_PACKET_SIZE, channel) < 0) {
	printf("knet_send_sync failed: %d %s\n", errno, strerror(errno));
	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	exit(FAIL);
	}

	flush_logs(logfds[0], stdout);

	no_helgrind:

	knet_link_set_enable(knet_h, 1, 0, 0);
	knet_host_remove(knet_h, 1);
	knet_handle_free(knet_h);
	flush_logs(logfds[0], stdout);
	close_logpipes(logfds);
	}

	int main(int argc, char *argv[])
	{
	need_root();

	test();

	return PASS;
	}
	diff --git a/libknet/tests/knet_bench.c b/libknet/tests/knet_bench.c
	index 433d4d53..3b735761 100644
	--- a/libknet/tests/knet_bench.c
	+++ b/libknet/tests/knet_bench.c
	@@ -1,632 +1,649 @@
	/*
	* Copyright (C) 2016 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <errno.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>
	#include <signal.h>
	#include <pthread.h>

	#include "libknet.h"

	#include "internals.h"
	#include "netutils.h"
	#include "test-common.h"

	#define MAX_NODES 128

	static int senderid = -1;
	static knet_handle_t knet_h;
	static int datafd = 0;
	static int8_t channel = 0;
	static int globallistener = 0;
	static int continous = 0;
	static struct sockaddr_storage allv4;
	static struct sockaddr_storage allv6;
	static int broadcast_test = 1;
	static pthread_t rx_thread = NULL;
	static char *rx_buf[PCKT_FRAG_MAX];

	#define TEST_PING 0
	#define TEST_PING_AND_DATA 1
	#define TEST_PERF 2

	static int test_type = TEST_PING;

	struct node {
	int nodeid;
	int links;
	struct sockaddr_storage address[KNET_MAX_LINK];
	};

	static void print_help(void)
	{
	printf("knet_bench usage:\n");
	printf(" -h print this help (no really)\n");
	printf(" -d enable debug logs (default INFO)\n");
	printf(" -c [implementation]:[crypto]:[hashing] crypto configuration. (default disabled)\n");
	printf(" Example: -c nss:aes128:sha1\n");
	printf(" -p [active\|passive\|rr] (default: passive)\n");
	+ printf(" -P [udp\|sctp\|tcp] (default: udp) protocol (transport) to use\n");
	printf(" -t [nodeid] This nodeid (required)\n");
	printf(" -n [nodeid],[link1_ip_addr],[link2_..] Other nodes information (at least one required)\n");
	printf(" Example: -t 1,192.168.8.1,3ffe::8:1,..\n");
	printf(" can be repeated up to %d and should contain also the localnode info\n", MAX_NODES);
	printf(" -b [port] baseport (default: 50000)\n");
	printf(" -l enable global listener on 0.0.0.0/:: (default: off, incompatible with -o)\n");
	printf(" -o enable baseport offset per nodeid\n");
	printf(" -w dont wait for all nodes to be up before starting the test (default: wait)\n");
	printf(" -T [ping\|ping_data\|perf] test type (default: ping)\n");
	printf(" ping: will wait for all hosts to join the knet network, sleep 5 seconds and quit\n");
	printf(" ping_data: will wait for all hosts to join the knet network, sends some data to all nodes and quit\n");
	printf(" perf: will wait for all hosts to join the knet network, perform a series of benchmarks and quit\n");
	printf(" -s nodeid that will generate traffic for benchmarks\n");
	printf(" -C repeat the test continously (default: off)\n");
	}

	static void parse_nodes(char nodesinfo[MAX_NODES], int onidx, int port, struct node nodes[MAX_NODES], int thisnodeid, int thisidx)
	{
	int i;
	char *temp = NULL;
	char port_str[10];

	memset(port_str, 0, sizeof(port_str));
	sprintf(port_str, "%d", port);

	for (i = 0; i < onidx; i++) {
	nodes[i].nodeid = atoi(strtok(nodesinfo[i], ","));
	if ((nodes[i].nodeid < 0) \|\| (nodes[i].nodeid > KNET_MAX_HOST)) {
	printf("Invalid nodeid: %d (0 - %d)\n", nodes[i].nodeid, KNET_MAX_HOST);
	exit(FAIL);
	}
	if (thisnodeid == nodes[i].nodeid) {
	*thisidx = i;
	}
	while((temp = strtok(NULL, ","))) {
	if (nodes[i].links == KNET_MAX_LINK) {
	printf("Too many links configured. Max %d\n", KNET_MAX_LINK);
	exit(FAIL);
	}
	if (strtoaddr(temp, port_str,
	(struct sockaddr *)&nodes[i].address[nodes[i].links],
	sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert %s to sockaddress\n", temp);
	exit(FAIL);
	}
	nodes[i].links++;
	}
	}

	if (strtoaddr("0.0.0.0", port_str, (struct sockaddr *)&allv4, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert 0.0.0.0 to sockaddress\n");
	exit(FAIL);
	}

	if (strtoaddr("::", port_str, (struct sockaddr *)&allv6, sizeof(struct sockaddr_storage)) < 0) {
	printf("Unable to convert :: to sockaddress\n");
	exit(FAIL);
	}

	for (i = 1; i < onidx; i++) {
	if (nodes[0].links != nodes[i].links) {
	printf("knet_bench does not support unbalanced link configuration\n");
	exit(FAIL);
	}
	}

	return;
	}

	static int private_data;

	static void sock_notify(void *pvt_data,
	int local_datafd,
	int8_t local_channel,
	uint8_t tx_rx,
	int error,
	int errorno)
	{
	printf("Error (%d - %d - %s) from socket: %d\n", error, errorno, strerror(errno), local_datafd);
	return;
	}

	static void setup_knet(int argc, char *argv[])
	{
	int logfd;
	int rv;
	- char cryptocfg = NULL, policystr = NULL;
	+ char cryptocfg = NULL, policystr = NULL, *protostr = NULL;
	char *othernodeinfo[MAX_NODES];
	struct node nodes[MAX_NODES];
	int thisnodeid = -1;
	int thisidx = -1;
	int onidx = 0;
	int debug = KNET_LOG_INFO;
	int port = 50000, portoffset = 0;
	int thisport = 0, otherport = 0;
	int thisnewport = 0, othernewport = 0;
	struct sockaddr_in *so_in;
	struct sockaddr_in6 *so_in6;
	struct sockaddr_storage *src;
	int i, link_idx, allnodesup = 0;
	int policy = KNET_LINK_POLICY_PASSIVE, policyfound = 0;
	+ int protocol = KNET_TRANSPORT_UDP, protofound = 0;
	int wait = 1;
	struct knet_handle_crypto_cfg knet_handle_crypto_cfg;
	char cryptomodel = NULL, cryptotype = NULL, *cryptohash = NULL;

	memset(nodes, 0, sizeof(nodes));

	optind = 0;
	- while ((rv = getopt(argc, argv, "CT:s:ldowb:t:n:c:p:h")) != EOF) {
	+ while ((rv = getopt(argc, argv, "CT:s:ldowb:t:n:c:p:P:h")) != EOF) {
	switch(rv) {
	case 'h':
	print_help();
	exit(PASS);
	break;
	case 'd':
	debug = KNET_LOG_DEBUG;
	break;
	case 'c':
	if (cryptocfg) {
	printf("Error: -c can only be specified once\n");
	exit(FAIL);
	}
	cryptocfg = optarg;
	break;
	case 'p':
	if (policystr) {
	printf("Error: -p can only be specified once\n");
	exit(FAIL);
	}
	policystr = optarg;
	if (!strcmp(policystr, "active")) {
	policy = KNET_LINK_POLICY_ACTIVE;
	policyfound = 1;
	}
	if (!strcmp(policystr, "rr")) {
	policy = KNET_LINK_POLICY_RR;
	policyfound = 1;
	}
	if (!strcmp(policystr, "passive")) {
	policy = KNET_LINK_POLICY_PASSIVE;
	policyfound = 1;
	}
	if (!policyfound) {
	printf("Error: invalid policy %s specified. -p accepts active\|passive\|rr\n", policystr);
	exit(FAIL);
	}
	break;
	+ case 'P':
	+ if (protostr) {
	+ printf("Error: -P can only be specified once\n");
	+ exit(FAIL);
	+ }
	+ protostr = optarg;
	+ if (!strcmp(protostr, "udp")) {
	+ protocol = KNET_TRANSPORT_UDP;
	+ protofound = 1;
	+ }
	+ if (!protofound) {
	+ printf("Error: invalid protocol %s specified. -P accepts udp\n", policystr);
	+ exit(FAIL);
	+ }
	+ break;
	case 't':
	if (thisnodeid >= 0) {
	printf("Error: -t can only be specified once\n");
	exit(FAIL);
	}
	thisnodeid = atoi(optarg);
	if ((thisnodeid < 0) \|\| (thisnodeid > 65536)) {
	printf("Error: -t nodeid out of range %d (1 - 65536)\n", thisnodeid);
	exit(FAIL);
	}
	break;
	case 'n':
	if (onidx == MAX_NODES) {
	printf("Error: too many other nodes. Max %d\n", MAX_NODES);
	exit(FAIL);
	}
	othernodeinfo[onidx] = optarg;
	onidx++;
	break;
	case 'b':
	port = atoi(optarg);
	if ((port < 1) \|\| (port > 65536)) {
	printf("Error: port %d out of range (1 - 65536)\n", port);
	exit(FAIL);
	}
	case 'o':
	if (globallistener) {
	printf("Error: -l cannot be used with -o\n");
	exit(FAIL);
	}
	portoffset = 1;
	break;
	case 'l':
	if (portoffset) {
	printf("Error: -o cannot be used with -l\n");
	exit(FAIL);
	}
	globallistener = 1;
	break;
	case 'w':
	wait = 0;
	break;
	case 's':
	if (senderid >= 0) {
	printf("Error: -s can only be specified once\n");
	exit(FAIL);
	}
	senderid = atoi(optarg);
	if ((senderid < 0) \|\| (senderid > 65536)) {
	printf("Error: -s nodeid out of range %d (1 - 65536)\n", senderid);
	exit(FAIL);
	}
	break;
	case 'T':
	if (!strcmp("ping", optarg)) {
	test_type = TEST_PING;
	}
	if (!strcmp("ping_data", optarg)) {
	test_type = TEST_PING_AND_DATA;
	}
	if (!strcmp("perf", optarg)) {
	test_type = TEST_PERF;
	}
	break;
	case 'C':
	continous = 1;
	break;
	default:
	break;
	}
	}

	if (thisnodeid < 0) {
	printf("Who am I?!? missing -t from command line?\n");
	exit(FAIL);
	}

	if (onidx < 1) {
	printf("no other nodes configured?!? missing -n from command line\n");
	exit(FAIL);
	}

	parse_nodes(othernodeinfo, onidx, port, nodes, thisnodeid, &thisidx);

	if (thisidx < 0) {
	printf("no config for this node found\n");
	exit(FAIL);
	}

	if (senderid >= 0) {
	for (i=0; i < onidx; i++) {
	if (senderid == nodes[i].nodeid) {
	break;
	}
	}
	if (i == onidx) {
	printf("Unable to find senderid in nodelist\n");
	exit(FAIL);
	}
	}

	if ((test_type == TEST_PERF) && (senderid < 0)) {
	printf("Error: performance test requires -s to be set (for now)\n");
	exit(FAIL);
	}

	logfd = start_logging(stdout);

	knet_h = knet_handle_new(thisnodeid, logfd, debug);
	if (!knet_h) {
	printf("Unable to knet_handle_new: %s\n", strerror(errno));
	exit(FAIL);
	}

	if (cryptocfg) {
	memset(&knet_handle_crypto_cfg, 0, sizeof(knet_handle_crypto_cfg));
	cryptomodel = strtok(cryptocfg, ":");
	cryptotype = strtok(NULL, ":");
	cryptohash = strtok(NULL, ":");
	if (cryptomodel) {
	strncpy(knet_handle_crypto_cfg.crypto_model, cryptomodel, sizeof(knet_handle_crypto_cfg.crypto_model) - 1);
	}
	if (cryptotype) {
	strncpy(knet_handle_crypto_cfg.crypto_cipher_type, cryptotype, sizeof(knet_handle_crypto_cfg.crypto_cipher_type) - 1);
	}
	if (cryptohash) {
	strncpy(knet_handle_crypto_cfg.crypto_hash_type, cryptohash, sizeof(knet_handle_crypto_cfg.crypto_hash_type) - 1);
	}
	knet_handle_crypto_cfg.private_key_len = KNET_MAX_KEY_LEN;
	if (knet_handle_crypto(knet_h, &knet_handle_crypto_cfg)) {
	printf("Unable to init crypto\n");
	exit(FAIL);
	}
	}

	if (knet_handle_enable_sock_notify(knet_h, &private_data, sock_notify) < 0) {
	printf("knet_handle_enable_sock_notify failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	exit(FAIL);
	}

	datafd = 0;
	channel = -1;

	if (knet_handle_add_datafd(knet_h, &datafd, &channel) < 0) {
	printf("knet_handle_add_datafd failed: %s\n", strerror(errno));
	knet_handle_free(knet_h);
	exit(FAIL);
	}

	for (i=0; i < onidx; i++) {
	if (i == thisidx) {
	continue;
	}

	if (knet_host_add(knet_h, nodes[i].nodeid) < 0) {
	printf("knet_host_add failed: %s\n", strerror(errno));
	exit(FAIL);
	}

	if (knet_host_set_policy(knet_h, nodes[i].nodeid, policy) < 0) {
	printf("knet_host_set_policy failed: %s\n", strerror(errno));
	exit(FAIL);
	}

	for (link_idx = 0; link_idx < nodes[i].links; link_idx++) {
	if (portoffset) {
	if (nodes[thisidx].address[link_idx].ss_family == AF_INET) {
	so_in = (struct sockaddr_in *)&nodes[thisidx].address[link_idx];
	thisport = ntohs(so_in->sin_port);
	thisnewport = thisport + nodes[i].nodeid;
	so_in->sin_port = (htons(thisnewport));
	so_in = (struct sockaddr_in *)&nodes[i].address[link_idx];
	otherport = ntohs(so_in->sin_port);
	othernewport = otherport + nodes[thisidx].nodeid;
	so_in->sin_port = (htons(othernewport));
	} else {
	so_in6 = (struct sockaddr_in6 *)&nodes[thisidx].address[link_idx];
	thisport = ntohs(so_in6->sin6_port);
	thisnewport = thisport + nodes[i].nodeid;
	so_in6->sin6_port = (htons(thisnewport));
	so_in6 = (struct sockaddr_in6 *)&nodes[i].address[link_idx];
	otherport = ntohs(so_in6->sin6_port);
	othernewport = otherport + nodes[thisidx].nodeid;
	so_in6->sin6_port = (htons(othernewport));
	}
	}
	if (!globallistener) {
	src = &nodes[thisidx].address[link_idx];
	} else {
	if (nodes[thisidx].address[link_idx].ss_family == AF_INET) {
	src = &allv4;
	} else {
	src = &allv6;
	}
	}
	if (knet_link_set_config(knet_h, nodes[i].nodeid, link_idx,
	- src,
	+ protocol, src,
	&nodes[i].address[link_idx]) < 0) {
	printf("Unable to configure link: %s\n", strerror(errno));
	exit(FAIL);
	}
	if (portoffset) {
	if (nodes[thisidx].address[link_idx].ss_family == AF_INET) {
	so_in = (struct sockaddr_in *)&nodes[thisidx].address[link_idx];
	so_in->sin_port = (htons(thisport));
	so_in = (struct sockaddr_in *)&nodes[i].address[link_idx];
	so_in->sin_port = (htons(otherport));
	} else {
	so_in6 = (struct sockaddr_in6 *)&nodes[thisidx].address[link_idx];
	so_in6->sin6_port = (htons(thisport));
	so_in6 = (struct sockaddr_in6 *)&nodes[i].address[link_idx];
	so_in6->sin6_port = (htons(otherport));
	}
	}
	if (knet_link_set_enable(knet_h, nodes[i].nodeid, link_idx, 1) < 0) {
	printf("knet_link_set_enable failed: %s\n", strerror(errno));
	exit(FAIL);
	}
	}
	}

	if (knet_handle_setfwd(knet_h, 1) < 0) {
	printf("knet_handle_setfwd failed: %s\n", strerror(errno));
	exit(FAIL);
	}

	if (wait) {
	while(!allnodesup) {
	allnodesup = 1;
	for (i=0; i < onidx; i++) {
	if (i == thisidx) {
	continue;
	}
	if(knet_h->host_index[nodes[i].nodeid]->status.reachable != 1) {
	printf("waiting host %d to be reachable\n", nodes[i].nodeid);
	allnodesup = 0;
	}
	}
	if (!allnodesup) {
	sleep(1);
	}
	}
	sleep(1);
	}
	}

	static int ping_dst_host_filter(void *pvt_data,
	const unsigned char *outdata,
	ssize_t outdata_len,
	uint8_t tx_rx,
	uint16_t this_host_id,
	uint16_t src_host_id,
	int8_t *dst_channel,
	uint16_t *dst_host_ids,
	size_t *dst_host_ids_entries)
	{
	if (broadcast_test) {
	return 1;
	}

	if (tx_rx == KNET_NOTIFY_TX) {
	memmove(&dst_host_ids[0], outdata, 2);
	} else {
	dst_host_ids[0] = this_host_id;
	}
	*dst_host_ids_entries = 1;
	return 0;
	}

	static void _rx_thread(void args)
	{
	fd_set rfds;
	ssize_t len;
	struct timeval tv;
	struct sockaddr_storage address[PCKT_FRAG_MAX];
	struct mmsghdr msg[PCKT_FRAG_MAX];
	struct iovec iov_in[PCKT_FRAG_MAX];
	int i, msg_recv;

	for (i = 0; i < PCKT_FRAG_MAX; i++) {
	rx_buf[i] = malloc(KNET_MAX_PACKET_SIZE);
	if (!rx_buf[i]) {
	printf("RXT: Unable to malloc!\n");
	return NULL;
	}
	memset(rx_buf[i], 0, KNET_MAX_PACKET_SIZE);
	iov_in[i].iov_base = (void *)rx_buf[i];
	iov_in[i].iov_len = KNET_MAX_PACKET_SIZE;
	memset(&msg[i].msg_hdr, 0, sizeof(struct msghdr));
	msg[i].msg_hdr.msg_name = &address[i];
	msg[i].msg_hdr.msg_namelen = sizeof(struct sockaddr_storage);
	msg[i].msg_hdr.msg_iov = &iov_in[i];
	msg[i].msg_hdr.msg_iovlen = 1;
	}

	select_loop:
	tv.tv_sec = 5;
	tv.tv_usec = 0;

	FD_ZERO(&rfds);
	FD_SET(datafd, &rfds);

	len = select(FD_SETSIZE, &rfds, NULL, NULL, &tv);
	if (len < 0) {
	printf("RXT: Unable select over datafd\nHALTING RX THREAD!\n");
	return NULL;
	}
	if (!len) {
	printf("RXT: No data for the past 5 seconds\n");
	}
	if (FD_ISSET(datafd, &rfds)) {
	msg_recv = recvmmsg(datafd, msg, PCKT_FRAG_MAX, MSG_DONTWAIT \| MSG_NOSIGNAL, NULL);
	if (msg_recv < 0) {
	printf("RXT: error from recvmmsg: %s\n", strerror(errno));
	}
	for (i = 0; i < msg_recv; i++) {
	if (msg[i].msg_len == 0) {
	printf("RXT: received 0 bytes message?\n");
	}
	if (test_type == TEST_PING_AND_DATA) {
	printf("received %u bytes message: %s\n", msg[i].msg_len, (char *)msg[i].msg_hdr.msg_iov->iov_base);
	}
	/*
	* do stats here
	*/
	}
	}

	goto select_loop;

	return NULL;
	}

	static void setup_data_txrx_common(void)
	{
	if (!rx_thread) {
	if (knet_handle_enable_filter(knet_h, NULL, ping_dst_host_filter)) {
	printf("Unable to enable dst_host_filter: %s\n", strerror(errno));
	exit(FAIL);
	}
	printf("Setting up rx thread\n");
	if (pthread_create(&rx_thread, 0, _rx_thread, NULL)) {
	printf("Unable to start rx thread\n");
	exit(FAIL);
	}
	}
	}

	static void stop_rx_thread(void)
	{
	void *retval;
	int i;

	if (rx_thread) {
	printf("Shutting down rx thread\n");
	for (i = 0; i < PCKT_FRAG_MAX; i ++) {
	free(rx_buf[i]);
	}
	pthread_cancel(rx_thread);
	pthread_join(rx_thread, &retval);
	}
	}

	static void send_ping_data(void)
	{
	const char *buf = "Hello world!\x0";
	ssize_t len = strlen(buf);

	if (knet_send(knet_h, buf, len, channel) != len) {
	printf("Error sending hello world: %s\n", strerror(errno));
	}
	sleep(1);
	}

	static void cleanup_all(void)
	{
	if (rx_thread) {
	stop_rx_thread();
	}
	knet_handle_stop(knet_h);
	}

	static void sigint_handler(int signum)
	{
	printf("Cleaning up... got signal: %d\n", signum);
	cleanup_all();
	exit(PASS);
	}

	int main(int argc, char *argv[])
	{
	if (signal(SIGINT, sigint_handler) == SIG_ERR) {
	printf("Unable to configure SIGINT handler\n");
	exit(FAIL);
	}

	if (is_helgrind()) {
	exit(SKIP);
	}

	need_root();

	setup_knet(argc, argv);

	restart:
	switch(test_type) {
	default:
	case TEST_PING: /* basic ping, no data */
	sleep(5);
	break;
	case TEST_PING_AND_DATA:
	setup_data_txrx_common();
	send_ping_data();
	break;
	case TEST_PERF:
	setup_data_txrx_common();
	break;
	}
	if (continous) {
	goto restart;
	}

	cleanup_all();

	return PASS;
	}
	diff --git a/libknet/tests/ping_test.c b/libknet/tests/ping_test.c
	index 55557c9d..65a699b0 100644
	--- a/libknet/tests/ping_test.c
	+++ b/libknet/tests/ping_test.c
	@@ -1,623 +1,639 @@
	/*
	* Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	* Federico Simoncelli <fsimon@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <stdio.h>
	#include <stdlib.h>
	#include <string.h>
	#include <unistd.h>
	#include <alloca.h>
	#include <signal.h>
	#include <sys/socket.h>
	#include <arpa/inet.h>
	#include <errno.h>

	#include "libknet.h"

	#define KNET_RING_DEFPORT 50000

	static int knet_sock[4];
	static int8_t channel[4];
	static knet_handle_t knet_h;
	static struct knet_handle_crypto_cfg knet_handle_crypto_cfg;
	static uint8_t loglevel = KNET_LOG_INFO;
	static uint8_t use_stdout = 0;
	+static uint8_t use_transport = KNET_TRANSPORT_UDP;
	static char *src_host = NULL;
	static char *src_port = NULL;
	static int can_use_sync = 0;
	static int max_nodeid = 0;

	static in_port_t tok_inport(char *str)
	{
	int value = atoi(str);

	if ((value < 0) \|\| (value > UINT16_MAX))
	return 0;

	return (in_port_t) value;
	}

	static int tok_inaddrport(char strin, struct sockaddr_in addr)
	{
	char strhost, strport, *tmp = NULL;
	char *str;

	str = strdup(strin);
	if (!str) {
	printf("no mem?\n");
	exit(1);
	}

	strhost = strtok_r(str, ":", &tmp);
	if (inet_aton(strhost, &addr->sin_addr) == 0) {
	printf("inet_aton error\n");
	exit(1);
	}

	if (!src_host)
	src_host = strdup(strhost);
	strport = strtok_r(NULL, ":", &tmp);

	addr->sin_family = AF_INET;

	if (strport == NULL) {
	src_port = malloc(KNET_MAX_PORT_LEN);
	if (!src_port) {
	printf("no mem?\n");
	exit(1);
	}
	snprintf(src_port, KNET_MAX_PORT_LEN, "%d", KNET_RING_DEFPORT);
	addr->sin_port = htons(KNET_RING_DEFPORT);
	} else {
	src_port = strdup(strport);
	addr->sin_port = htons(tok_inport(strport));
	}
	free(str);
	return 0;
	}

	static void print_usage(char *name)
	{
	printf("usage: %s <localip>[:<port>] <remoteip>[:port] [...]\n", name);
	printf("example: %s 0.0.0.0 192.168.0.2\n", name);
	printf("example: %s 127.0.0.1:50000 127.0.0.1:50000 crypto:nss,aes256,sha1\n", name);
	printf("example: %s 127.0.0.1:50000 127.0.0.1:50000 debug\n", name);
	}

	static void set_log(int argc, char *argv[])
	{
	int i;

	for (i = 0; i < argc; i++) {
	if (!strncmp(argv[i], "stdout", 6)) {
	use_stdout = 1;
	break;
	}
	}
	}

	+static void set_transport(int argc, char *argv[])
	+{
	+ int i;
	+
	+ for (i = 0; i < argc; i++) {
	+ if (!strncmp(argv[i], "udp", 3)) {
	+ use_transport = KNET_TRANSPORT_UDP;
	+ break;
	+ }
	+ }
	+}
	+
	static void set_debug(int argc, char *argv[])
	{
	int i;

	for (i = 0; i < argc; i++) {
	if (!strncmp(argv[i], "debug", 5)) {
	loglevel = KNET_LOG_DEBUG;
	break;
	}
	}
	}

	static int set_crypto(int argc, char *argv[])
	{
	int i, found = 0;

	for (i = 0; i < argc; i++) {
	if (!strncmp(argv[i], "crypto", 6)) {
	found = 1;
	break;
	}
	}

	if (found) {
	char *tmp = NULL;
	strtok_r(argv[i], ":", &tmp);
	strncpy(knet_handle_crypto_cfg.crypto_model,
	strtok_r(NULL, ",", &tmp),
	sizeof(knet_handle_crypto_cfg.crypto_model) - 1);
	strncpy(knet_handle_crypto_cfg.crypto_cipher_type,
	strtok_r(NULL, ",", &tmp),
	sizeof(knet_handle_crypto_cfg.crypto_cipher_type) - 1);
	strncpy(knet_handle_crypto_cfg.crypto_hash_type,
	strtok_r(NULL, ",", &tmp),
	sizeof(knet_handle_crypto_cfg.crypto_hash_type) - 1);
	printf("Setting up encryption: model: %s crypto: %s hmac: %s\n",
	knet_handle_crypto_cfg.crypto_model,
	knet_handle_crypto_cfg.crypto_cipher_type,
	knet_handle_crypto_cfg.crypto_hash_type);
	return 1;
	}

	return 0;
	}

	static void argv_to_hosts(int argc, char *argv[])
	{
	int err, i;
	uint16_t node_id;
	struct sockaddr_storage src_addr;
	struct sockaddr_storage dst_addr;

	for (i = 2; i < argc; i++) {
	if (!strncmp(argv[i], "crypto", 6))
	continue;
	if (!strncmp(argv[i], "debug", 5))
	continue;
	if (!strncmp(argv[i], "stdout", 6))
	continue;
	+ if (!strncmp(argv[i], "udp", 3))
	+ continue;

	node_id = i - 1;

	max_nodeid = node_id;

	if (knet_host_add(knet_h, node_id) != 0) {
	printf("Unable to add new knet_host\n");
	exit(EXIT_FAILURE);
	}

	knet_host_set_name(knet_h, node_id, argv[i]);

	memset(&src_addr, 0, sizeof(struct sockaddr_storage));

	err = tok_inaddrport(argv[1], (struct sockaddr_in *) &src_addr);
	if (err < 0) {
	printf("Unable to convert ip address: %s", argv[i]);
	exit(EXIT_FAILURE);
	}

	memset(&dst_addr, 0, sizeof(struct sockaddr_storage));

	err = tok_inaddrport(argv[i],
	(struct sockaddr_in *) &dst_addr);
	if (err < 0) {
	printf("Unable to convert ip address: %s", argv[i]);
	exit(EXIT_FAILURE);
	}

	- knet_link_set_config(knet_h, node_id, 0, &src_addr, &dst_addr);
	+ knet_link_set_config(knet_h, node_id, 0, use_transport, &src_addr, &dst_addr);
	knet_link_set_ping_timers(knet_h, node_id, 0, 1000, 5000, 2048);
	knet_link_set_pong_count(knet_h, node_id, 0, 3);
	knet_link_set_enable(knet_h, node_id, 0, 1);
	}
	}

	/* Testing the latency/timeout:
	* # tc qdisc add dev lo root handle 1:0 netem delay 1s limit 1000
	* # tc -d qdisc show dev lo
	* # tc qdisc del dev lo root
	*/
	static int print_link(knet_handle_t khandle, uint16_t host_id)
	{
	int i;
	struct knet_link_status status;
	uint8_t link_ids[KNET_MAX_LINK];
	size_t link_ids_entries;

	if (knet_link_get_link_list(khandle, host_id, link_ids, &link_ids_entries)) {
	printf("unable to get list of configured links\n");
	return -1;
	}

	for (i = 0; i < link_ids_entries; i++) {
	if (knet_link_get_status(knet_h, host_id, link_ids[i], &status) < 0)
	return -1;

	if (status.enabled != 1) continue;

	printf("host %u, link %u latency is %llu us, status: %s mtu: %u overhead: %u\n",
	host_id, i, status.latency,
	(status.connected == 0) ? "disconnected" : "connected",
	status.mtu, status.proto_overhead);
	}

	return 0;
	}

	static void sigint_handler(int signum)
	{
	int i, j;
	uint16_t host_ids[KNET_MAX_HOST];
	uint8_t link_ids[KNET_MAX_LINK];
	size_t host_ids_entries = 0, link_ids_entries = 0;
	struct knet_link_status status;

	printf("Cleaning up... got signal: %d\n", signum);

	if (knet_h != NULL) {
	if (knet_host_get_host_list(knet_h, host_ids, &host_ids_entries))
	printf("Unable to get host list: %s\n",strerror(errno));

	for (i = 0; i < host_ids_entries; i++) {
	if (knet_link_get_link_list(knet_h, host_ids[i], link_ids, &link_ids_entries)) {
	printf("Unable to get link list: %s\n",strerror(errno));
	}
	for (j = 0; j < link_ids_entries; j++) {
	if (knet_link_get_status(knet_h, host_ids[i], link_ids[j], &status)) {
	if (errno != EINVAL) {
	printf("Unable to get link data: %s\n",strerror(errno));
	}
	continue;
	}
	if (status.enabled != 1) {
	continue;
	}

	if (knet_link_set_enable(knet_h, host_ids[i], j, 0))
	printf("Unable to remove link: %s\n",strerror(errno));
	}
	if (knet_host_remove(knet_h, host_ids[i]))
	printf("Unable to remove host: %s\n",strerror(errno));
	}

	for (j = 0; j < 4; j++) {
	if (knet_handle_remove_datafd(knet_h, knet_sock[j]) < 0) {
	printf("Unable to delete datafd!!!: %s\n",strerror(errno));
	exit(EXIT_FAILURE);
	}
	}

	if (knet_handle_free(knet_h)) {
	printf("Unable to cleanup before exit: %s\n",strerror(errno));
	exit(EXIT_FAILURE);
	}
	}

	exit(EXIT_SUCCESS);
	}

	static void pmtud_notify(void *private_data, unsigned int data_mtu)
	{
	printf("New mtu change notification: private_data: %p PMTUd data %u\n", private_data, data_mtu);
	return;
	}

	static void host_notify(void *private_data, uint16_t host_id, uint8_t reachable, uint8_t remote, uint8_t external)
	{
	struct knet_host_status status;

	printf("Received host_id (%u) status change notification. reachable: %u remote: %u external: %u\n",
	host_id, reachable, remote, external);

	if (reachable) {
	can_use_sync = 1;
	} else {
	can_use_sync = 0;
	}

	if (knet_host_get_status(knet_h, host_id, &status)) {
	printf("Unable to get host status\n");
	exit(EXIT_FAILURE);
	}

	printf("Recorded host_id (%u) status change notification. reachable: %u remote: %u external: %u\n",
	host_id, status.reachable, status.remote, status.external);

	return;
	}

	static void sock_notify(void *private_data, int datafd, int8_t chan, uint8_t tx_rx, int error, int errorno)
	{
	printf("Received sock notify, datafd: %d channel: %d direction: %u error: %d errno: %d (%s)\n",
	datafd, chan, tx_rx, error, errorno, strerror(errorno));

	printf("Something went wrong with our sockets!\n");
	exit(EXIT_FAILURE);
	}

	static void recv_data(knet_handle_t khandle, int inchannel, int has_crypto)
	{
	char recvbuff[66000];
	ssize_t rlen = 0;
	uint16_t nodeid;

	memset(&recvbuff, 0, sizeof(recvbuff));

	rlen = knet_recv(knet_h, recvbuff, KNET_MAX_PACKET_SIZE, inchannel);

	if (!rlen) {
	printf("EOF\n");
	return;
	}

	if ((rlen < 0) && (errno == EINVAL)) {
	printf("Something went wrong with knet_recv. Aborting\n");
	exit(1);
	}

	if ((rlen < 0) && ((errno == EAGAIN) \|\| (errno == EWOULDBLOCK))) {
	printf("NO MORE DATA TO READ: %s\n", strerror(errno));
	return;
	}

	memmove(&nodeid, recvbuff, 2);

	printf("Received data (%zu bytes): '%s' on channel: %d for nodeid %u\n", rlen, recvbuff+2, inchannel, nodeid);

	if (has_crypto) {
	#if 0
	printf("changing crypto key\n");
	memset(knet_handle_crypto_cfg.private_key, has_crypto, KNET_MAX_KEY_LEN);
	if (knet_handle_crypto(knet_h, &knet_handle_crypto_cfg)) {
	printf("Unable to change key on the fly\n");
	has_crypto++;
	}
	#endif
	}
	}

	static int ping_dst_host_filter(void *private_data,
	const unsigned char *outdata,
	ssize_t outdata_len,
	uint8_t tx_rx,
	uint16_t this_host_id,
	uint16_t src_host_id,
	int8_t *dst_channel,
	uint16_t *dst_host_ids,
	size_t *dst_host_ids_entries)
	{
	if (tx_rx == KNET_NOTIFY_TX) {
	memmove(&dst_host_ids[0], outdata, 2);
	} else {
	dst_host_ids[0] = this_host_id;
	}
	*dst_host_ids_entries = 1;
	return 0;
	}

	int main(int argc, char *argv[])
	{
	char out_big_buff[64000], out_big_frag[65536], hello_world[16];
	ssize_t len;
	fd_set rfds;
	struct timeval tv;
	int logpipefd[2];
	uint16_t host_ids[KNET_MAX_HOST];
	size_t host_ids_entries = 0;
	int has_crypto = 0;
	int logfd;
	unsigned int data_mtu = 0;
	int big = 0;
	int j;
	int8_t chan;
	int use_sync = 0;
	uint16_t dst_nodeid;

	if (argc < 3) {
	print_usage(argv[0]);
	exit(EXIT_FAILURE);
	}

	if (pipe(logpipefd)) {
	printf("Unable to create log pipe\n");
	exit(EXIT_FAILURE);
	}

	knet_h = NULL;

	if (signal(SIGINT, sigint_handler) == SIG_ERR) {
	printf("Unable to configure SIGINT handler\n");
	exit(EXIT_FAILURE);
	}

	set_log(argc, argv);
	if (use_stdout) {
	logfd = 1;
	} else {
	logfd = logpipefd[1];
	}

	set_debug(argc, argv);
	+ set_transport(argc, argv);

	if ((knet_h = knet_handle_new(1, logfd, loglevel)) == NULL) {
	printf("Unable to create new knet_handle_t\n");
	exit(EXIT_FAILURE);
	}

	if (knet_handle_pmtud_get(knet_h, &data_mtu)) {
	printf("Unable to get PMTUd current values\n");
	exit(EXIT_FAILURE);
	} else {
	printf("Current data PMTUd %u\n", data_mtu);
	}

	if (knet_handle_enable_pmtud_notify(knet_h, NULL, pmtud_notify)) {
	printf("Unable to install PMTUd notification callback\n");
	exit(EXIT_FAILURE);
	}

	if (knet_host_enable_status_change_notify(knet_h, NULL, host_notify)) {
	printf("Unable to install host status notification callback\n");
	exit(EXIT_FAILURE);
	}

	if (knet_handle_enable_sock_notify(knet_h, NULL, sock_notify)) {
	printf("Unable to install sock notification callback\n");
	exit(EXIT_FAILURE);
	}

	if (knet_handle_pmtud_setfreq(knet_h, 5)) {
	printf("Unable to set PMTUd interval\n");
	exit(EXIT_FAILURE);
	}

	if (knet_handle_enable_filter(knet_h, NULL, ping_dst_host_filter)) {
	printf("Unable to enable filter\n");
	exit(EXIT_FAILURE);
	}

	if (set_crypto(argc, argv)) {
	memset(knet_handle_crypto_cfg.private_key, 0, KNET_MAX_KEY_LEN);
	knet_handle_crypto_cfg.private_key_len = KNET_MAX_KEY_LEN;
	if (knet_handle_crypto(knet_h, &knet_handle_crypto_cfg)) {
	printf("Unable to init crypto\n");
	exit(EXIT_FAILURE);
	}
	has_crypto = 1;
	} else {
	printf("Crypto not activated\n");
	}

	argv_to_hosts(argc, argv);
	knet_handle_setfwd(knet_h, 1);

	for (j = 0; j < 4; j++) {
	knet_sock[j] = 0;
	channel[j] = -1;
	if (knet_handle_add_datafd(knet_h, &knet_sock[j], &channel[j]) < 0) {
	printf("Unable to add datafd!!!\n");
	exit(EXIT_FAILURE);
	}
	}

	if (knet_handle_get_datafd(knet_h, 1, &j)) {
	printf("Unable to get data fd from chan\n");
	exit(EXIT_FAILURE);
	}
	printf("get datafd[%d] from chan[1]; %d\n", knet_sock[1], j);

	if (knet_handle_get_channel(knet_h, knet_sock[1], &chan)) {
	printf("Unable to get chan from data fd\n");
	exit(EXIT_FAILURE);
	}
	printf("get chan[1] from sock[%d]: %d\n", knet_sock[1], chan);

	while (1) {
	ssize_t wlen;
	size_t i, buff_len;
	char *buff;
	int outchan;

	knet_host_get_host_list(knet_h, host_ids, &host_ids_entries);
	for (i = 0; i < host_ids_entries; i++) {
	print_link(knet_h, host_ids[i]);
	}

	memset(&out_big_frag, 0, sizeof(out_big_frag));
	memset(&out_big_buff, 0, sizeof(out_big_buff));
	memset(&hello_world, 0, sizeof(hello_world));

	snprintf(hello_world+2, sizeof(hello_world)-2, "Hello world!");
	snprintf(out_big_buff+2, sizeof(out_big_buff)-2, "%zu", sizeof(out_big_buff));
	snprintf(out_big_frag+2, sizeof(out_big_frag)-2, "%zu", sizeof(out_big_frag));

	switch(big) {
	case 0: /* hello world */
	buff = hello_world;
	buff_len = sizeof(hello_world);
	big = 1;
	outchan = channel[0];
	break;
	case 1: /* big but does not require frag */
	buff = out_big_buff;
	buff_len = sizeof(out_big_buff);
	big = 2;
	outchan = channel[1];
	use_sync = 0;
	break;
	case 2: /* big and requires frag */
	buff = out_big_frag;
	buff_len = sizeof(out_big_frag);
	big = 0;
	outchan = channel[2];
	use_sync = 1;
	break;
	default:
	printf("unknown packet size?\n");
	exit(1);
	break;
	}

	printf("Sending '%zu' bytes on channel: %d\n", buff_len, outchan);
	if ((can_use_sync) && (use_sync)) {
	for (j = 1; j <= max_nodeid; j++) {
	dst_nodeid = j;
	memmove(buff, &dst_nodeid, 2);
	printf("Using sync send\n");
	wlen = knet_send_sync(knet_h, buff, buff_len, outchan);
	if (wlen < 0) {
	printf("Unable to send messages to socket: %s\n", strerror(errno));
	exit(1);
	}
	}
	} else {
	/* clear node id */
	memset(buff, 0, 2);
	printf("Using async send\n");
	wlen = knet_send(knet_h, buff, buff_len, outchan);
	if (wlen != buff_len) {
	printf("Unable to send messages to socket: %s\n", strerror(errno));
	exit(1);
	}
	}

	tv.tv_sec = 1;
	tv.tv_usec = 0;

	select_loop:
	FD_ZERO(&rfds);
	for (j = 0; j < 4; j++) {
	FD_SET(knet_sock[j], &rfds);
	}
	FD_SET(logpipefd[0], &rfds);

	len = select(FD_SETSIZE, &rfds, NULL, NULL, &tv);

	/* uncomment this to replicate the one-message problem */
	/* usleep(500000); */

	if (len < 0) {
	printf("Unable select over knet_handle_t\n");
	exit(EXIT_FAILURE);
	} else if (FD_ISSET(knet_sock[0], &rfds)) {
	recv_data(knet_h, channel[0], has_crypto);
	} else if (FD_ISSET(knet_sock[1], &rfds)) {
	recv_data(knet_h, channel[1], has_crypto);
	} else if (FD_ISSET(knet_sock[2], &rfds)) {
	recv_data(knet_h, channel[2], has_crypto);
	} else if (FD_ISSET(knet_sock[3], &rfds)) {
	recv_data(knet_h, channel[3], has_crypto);
	} else if (FD_ISSET(logpipefd[0], &rfds)) {
	struct knet_log_msg msg;
	size_t bytes_read = 0;

	while (bytes_read < sizeof(struct knet_log_msg)) {
	len = read(logpipefd[0], &msg + bytes_read,
	sizeof(struct knet_log_msg) - bytes_read);
	if (len <= 0) {
	printf("Error from log fd, unable to read data\n");
	exit(EXIT_FAILURE);
	}
	bytes_read += len;
	}

	printf("[%s] %s: %s\n",
	knet_log_get_loglevel_name(msg.msglevel),
	knet_log_get_subsystem_name(msg.subsystem),
	msg.msg);
	}

	if ((tv.tv_sec > 0) \|\| (tv.tv_usec > 0))
	goto select_loop;
	}

	/* FIXME: allocated hosts should be free'd */

	return 0;
	}
	diff --git a/libknet/threads_pmtud.c b/libknet/threads_pmtud.c
	index 16a816a6..3011416e 100644
	--- a/libknet/threads_pmtud.c
	+++ b/libknet/threads_pmtud.c
	@@ -1,388 +1,388 @@
	/*
	* Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	* Federico Simoncelli <fsimon@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <unistd.h>
	#include <string.h>
	#include <errno.h>
	#include <pthread.h>

	#include "crypto.h"
	#include "link.h"
	#include "host.h"
	#include "logging.h"
	#include "threads_common.h"
	#include "threads_pmtud.h"

	static int _handle_check_link_pmtud(knet_handle_t knet_h, struct knet_host dst_host, struct knet_link dst_link)
	{
	int ret, savederrno, mutex_retry_limit, failsafe;
	ssize_t onwire_len; /* current packet onwire size */
	ssize_t overhead_len; /* onwire packet overhead (protocol based) */
	ssize_t max_mtu_len; /* max mtu for protocol */
	ssize_t data_len; /* how much data we can send in the packet
	* generally would be onwire_len - overhead_len
	* needs to be adjusted for crypto
	*/
	ssize_t pad_len; /* crypto packet pad size, needs to move into crypto.c callbacks */
	int len; /* len of what we were able to sendto onwire */

	struct timespec ts;
	unsigned char outbuf = (unsigned char )knet_h->pmtudbuf;

	mutex_retry_limit = 0;
	failsafe = 0;
	pad_len = 0;

	- dst_link->last_bad_mtu = knet_h->transport_ops->link_get_mtu_overhead(dst_link->transport);
	+ dst_link->last_bad_mtu = knet_h->transport_ops[dst_link->transport_type]->link_get_mtu_overhead(dst_link->transport);

	knet_h->pmtudbuf->khp_pmtud_link = dst_link->link_id;

	switch (dst_link->dst_addr.ss_family) {
	case AF_INET6:
	max_mtu_len = KNET_PMTUD_SIZE_V6;
	overhead_len = KNET_PMTUD_OVERHEAD_V6;
	dst_link->last_good_mtu = dst_link->last_ping_size + KNET_PMTUD_OVERHEAD_V6;
	break;
	case AF_INET:
	max_mtu_len = KNET_PMTUD_SIZE_V4;
	overhead_len = KNET_PMTUD_OVERHEAD_V4;
	dst_link->last_good_mtu = dst_link->last_ping_size + KNET_PMTUD_OVERHEAD_V6;
	break;
	default:
	log_debug(knet_h, KNET_SUB_PMTUD_T, "PMTUD aborted, unknown protocol");
	return -1;
	break;
	}

	/*
	* discovery starts from the top because kernel will
	* refuse to send packets > current iface mtu.
	* this saves us some time and network bw.
	*/
	onwire_len = max_mtu_len;

	restart:

	/*
	* prevent a race when interface mtu is changed _exactly_ during
	* the discovery process and it's complex to detect. Easier
	* to wait the next loop.
	* 30 is not an arbitrary value. To bisect from 576 to 128000 doesn't
	* take more than 18/19 steps.
	*/

	if (failsafe == 30) {
	log_err(knet_h, KNET_SUB_PMTUD_T,
	"Aborting PMTUD process: Too many attempts. MTU might have changed during discovery.");
	return -1;
	} else {
	failsafe++;
	}

	data_len = onwire_len - overhead_len;

	if (knet_h->crypto_instance) {

	if (knet_h->sec_block_size) {
	pad_len = knet_h->sec_block_size - (data_len % knet_h->sec_block_size);
	if (pad_len == knet_h->sec_block_size) {
	pad_len = 0;
	}
	data_len = data_len + pad_len;
	}

	data_len = data_len + (knet_h->sec_hash_size + knet_h->sec_salt_size + knet_h->sec_block_size);

	if (knet_h->sec_block_size) {
	while (data_len + overhead_len >= max_mtu_len) {
	data_len = data_len - knet_h->sec_block_size;
	}
	}

	if (dst_link->last_bad_mtu) {
	while (data_len + overhead_len >= dst_link->last_bad_mtu) {
	data_len = data_len - (knet_h->sec_hash_size + knet_h->sec_salt_size + knet_h->sec_block_size);
	}
	}

	if (data_len < (knet_h->sec_hash_size + knet_h->sec_salt_size + knet_h->sec_block_size) + 1) {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "Aborting PMTUD process: link mtu smaller than crypto header detected (link might have been disconnected)");
	return -1;
	}

	onwire_len = data_len + overhead_len;
	knet_h->pmtudbuf->khp_pmtud_size = onwire_len;

	if (crypto_encrypt_and_sign(knet_h,
	(const unsigned char *)knet_h->pmtudbuf,
	data_len - (knet_h->sec_hash_size + knet_h->sec_salt_size + knet_h->sec_block_size),
	knet_h->pmtudbuf_crypt,
	&data_len) < 0) {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "Unable to crypto pmtud packet");
	return -1;
	}

	outbuf = knet_h->pmtudbuf_crypt;

	} else {

	knet_h->pmtudbuf->khp_pmtud_size = onwire_len;

	}

	/* link has gone down, aborting pmtud */
	if (dst_link->status.connected != 1) {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "PMTUD detected host (%u) link (%u) has been disconnected", dst_host->host_id, dst_link->link_id);
	return -1;
	}

	if (pthread_mutex_lock(&knet_h->pmtud_mutex) != 0) {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "Unable to get mutex lock");
	return -1;
	}

	len = sendto(dst_link->outsock, outbuf, data_len,
	MSG_DONTWAIT \| MSG_NOSIGNAL, (struct sockaddr *) &dst_link->dst_addr,
	sizeof(struct sockaddr_storage));
	savederrno = errno;

	if ((len < 0) && (savederrno != EMSGSIZE)) {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "Unable to send pmtu packet (sendto): %d %s", savederrno, strerror(savederrno));
	pthread_mutex_unlock(&knet_h->pmtud_mutex);
	return -1;
	}

	if (len != data_len) {
	/*
	* this is coming from "localhost" already.
	*/
	if (savederrno == EMSGSIZE) {
	dst_link->last_bad_mtu = onwire_len;
	} else {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "Unable to send pmtu packet len: %zu err: %s", onwire_len, strerror(savederrno));
	}
	} else {
	dst_link->last_sent_mtu = onwire_len;
	dst_link->last_recv_mtu = 0;

	if (clock_gettime(CLOCK_REALTIME, &ts) < 0) {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "Unable to get current time: %s", strerror(errno));
	pthread_mutex_unlock(&knet_h->pmtud_mutex);
	return -1;
	}

	/*
	* Set an artibrary 2 seconds timeout to receive a PMTUd reply
	* perhaps this should be configurable but:
	* 1) too short timeout can cause instability since MTU value
	* influeces link status
	* 2) too high timeout slows down the MTU detection process for
	* small MTU
	*
	* Another option is to make the PMTUd process less influent
	* in link status detection but that could cause data packet loss
	* without link up/down changes
	*/
	ts.tv_sec += 2;
	ret = pthread_cond_timedwait(&knet_h->pmtud_cond, &knet_h->pmtud_mutex, &ts);

	if (shutdown_in_progress(knet_h)) {
	pthread_mutex_unlock(&knet_h->pmtud_mutex);
	log_debug(knet_h, KNET_SUB_PMTUD_T, "PMTUD aborted. shutdown in progress");
	return -1;
	}

	if ((ret != 0) && (ret != ETIMEDOUT)) {
	pthread_mutex_unlock(&knet_h->pmtud_mutex);
	if (mutex_retry_limit == 3) {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "PMTUD aborted, unable to get mutex lock");
	return -1;
	}
	mutex_retry_limit++;
	goto restart;
	}

	if ((dst_link->last_recv_mtu != onwire_len) \|\| (ret)) {
	dst_link->last_bad_mtu = onwire_len;
	} else {
	int found_mtu = 0;

	if (knet_h->sec_block_size) {
	if ((onwire_len + knet_h->sec_block_size >= max_mtu_len) \|\|
	((dst_link->last_bad_mtu) && (dst_link->last_bad_mtu <= (onwire_len + knet_h->sec_block_size)))) {
	found_mtu = 1;
	}
	} else {
	if ((onwire_len == max_mtu_len) \|\|
	((dst_link->last_bad_mtu) && (dst_link->last_bad_mtu == (onwire_len + 1)))) {
	found_mtu = 1;
	}
	}

	if (found_mtu) {
	/*
	* account for IP overhead, knet headers and crypto in PMTU calculation
	*/
	dst_link->status.mtu = onwire_len - dst_link->status.proto_overhead;
	pthread_mutex_unlock(&knet_h->pmtud_mutex);
	return 0;
	}

	dst_link->last_good_mtu = onwire_len;
	}
	}

	onwire_len = (dst_link->last_good_mtu + dst_link->last_bad_mtu) / 2;
	pthread_mutex_unlock(&knet_h->pmtud_mutex);

	goto restart;
	}

	static int _handle_check_pmtud(knet_handle_t knet_h, struct knet_host dst_host, struct knet_link dst_link, unsigned int *min_mtu)
	{
	uint8_t saved_valid_pmtud;
	unsigned int saved_pmtud;
	struct timespec clock_now;
	unsigned long long diff_pmtud, interval;

	interval = knet_h->pmtud_interval * 1000000000llu; /* nanoseconds */

	if (clock_gettime(CLOCK_MONOTONIC, &clock_now) != 0) {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "Unable to get monotonic clock");
	return 0;
	}

	timespec_diff(dst_link->pmtud_last, clock_now, &diff_pmtud);

	if (diff_pmtud < interval) {
	*min_mtu = dst_link->status.mtu;
	return dst_link->has_valid_mtu;
	}

	switch (dst_link->dst_addr.ss_family) {
	case AF_INET6:
	dst_link->status.proto_overhead = KNET_PMTUD_OVERHEAD_V6 + KNET_HEADER_ALL_SIZE + knet_h->sec_header_size;
	break;
	case AF_INET:
	dst_link->status.proto_overhead = KNET_PMTUD_OVERHEAD_V4 + KNET_HEADER_ALL_SIZE + knet_h->sec_header_size;
	break;
	}

	saved_pmtud = dst_link->status.mtu;
	saved_valid_pmtud = dst_link->has_valid_mtu;

	log_debug(knet_h, KNET_SUB_PMTUD_T, "Starting PMTUD for host: %u link: %u", dst_host->host_id, dst_link->link_id);

	if (_handle_check_link_pmtud(knet_h, dst_host, dst_link) < 0) {
	dst_link->has_valid_mtu = 0;
	} else {
	dst_link->has_valid_mtu = 1;
	switch (dst_link->dst_addr.ss_family) {
	case AF_INET6:
	if (((dst_link->status.mtu + dst_link->status.proto_overhead) < KNET_PMTUD_MIN_MTU_V6) \|\|
	((dst_link->status.mtu + dst_link->status.proto_overhead) > KNET_PMTUD_SIZE_V6)) {
	log_debug(knet_h, KNET_SUB_PMTUD_T,
	"PMTUD detected an IPv6 MTU out of bound value (%u) for host: %u link: %u.",
	dst_link->status.mtu + dst_link->status.proto_overhead, dst_host->host_id, dst_link->link_id);
	dst_link->has_valid_mtu = 0;
	}
	break;
	case AF_INET:
	if (((dst_link->status.mtu + dst_link->status.proto_overhead) < KNET_PMTUD_MIN_MTU_V4) \|\|
	((dst_link->status.mtu + dst_link->status.proto_overhead) > KNET_PMTUD_SIZE_V4)) {
	log_debug(knet_h, KNET_SUB_PMTUD_T,
	"PMTUD detected an IPv4 MTU out of bound value (%u) for host: %u link: %u.",
	dst_link->status.mtu + dst_link->status.proto_overhead, dst_host->host_id, dst_link->link_id);
	dst_link->has_valid_mtu = 0;
	}
	break;
	}
	if (dst_link->has_valid_mtu) {
	if ((saved_pmtud) && (saved_pmtud != dst_link->status.mtu)) {
	log_info(knet_h, KNET_SUB_PMTUD_T, "PMTUD link change for host: %u link: %u from %u to %u",
	dst_host->host_id, dst_link->link_id, saved_pmtud, dst_link->status.mtu);
	}
	log_debug(knet_h, KNET_SUB_PMTUD_T, "PMTUD completed for host: %u link: %u current link mtu: %u",
	dst_host->host_id, dst_link->link_id, dst_link->status.mtu);
	if (dst_link->status.mtu < *min_mtu) {
	*min_mtu = dst_link->status.mtu;
	}
	dst_link->pmtud_last = clock_now;
	}
	}

	if (saved_valid_pmtud != dst_link->has_valid_mtu) {
	_host_dstcache_update_sync(knet_h, dst_host);
	}

	return dst_link->has_valid_mtu;
	}

	void _handle_pmtud_link_thread(void data)
	{
	knet_handle_t knet_h = (knet_handle_t) data;
	struct knet_host *dst_host;
	struct knet_link *dst_link;
	int link_idx;
	unsigned int min_mtu, have_mtu;

	knet_h->data_mtu = KNET_PMTUD_MIN_MTU_V4 - KNET_HEADER_ALL_SIZE - knet_h->sec_header_size;

	/* preparing pmtu buffer */
	knet_h->pmtudbuf->kh_version = KNET_HEADER_VERSION;
	knet_h->pmtudbuf->kh_type = KNET_HEADER_TYPE_PMTUD;
	knet_h->pmtudbuf->kh_node = htons(knet_h->host_id);

	while (!shutdown_in_progress(knet_h)) {
	usleep(KNET_THREADS_TIMERES);

	if (pthread_rwlock_rdlock(&knet_h->global_rwlock) != 0) {
	log_debug(knet_h, KNET_SUB_PMTUD_T, "Unable to get read lock");
	continue;
	}

	min_mtu = KNET_PMTUD_SIZE_V4 - KNET_HEADER_ALL_SIZE - knet_h->sec_header_size;
	have_mtu = 0;

	for (dst_host = knet_h->host_head; dst_host != NULL; dst_host = dst_host->next) {
	for (link_idx = 0; link_idx < KNET_MAX_LINK; link_idx++) {
	dst_link = &dst_host->link[link_idx];

	if ((dst_link->status.enabled != 1) \|\|
	(dst_link->status.connected != 1) \|\|
	(!dst_link->last_ping_size) \|\|
	((dst_link->dynamic == KNET_LINK_DYNIP) &&
	(dst_link->status.dynconnected != 1)))
	continue;

	if (_handle_check_pmtud(knet_h, dst_host, dst_link, &min_mtu)) {
	have_mtu = 1;
	}
	}
	}

	if (have_mtu) {
	if (knet_h->data_mtu != min_mtu) {
	knet_h->data_mtu = min_mtu;
	log_info(knet_h, KNET_SUB_PMTUD_T, "Global data MTU changed to: %u", knet_h->data_mtu);

	if (knet_h->pmtud_notify_fn) {
	knet_h->pmtud_notify_fn(knet_h->pmtud_notify_fn_private_data,
	knet_h->data_mtu);
	}
	}
	}

	pthread_rwlock_unlock(&knet_h->global_rwlock);
	}

	return NULL;
	}
	diff --git a/libknet/threads_send_recv.c b/libknet/threads_send_recv.c
	index d7b34430..4cdf2ccc 100644
	--- a/libknet/threads_send_recv.c
	+++ b/libknet/threads_send_recv.c
	@@ -1,1216 +1,1221 @@
	/*
	* Copyright (C) 2010-2015 Red Hat, Inc. All rights reserved.
	*
	* Authors: Fabio M. Di Nitto <fabbione@kronosnet.org>
	* Federico Simoncelli <fsimon@kronosnet.org>
	*
	* This software licensed under GPL-2.0+, LGPL-2.0+
	*/

	#include "config.h"

	#include <stdio.h>
	#include <string.h>
	#include <unistd.h>
	#include <errno.h>
	#include <pthread.h>
	#include <math.h>
	#include <sys/epoll.h>
	#include <sys/types.h>
	#include <sys/socket.h>
	#include <netdb.h>

	#include "crypto.h"
	#include "compat.h"
	#include "host.h"
	#include "link.h"
	#include "logging.h"
	#include "transports.h"
	#include "threads_common.h"
	#include "threads_send_recv.h"

	/*
	* SEND
	*/

	static int _dispatch_to_links(knet_handle_t knet_h, struct knet_host dst_host, struct iovec iov_out)
	{
	int link_idx, msg_idx, sent_msgs, msgs_to_send, prev_sent, progress;
	struct mmsghdr msg[PCKT_FRAG_MAX];
	int err = 0, savederrno = 0;

	memset(&msg, 0, sizeof(struct mmsghdr));

	for (link_idx = 0; link_idx < dst_host->active_link_entries; link_idx++) {

	msgs_to_send = knet_h->send_to_links_buf[0]->khp_data_frag_num;
	sent_msgs = 0;
	prev_sent = 0;
	progress = 1;

	retry:
	msg_idx = 0;

	while (msg_idx < msgs_to_send) {
	memset(&msg[msg_idx].msg_hdr, 0, sizeof(struct msghdr));
	msg[msg_idx].msg_hdr.msg_name = &dst_host->link[dst_host->active_links[link_idx]].dst_addr;
	msg[msg_idx].msg_hdr.msg_namelen = sizeof(struct sockaddr_storage);
	msg[msg_idx].msg_hdr.msg_iov = &iov_out[msg_idx + prev_sent];
	msg[msg_idx].msg_hdr.msg_iovlen = 1;
	msg_idx++;
	}

	sent_msgs = sendmmsg(dst_host->link[dst_host->active_links[link_idx]].outsock,
	msg, msg_idx, MSG_DONTWAIT \| MSG_NOSIGNAL);
	savederrno = errno;

	if ((sent_msgs >= 0) && (sent_msgs < msg_idx)) {
	if ((sent_msgs) \|\| (progress)) {
	msgs_to_send = msg_idx - sent_msgs;
	prev_sent = prev_sent + sent_msgs;
	if (sent_msgs) {
	progress = 1;
	} else {
	progress = 0;
	}
	log_debug(knet_h, KNET_SUB_SEND_T, "Unable to send all (%d/%d) data packets to host %s (%u) link %s:%s (%u)",
	sent_msgs, msg_idx,
	dst_host->name, dst_host->host_id,
	dst_host->link[dst_host->active_links[link_idx]].status.dst_ipaddr,
	dst_host->link[dst_host->active_links[link_idx]].status.dst_port,
	dst_host->link[dst_host->active_links[link_idx]].link_id);
	goto retry;
	}
	if (!progress) {
	savederrno = EAGAIN;
	err = -1;
	goto out_unlock;
	}
	}

	if (sent_msgs < 0) {
	log_debug(knet_h, KNET_SUB_SEND_T, "Unable to send data packet to host %s (%u) link %s:%s (%u): %s",
	dst_host->name, dst_host->host_id,
	dst_host->link[dst_host->active_links[link_idx]].status.dst_ipaddr,
	dst_host->link[dst_host->active_links[link_idx]].status.dst_port,
	dst_host->link[dst_host->active_links[link_idx]].link_id,
	strerror(savederrno));
	err = -1;
	goto out_unlock;
	}

	if ((dst_host->link_handler_policy == KNET_LINK_POLICY_RR) &&
	(dst_host->active_link_entries > 1)) {
	uint8_t cur_link_id = dst_host->active_links[0];

	memmove(&dst_host->active_links[0], &dst_host->active_links[1], KNET_MAX_LINK - 1);
	dst_host->active_links[dst_host->active_link_entries - 1] = cur_link_id;

	break;
	}
	}

	out_unlock:

	errno = savederrno;
	return err;
	}

	static int _parse_recv_from_sock(knet_handle_t knet_h, int buf_idx, ssize_t inlen, int8_t channel, int is_sync)
	{
	ssize_t outlen, frag_len;
	struct knet_host *dst_host;
	uint16_t dst_host_ids_temp[KNET_MAX_HOST];
	size_t dst_host_ids_entries_temp = 0;
	uint16_t dst_host_ids[KNET_MAX_HOST];
	size_t dst_host_ids_entries = 0;
	int bcast = 1;
	struct knet_hostinfo *knet_hostinfo;
	struct iovec iov_out[PCKT_FRAG_MAX];
	uint8_t frag_idx;
	unsigned int temp_data_mtu;
	int host_idx;
	int send_mcast = 0;
	struct knet_header *inbuf;
	int savederrno = 0;
	int err = 0;

	inbuf = knet_h->recv_from_sock_buf[buf_idx];

	if ((knet_h->enabled != 1) &&
	(inbuf->kh_type != KNET_HEADER_TYPE_HOST_INFO)) { /* data forward is disabled */
	log_debug(knet_h, KNET_SUB_SEND_T, "Received data packet but forwarding is disabled");
	savederrno = ECANCELED;
	err = -1;
	goto out_unlock;
	}

	/*
	* move this into a separate function to expand on
	* extra switching rules
	*/
	switch(inbuf->kh_type) {
	case KNET_HEADER_TYPE_DATA:
	if (knet_h->dst_host_filter_fn) {
	bcast = knet_h->dst_host_filter_fn(
	knet_h->dst_host_filter_fn_private_data,
	(const unsigned char *)inbuf->khp_data_userdata,
	inlen,
	KNET_NOTIFY_TX,
	knet_h->host_id,
	knet_h->host_id,
	&channel,
	dst_host_ids_temp,
	&dst_host_ids_entries_temp);
	if (bcast < 0) {
	log_debug(knet_h, KNET_SUB_SEND_T, "Error from dst_host_filter_fn: %d", bcast);
	savederrno = EFAULT;
	err = -1;
	goto out_unlock;
	}

	if ((!bcast) && (!dst_host_ids_entries_temp)) {
	log_debug(knet_h, KNET_SUB_SEND_T, "Message is unicast but no dst_host_ids_entries");
	savederrno = EINVAL;
	err = -1;
	goto out_unlock;
	}
	}
	break;
	case KNET_HEADER_TYPE_HOST_INFO:
	knet_hostinfo = (struct knet_hostinfo *)inbuf->khp_data_userdata;
	if (knet_hostinfo->khi_bcast == KNET_HOSTINFO_UCAST) {
	bcast = 0;
	dst_host_ids_temp[0] = knet_hostinfo->khi_dst_node_id;
	dst_host_ids_entries_temp = 1;
	knet_hostinfo->khi_dst_node_id = htons(knet_hostinfo->khi_dst_node_id);
	}
	break;
	default:
	log_warn(knet_h, KNET_SUB_SEND_T, "Receiving unknown messages from socket");
	savederrno = ENOMSG;
	err = -1;
	goto out_unlock;
	break;
	}

	if (is_sync) {
	if ((bcast) \|\|
	((!bcast) && (dst_host_ids_entries_temp > 1))) {
	log_debug(knet_h, KNET_SUB_SEND_T, "knet_send_sync is only supported with unicast packets for one destination");
	savederrno = E2BIG;
	err = -1;
	goto out_unlock;
	}
	}

	/*
	* check destinations hosts before spending time
	* in fragmenting/encrypting packets to save
	* time processing data for unrechable hosts.
	* for unicast, also remap the destination data
	* to skip unreachable hosts.
	*/

	if (!bcast) {
	dst_host_ids_entries = 0;
	for (host_idx = 0; host_idx < dst_host_ids_entries_temp; host_idx++) {
	dst_host = knet_h->host_index[dst_host_ids_temp[host_idx]];
	if (!dst_host) {
	continue;
	}
	if (dst_host->status.reachable) {
	dst_host_ids[dst_host_ids_entries] = dst_host_ids_temp[host_idx];
	dst_host_ids_entries++;
	}
	}
	if (!dst_host_ids_entries) {
	savederrno = EHOSTDOWN;
	err = -1;
	goto out_unlock;
	}
	} else {
	send_mcast = 0;
	for (dst_host = knet_h->host_head; dst_host != NULL; dst_host = dst_host->next) {
	if (dst_host->status.reachable) {
	send_mcast = 1;
	break;
	}
	}
	if (!send_mcast) {
	savederrno = EHOSTDOWN;
	err = -1;
	goto out_unlock;
	}
	}

	if (!knet_h->data_mtu) {
	/*
	* using MIN_MTU_V4 for data mtu is not completely accurate but safe enough
	*/
	log_debug(knet_h, KNET_SUB_SEND_T,
	"Received data packet but data MTU is still unknown."
	" Packet might not be delivered."
	" Assuming mininum IPv4 mtu (%d)",
	KNET_PMTUD_MIN_MTU_V4);
	temp_data_mtu = KNET_PMTUD_MIN_MTU_V4;
	} else {
	/*
	* take a copy of the mtu to avoid value changing under
	* our feet while we are sending a fragmented pckt
	*/
	temp_data_mtu = knet_h->data_mtu;
	}

	/*
	* prepare the outgoing buffers
	*/

	frag_len = inlen;
	frag_idx = 0;

	inbuf->khp_data_bcast = bcast;
	inbuf->khp_data_frag_num = ceil((float)inlen / temp_data_mtu);
	inbuf->khp_data_channel = channel;

	while (frag_idx < inbuf->khp_data_frag_num) {
	/*
	* set the iov_base
	*/
	iov_out[frag_idx].iov_base = (void *)knet_h->send_to_links_buf[frag_idx];

	/*
	* set the len
	*/
	if (frag_len > temp_data_mtu) {
	iov_out[frag_idx].iov_len = temp_data_mtu + KNET_HEADER_DATA_SIZE;
	} else {
	iov_out[frag_idx].iov_len = frag_len + KNET_HEADER_DATA_SIZE;
	}

	/*
	* copy the frag info on all buffers
	*/
	knet_h->send_to_links_buf[frag_idx]->kh_type = inbuf->kh_type;

	knet_h->send_to_links_buf[frag_idx]->khp_data_frag_num = inbuf->khp_data_frag_num;
	knet_h->send_to_links_buf[frag_idx]->khp_data_bcast = inbuf->khp_data_bcast;
	knet_h->send_to_links_buf[frag_idx]->khp_data_channel = inbuf->khp_data_channel;

	memmove(knet_h->send_to_links_buf[frag_idx]->khp_data_userdata,
	inbuf->khp_data_userdata + (temp_data_mtu * frag_idx),
	iov_out[frag_idx].iov_len - KNET_HEADER_DATA_SIZE);

	frag_len = frag_len - temp_data_mtu;

	frag_idx++;
	}

	if (!bcast) {

	for (host_idx = 0; host_idx < dst_host_ids_entries; host_idx++) {

	dst_host = knet_h->host_index[dst_host_ids[host_idx]];

	knet_h->send_to_links_buf[0]->khp_data_seq_num = htons(++dst_host->ucast_seq_num_tx);

	frag_idx = 0;

	while (frag_idx < knet_h->send_to_links_buf[0]->khp_data_frag_num) {

	knet_h->send_to_links_buf[frag_idx]->khp_data_seq_num = knet_h->send_to_links_buf[0]->khp_data_seq_num;

	if (knet_h->crypto_instance) {
	if (crypto_encrypt_and_sign(
	knet_h,
	(const unsigned char *)knet_h->send_to_links_buf[frag_idx],
	iov_out[frag_idx].iov_len,
	knet_h->send_to_links_buf_crypt[frag_idx],
	&outlen) < 0) {
	log_debug(knet_h, KNET_SUB_SEND_T, "Unable to encrypt unicast packet");
	savederrno = ECHILD;
	err = -1;
	goto out_unlock;
	}
	iov_out[frag_idx].iov_base = knet_h->send_to_links_buf_crypt[frag_idx];
	iov_out[frag_idx].iov_len = outlen;
	}

	frag_idx++;
	}

	err = _dispatch_to_links(knet_h, dst_host, iov_out);
	savederrno = errno;
	if (err) {
	goto out_unlock;
	}

	}

	} else {

	knet_h->send_to_links_buf[0]->khp_data_seq_num = htons(++knet_h->bcast_seq_num_tx);

	frag_idx = 0;

	while (frag_idx < knet_h->send_to_links_buf[0]->khp_data_frag_num) {

	knet_h->send_to_links_buf[frag_idx]->khp_data_seq_num = knet_h->send_to_links_buf[0]->khp_data_seq_num;

	if (knet_h->crypto_instance) {
	if (crypto_encrypt_and_sign(
	knet_h,
	(const unsigned char *)knet_h->send_to_links_buf[frag_idx],
	iov_out[frag_idx].iov_len,
	knet_h->send_to_links_buf_crypt[frag_idx],
	&outlen) < 0) {
	log_debug(knet_h, KNET_SUB_SEND_T, "Unable to encrypt unicast packet");
	savederrno = ECHILD;
	err = -1;
	goto out_unlock;
	}
	iov_out[frag_idx].iov_base = knet_h->send_to_links_buf_crypt[frag_idx];
	iov_out[frag_idx].iov_len = outlen;
	}

	frag_idx++;
	}

	for (dst_host = knet_h->host_head; dst_host != NULL; dst_host = dst_host->next) {
	if (dst_host->status.reachable) {
	err = _dispatch_to_links(knet_h, dst_host, iov_out);
	savederrno = errno;
	if (err) {
	goto out_unlock;
	}
	}
	}

	}

	out_unlock:
	if ((inlen > 0) && (inbuf->kh_type == KNET_HEADER_TYPE_HOST_INFO)) {
	if (pthread_mutex_lock(&knet_h->host_mutex) != 0)
	log_debug(knet_h, KNET_SUB_SEND_T, "Unable to get mutex lock");
	pthread_cond_signal(&knet_h->host_cond);
	pthread_mutex_unlock(&knet_h->host_mutex);
	}

	errno = savederrno;
	return err;
	}

	int knet_send_sync(knet_handle_t knet_h, const char *buff, const size_t buff_len, const int8_t channel)
	{
	int savederrno = 0, err = 0;

	if (!knet_h) {
	errno = EINVAL;
	return -1;
	}

	if (buff == NULL) {
	errno = EINVAL;
	return -1;
	}

	if (buff_len <= 0) {
	errno = EINVAL;
	return -1;
	}

	if (buff_len > KNET_MAX_PACKET_SIZE) {
	errno = EINVAL;
	return -1;
	}

	if (channel < 0) {
	errno = EINVAL;
	return -1;
	}

	if (channel >= KNET_DATAFD_MAX) {
	errno = EINVAL;
	return -1;
	}

	savederrno = pthread_rwlock_rdlock(&knet_h->global_rwlock);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_SEND_T, "Unable to get read lock: %s",
	strerror(savederrno));
	errno = savederrno;
	return -1;
	}

	if (!knet_h->sockfd[channel].in_use) {
	savederrno = EINVAL;
	err = -1;
	goto out;
	}

	savederrno = pthread_mutex_lock(&knet_h->tx_mutex);
	if (savederrno) {
	log_err(knet_h, KNET_SUB_SEND_T, "Unable to get TX mutex lock: %s",
	strerror(savederrno));
	err = -1;
	goto out;
	}

	knet_h->recv_from_sock_buf[0]->kh_type = KNET_HEADER_TYPE_DATA;
	memmove(knet_h->recv_from_sock_buf[0]->khp_data_userdata, buff, buff_len);
	err = _parse_recv_from_sock(knet_h, 0, buff_len, channel, 1);
	savederrno = errno;

	pthread_mutex_unlock(&knet_h->tx_mutex);

	out:
	pthread_rwlock_unlock(&knet_h->global_rwlock);

	errno = savederrno;
	return err;
	}


	static void _close_socket(knet_handle_t knet_h, int sockfd)
	{
	struct epoll_event ev;
	+ int i;

	log_err(knet_h, KNET_SUB_LINK_T, "EOF received on socket fd %d", sockfd);

	memset(&ev, 0, sizeof(struct epoll_event));

	ev.events = EPOLLIN;
	ev.data.fd = sockfd;
	if (epoll_ctl(knet_h->recv_from_links_epollfd, EPOLL_CTL_DEL, sockfd, &ev)) {
	log_err(knet_h, KNET_SUB_LISTENER, "Unable to remove EOFed socket from epoll pool: %s",
	strerror(errno));
	}

	/* Tell transport that the FD has been closed */
	- knet_h->transport_ops->handle_fd_eof(knet_h, sockfd);
	+ for (i=0; i<KNET_MAX_TRANSPORTS; i++) {
	+ if (knet_h->transports[i] &&
	+ !knet_h->transport_ops[i]->handle_fd_eof(knet_h, sockfd))
	+ break;
	+ }
	}

	static void _handle_send_to_links(knet_handle_t knet_h, int sockfd, int8_t channel, struct mmsghdr *msg, int type)
	{
	ssize_t inlen = 0;
	struct iovec iov_in;
	int msg_recv, i;
	int savederrno = 0, docallback = 0;

	if ((channel >= 0) &&
	(channel < KNET_DATAFD_MAX) &&
	(!knet_h->sockfd[channel].is_socket)) {
	memset(&iov_in, 0, sizeof(iov_in));
	iov_in.iov_base = (void *)knet_h->recv_from_sock_buf[0]->khp_data_userdata;
	iov_in.iov_len = KNET_MAX_PACKET_SIZE;

	inlen = readv(sockfd, &iov_in, 1);

	if (inlen <= 0) {
	savederrno = errno;
	docallback = 1;
	goto out;
	}

	msg_recv = 1;
	knet_h->recv_from_sock_buf[0]->kh_type = type;
	_parse_recv_from_sock(knet_h, 0, inlen, channel, 0);
	} else {
	msg_recv = recvmmsg(sockfd, msg, PCKT_FRAG_MAX, MSG_DONTWAIT \| MSG_NOSIGNAL, NULL);
	if (msg_recv < 0) {
	inlen = msg_recv;
	savederrno = errno;
	docallback = 1;
	goto out;
	}
	for (i = 0; i < msg_recv; i++) {
	inlen = msg[i].msg_len;
	if (inlen == 0) {
	savederrno = 0;
	docallback = 1;
	goto out;
	break;
	}
	knet_h->recv_from_sock_buf[i]->kh_type = type;
	_parse_recv_from_sock(knet_h, i, inlen, channel, 0);
	}
	}

	out:

	if (inlen < 0) {
	struct epoll_event ev;

	memset(&ev, 0, sizeof(struct epoll_event));

	if (epoll_ctl(knet_h->send_to_links_epollfd,
	EPOLL_CTL_DEL, knet_h->sockfd[channel].sockfd[knet_h->sockfd[channel].is_created], &ev)) {
	log_err(knet_h, KNET_SUB_SEND_T, "Unable to del datafd %d from linkfd epoll pool: %s",
	knet_h->sockfd[channel].sockfd[0], strerror(savederrno));
	} else {
	knet_h->sockfd[channel].has_error = 1;
	}

	}

	if (docallback) {
	knet_h->sock_notify_fn(knet_h->sock_notify_fn_private_data,
	knet_h->sockfd[channel].sockfd[0],
	channel,
	KNET_NOTIFY_TX,
	inlen,
	savederrno);
	}
	}

	void _handle_send_to_links_thread(void data)
	{
	knet_handle_t knet_h = (knet_handle_t) data;
	struct epoll_event events[KNET_EPOLL_MAX_EVENTS];
	struct sockaddr_storage address[PCKT_FRAG_MAX];
	struct mmsghdr msg[PCKT_FRAG_MAX];
	struct iovec iov_in[PCKT_FRAG_MAX];
	int i, nev, type;
	int8_t channel;

	memset(&msg, 0, sizeof(struct mmsghdr));

	/* preparing data buffer */
	for (i = 0; i < PCKT_FRAG_MAX; i++) {
	iov_in[i].iov_base = (void *)knet_h->recv_from_sock_buf[i]->khp_data_userdata;
	iov_in[i].iov_len = KNET_MAX_PACKET_SIZE;

	memset(&msg[i].msg_hdr, 0, sizeof(struct msghdr));

	msg[i].msg_hdr.msg_name = &address[i];
	msg[i].msg_hdr.msg_namelen = sizeof(struct sockaddr_storage);
	msg[i].msg_hdr.msg_iov = &iov_in[i];
	msg[i].msg_hdr.msg_iovlen = 1;

	knet_h->recv_from_sock_buf[i]->kh_version = KNET_HEADER_VERSION;
	knet_h->recv_from_sock_buf[i]->khp_data_frag_seq = 0;
	knet_h->recv_from_sock_buf[i]->kh_node = htons(knet_h->host_id);

	knet_h->send_to_links_buf[i]->kh_version = KNET_HEADER_VERSION;
	knet_h->send_to_links_buf[i]->khp_data_frag_seq = i + 1;
	knet_h->send_to_links_buf[i]->kh_node = htons(knet_h->host_id);
	}

	while (!shutdown_in_progress(knet_h)) {
	nev = epoll_wait(knet_h->send_to_links_epollfd, events, KNET_EPOLL_MAX_EVENTS + 1, -1);

	if (pthread_rwlock_rdlock(&knet_h->global_rwlock) != 0) {
	log_debug(knet_h, KNET_SUB_SEND_T, "Unable to get read lock");
	continue;
	}

	for (i = 0; i < nev; i++) {
	if (events[i].data.fd == knet_h->hostsockfd[0]) {
	type = KNET_HEADER_TYPE_HOST_INFO;
	channel = -1;
	} else {
	type = KNET_HEADER_TYPE_DATA;
	for (channel = 0; channel < KNET_DATAFD_MAX; channel++) {
	if ((knet_h->sockfd[channel].in_use) &&
	(knet_h->sockfd[channel].sockfd[knet_h->sockfd[channel].is_created] == events[i].data.fd)) {
	break;
	}
	}
	}
	if (pthread_mutex_lock(&knet_h->tx_mutex) != 0) {
	log_debug(knet_h, KNET_SUB_SEND_T, "Unable to get mutex lock");
	pthread_rwlock_unlock(&knet_h->listener_rwlock);
	continue;
	}
	_handle_send_to_links(knet_h, events[i].data.fd, channel, msg, type);
	pthread_mutex_unlock(&knet_h->tx_mutex);
	}
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	}

	return NULL;
	}

	/*
	* RECV
	*/

	/*
	* return 1 if a > b
	* return -1 if b > a
	* return 0 if they are equal
	*/
	static inline int timecmp(struct timespec a, struct timespec b)
	{
	if (a.tv_sec != b.tv_sec) {
	if (a.tv_sec > b.tv_sec) {
	return 1;
	} else {
	return -1;
	}
	} else {
	if (a.tv_nsec > b.tv_nsec) {
	return 1;
	} else if (a.tv_nsec < b.tv_nsec) {
	return -1;
	} else {
	return 0;
	}
	}
	}

	/*
	* this functions needs to return an index (0 to 7)
	* to a knet_host_defrag_buf. (-1 on errors)
	*/

	static int find_pckt_defrag_buf(knet_handle_t knet_h, struct knet_header *inbuf)
	{
	struct knet_host *src_host = knet_h->host_index[inbuf->kh_node];
	int i, oldest;

	/*
	* check if there is a buffer already in use handling the same seq_num
	*/
	for (i = 0; i < KNET_MAX_LINK; i++) {
	if (src_host->defrag_buf[i].in_use) {
	if (src_host->defrag_buf[i].pckt_seq == inbuf->khp_data_seq_num) {
	return i;
	}
	}
	}

	/*
	* If there is no buffer that's handling the current seq_num
	* either it's new or it's been reclaimed already.
	* check if it's been reclaimed/seen before using the defrag circular
	* buffer. If the pckt has been seen before, the buffer expired (ETIME)
	* and there is no point to try to defrag it again.
	*/
	if (!_seq_num_lookup(src_host, inbuf->khp_data_bcast, inbuf->khp_data_seq_num, 1)) {
	errno = ETIME;
	return -1;
	}

	/*
	* register the pckt as seen
	*/
	_seq_num_set(src_host, inbuf->khp_data_bcast, inbuf->khp_data_seq_num, 1);

	/*
	* see if there is a free buffer
	*/
	for (i = 0; i < KNET_MAX_LINK; i++) {
	if (!src_host->defrag_buf[i].in_use) {
	return i;
	}
	}

	/*
	* at this point, there are no free buffers, the pckt is new
	* and we need to reclaim a buffer, and we will take the one
	* with the oldest timestamp. It's as good as any.
	*/

	oldest = 0;

	for (i = 0; i < KNET_MAX_LINK; i++) {
	if (timecmp(src_host->defrag_buf[i].last_update, src_host->defrag_buf[oldest].last_update) < 0) {
	oldest = i;
	}
	}
	src_host->defrag_buf[oldest].in_use = 0;
	return oldest;
	}

	static int pckt_defrag(knet_handle_t knet_h, struct knet_header inbuf, ssize_t len)
	{
	struct knet_host_defrag_buf *defrag_buf;
	int defrag_buf_idx;

	defrag_buf_idx = find_pckt_defrag_buf(knet_h, inbuf);
	if (defrag_buf_idx < 0) {
	if (errno == ETIME) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Defrag buffer expired");
	}
	return 1;
	}

	defrag_buf = &knet_h->host_index[inbuf->kh_node]->defrag_buf[defrag_buf_idx];

	/*
	* if the buf is not is use, then make sure it's clean
	*/
	if (!defrag_buf->in_use) {
	memset(defrag_buf, 0, sizeof(struct knet_host_defrag_buf));
	defrag_buf->in_use = 1;
	defrag_buf->pckt_seq = inbuf->khp_data_seq_num;
	}

	/*
	* update timestamp on the buffer
	*/
	clock_gettime(CLOCK_MONOTONIC, &defrag_buf->last_update);

	/*
	* check if we already received this fragment
	*/
	if (defrag_buf->frag_map[inbuf->khp_data_frag_seq]) {
	/*
	* if we have received this fragment and we didn't clear the buffer
	* it means that we don't have all fragments yet
	*/
	return 1;
	}

	/*
	* we need to handle the last packet with gloves due to its different size
	*/

	if (inbuf->khp_data_frag_seq == inbuf->khp_data_frag_num) {
	defrag_buf->last_frag_size = *len;

	/*
	* in the event when the last packet arrives first,
	* we still don't know the offset vs the other fragments (based on MTU),
	* so we store the fragment at the end of the buffer where it's safe
	* and take a copy of the len so that we can restore its offset later.
	* remember we can't use the local MTU for this calculation because pMTU
	* can be asymettric between the same hosts.
	*/
	if (!defrag_buf->frag_size) {
	defrag_buf->last_first = 1;
	memmove(defrag_buf->buf + (KNET_MAX_PACKET_SIZE - *len),
	inbuf->khp_data_userdata,
	*len);
	}
	} else {
	defrag_buf->frag_size = *len;
	}

	memmove(defrag_buf->buf + ((inbuf->khp_data_frag_seq - 1) * defrag_buf->frag_size),
	inbuf->khp_data_userdata, *len);

	defrag_buf->frag_recv++;
	defrag_buf->frag_map[inbuf->khp_data_frag_seq] = 1;

	/*
	* check if we received all the fragments
	*/
	if (defrag_buf->frag_recv == inbuf->khp_data_frag_num) {
	/*
	* special case the last pckt
	*/

	if (defrag_buf->last_first) {
	memmove(defrag_buf->buf + ((inbuf->khp_data_frag_num - 1) * defrag_buf->frag_size),
	defrag_buf->buf + (KNET_MAX_PACKET_SIZE - defrag_buf->last_frag_size),
	defrag_buf->last_frag_size);
	}

	/*
	* recalculate packet lenght
	*/

	len = ((inbuf->khp_data_frag_num - 1) defrag_buf->frag_size) + defrag_buf->last_frag_size;

	/*
	* copy the pckt back in the user data
	*/
	memmove(inbuf->khp_data_userdata, defrag_buf->buf, *len);

	/*
	* free this buffer
	*/
	defrag_buf->in_use = 0;
	return 0;
	}

	return 1;
	}

	static void _parse_recv_from_links(knet_handle_t knet_h, struct sockaddr_storage *address, int ind, ssize_t len)
	{
	ssize_t outlen;
	struct knet_host *src_host;
	struct knet_link *src_link;
	unsigned long long latency_last;
	uint16_t dst_host_ids[KNET_MAX_HOST];
	size_t dst_host_ids_entries = 0;
	int bcast = 1;
	struct timespec recvtime;
	struct knet_header *inbuf = knet_h->recv_from_links_buf[ind];
	unsigned char outbuf = (unsigned char )knet_h->recv_from_links_buf[ind];
	struct knet_hostinfo *knet_hostinfo;
	struct iovec iov_out[1];
	int8_t channel;

	if (knet_h->crypto_instance) {
	if (crypto_authenticate_and_decrypt(knet_h,
	(unsigned char *)inbuf,
	len,
	knet_h->recv_from_links_buf_decrypt,
	&outlen) < 0) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Unable to decrypt/auth packet");
	return;
	}
	len = outlen;
	inbuf = (struct knet_header *)knet_h->recv_from_links_buf_decrypt;
	}

	if (len < (KNET_HEADER_SIZE + 1)) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Packet is too short: %ld", len);
	return;
	}

	if (inbuf->kh_version != KNET_HEADER_VERSION) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Packet version does not match");
	return;
	}

	inbuf->kh_node = ntohs(inbuf->kh_node);
	src_host = knet_h->host_index[inbuf->kh_node];
	if (src_host == NULL) { /* host not found */
	log_debug(knet_h, KNET_SUB_LINK_T, "Unable to find source host for this packet");
	return;
	}

	src_link = NULL;

	if ((inbuf->kh_type & KNET_HEADER_TYPE_PMSK) != 0) {
	src_link = src_host->link +
	(inbuf->khp_ping_link % KNET_MAX_LINK);
	if (src_link->dynamic == KNET_LINK_DYNIP) {
	if (memcmp(&src_link->dst_addr, address, sizeof(struct sockaddr_storage)) != 0) {
	log_debug(knet_h, KNET_SUB_LINK_T, "host: %u link: %u appears to have changed ip address",
	src_host->host_id, src_link->link_id);
	memmove(&src_link->dst_addr, address, sizeof(struct sockaddr_storage));
	if (getnameinfo((const struct sockaddr *)&src_link->dst_addr, sizeof(struct sockaddr_storage),
	src_link->status.dst_ipaddr, KNET_MAX_HOST_LEN,
	src_link->status.dst_port, KNET_MAX_PORT_LEN,
	NI_NUMERICHOST \| NI_NUMERICSERV) != 0) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Unable to resolve ???");
	snprintf(src_link->status.dst_ipaddr, KNET_MAX_HOST_LEN - 1, "Unknown!!!");
	snprintf(src_link->status.dst_port, KNET_MAX_PORT_LEN - 1, "??");
	}
	}
	src_link->status.dynconnected = 1;
	}
	}

	switch (inbuf->kh_type) {
	case KNET_HEADER_TYPE_HOST_INFO:
	case KNET_HEADER_TYPE_DATA:
	inbuf->khp_data_seq_num = ntohs(inbuf->khp_data_seq_num);
	channel = inbuf->khp_data_channel;

	if (!_seq_num_lookup(src_host, inbuf->khp_data_bcast, inbuf->khp_data_seq_num, 0)) {
	if (src_host->link_handler_policy != KNET_LINK_POLICY_ACTIVE) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Packet has already been delivered");
	}
	return;
	}

	if (inbuf->khp_data_frag_num > 1) {
	/*
	* len as received from the socket also includes extra stuff
	* that the defrag code doesn't care about. So strip it
	* here and readd only for repadding once we are done
	* defragging
	*/
	len = len - KNET_HEADER_DATA_SIZE;
	if (pckt_defrag(knet_h, inbuf, &len)) {
	return;
	}
	len = len + KNET_HEADER_DATA_SIZE;
	}

	if (inbuf->kh_type == KNET_HEADER_TYPE_DATA) {
	if (knet_h->enabled != 1) /* data forward is disabled */
	break;

	if (knet_h->dst_host_filter_fn) {
	int host_idx;
	int found = 0;

	bcast = knet_h->dst_host_filter_fn(
	knet_h->dst_host_filter_fn_private_data,
	(const unsigned char *)inbuf->khp_data_userdata,
	len - KNET_HEADER_DATA_SIZE,
	KNET_NOTIFY_RX,
	knet_h->host_id,
	inbuf->kh_node,
	&channel,
	dst_host_ids,
	&dst_host_ids_entries);
	if (bcast < 0) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Error from dst_host_filter_fn: %d", bcast);
	return;
	}

	if ((!bcast) && (!dst_host_ids_entries)) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Message is unicast but no dst_host_ids_entries");
	return;
	}

	/* check if we are dst for this packet */
	if (!bcast) {
	for (host_idx = 0; host_idx < dst_host_ids_entries; host_idx++) {
	if (dst_host_ids[host_idx] == knet_h->host_id) {
	found = 1;
	break;
	}
	}
	if (!found) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Packet is not for us");
	return;
	}
	}
	}
	}

	if (inbuf->kh_type == KNET_HEADER_TYPE_DATA) {
	if (!knet_h->sockfd[channel].in_use) {
	log_debug(knet_h, KNET_SUB_LINK_T,
	"received packet for channel %d but there is no local sock connected",
	channel);
	return;
	}

	memset(iov_out, 0, sizeof(iov_out));
	iov_out[0].iov_base = (void *) inbuf->khp_data_userdata;
	iov_out[0].iov_len = len - KNET_HEADER_DATA_SIZE;

	outlen = writev(knet_h->sockfd[channel].sockfd[knet_h->sockfd[channel].is_created], iov_out, 1);
	if (outlen <= 0) {
	knet_h->sock_notify_fn(knet_h->sock_notify_fn_private_data,
	knet_h->sockfd[channel].sockfd[0],
	channel,
	KNET_NOTIFY_RX,
	outlen,
	errno);
	return;
	}
	if (outlen == iov_out[0].iov_len) {
	_seq_num_set(src_host, bcast, inbuf->khp_data_seq_num, 0);
	}
	} else { /* HOSTINFO */
	knet_hostinfo = (struct knet_hostinfo *)inbuf->khp_data_userdata;
	if (knet_hostinfo->khi_bcast == KNET_HOSTINFO_UCAST) {
	bcast = 0;
	knet_hostinfo->khi_dst_node_id = ntohs(knet_hostinfo->khi_dst_node_id);
	}
	if (!_seq_num_lookup(src_host, bcast, inbuf->khp_data_seq_num, 0)) {
	return;
	}
	_seq_num_set(src_host, bcast, inbuf->khp_data_seq_num, 0);
	switch(knet_hostinfo->khi_type) {
	case KNET_HOSTINFO_TYPE_LINK_UP_DOWN:
	src_link = src_host->link +
	(knet_hostinfo->khip_link_status_link_id % KNET_MAX_LINK);
	/*
	* basically if the node is coming back to life from a crash
	* we should receive a host info where local previous status == remote current status
	* and so we can detect that node is showing up again
	* we need to clear cbuffers and notify the node of our status by resending our host info
	*/
	if ((src_link->remoteconnected == KNET_HOSTINFO_LINK_STATUS_UP) &&
	(src_link->remoteconnected == knet_hostinfo->khip_link_status_status)) {
	src_link->host_info_up_sent = 0;
	}
	src_link->remoteconnected = knet_hostinfo->khip_link_status_status;
	if (src_link->remoteconnected == KNET_HOSTINFO_LINK_STATUS_DOWN) {
	/*
	* if a host is disconnecting clean, we note that in donnotremoteupdate
	* so that we don't send host info back immediately but we wait
	* for the node to send an update when it's alive again
	*/
	src_link->host_info_up_sent = 0;
	src_link->donnotremoteupdate = 1;
	} else {
	src_link->donnotremoteupdate = 0;
	}
	log_debug(knet_h, KNET_SUB_LINK_T, "host message up/down. from host: %u link: %u remote connected: %u",
	src_host->host_id,
	src_link->link_id,
	src_link->remoteconnected);
	if (_host_dstcache_update_async(knet_h, src_host)) {
	log_debug(knet_h, KNET_SUB_LINK_T,
	"Unable to update switch cache for host: %u link: %u remote connected: %u)",
	src_host->host_id,
	src_link->link_id,
	src_link->remoteconnected);
	}
	break;
	case KNET_HOSTINFO_TYPE_LINK_TABLE:
	break;
	default:
	log_warn(knet_h, KNET_SUB_LINK_T, "Receiving unknown host info message from host %u", src_host->host_id);
	break;
	}
	}
	break;
	case KNET_HEADER_TYPE_PING:
	outlen = KNET_HEADER_PING_SIZE;
	inbuf->kh_type = KNET_HEADER_TYPE_PONG;
	inbuf->kh_node = htons(knet_h->host_id);

	if (knet_h->crypto_instance) {
	if (crypto_encrypt_and_sign(knet_h,
	(const unsigned char *)inbuf,
	len,
	knet_h->recv_from_links_buf_crypt,
	&outlen) < 0) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Unable to encrypt pong packet");
	break;
	}
	outbuf = knet_h->recv_from_links_buf_crypt;
	}

	if (sendto(src_link->outsock, outbuf, outlen, MSG_DONTWAIT \| MSG_NOSIGNAL,
	(struct sockaddr *) &src_link->dst_addr,
	sizeof(struct sockaddr_storage)) != outlen) {
	log_debug(knet_h, KNET_SUB_LINK_T,
	"Unable to send pong reply (sock: %d) packet (sendto): %d %s. recorded src ip: %s src port: %s dst ip: %s dst port: %s",
	src_link->outsock, errno, strerror(errno),
	src_link->status.src_ipaddr, src_link->status.src_port,
	src_link->status.dst_ipaddr, src_link->status.dst_port);
	}

	break;
	case KNET_HEADER_TYPE_PONG:
	clock_gettime(CLOCK_MONOTONIC, &src_link->status.pong_last);

	memmove(&recvtime, &inbuf->khp_ping_time[0], sizeof(struct timespec));
	timespec_diff(recvtime,
	src_link->status.pong_last, &latency_last);

	src_link->status.latency =
	((src_link->status.latency * src_link->latency_exp) +
	((latency_last / 1000llu) *
	(src_link->latency_fix - src_link->latency_exp))) /
	src_link->latency_fix;

	if (src_link->status.latency < src_link->pong_timeout) {
	if (!src_link->status.connected) {
	if (src_link->received_pong >= src_link->pong_count) {
	log_info(knet_h, KNET_SUB_LINK_T, "host: %u link: %u is up",
	src_host->host_id, src_link->link_id);
	_link_updown(knet_h, src_host->host_id, src_link->link_id, src_link->status.enabled, 1);
	} else {
	src_link->received_pong++;
	log_debug(knet_h, KNET_SUB_LINK_T, "host: %u link: %u received pong: %u",
	src_host->host_id, src_link->link_id, src_link->received_pong);
	}
	}
	}

	break;
	case KNET_HEADER_TYPE_PMTUD:
	outlen = KNET_HEADER_PMTUD_SIZE;
	inbuf->kh_type = KNET_HEADER_TYPE_PMTUD_REPLY;
	inbuf->kh_node = htons(knet_h->host_id);

	if (knet_h->crypto_instance) {
	if (crypto_encrypt_and_sign(knet_h,
	(const unsigned char *)inbuf,
	len,
	knet_h->recv_from_links_buf_crypt,
	&outlen) < 0) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Unable to encrypt PMTUd reply packet");
	break;
	}
	outbuf = knet_h->recv_from_links_buf_crypt;
	}

	if (sendto(src_link->outsock, outbuf, outlen, MSG_DONTWAIT \| MSG_NOSIGNAL,
	(struct sockaddr *) &src_link->dst_addr,
	sizeof(struct sockaddr_storage)) != outlen) {
	log_debug(knet_h, KNET_SUB_LINK_T,
	"Unable to send PMTUd reply (sock: %d) packet (sendto): %d %s. recorded src ip: %s src port: %s dst ip: %s dst port: %s",
	src_link->outsock, errno, strerror(errno),
	src_link->status.src_ipaddr, src_link->status.src_port,
	src_link->status.dst_ipaddr, src_link->status.dst_port);
	}

	break;
	case KNET_HEADER_TYPE_PMTUD_REPLY:
	if (pthread_mutex_lock(&knet_h->pmtud_mutex) != 0) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Unable to get mutex lock");
	break;
	}
	src_link->last_recv_mtu = inbuf->khp_pmtud_size;
	pthread_cond_signal(&knet_h->pmtud_cond);
	pthread_mutex_unlock(&knet_h->pmtud_mutex);
	break;
	default:
	return;
	}
	}

	static void _handle_recv_from_links(knet_handle_t knet_h, int sockfd, struct mmsghdr *msg)
	{
	int i, msg_recv;

	if (pthread_rwlock_rdlock(&knet_h->global_rwlock) != 0) {
	log_debug(knet_h, KNET_SUB_LINK_T, "Unable to get read lock");
	return;
	}

	msg_recv = recvmmsg(sockfd, msg, PCKT_FRAG_MAX, MSG_DONTWAIT \| MSG_NOSIGNAL, NULL);
	if (msg_recv < 0) {
	log_err(knet_h, KNET_SUB_LINK_T, "No message received from recvmmsg: %s", strerror(errno));
	goto exit_unlock;
	}

	if (msg_recv == 0) {
	_close_socket(knet_h, sockfd);
	}

	for (i = 0; i < msg_recv; i++) {
	if (msg[i].msg_len == 0) {
	_close_socket(knet_h, sockfd);
	goto exit_unlock;
	}
	else {
	_parse_recv_from_links(knet_h, (struct sockaddr_storage *)&msg[i].msg_hdr.msg_name, i, msg[i].msg_len);
	}
	}

	exit_unlock:
	pthread_rwlock_unlock(&knet_h->global_rwlock);
	}

	void _handle_recv_from_links_thread(void data)
	{
	int i, nev;
	knet_handle_t knet_h = (knet_handle_t) data;
	struct epoll_event events[KNET_EPOLL_MAX_EVENTS];
	struct sockaddr_storage address[PCKT_FRAG_MAX];
	struct mmsghdr msg[PCKT_FRAG_MAX];
	struct iovec iov_in[PCKT_FRAG_MAX];

	memset(&msg, 0, sizeof(struct mmsghdr));

	for (i = 0; i < PCKT_FRAG_MAX; i++) {
	iov_in[i].iov_base = (void *)knet_h->recv_from_links_buf[i];
	iov_in[i].iov_len = KNET_DATABUFSIZE;

	memset(&msg[i].msg_hdr, 0, sizeof(struct msghdr));

	msg[i].msg_hdr.msg_name = &address[i];
	msg[i].msg_hdr.msg_namelen = sizeof(struct sockaddr_storage);
	msg[i].msg_hdr.msg_iov = &iov_in[i];
	msg[i].msg_hdr.msg_iovlen = 1;
	}

	while (!shutdown_in_progress(knet_h)) {
	nev = epoll_wait(knet_h->recv_from_links_epollfd, events, KNET_EPOLL_MAX_EVENTS, -1);

	for (i = 0; i < nev; i++) {
	_handle_recv_from_links(knet_h, events[i].data.fd, msg);
	}
	}

	return NULL;
	}
	diff --git a/libknet/transport_common.c b/libknet/transport_common.c
	index 8455a476..f55170d7 100644
	--- a/libknet/transport_common.c
	+++ b/libknet/transport_common.c
	@@ -1,140 +1,140 @@
	#include "config.h"

	#include <stdio.h>
	#include <string.h>
	#include <unistd.h>
	#include <errno.h>
	#include <pthread.h>
	#include <math.h>
	#include <sys/epoll.h>
	#include <sys/types.h>
	#include <sys/socket.h>
	#include <netdb.h>
	#include <malloc.h>
	#include <arpa/inet.h>

	#include "libknet.h"
	#include "host.h"
	#include "link.h"
	#include "logging.h"
	#include "common.h"
	#include "transports.h"

	#ifdef DEBUG
	/*
	- * Keeping this light (and therefore not thread-safe) as it's
	+ * Keeping this light (and there fornot thread-safe) as it's
	* for debugging only
	*/
	const char _transport_print_ip(const struct sockaddr_storage ss)
	{
	static char printbuf[INET6_ADDRSTRLEN];

	if (ss->ss_family == AF_INET) {
	struct sockaddr_in in4 = (struct sockaddr_in )ss;
	return inet_ntop(AF_INET, &in4->sin_addr, printbuf, sizeof(printbuf));
	}
	else {
	struct sockaddr_in6 in6 = (struct sockaddr_in6 )ss;
	return inet_ntop(AF_INET6, &in6->sin6_addr, printbuf, sizeof(printbuf));
	}
	}
	#else
	const char _transport_print_ip(const struct sockaddr_storage ss)
	{
	return "node";
	}
	#endif

	int _configure_transport_socket(knet_handle_t knet_h, int sock, struct sockaddr_storage address, const char type)
	{
	int err = 0;
	int value;
	int savederrno;

	value = KNET_RING_RCVBUFF;
	if (setsockopt(sock, SOL_SOCKET, SO_RCVBUFFORCE, &value, sizeof(value)) < 0) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_TRANSPORT_T, "Unable to set %s receive buffer: %s",
	type, strerror(savederrno));
	goto exit_error;
	}

	value = KNET_RING_RCVBUFF;
	if (setsockopt(sock, SOL_SOCKET, SO_SNDBUFFORCE, &value, sizeof(value)) < 0) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_TRANSPORT_T, "Unable to set %s send buffer: %s",
	type, strerror(savederrno));
	goto exit_error;
	}

	value = 1;
	if (setsockopt(sock, SOL_IP, IP_FREEBIND, &value, sizeof(value)) <0) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_TRANSPORT_T, "Unable to set FREEBIND on %s socket: %s",
	type, strerror(savederrno));
	goto exit_error;
	}

	if (address->ss_family == AF_INET6) {
	value = 1;
	if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
	&value, sizeof(value)) < 0) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_TRANSPORT_T, "Unable to set %s IPv6 only: %s",
	type, strerror(savederrno));
	goto exit_error;

	}
	value = IPV6_PMTUDISC_PROBE;
	if (setsockopt(sock, SOL_IPV6, IPV6_MTU_DISCOVER, &value, sizeof(value)) <0) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_TRANSPORT_T, "Unable to set PMTUDISC on %s socket: %s",
	type, strerror(savederrno));
	goto exit_error;
	}
	} else {
	value = IP_PMTUDISC_PROBE;
	if (setsockopt(sock, SOL_IP, IP_MTU_DISCOVER, &value, sizeof(value)) <0) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_TRANSPORT_T, "Unable to set PMTUDISC on %s socket: %s",
	type, strerror(savederrno));
	goto exit_error;
	}
	}

	value = 1;
	if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(value)) < 0) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_TRANSPORT_T, "Unable to set %s reuseaddr: %s",
	type, strerror(savederrno));
	goto exit_error;
	}

	if (_fdset_cloexec(sock)) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_TRANSPORT_T, "Unable to set %s CLOEXEC socket opts: %s",
	type, strerror(savederrno));
	goto exit_error;
	}

	if (_fdset_nonblock(sock)) {
	savederrno = errno;
	err = -1;
	log_err(knet_h, KNET_SUB_TRANSPORT_T, "Unable to set %s NONBLOCK socket opts: %s",
	type, strerror(savederrno));
	goto exit_error;
	}

	err = 0;

	exit_error:
	return err;
	}
	diff --git a/libknet/transports.h b/libknet/transports.h
	index 5a0cbd03..2abac866 100644
	--- a/libknet/transports.h
	+++ b/libknet/transports.h
	@@ -1,8 +1,7 @@
	#include <netinet/in.h>
	-#include <netinet/sctp.h>

	knet_transport_ops_t *get_udp_transport(void);

	const char _transport_print_ip(const struct sockaddr_storage ss);
	int _configure_transport_socket(knet_handle_t knet_h, int sock, struct sockaddr_storage address, const char type);

File Metadata

Mime Type: text/x-diff
Expires: Wed, Jun 25, 2:12 AM (9 h, 28 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1951833
Default Alt Text: (290 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions