[nozzle] move set up and down to the stable API section

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

diff --git a/libnozzle/internals.c b/libnozzle/internals.c
index 48815e4d64db977fd1cdd6ee6d51710a98ea48df..f21784ff357bcb07a595b2efc6829b3f273f1a03 100644 (file)
--- a/libnozzle/internals.c
+++ b/libnozzle/internals.c
@@ -518,139 +518,6 @@ int nozzle_reset_mtu(nozzle_t nozzle, char **error_string)
        return nozzle_set_mtu(nozzle, nozzle->default_mtu, error_string);
 }
 
-int nozzle_set_up(nozzle_t nozzle, char **error_preup, char **error_up)
-{
-       int err = 0, savederrno = 0;
-       struct ifreq ifr;
-
-       if (!nozzle) {
-               errno = EINVAL;
-               return -1;
-       }
-
-       savederrno = pthread_mutex_lock(&config_mutex);
-       if (savederrno) {
-               errno = savederrno;
-               return -1;
-       }
-
-       if (!_check(nozzle)) {
-               savederrno = EINVAL;
-               err = -1;
-               goto out_clean;
-       }
-
-       if ((nozzle->hasupdown) && ((!error_preup) || (!error_up))) {
-               savederrno = EINVAL;
-               err = -1;
-               goto out_clean;
-       }
-
-       if (nozzle->up) {
-               goto out_clean;
-       }
-
-       memset(&ifr, 0, sizeof(struct ifreq));
-       strncpy(ifname, nozzle->name, IFNAMSIZ);
-
-       err = ioctl(lib_cfg.ioctlfd, SIOCGIFFLAGS, &ifr);
-       if (err) {
-               savederrno = errno;
-               goto out_clean;
-       }
-
-       _exec_updown(nozzle, "pre-up.d", error_preup);
-
-       ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
-       err = ioctl(lib_cfg.ioctlfd, SIOCSIFFLAGS, &ifr);
-       if (err) {
-               savederrno = errno;
-               goto out_clean;
-       }
-
-       _exec_updown(nozzle, "up.d", error_up);
-
-       nozzle->up = 1;
-
-out_clean:
-       pthread_mutex_unlock(&config_mutex);
-       errno = savederrno;
-       return err;
-}
-
-static int _set_down(nozzle_t nozzle, char **error_down, char **error_postdown)
-{
-       int err = 0, savederrno = 0;
-       struct ifreq ifr;
-
-       if (!nozzle->up) {
-               goto out_clean;
-       }
-
-       memset(&ifr, 0, sizeof(struct ifreq));
-       strncpy(ifname, nozzle->name, IFNAMSIZ);
-
-       err = ioctl(lib_cfg.ioctlfd, SIOCGIFFLAGS, &ifr);
-       if (err) {
-               savederrno = errno;
-               goto out_clean;
-       }
-
-       _exec_updown(nozzle, "down.d", error_down);
-
-       ifr.ifr_flags &= ~IFF_UP;
-
-       err = ioctl(lib_cfg.ioctlfd, SIOCSIFFLAGS, &ifr);
-       if (err) {
-               savederrno = errno;
-               goto out_clean;
-       }
-
-       _exec_updown(nozzle, "post-down.d", error_postdown);
-
-       nozzle->up = 0;
-
-out_clean:
-       errno = savederrno;
-       return err;
-}
-
-int nozzle_set_down(nozzle_t nozzle, char **error_down, char **error_postdown)
-{
-       int err = 0, savederrno = 0;
-
-       if (!nozzle) {
-               errno = EINVAL;
-               return -1;
-       }
-
-       savederrno = pthread_mutex_lock(&config_mutex);
-       if (savederrno) {
-               errno = savederrno;
-               return -1;
-       }
-
-       if (!_check(nozzle)) {
-               savederrno = EINVAL;
-               err = -1;
-               goto out_clean;
-       }
-
-       if ((nozzle->hasupdown) && ((!error_down) || (!error_postdown))) {
-               savederrno = EINVAL;
-               err = -1;
-               goto out_clean;
-       }
-
-       err = _set_down(nozzle, error_down, error_postdown);
-       savederrno = errno;
-
-out_clean:
-       pthread_mutex_unlock(&config_mutex);
-       errno = savederrno;
-       return err;
-}
-
 static int _set_ip(nozzle_t nozzle, const char *command,
                      const char *ipaddr, const char *prefix,
                      char **error_string, int secondary)

diff --git a/libnozzle/libnozzle.c b/libnozzle/libnozzle.c
index afed9f9b0e48aff363955a2749be3586ff00943b..0ea6e0c6cb67b97768ee2d891d8dc858080228b0 100644 (file)
--- a/libnozzle/libnozzle.c
+++ b/libnozzle/libnozzle.c
@@ -81,39 +81,6 @@ static void _close_cfg(void)
        }
 }
 
-static int _set_down(nozzle_t nozzle)
-{
-       int err = 0, savederrno = 0;
-       struct ifreq ifr;
-
-       if (!nozzle->up) {
-               goto out_clean;
-       }
-
-       memset(&ifr, 0, sizeof(struct ifreq));
-       strncpy(ifname, nozzle->name, IFNAMSIZ);
-
-       err = ioctl(lib_cfg.ioctlfd, SIOCGIFFLAGS, &ifr);
-       if (err) {
-               savederrno = errno;
-               goto out_clean;
-       }
-
-       ifr.ifr_flags &= ~IFF_UP;
-
-       err = ioctl(lib_cfg.ioctlfd, SIOCSIFFLAGS, &ifr);
-       if (err) {
-               savederrno = errno;
-               goto out_clean;
-       }
-
-       nozzle->up = 0;
-
-out_clean:
-       errno = savederrno;
-       return err;
-}
-
 static int _set_ip(nozzle_t nozzle, const char *command,
                      const char *ipaddr, const char *prefix,
                      char **error_string, int secondary)
