diff --git a/libtap/libtap.c b/libtap/libtap.c
index f6b27a81..3edab11d 100644
--- a/libtap/libtap.c
+++ b/libtap/libtap.c
@@ -1,1908 +1,1913 @@
 #include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <linux/if_tun.h>
 #include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <arpa/inet.h>
 #include <pthread.h>
 #include <limits.h>
 #include <stdio.h>
 #include <net/if.h>
 #include <ifaddrs.h>
 #include <stdint.h>
 
 #include "libtap.h"
 
 #define MAX_IP_CHAR	128
 #define MAX_PREFIX_CHAR	4
 #define MAX_MAC_CHAR	18
 
 struct _ip {
 	char ip_addr[MAX_IP_CHAR];
 	char prefix[MAX_PREFIX_CHAR];
 	struct _ip *next;
 };
 
 struct _iface {
 	struct ifreq ifr;
 	int fd;
 	char default_mac[MAX_MAC_CHAR];
 	int default_mtu;
 	char updownpath[PATH_MAX];
 	int hasupdown;
 	int up;
 	struct _ip *ip;
 	struct _iface *next;
 };
 #define ifname ifr.ifr_name
 
 struct _config {
 	struct _iface *head;
 	int sockfd;
 };
 
 static int lib_init = 0;
 static struct _config lib_cfg;
 static pthread_mutex_t lib_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* forward declarations */
 static int _execute_shell(const char *command, char **error_string);
 static int _exec_updown(const tap_t tap, const char *action, char **error_string);
 static int _read_pipe(int fd, char **file, size_t *length);
 static int _check(const tap_t tap);
 static void _close(tap_t tap);
 static void _close_cfg(void);
 static int _get_mtu(const tap_t tap);
 static int _get_mac(const tap_t tap, char **ether_addr);
 static int _set_down(tap_t tap, char **error_down, char **error_postdown);
 static char *_get_v4_broadcast(const char *ip_addr, const char *prefix);
 static int _set_ip(tap_t tap, const char *command,
 		      const char *ip_addr, const char *prefix,
 		      char **error_string);
 static int _find_ip(tap_t tap,
 			const char *ip_addr, const char *prefix,
 			struct _ip **ip, struct _ip **ip_prev);
 
 static int _read_pipe(int fd, char **file, size_t *length)
 {
 	char buf[4096];
 	int n;
 	int done = 0;
 
 	*file = NULL;
 	*length = 0;
 
 	memset(buf, 0, sizeof(buf));
 
 	while (!done) {
 
 		n = read(fd, buf, sizeof(buf));
 
 		if (n < 0) {
 			if (errno == EINTR)
 				continue;
 
 			if (*file)
 				free(*file);
 
 			return n;
 		}
 
 		if (n == 0 && (!*length))
 			return 0;
 
 		if (n == 0)
 			done = 1;
 
 		if (*file)
 			*file = realloc(*file, (*length) + n + done);
 		else
 			*file = malloc(n + done);
 
 		if (!*file)
 			return -1;
 
 		memcpy((*file) + (*length), buf, n);
 		*length += (done + n);
 	}
 
 	/* Null terminator */
 	(*file)[(*length) - 1] = 0;
 
 	return 0;
 }
 
 static int _execute_shell(const char *command, char **error_string)
 {
 	pid_t pid;
 	int status, err = 0;
 	int fd[2];
 	size_t size = 0;
 
 	if ((command == NULL) || (!error_string)) {
 		errno = EINVAL;
 		return -1;
 	}
 
 	*error_string = NULL;
 
 	err = pipe(fd);
 	if (err)
 		goto out_clean;
 
 	pid = fork();
 	if (pid < 0) {
 		err = pid;
 		goto out_clean;
 	}
 
 	if (pid) { /* parent */
 
 		close(fd[1]);
 		err = _read_pipe(fd[0], error_string, &size);
 		if (err)
 			goto out_clean;
 
 		waitpid(pid, &status, 0);
 		if (!WIFEXITED(status)) {
 			err = -1;
 			goto out_clean;
 		}
 		if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
 			err = WEXITSTATUS(status);
 			goto out_clean;
 		}
 	} else { /* child */
 		close(0);
 		close(1);
 		close(2);
 
 		close(fd[0]);
 		dup2(fd[1], 1);
 		dup2(fd[1], 2);
 		close(fd[1]);
 
 		execlp("/bin/sh", "/bin/sh", "-c", command, NULL);
 		exit(EXIT_FAILURE);
 	}
 
 out_clean:
 	close(fd[0]);
 	close(fd[1]);
 
 	return err;
 }
 
 static int _exec_updown(const tap_t tap, const char *action, char **error_string)
 {
 	char command[PATH_MAX];
 	struct stat sb;
 	int err = 0;
 
 	if (!tap->hasupdown)
 		return 0;
 
 	memset(command, 0, PATH_MAX);
 
 	snprintf(command, PATH_MAX, "%s%s/%s", tap->updownpath, action, tap->ifname);
 
 	err = stat(command, &sb);
 	if ((err < 0) && (errno == ENOENT))
 		return 0;
 
 	err = _execute_shell(command, error_string);
 	if ((!err) && (*error_string)) {
 		free(*error_string);
 		*error_string = NULL;
 	}
 
 	return err;
 }
 
 static int _check(const tap_t tap)
 {
 	tap_t temp = lib_cfg.head;
 
 	if (!tap)
 		return 0;
 
 	while (temp != NULL) {
 		if (tap == temp)
 			return 1;
 
 		temp = temp->next;
 	}
 
 	return 0;
 }
 
 static void _close(tap_t tap)
 {
 	if (!tap)
 		return;
 
 	if (tap->fd)
 		close(tap->fd);
 
 	free(tap);
 
 	return;
 }
 
 static void _close_cfg(void)
 {
 	if (lib_cfg.head == NULL) {
 		close(lib_cfg.sockfd);
 		lib_init = 0;
 	}
 }
 
 static int _get_mtu(const tap_t tap)
 {
 	int err;
 
 	err = ioctl(lib_cfg.sockfd, SIOCGIFMTU, &tap->ifr);
 	if (err)
 		goto out_clean;
 
 	err = tap->ifr.ifr_mtu;
 
 out_clean:
 	return err;
 }
 
 static int _get_mac(const tap_t tap, char **ether_addr)
 {
 	int err;
 	char mac[MAX_MAC_CHAR];
 
 	err = ioctl(lib_cfg.sockfd, SIOCGIFHWADDR, &tap->ifr);
 	if (err)
 		goto out_clean;
 
 	ether_ntoa_r((struct ether_addr *)tap->ifr.ifr_hwaddr.sa_data, mac);
 
 	*ether_addr = strdup(mac);
 	if (!*ether_addr)
 		err = -1;
 
 out_clean:
 
 	return err;
 }
 
 tap_t tap_find(char *dev, size_t dev_size)
 {
 	tap_t tap;
 
 	if (dev == NULL) {
 		errno = EINVAL;
 		return NULL;
 	}
 
 	if (dev_size < IFNAMSIZ) {
 		errno = EINVAL;
 		return NULL;
 	}
 
 	if (strlen(dev) > IFNAMSIZ) {
 		errno = E2BIG;
 		return NULL;
 	}
 
 	pthread_mutex_lock(&lib_mutex);
 
 	tap = lib_cfg.head;
 	while (tap != NULL) {
 		if (!strcmp(dev, tap->ifname))
 			break;
 		tap = tap->next;
 	}
 
 	pthread_mutex_unlock(&lib_mutex);
 	return tap;
 }
 
 tap_t tap_open(char *dev, size_t dev_size, const char *updownpath)
 {
 	tap_t tap;
 	char *temp_mac = NULL;
 
 	if (dev == NULL) {
 		errno = EINVAL;
 		return NULL;
 	}
 
 	if (dev_size < IFNAMSIZ) {
 		errno = EINVAL;
 		return NULL;
 	}
 
 	if (strlen(dev) > IFNAMSIZ) {
 		errno = E2BIG;
 		return NULL;
 	}
 
 	if (updownpath) {
 		/* only absolute paths */
 		if (updownpath[0] != '/') {
 			errno = EINVAL;
 			return NULL;
 		}
 		/* 14: 2 for /, 1 for \0 + 11 (post-down.d) */
 		if (strlen(updownpath) >= (PATH_MAX - (strlen(dev) + 14))) {
 			errno = E2BIG;
 			return NULL;
 		}
 	}
 
 	pthread_mutex_lock(&lib_mutex);
 
 	tap = malloc(sizeof(struct _iface));
 	if (!tap)
 		return NULL;
 
 	memset(tap, 0, sizeof(struct _iface));
 
 	if ((tap->fd = open("/dev/net/tun", O_RDWR)) < 0)
 		goto out_error;
 
 	strncpy(tap->ifname, dev, IFNAMSIZ);
 	tap->ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
 
 	if (ioctl(tap->fd, TUNSETIFF, &tap->ifr) < 0)
 		goto out_error;
 
 	if ((strlen(dev) > 0) && (strcmp(dev, tap->ifname) != 0)) {
 		errno = EBUSY;
 		goto out_error;
 	}
 
 	strcpy(dev, tap->ifname);
 
 	if (!lib_init) {
 		lib_cfg.head = NULL;
 		lib_cfg.sockfd = socket(AF_INET, SOCK_STREAM, 0);
 			if (lib_cfg.sockfd < 0)
 				goto out_error;
 		lib_init = 1;
 	}
 
 	if (ioctl(lib_cfg.sockfd, SIOGIFINDEX, &tap->ifr) < 0)
 		goto out_error;
 
 	tap->default_mtu = _get_mtu(tap);
 	if (tap->default_mtu < 0)
 		goto out_error;
 
 	if (_get_mac(tap, &temp_mac) < 0)
 		goto out_error;
 
 	strncpy(tap->default_mac, temp_mac, 18);
 	free(temp_mac);
 
 	if (updownpath) {
 		int len = strlen(updownpath);
 
 		strcpy(tap->updownpath, updownpath);
 		if (tap->updownpath[len-1] != '/') {
 			tap->updownpath[len] = '/';
 		}
 		tap->hasupdown = 1;
 	}
 
 	tap->next = lib_cfg.head;
 	lib_cfg.head = tap;
 
 	pthread_mutex_unlock(&lib_mutex);
 	return tap;
 
 out_error:
 	_close(tap);
 	_close_cfg();
 	pthread_mutex_unlock(&lib_mutex);
 	return NULL;
 }
 
 // TODO: consider better error report from here
 int tap_close(tap_t tap)
 {
 	int err = 0;
 	tap_t temp = lib_cfg.head;
 	tap_t prev = lib_cfg.head;
 	struct _ip *ip, *ip_next;
 	char *error_string = NULL;
 	char *error_down = NULL, *error_postdown = NULL;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if (!_check(tap)) {
 		errno = EINVAL;
 		err = -1;
 		goto out_clean;
 	}
 
 	while ((temp) && (temp != tap)) {
 		prev = temp;
 		temp = temp->next;
 	}
 
 	if (tap == prev) {
 		lib_cfg.head = tap->next;
 	} else {
 		prev->next = tap->next;
 	}
 
 	_set_down(tap, &error_down, &error_postdown);
 	if (error_down)
 		free(error_down);
 	if (error_postdown)
 		free(error_postdown);
 
 	ip = tap->ip;
 	while (ip) {
 		ip_next = ip->next;
 		_set_ip(tap, "del", ip->ip_addr, ip->prefix, &error_string);
 		if (error_string) {
 			free(error_string);
 			error_string = NULL;
 		}
 		free(ip);
 		ip = ip_next;
 	}
 
 	_close(tap);
 	_close_cfg();
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 int tap_get_mtu(const tap_t tap)
 {
 	int err;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if (!_check(tap)) {
 		errno = EINVAL;
 		err = -1;
 		goto out_clean;
 	}
 
 	err = _get_mtu(tap);
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 int tap_set_mtu(tap_t tap, const int mtu)
 {
 	int err, oldmtu;
+	short oldflags;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if (!_check(tap)) {
 		errno = EINVAL;
 		err = -1;
 		goto out_clean;
 	}
 
+	oldflags = tap->ifr.ifr_flags;
 	oldmtu = tap->ifr.ifr_mtu;
+	tap->ifr.ifr_flags = 0;
 	tap->ifr.ifr_mtu = mtu;
 
 	err = ioctl(lib_cfg.sockfd, SIOCSIFMTU, &tap->ifr);
 	if (err)
 		tap->ifr.ifr_mtu = oldmtu;
 
+	tap->ifr.ifr_flags = oldflags;
+
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 int tap_reset_mtu(tap_t tap)
 {
 	return tap_set_mtu(tap, tap->default_mtu);
 }
 
 int tap_get_mac(const tap_t tap, char **ether_addr)
 {
 	int err;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if ((!_check(tap)) || (!ether_addr)) {
 		errno = EINVAL;
 		err = -1;
 		goto out_clean;
 	}
 
 	err = _get_mac(tap, ether_addr);
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 int tap_set_mac(tap_t tap, const char *ether_addr)
 {
 	struct ether_addr oldmac;
 	int err;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if ((!_check(tap)) || (!ether_addr)) {
 		errno = EINVAL;
 		err = -1;
 		goto out_clean;
 	}
 
 	memcpy(&oldmac, tap->ifr.ifr_hwaddr.sa_data, ETH_ALEN);
 	memcpy(tap->ifr.ifr_hwaddr.sa_data, ether_aton(ether_addr), ETH_ALEN);
 
 	err = ioctl(lib_cfg.sockfd, SIOCSIFHWADDR, &tap->ifr);
 	if (err)
 		memcpy(tap->ifr.ifr_hwaddr.sa_data, &oldmac, ETH_ALEN);
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 int tap_reset_mac(tap_t tap)
 {
 	return tap_set_mac(tap, tap->default_mac);
 }
 
 int tap_set_up(tap_t tap, char **error_preup, char **error_up)
 {
 	int err = 0;
 	short int oldflags;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if (!_check(tap) || (!error_preup) || (!error_up)) {
 		errno = EINVAL;
 		err = -1;
 		goto out_clean;
 	}
 
 	if (tap->up)
 		goto out_clean;
 
 	_exec_updown(tap, "pre-up.d", error_preup);
 
 	oldflags = tap->ifr.ifr_flags;
 	tap->ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
 	err=ioctl(lib_cfg.sockfd, SIOCSIFFLAGS, &tap->ifr);
 
 	if (err)
 		tap->ifr.ifr_flags = oldflags;
 
 	_exec_updown(tap, "up.d", error_up);
 
 	tap->up = 1;
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 static int _set_down(tap_t tap, char **error_down, char **error_postdown)
 {
 	int err = 0;
 	short int oldflags;
 
 	if (!tap->up)
 		goto out_clean;
 
 	_exec_updown(tap, "down.d", error_down);
 
 	oldflags = tap->ifr.ifr_flags;
 	tap->ifr.ifr_flags &= ~IFF_UP;
 	err=ioctl(lib_cfg.sockfd, SIOCSIFFLAGS, &tap->ifr);
 
 	if (err) {
 		tap->ifr.ifr_flags = oldflags;
 		goto out_clean;
 	}
 
 	_exec_updown(tap, "post-down.d", error_postdown);
 
 	tap->up = 0;
 
 out_clean:
 	return err;
 }
 
 int tap_set_down(tap_t tap, char **error_down, char **error_postdown)
 {
 	int err = 0;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if (!_check(tap) || (!error_down) || (!error_postdown)) {
 		errno = EINVAL;
 		err = -1;
 		goto out_clean;
 	}
 
 	err = _set_down(tap, error_down, error_postdown);
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 static char *_get_v4_broadcast(const char *ip_addr, const char *prefix)
 {
 	int prefix_len;
 	struct in_addr mask;
 	struct in_addr broadcast;
 	struct in_addr address;
 
 	prefix_len = atoi(prefix);
 
 	if ((prefix_len > 32) || (prefix_len < 0))
 		return NULL;
 
 	if (inet_pton(AF_INET, ip_addr, &address) <= 0)
 		return NULL;
 
 	mask.s_addr = htonl(~((1 << (32 - prefix_len)) - 1));
 
 	memset(&broadcast, 0, sizeof(broadcast));
 	broadcast.s_addr = (address.s_addr & mask.s_addr) | ~mask.s_addr;
 
 	return strdup(inet_ntoa(broadcast));
 }
 
 static int _set_ip(tap_t tap, const char *command,
 		      const char *ip_addr, const char *prefix,
 		      char **error_string)
 {
 	char *broadcast = NULL;
 	char cmdline[4096];
 
 	if (!strchr(ip_addr, ':')) {
 		broadcast = _get_v4_broadcast(ip_addr, prefix);
 		if (!broadcast) {
 			errno = EINVAL;
 			return -1;
 		}
 	}
 
 	memset(cmdline, 0, sizeof(cmdline));
 
 	if (broadcast) {
 		snprintf(cmdline, sizeof(cmdline)-1,
 			"ip addr %s %s/%s dev %s broadcast %s",
 			 command, ip_addr, prefix,
 			 tap->ifname, broadcast);
 		free(broadcast);
 	} else {
 		snprintf(cmdline, sizeof(cmdline)-1,
 			"ip addr %s %s/%s dev %s",
 			command, ip_addr, prefix,
 			tap->ifname);
 	}
 
 	return _execute_shell(cmdline, error_string);
 }
 
 static int _find_ip(tap_t tap,
 			const char *ip_addr, const char *prefix,
 			struct _ip **ip, struct _ip **ip_prev)
 {
 	struct _ip *local_ip, *local_ip_prev;
 	int found = 0;
 
 	local_ip = local_ip_prev = tap->ip;
 
 	while(local_ip) {
 		if ((!strcmp(local_ip->ip_addr, ip_addr)) && (!strcmp(local_ip->prefix, prefix))) {
 			found = 1;
 			break;
 		}
 		local_ip_prev = local_ip;
 		local_ip = local_ip->next;
 	}
 
 	if (found) {
 		*ip = local_ip;
 		*ip_prev = local_ip_prev;
 	}
 
 	return found;
 }
 
 int tap_add_ip(tap_t tap, const char *ip_addr, const char *prefix, char **error_string)
 {
 	int err = 0, found;
 	struct _ip *ip = NULL, *ip_prev = NULL;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if ((!_check(tap)) || (!ip_addr) || (!prefix) || (!error_string)) {
 		errno = EINVAL;
 		err = -1;
 		goto out_clean;
 	}
 
 	found = _find_ip(tap, ip_addr, prefix, &ip, &ip_prev);
 	if (found)
 		goto out_clean;
 
 	ip = malloc(sizeof(struct _ip));
 	if (!ip) {
 		err = -1 ;
 		goto out_clean;
 	}
 	memset(ip, 0, sizeof(struct _ip));
 	strncpy(ip->ip_addr, ip_addr, MAX_IP_CHAR);
 	strncpy(ip->prefix, prefix, MAX_PREFIX_CHAR);
 
 	err = _set_ip(tap, "add", ip_addr, prefix, error_string);
 
 	if (err) {
 		free(ip);
 		goto out_clean;
 	}
 
 	ip->next = tap->ip;
 	tap->ip = ip;
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 int tap_del_ip(tap_t tap, const char *ip_addr, const char *prefix, char **error_string)
 {
 	int err = 0, found;
 	struct _ip *ip = NULL, *ip_prev = NULL;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if ((!_check(tap)) || (!ip_addr) || (!prefix) || (!error_string)) {
 		errno = EINVAL;
 		err = -1;
 		goto out_clean;
 	}
 
 	found = _find_ip(tap, ip_addr, prefix, &ip, &ip_prev);
 	if (!found)
 		goto out_clean;
 
 	err = _set_ip(tap, "del", ip_addr, prefix, error_string);
 
 	if (!err) {
 		if (ip == ip_prev) {
 			tap->ip = ip->next;
 		} else {
 			ip_prev->next = ip->next;
 		}
 		free(ip);
 	}
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 int tap_get_fd(const tap_t tap)
 {
 	int fd;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if (!_check(tap)) {
 		errno = EINVAL;
 		fd = -1;
 		goto out_clean;
 	}
 
 	fd = tap->fd;
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return fd;
 }
 
 const char *tap_get_name(const tap_t tap)
 {
 	char *name = NULL;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	if (!_check(tap)) {
 		errno = EINVAL;
 		goto out_clean;
 	}
 
 	name = tap->ifname;
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return name;
 }
 
 int tap_get_ips(const tap_t tap, char **ip_addr_list, int *entries)
 {
 	int err = 0;
 	int found = 0;
 	char *ip_list = NULL;
 	int size = 0, offset = 0, len;
 	struct _ip *ip = tap->ip;
 
 	pthread_mutex_lock(&lib_mutex);
 
 	while (ip) {
 		found++;
 		ip = ip->next;
 	}
 
 	size = found * (MAX_IP_CHAR + MAX_PREFIX_CHAR + 2);
 	ip_list = malloc(size);
 	if (!ip_list) {
 		err = -1;
 		goto out_clean;
 	}
 
 	memset(ip_list, 0, size);
 
 	ip = tap->ip;
 
 	while (ip) {
 		len = strlen(ip->ip_addr);
 		memcpy(ip_list + offset, ip->ip_addr, len);
 		offset = offset + len + 1;
 		len = strlen(ip->prefix);
 		memcpy(ip_list + offset, ip->prefix, len);
 		offset = offset + len + 1;
 		ip = ip->next;
 	}
 
 	*ip_addr_list = ip_list;
 	*entries = found;
 
 out_clean:
 	pthread_mutex_unlock(&lib_mutex);
 
 	return err;
 }
 
 #ifdef TEST
 static int is_if_in_system(char *name)
 {
 	struct ifaddrs *ifap = NULL;
 	struct ifaddrs *ifa;
 	int found = 0;
 
 	if (getifaddrs(&ifap) < 0) {
 		printf("Unable to get interface list.\n");
 		return -1;
 	}
 
 	ifa = ifap;
 
 	while (ifa) {
 		if (!strncmp(name, ifa->ifa_name, IFNAMSIZ)) {
 			found = 1;
 			break;
 		}
 		ifa=ifa->ifa_next;
 	}
 
 	freeifaddrs(ifap);
 	return found;
 }
 
 static int test_iface(char *name, size_t size, const char *updownpath)
 {
 	tap_t tap;
 
 	tap=tap_open(name, size, updownpath);
 	if (!tap) {
 		if (lib_cfg.sockfd < 0)
 			printf("Unable to open knet_socket\n");
 		printf("Unable to open knet.\n");
 		return -1;
 	}
 	printf("Created interface: %s\n", name);
 
 	if (is_if_in_system(name) > 0) {
 		printf("Found interface %s on the system\n", name);
 	} else {
 		printf("Unable to find interface %s on the system\n", name);
 	}
 
 	if (!tap_find(name, size)) {
 		printf("Unable to find interface %s in tap db\n", name);
 	} else {
 		printf("Found interface %s in tap db\n", name);
 	}
 
 	tap_close(tap);
 
 	if (is_if_in_system(name) == 0)
 		printf("Successfully removed interface %s from the system\n", name);
 
 	return 0;
 }
 
 static int check_tap_open_close(void)
 {
 	char device_name[2*IFNAMSIZ];
 	char fakepath[PATH_MAX];
 	size_t size = IFNAMSIZ;
 
 	memset(device_name, 0, sizeof(device_name));
 
 	printf("Creating random tap interface:\n");
 	if (test_iface(device_name, size,  NULL) < 0) {
 		printf("Unable to create random interface\n");
 		return -1;
 	}
 
 	printf("Creating kronostest tap interface:\n");
 	strncpy(device_name, "kronostest", IFNAMSIZ);
 	if (test_iface(device_name, size, NULL) < 0) {
 		printf("Unable to create kronosnet interface\n");
 		return -1;
 	}
 
 	printf("Testing ERROR conditions\n");
 
 	printf("Testing dev == NULL\n");
 	errno=0;
 	if ((test_iface(NULL, size, NULL) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_open sanity checks\n");
 		return -1;
 	}
 
 	printf("Testing size < IFNAMSIZ\n");
 	errno=0;
 	if ((test_iface(device_name, 1, NULL) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_open sanity checks\n");
 		return -1;
 	}
 
 	printf("Testing device_name size > IFNAMSIZ\n");
 	errno=0;
 	strcpy(device_name, "abcdefghilmnopqrstuvwz");
 	if ((test_iface(device_name, IFNAMSIZ, NULL) >= 0) || (errno != E2BIG)) {
 		printf("Something is wrong in tap_open sanity checks\n");
 		return -1;
 	}
 
 	printf("Testing updown path != abs\n");
 	errno=0;
 	strcpy(device_name, "kronostest");
 	if ((test_iface(device_name, IFNAMSIZ, "foo")  >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_open sanity checks\n");
 		return -1;
 	}
 
 	memset(fakepath, '/', PATH_MAX - 2);
 	fakepath[PATH_MAX-1] = 0;
 
 	printf("Testing updown path > PATH_MAX\n");
 	errno=0;
 	strcpy(device_name, "kronostest");
 	if ((test_iface(device_name, IFNAMSIZ, fakepath)  >= 0) || (errno != E2BIG)) {
 		printf("Something is wrong in tap_open sanity checks\n");
 		return -1;
 	}
 
 	return 0;
 }
 
 static int check_knet_multi_eth(void)
 {
 	char device_name1[IFNAMSIZ];
 	char device_name2[IFNAMSIZ];
 	size_t size = IFNAMSIZ;
 	int err=0;
 	tap_t tap1 = NULL;
 	tap_t tap2 = NULL;
 
 	printf("Testing multiple knet interface instances\n");
 
 	memset(device_name1, 0, size);
 	memset(device_name2, 0, size);
 
 	strncpy(device_name1, "kronostest1", size);
 	strncpy(device_name2, "kronostest2", size);
 
 	tap1 = tap_open(device_name1, size, NULL);
 	if (!tap1) {
 		printf("Unable to init %s\n", device_name1);
 		err = -1;
 		goto out_clean;
 	}
 
 	if (is_if_in_system(device_name1) > 0) {
 		printf("Found interface %s on the system\n", device_name1);
 	} else {
 		printf("Unable to find interface %s on the system\n", device_name1);
 	}
 
 	tap2 = tap_open(device_name2, size, NULL);
 	if (!tap2) {
 		printf("Unable to init %s\n", device_name2);
 		err = -1;
 		goto out_clean;
 	}
 
 	if (is_if_in_system(device_name2) > 0) {
 		printf("Found interface %s on the system\n", device_name2);
 	} else {
 		printf("Unable to find interface %s on the system\n", device_name2);
 	}
 
 	if (tap1)
 		tap_close(tap1);
 	if (tap2)
 		tap_close(tap2);
 
 	printf("Testing error conditions\n");
 
 	printf("Open same device twice\n");
 
 	tap1 = tap_open(device_name1, size, NULL);
 	if (!tap1) {
 		printf("Unable to init %s\n", device_name1);
 		err = -1;
 		goto out_clean;
 	}
 
 	if (is_if_in_system(device_name1) > 0) {
 		printf("Found interface %s on the system\n", device_name1);
 	} else {
 		printf("Unable to find interface %s on the system\n", device_name1);
 	}
 
 	tap2 = tap_open(device_name1, size, NULL);
 	if (tap2) {
 		printf("We were able to init 2 interfaces with the same name!\n");
 		err = -1;
 		goto out_clean;
 	}
 
 out_clean:
 	if (tap1)
 		tap_close(tap1);
 	if (tap2)
 		tap_close(tap2);
 	return err;
 }
 
 static int check_knet_mtu(void)
 {
 	char device_name[IFNAMSIZ];
 	size_t size = IFNAMSIZ;
 	int err=0;
 	tap_t tap;
 
 	int current_mtu = 0;
 	int expected_mtu = 1500;
 
 	printf("Testing get/set MTU\n");
 
 	memset(device_name, 0, size);
 	strncpy(device_name, "kronostest", size);
 	tap = tap_open(device_name, size, NULL);
 	if (!tap) {
 		printf("Unable to init %s\n", device_name);
 		return -1;
 	}
 
 	printf("Comparing default MTU\n");
 	current_mtu = tap_get_mtu(tap);
 	if (current_mtu < 0) {
 		printf("Unable to get MTU\n");
 		err = -1;
 		goto out_clean;
 	}
 	if (current_mtu != expected_mtu) {
 		printf("current mtu [%d] does not match expected default [%d]\n", current_mtu, expected_mtu);
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Setting MTU to 9000\n");
 	expected_mtu = 9000;
 	if (tap_set_mtu(tap, expected_mtu) < 0) {
 		printf("Unable to set MTU to %d\n", expected_mtu);
 		err = -1;
 		goto out_clean;
 	}
 
 	current_mtu = tap_get_mtu(tap);
 	if (current_mtu < 0) {
 		printf("Unable to get MTU\n");
 		err = -1;
 		goto out_clean;
 	}
 	if (current_mtu != expected_mtu) {
 		printf("current mtu [%d] does not match expected value [%d]\n", current_mtu, expected_mtu);
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Testing ERROR conditions\n");
 
 	printf("Passing empty struct to get_mtu\n");
 	if (tap_get_mtu(NULL) > 0) {
 		printf("Something is wrong in tap_get_mtu sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Passing empty struct to set_mtu\n");
 	if (tap_set_mtu(NULL, 1500) == 0) {
 		printf("Something is wrong in tap_set_mtu sanity checks\n"); 
 		err = -1;
 		goto out_clean;
 	}
 
 out_clean:
 	tap_close(tap);
 
 	return err;
 }
 
 static int check_knet_mac(void)
 {
 	char device_name[IFNAMSIZ];
 	size_t size = IFNAMSIZ;
 	int err=0;
 	tap_t tap;
 	char *current_mac = NULL, *temp_mac = NULL, *err_mac = NULL;
 	struct ether_addr *cur_mac, *tmp_mac;
 
 	printf("Testing get/set MAC\n");
 
 	memset(device_name, 0, size);
 	strncpy(device_name, "kronostest", size);
 	tap = tap_open(device_name, size, NULL);
 	if (!tap) {
 		printf("Unable to init %s\n", device_name);
 		return -1;
 	}
 
 	printf("Get current MAC\n");
 
 	if (tap_get_mac(tap, &current_mac) < 0) {
 		printf("Unable to get current MAC address.\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Current MAC: %s\n", current_mac);
 
 	printf("Setting MAC: 00:01:01:01:01:01\n");
 
 	if (tap_set_mac(tap, "00:01:01:01:01:01") < 0) {
 		printf("Unable to set current MAC address.\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	if (tap_get_mac(tap, &temp_mac) < 0) {
 		printf("Unable to get current MAC address.\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Current MAC: %s\n", temp_mac);
 
 	cur_mac = ether_aton(current_mac);
 	tmp_mac = ether_aton(temp_mac);
 
 	printf("Comparing MAC addresses\n");
 	if (memcmp(cur_mac, tmp_mac, sizeof(struct ether_addr))) {
 		printf("Mac addresses are not the same?!\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Testing ERROR conditions\n");
 
 	printf("Pass NULL to get_mac (pass1)\n");
 	errno = 0;
 	if ((tap_get_mac(NULL, &err_mac) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_get_mac sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Pass NULL to get_mac (pass2)\n");
 	errno = 0;
 	if ((tap_get_mac(tap, NULL) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_get_mac sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Pass NULL to set_mac (pass1)\n");
 	errno = 0;
 	if ((tap_set_mac(tap, NULL) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_set_mac sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Pass NULL to set_mac (pass2)\n");
 	errno = 0;
 	if ((tap_set_mac(NULL, err_mac) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_set_mac sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 out_clean:
 	if (err_mac) {
 		printf("Something managed to set err_mac!\n");
 		err = -1;
 		free(err_mac);
 	}
 
 	if (current_mac)
 		free(current_mac);
 	if (temp_mac)
 		free(temp_mac);
 
 	tap_close(tap);
 
 	return err;
 }
 
 static int check_tap_execute_shell(void)
 {
 	int err = 0;
 	char command[4096];
 	char *error_string = NULL;
 
 	memset(command, 0, sizeof(command));
 
 	printf("Testing _execute_shell\n");
 
 	printf("command /bin/true\n");
 
 	err = _execute_shell("/bin/true", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to execute /bin/true ?!?!\n");
 		goto out_clean;
 	}
 
 	printf("Testing ERROR conditions\n");
 
 	printf("command /bin/false\n");
 
 	err = _execute_shell("/bin/false", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (!err) {
 		printf("Can we really execute /bin/false successfully?!?!\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("command that outputs to stdout (enforcing redirect)\n");
 
 	err = _execute_shell("/bin/grep -h 2>&1", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (!err) {
 		printf("Can we really execute /bin/grep -h successfully?!?\n");
 		err = -1;
 		goto out_clean;
 	} 
 
 	printf("command that outputs to stderr\n");
 	err = _execute_shell("/bin/grep -h", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (!err) {
 		printf("Can we really execute /bin/grep -h successfully?!?\n");
 		err = -1;
 		goto out_clean;
 	} 
 
 	printf("empty command\n");
 	err = _execute_shell(NULL, &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (!err) {
 		printf("Can we really execute (nil) successfully?!?!\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("empty error\n");
 	err = _execute_shell("/bin/true", NULL);
 	if (!err) {
 		printf("Check EINVAL filter for no error_string!\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	err = 0;
 
 out_clean:
 
 	return err;
 }
 
 static int check_knet_up_down(void)
 {
 	char device_name[IFNAMSIZ];
 	size_t size = IFNAMSIZ;
 	int err=0;
 	tap_t tap;
 	char *error_string = NULL;
 	char *error_preup = NULL, *error_up = NULL;
 	char *error_down = NULL, *error_postdown = NULL;
 
 	printf("Testing interface up/down\n");
 
 	memset(device_name, 0, size);
 	strncpy(device_name, "kronostest", size);
 	tap = tap_open(device_name, size, NULL);
 	if (!tap) {
 		printf("Unable to init %s\n", device_name);
 		return -1;
 	}
 
 	printf("Put the interface up\n");
 
 	err = tap_set_up(tap, &error_preup, &error_up);
 	if (error_preup) {
 		printf("preup output: %s\n", error_preup);
 		free(error_preup);
 		error_preup = NULL;
 	}
 	if (error_up) {
 		printf("up output: %s\n", error_up);
 		free(error_up);
 		error_up = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to set interface up\n");
 		err = -1;
 		goto out_clean;
 	}
 
 
 	err = _execute_shell("ip addr show dev kronostest | grep -q UP", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to verify inteface UP\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Put the interface down\n");
 
 	err = tap_set_down(tap, &error_down, &error_postdown);
 	if (error_down) {
 		printf("down output: %s\n", error_down);
 		free(error_down);
 		error_down = NULL;
 	}
 	if (error_postdown) {
 		printf("postdown output: %s\n", error_down);
 		free(error_down);
 		error_down = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to put the interface down\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	err = _execute_shell("ifconfig kronostest | grep -q UP", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (!err) {
 		printf("Unable to verify inteface DOWN\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	tap_close(tap);
 
 	printf("Testing interface pre-up/up/down/post-down (exec errors)\n");
 
 	tap = tap_open(device_name, size, ABSBUILDDIR "/tap_updown_bad");
 	if (!tap) {
 		printf("Unable to init %s\n", device_name);
 		return -1;
 	}
 
 	printf("Put the interface up\n");
 
 	err = tap_set_up(tap, &error_preup, &error_up);
 	if (error_preup) {
 		printf("preup output: %s\n", error_preup);
 		free(error_preup);
 		error_preup = NULL;
 	}
 	if (error_up) {
 		printf("up output: %s\n", error_up);
 		free(error_up);
 		error_up = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to set interface up\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Put the interface down\n");
 
 	err = tap_set_down(tap, &error_down, &error_postdown);
 	if (error_down) {
 		printf("down output: %s\n", error_down);
 		free(error_down);
 		error_down = NULL;
 	}
 	if (error_postdown) {
 		printf("postdown output: %s\n", error_down);
 		free(error_down);
 		error_down = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to put the interface down\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	tap_close(tap);
 
 	printf("Testing interface pre-up/up/down/post-down\n");
 
 	tap = tap_open(device_name, size, ABSBUILDDIR "/tap_updown_good");
 	if (!tap) {
 		printf("Unable to init %s\n", device_name);
 		return -1;
 	}
 
 	printf("Put the interface up\n");
 
 	err = tap_set_up(tap, &error_preup, &error_up);
 	if (error_preup) {
 		printf("preup output: %s\n", error_preup);
 		free(error_preup);
 		error_preup = NULL;
 	}
 	if (error_up) {
 		printf("up output: %s\n", error_up);
 		free(error_up);
 		error_up = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to set interface up\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Put the interface down\n");
 
 	err = tap_set_down(tap, &error_down, &error_postdown);
 	if (error_down) {
 		printf("down output: %s\n", error_down);
 		free(error_down);
 		error_down = NULL;
 	}
 	if (error_postdown) {
 		printf("postdown output: %s\n", error_down);
 		free(error_down);
 		error_down = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to put the interface down\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	tap_close(tap);
 
 	printf("Test ERROR conditions\n");
 
 	printf("Pass NULL to tap set_up\n");
 	errno = 0;
 	if ((tap_set_up(NULL, &error_preup, &error_up) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_set_up sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Pass NULL to error_preup set_up\n");
 	errno = 0;
 	if ((tap_set_up(tap, NULL, &error_up) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_set_up sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Pass NULL to error_up set_up\n");
 	errno = 0;
 	if ((tap_set_up(tap, &error_preup, NULL) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_set_up sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Pass NULL to tap set_down\n");
 	errno = 0;
 	if ((tap_set_down(NULL, &error_down, &error_postdown) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_set_down sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Pass NULL to error_down set_down\n");
 	errno = 0;
 	if ((tap_set_down(tap, NULL, &error_postdown) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_set_down sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 	printf("Pass NULL to error_postdown set_down\n");
 	errno = 0;
 	if ((tap_set_down(tap, &error_down, NULL) >= 0) || (errno != EINVAL)) {
 		printf("Something is wrong in tap_set_down sanity checks\n");
 		err = -1;
 		goto out_clean;
 	}
 
 out_clean:
 
 	tap_close(tap);
 
 	return err;
 }
 
 static int check_knet_close_leak(void)
 {
 	char device_name[IFNAMSIZ];
 	size_t size = IFNAMSIZ;
 	int err=0;
 	tap_t tap;
 	char *error_string = NULL;
 
 	printf("Testing close leak (needs valgrind)\n");
 
 	memset(device_name, 0, size);
 	strncpy(device_name, "kronostest", size);
 	tap = tap_open(device_name, size, NULL);
 	if (!tap) {
 		printf("Unable to init %s\n", device_name);
 		return -1;
 	}
 
 	printf("Adding ip: 192.168.168.168/24\n");
 
 	err = tap_add_ip(tap, "192.168.168.168", "24", &error_string);
 	if (error_string) {
 		printf("add ip output: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to assign IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	printf("Adding ip: 192.168.169.169/24\n");
 
 	err = tap_add_ip(tap, "192.168.169.169", "24", &error_string);
 	if (error_string) {
 		printf("add ip output: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to assign IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 out_clean:
 
 	tap_close(tap);
 
 	return err;
 }
 
 static int check_knet_set_del_ip(void)
 {
 	char device_name[IFNAMSIZ];
 	size_t size = IFNAMSIZ;
 	int err=0;
 	tap_t tap;
 	char *ip_list = NULL;
 	int ip_list_entries = 0, i, offset = 0;
 	char *error_string = NULL;
 
 	printf("Testing interface add/remove ip\n");
 
 	memset(device_name, 0, size);
 	strncpy(device_name, "kronostest", size);
 	tap = tap_open(device_name, size, NULL);
 	if (!tap) {
 		printf("Unable to init %s\n", device_name);
 		return -1;
 	}
 
 	printf("Adding ip: 192.168.168.168/24\n");
 
 	err = tap_add_ip(tap, "192.168.168.168", "24", &error_string);
 	if (error_string) {
 		printf("add ip output: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to assign IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	printf("Adding ip: 192.168.169.169/24\n");
 
 	err = tap_add_ip(tap, "192.168.169.169", "24", &error_string);
 	if (error_string) {
 		printf("add ip output: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to assign IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	printf("Adding duplicate ip: 192.168.168.168/24\n");
 
 	err = tap_add_ip(tap, "192.168.168.168", "24", &error_string);
 	if (error_string) {
 		printf("add ip output: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to find IP address in libtap db\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	printf("Checking ip: 192.168.168.168/24\n");
 
 	err = _execute_shell("ip addr show dev kronostest | grep -q 192.168.168.168/24", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err) {
 		printf("Unable to verify IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	printf("Get ip list from libtap:\n");
 
 	if (tap_get_ips(tap, &ip_list, &ip_list_entries) < 0) {
 		printf("Not enough mem?\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	if (ip_list_entries != 2) {
 		printf("Didn't get enough ip back from libtap?\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	for (i = 1; i <= ip_list_entries; i++) {
 		printf("Found IP %s %s in libtap db\n", ip_list + offset, ip_list + offset + strlen(ip_list + offset) + 1);
 		offset = offset + strlen(ip_list) + 1;
 		offset = offset + strlen(ip_list + offset) + 1;
 	}
 
 	free(ip_list);
 
 	printf("Deleting ip: 192.168.168.168/24\n");
 
 	err = tap_del_ip(tap, "192.168.168.168", "24", &error_string);
 	if (error_string) {
 		printf("del ip output: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to delete IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	printf("Deleting ip: 192.168.169.169/24\n");
 
 	err = tap_del_ip(tap, "192.168.169.169", "24", &error_string);
 	if (error_string) {
 		printf("del ip output: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to delete IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	printf("Deleting again ip: 192.168.168.168/24\n");
 
 	err = tap_del_ip(tap, "192.168.168.168", "24", &error_string);
 	if (error_string) {
 		printf("del ip output: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to delete IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	err = _execute_shell("ip addr show dev kronostest | grep -q 192.168.168.168/24", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (!err) {
 		printf("Unable to verify IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	printf("Adding ip: 3ffe::1/64\n");
 
 	err = tap_add_ip(tap, "3ffe::1", "64", &error_string);
 	if (error_string) {
 		printf("add ipv6 output: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err < 0) {
 		printf("Unable to assign IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	err = _execute_shell("ip addr show dev kronostest | grep -q 3ffe::1/64", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err) {
 		printf("Unable to verify IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	printf("Deleting ip: 3ffe::1/64\n");
 
 	err = tap_del_ip(tap, "3ffe::1", "64", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (err) {
 		printf("Unable to delete IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 	err = _execute_shell("ip addr show dev kronostest | grep -q 3ffe::1/64", &error_string);
 	if (error_string) {
 		printf("Error string: %s\n", error_string);
 		free(error_string);
 		error_string = NULL;
 	}
 	if (!err) {
 		printf("Unable to verify IP address\n");
 		err=-1;
 		goto out_clean;
 	}
 
 out_clean:
 
 	tap_close(tap);
 
 	return err;
 }
 
 int main(void)
 {
 	if (check_tap_open_close() < 0)
 		return -1;
 
 	if (check_knet_multi_eth() < 0)
 		return -1;
 
 	if (check_knet_mtu() < 0)
 		return -1;
 
 	if (check_knet_mac() < 0)
 		return -1;
 
 	if (check_tap_execute_shell() < 0)
 		return -1;
 
 	if (check_knet_up_down() < 0)
 		return -1;
 
 	if (check_knet_set_del_ip() < 0)
 		return -1;
 
 	if (check_knet_close_leak() < 0)
 		return -1;
 
 	return 0;
 }
 #endif