[nozzle] move code around to reflect completion and drop copy of code…

… from internals.c Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · Apr 20, 2018 · 1d2ca0e · 1d2ca0e
1 parent 39f9a9e
commit 1d2ca0e
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 189 deletions.
diff --git a/libnozzle/internals.c b/libnozzle/internals.c
@@ -161,24 +161,6 @@ int run_updown(const nozzle_t nozzle, const char *action, char **error_string)
 }
 
 #if 0
-static int _check(const nozzle_t nozzle)
-{
-	nozzle_t temp = lib_cfg.head;
-
-	if (!nozzle) {
-		return 0;
-	}
-
-	while (temp != NULL) {
-		if (nozzle == temp)
-			return 1;
-
-		temp = temp->next;
-	}
-
-	return 0;
-}
-
 static void _close(nozzle_t nozzle)
 {
 #ifdef KNET_BSD
@@ -302,38 +284,6 @@ static int _get_mac(const nozzle_t nozzle, char **ether_addr)
 	return err;
 }
 
-nozzle_t nozzle_get_handle_by_name(char *devname)
-{
-	int savederrno = 0;
-	nozzle_t nozzle;
-
-	if ((devname == NULL) || (strlen(devname) > IFNAMSIZ)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	savederrno = pthread_mutex_lock(&config_mutex);
-	if (savederrno) {
-		errno = savederrno;
-		return NULL;
-	}
-
-	nozzle = lib_cfg.head;
-	while (nozzle != NULL) {
-		if (!strcmp(devname, nozzle->name))
-			break;
-		nozzle = nozzle->next;
-	}
-
-	if (!nozzle) {
-		savederrno = ENOENT;
-	}
-
-	pthread_mutex_unlock(&config_mutex);
-	errno = savederrno;
-	return nozzle;
-}
-
 nozzle_t nozzle_open(char *devname, size_t devname_size, const char *updownpath)
 {
 	int savederrno = 0;
@@ -1130,64 +1080,6 @@ int nozzle_del_ip(nozzle_t nozzle, const char *ipaddr, const char *prefix, char
 	return err;
 }
 
-int nozzle_get_fd(const nozzle_t nozzle)
-{
-	int fd = -1, savederrno = 0;
-
-	if (!nozzle) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	savederrno = pthread_mutex_lock(&config_mutex);
-	if (savederrno) {
-		errno = savederrno;
-		return -1;
-	}
-
-	if (!_check(nozzle)) {
-		savederrno = ENOENT;
-		fd = -1;
-		goto out_clean;
-	}
-
-	fd = nozzle->fd;
-
-out_clean:
-	pthread_mutex_unlock(&config_mutex);
-	errno = savederrno;
-	return fd;
-}
-
-const char *nozzle_get_name_by_handle(const nozzle_t nozzle)
-{
-	int savederrno = 0;
-	char *name = NULL;
-
-	if (!nozzle) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	savederrno = pthread_mutex_lock(&config_mutex);
-	if (savederrno) {
-		errno = savederrno;
-		return NULL;
-	}
-
-	if (!_check(nozzle)) {
-		errno = ENOENT;
-		goto out_clean;
-	}
-
-	name = nozzle->name;
-
-out_clean:
-	pthread_mutex_unlock(&config_mutex);
-	errno = savederrno;
-	return name;
-}
-
 int nozzle_get_ips(const nozzle_t nozzle, char **ipaddr_list, int *entries)
 {
 	int err = 0, savederrno = 0;

diff --git a/libnozzle/libnozzle.c b/libnozzle/libnozzle.c
@@ -207,38 +207,6 @@ static int _get_mac(const nozzle_t nozzle, char **ether_addr)
 	return err;
 }
 
-nozzle_t nozzle_get_handle_by_name(char *devname)
-{
-	int savederrno = 0;
-	nozzle_t nozzle;
-
-	if ((devname == NULL) || (strlen(devname) > IFNAMSIZ)) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	savederrno = pthread_mutex_lock(&config_mutex);
-	if (savederrno) {
-		errno = savederrno;
-		return NULL;
-	}
-
-	nozzle = lib_cfg.head;
-	while (nozzle != NULL) {
-		if (!strcmp(devname, nozzle->name))
-			break;
-		nozzle = nozzle->next;
-	}
-
-	if (!nozzle) {
-		savederrno = ENOENT;
-	}
-
-	pthread_mutex_unlock(&config_mutex);
-	errno = savederrno;
-	return nozzle;
-}
-
 nozzle_t nozzle_open(char *devname, size_t devname_size, const char *updownpath)
 {
 	int savederrno = 0;
@@ -1020,54 +988,6 @@ int nozzle_del_ip(nozzle_t nozzle, const char *ipaddr, const char *prefix, char
 	return err;
 }
 
-int nozzle_get_fd(const nozzle_t nozzle)
-{
-	int fd = -1, savederrno = 0;
-
-	savederrno = pthread_mutex_lock(&config_mutex);
-	if (savederrno) {
-		errno = savederrno;
-		return -1;
-	}
-
-	if (!is_valid_nozzle(nozzle)) {
-		savederrno = ENOENT;
-		fd = -1;
-		goto out_clean;
-	}
-
-	fd = nozzle->fd;
-
-out_clean:
-	pthread_mutex_unlock(&config_mutex);
-	errno = savederrno;
-	return fd;
-}
-
-const char *nozzle_get_name_by_handle(const nozzle_t nozzle)
-{
-	int savederrno = 0;
-	char *name = NULL;
-
-	savederrno = pthread_mutex_lock(&config_mutex);
-	if (savederrno) {
-		errno = savederrno;
-		return NULL;
-	}
-
-	if (!is_valid_nozzle(nozzle)) {
-		savederrno = ENOENT;
-		goto out_clean;
-	}
-
-	name = nozzle->name;
-
-out_clean:
-	pthread_mutex_unlock(&config_mutex);
-	errno = savederrno;
-	return name;
-}
-
 int nozzle_get_ips(const nozzle_t nozzle, char **ipaddr_list, int *entries)
 {
 	int err = 0, savederrno = 0;
@@ -1136,3 +1056,87 @@ int nozzle_get_ips(const nozzle_t nozzle, char **ipaddr_list, int *entries)
 	errno = savederrno;
 	return err;
 }
+
+/*
+ * functions below should be completed
+ */
+
+nozzle_t nozzle_get_handle_by_name(const char *devname)
+{
+	int savederrno = 0;
+	nozzle_t nozzle;
+
+	if ((devname == NULL) || (strlen(devname) > IFNAMSIZ)) {
+		errno = EINVAL;
+		return NULL;
+	}
+
+	savederrno = pthread_mutex_lock(&config_mutex);
+	if (savederrno) {
+		errno = savederrno;
+		return NULL;
+	}
+
+	nozzle = lib_cfg.head;
+	while (nozzle != NULL) {
+		if (!strcmp(devname, nozzle->name))
+			break;
+		nozzle = nozzle->next;
+	}
+
+	if (!nozzle) {
+		savederrno = ENOENT;
+	}
+
+	pthread_mutex_unlock(&config_mutex);
+	errno = savederrno;
+	return nozzle;
+}
+
+const char *nozzle_get_name_by_handle(const nozzle_t nozzle)
+{
+	int savederrno = 0;
+	char *name = NULL;
+
+	savederrno = pthread_mutex_lock(&config_mutex);
+	if (savederrno) {
+		errno = savederrno;
+		return NULL;
+	}
+
+	if (!is_valid_nozzle(nozzle)) {
+		savederrno = ENOENT;
+		goto out_clean;
+	}
+
+	name = nozzle->name;
+
+out_clean:
+	pthread_mutex_unlock(&config_mutex);
+	errno = savederrno;
+	return name;
+}
+
+int nozzle_get_fd(const nozzle_t nozzle)
+{
+	int fd = -1, savederrno = 0;
+
+	savederrno = pthread_mutex_lock(&config_mutex);
+	if (savederrno) {
+		errno = savederrno;
+		return -1;
+	}
+
+	if (!is_valid_nozzle(nozzle)) {
+		savederrno = ENOENT;
+		fd = -1;
+		goto out_clean;
+	}
+
+	fd = nozzle->fd;
+
+out_clean:
+	pthread_mutex_unlock(&config_mutex);
+	errno = savederrno;
+	return fd;
+}
diff --git a/libnozzle/libnozzle.h b/libnozzle/libnozzle.h
@@ -301,7 +301,7 @@ int nozzle_reset_mac(nozzle_t nozzle);
  * NULL on error and errno is set.
  */
 
-nozzle_t nozzle_get_handle_by_name(char *devname);
+nozzle_t nozzle_get_handle_by_name(const char *devname);
 
 /**
  * nozzle_get_name_by_handle