@@ -305,6 +272,39 @@ out_clean:
        return err;
 }
 
+static int set_iface_down(nozzle_t nozzle)
+{
+       int err = 0, savederrno = 0;
+       struct ifreq ifr;
+
+       if (!nozzle->up) {
+               goto out_clean;
+       }
+
+       memset(&ifr, 0, sizeof(struct ifreq));
+       strncpy(ifname, nozzle->name, IFNAMSIZ);
+
+       err = ioctl(lib_cfg.ioctlfd, SIOCGIFFLAGS, &ifr);
+       if (err) {
+               savederrno = errno;
+               goto out_clean;
+       }
+
+       ifr.ifr_flags &= ~IFF_UP;
+
+       err = ioctl(lib_cfg.ioctlfd, SIOCSIFFLAGS, &ifr);
+       if (err) {
+               savederrno = errno;
+               goto out_clean;
+       }
+
+       nozzle->up = 0;
+
+out_clean:
+       errno = savederrno;
+       return err;
+}
+
 /*
  * public API
  */
@@ -522,7 +522,7 @@ int nozzle_close(nozzle_t nozzle)
                prev->next = nozzle->next;
        }
 
-       _set_down(nozzle);
+       set_iface_down(nozzle);
 
        ip = nozzle->ip;
        while (ip) {
@@ -610,76 +610,6 @@ int nozzle_reset_mtu(nozzle_t nozzle, char **error_string)
        return nozzle_set_mtu(nozzle, nozzle->default_mtu, error_string);
 }
 
-int nozzle_set_up(nozzle_t nozzle)
-{
-       int err = 0, savederrno = 0;
-       struct ifreq ifr;
-
-       savederrno = pthread_mutex_lock(&config_mutex);
-       if (savederrno) {
-               errno = savederrno;
-               return -1;
-       }
-
-       if (!is_valid_nozzle(nozzle)) {
-               savederrno = EINVAL;
-               err = -1;
-               goto out_clean;
-       }
-
-       if (nozzle->up) {
-               goto out_clean;
-       }
-
-       memset(&ifr, 0, sizeof(struct ifreq));
-       strncpy(ifname, nozzle->name, IFNAMSIZ);
-
-       err = ioctl(lib_cfg.ioctlfd, SIOCGIFFLAGS, &ifr);
-       if (err) {
-               savederrno = errno;
-               goto out_clean;
-       }
-
-       ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
-       err = ioctl(lib_cfg.ioctlfd, SIOCSIFFLAGS, &ifr);
-       if (err) {
-               savederrno = errno;
-               goto out_clean;
-       }
-
-       nozzle->up = 1;
-
-out_clean:
-       pthread_mutex_unlock(&config_mutex);
-       errno = savederrno;
-       return err;
-}
-
-int nozzle_set_down(nozzle_t nozzle)
-{
-       int err = 0, savederrno = 0;
-
-       savederrno = pthread_mutex_lock(&config_mutex);
-       if (savederrno) {
-               errno = savederrno;
-               return -1;
-       }
-
-       if (!is_valid_nozzle(nozzle)) {
-               savederrno = EINVAL;
-               err = -1;
-               goto out_clean;
-       }
-
-       err = _set_down(nozzle);
-       savederrno = errno;
-
-out_clean:
-       pthread_mutex_unlock(&config_mutex);
-       errno = savederrno;
-       return err;
-}
-
 int nozzle_add_ip(nozzle_t nozzle, const char *ipaddr, const char *prefix, char **error_string)
 {
        int err = 0, savederrno = 0;
@@ -947,6 +877,76 @@ out_clean:
  * functions below should be completed
  */
 
+int nozzle_set_up(nozzle_t nozzle)
+{
+       int err = 0, savederrno = 0;
+       struct ifreq ifr;
+
+       savederrno = pthread_mutex_lock(&config_mutex);
+       if (savederrno) {
+               errno = savederrno;
+               return -1;
+       }
+
+       if (!is_valid_nozzle(nozzle)) {
+               savederrno = EINVAL;
+               err = -1;
+               goto out_clean;
+       }
+
+       if (nozzle->up) {
+               goto out_clean;
+       }
+
+       memset(&ifr, 0, sizeof(struct ifreq));
+       strncpy(ifname, nozzle->name, IFNAMSIZ);
+
+       err = ioctl(lib_cfg.ioctlfd, SIOCGIFFLAGS, &ifr);
+       if (err) {
+               savederrno = errno;
+               goto out_clean;
+       }
+
+       ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
+       err = ioctl(lib_cfg.ioctlfd, SIOCSIFFLAGS, &ifr);
+       if (err) {
+               savederrno = errno;
+               goto out_clean;
+       }
+
+       nozzle->up = 1;
+
+out_clean:
+       pthread_mutex_unlock(&config_mutex);
+       errno = savederrno;
+       return err;
+}
+
+int nozzle_set_down(nozzle_t nozzle)
+{
+       int err = 0, savederrno = 0;
+
+       savederrno = pthread_mutex_lock(&config_mutex);
+       if (savederrno) {
+               errno = savederrno;
+               return -1;
+       }
+
+       if (!is_valid_nozzle(nozzle)) {
+               savederrno = EINVAL;
+               err = -1;
+               goto out_clean;
+       }
+
+       err = set_iface_down(nozzle);
+       savederrno = errno;
+
+out_clean:
+       pthread_mutex_unlock(&config_mutex);
+       errno = savederrno;
+       return err;
+}
+
 int nozzle_get_mtu(const nozzle_t nozzle)
 {
        int err = 0, savederrno = 0;