Move the code for tweaking interface flags into one function.

3 files changed, 62 insertions, 64 deletions

diff --git a/usr.sbin/ppp/ppp/bundle.c b/usr.sbin/ppp/ppp/bundle.c
index 42eabb8fa0d..7286c4eaa0e 100644
--- a/usr.sbin/ppp/ppp/bundle.c
+++ b/usr.sbin/ppp/ppp/bundle.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bundle.c,v 1.16 1999/05/12 10:03:48 brian Exp $
+ *	$Id: bundle.c,v 1.17 1999/05/27 08:44:48 brian Exp $
  */
 
 #include <sys/param.h>
@@ -719,10 +719,9 @@ bundle_UnlockTun(struct bundle *bundle)
 struct bundle *
 bundle_Create(const char *prefix, int type, const char **argv)
 {
-  int s, enoentcount, err;
-  const char *ifname;
-  struct ifreq ifrq;
   static struct bundle bundle;		/* there can be only one */
+  int enoentcount, err;
+  const char *ifname;
 #ifdef TUNSIFMODE
   int iff;
 #endif
@@ -761,13 +760,6 @@ bundle_Create(const char *prefix, int type, const char **argv)
   bundle.argv0 = argv[0];
   bundle.argv1 = argv[1];
 
-  s = socket(AF_INET, SOCK_DGRAM, 0);
-  if (s < 0) {
-    log_Printf(LogERROR, "bundle_Create: socket(): %s\n", strerror(errno));
-    close(bundle.dev.fd);
-    return NULL;
-  }
-
   ifname = strrchr(bundle.dev.Name, '/');
   if (ifname == NULL)
     ifname = bundle.dev.Name;
@@ -776,7 +768,6 @@ bundle_Create(const char *prefix, int type, const char **argv)
 
   bundle.iface = iface_Create(ifname);
   if (bundle.iface == NULL) {
-    close(s);
     close(bundle.dev.fd);
     return NULL;
   }
@@ -789,38 +780,16 @@ bundle_Create(const char *prefix, int type, const char **argv)
 	       strerror(errno));
 #endif
 
-  /*
-   * Now, bring up the interface.
-   */
-  memset(&ifrq, '\0', sizeof ifrq);
-  strncpy(ifrq.ifr_name, ifname, sizeof ifrq.ifr_name - 1);
-  ifrq.ifr_name[sizeof ifrq.ifr_name - 1] = '\0';
-  if (ID0ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) {
-    log_Printf(LogERROR, "bundle_Create: ioctl(SIOCGIFFLAGS): %s\n",
-	      strerror(errno));
-    close(s);
-    iface_Destroy(bundle.iface);
-    bundle.iface = NULL;
-    close(bundle.dev.fd);
-    return NULL;
-  }
-  ifrq.ifr_flags |= IFF_UP;
-  if (ID0ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) {
-    log_Printf(LogERROR, "bundle_Create: ioctl(SIOCSIFFLAGS): %s\n",
-	      strerror(errno));
-    close(s);
+  if (!iface_SetFlags(bundle.iface, IFF_UP)) {
     iface_Destroy(bundle.iface);
     bundle.iface = NULL;
     close(bundle.dev.fd);
     return NULL;
   }
 
-  close(s);
-
   log_Printf(LogPHASE, "Using interface: %s\n", ifname);
 
   bundle.ifSpeed = 0;
-
   bundle.routing_seq = 0;
   bundle.phase = PHASE_DEAD;
   bundle.CleaningUp = 0;
@@ -899,34 +868,8 @@ bundle_Create(const char *prefix, int type, const char **argv)
 static void
 bundle_DownInterface(struct bundle *bundle)
 {
-  struct ifreq ifrq;
-  int s;
-
   route_IfDelete(bundle, 1);
-
-  s = ID0socket(AF_INET, SOCK_DGRAM, 0);
-  if (s < 0) {
-    log_Printf(LogERROR, "bundle_DownInterface: socket: %s\n", strerror(errno));
-    return;
-  }
-
-  memset(&ifrq, '\0', sizeof ifrq);
-  strncpy(ifrq.ifr_name, bundle->iface->name, sizeof ifrq.ifr_name - 1);
-  ifrq.ifr_name[sizeof ifrq.ifr_name - 1] = '\0';
-  if (ID0ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) {
-    log_Printf(LogERROR, "bundle_DownInterface: ioctl(SIOCGIFFLAGS): %s\n",
-       strerror(errno));
-    close(s);
-    return;
-  }
-  ifrq.ifr_flags &= ~IFF_UP;
-  if (ID0ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) {
-    log_Printf(LogERROR, "bundle_DownInterface: ioctl(SIOCSIFFLAGS): %s\n",
-       strerror(errno));
-    close(s);
-    return;
-  }
-  close(s);
+  iface_ClearFlags(bundle->iface, IFF_UP);
 }
 
 void
diff --git a/usr.sbin/ppp/ppp/iface.c b/usr.sbin/ppp/ppp/iface.c
index 19051dc58f2..69cba1863dd 100644
--- a/usr.sbin/ppp/ppp/iface.c
+++ b/usr.sbin/ppp/ppp/iface.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iface.c,v 1.4 1999/05/08 11:06:35 brian Exp $
+ *	$Id: iface.c,v 1.5 1999/05/27 08:44:48 brian Exp $
  */
 
 #include <sys/param.h>
@@ -406,6 +406,59 @@ iface_inDelete(struct iface *iface, struct in_addr ip)
   return 0;
 }
 
+#define IFACE_ADDFLAGS 1
+#define IFACE_DELFLAGS 2
+
+static int
+iface_ChangeFlags(struct iface *iface, int flags, int how)
+{
+  struct ifreq ifrq;
+  int s;
+
+  s = ID0socket(AF_INET, SOCK_DGRAM, 0);
+  if (s < 0) {
+    log_Printf(LogERROR, "iface_ClearFlags: socket: %s\n", strerror(errno));
+    return 0;
+  }
+
+  memset(&ifrq, '\0', sizeof ifrq);
+  strncpy(ifrq.ifr_name, iface->name, sizeof ifrq.ifr_name - 1);
+  ifrq.ifr_name[sizeof ifrq.ifr_name - 1] = '\0';
+  if (ID0ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) {
+    log_Printf(LogERROR, "iface_ClearFlags: ioctl(SIOCGIFFLAGS): %s\n",
+       strerror(errno));
+    close(s);
+    return 0;
+  }
+
+  if (how == IFACE_ADDFLAGS)
+    ifrq.ifr_flags |= flags;
+  else
+    ifrq.ifr_flags &= ~flags;
+
+  if (ID0ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) {
+    log_Printf(LogERROR, "iface_ClearFlags: ioctl(SIOCSIFFLAGS): %s\n",
+       strerror(errno));
+    close(s);
+    return 0;
+  }
+  close(s);
+
+  return 1;	/* Success */
+}
+
+int
+iface_SetFlags(struct iface *iface, int flags)
+{
+  return iface_ChangeFlags(iface, flags, IFACE_ADDFLAGS);
+}
+
+int
+iface_ClearFlags(struct iface *iface, int flags)
+{
+  return iface_ChangeFlags(iface, flags, IFACE_DELFLAGS);
+}
+
 void
 iface_Destroy(struct iface *iface)
 {
diff --git a/usr.sbin/ppp/ppp/iface.h b/usr.sbin/ppp/ppp/iface.h
index ffd1fefe913..0c377804e67 100644
--- a/usr.sbin/ppp/ppp/iface.h
+++ b/usr.sbin/ppp/ppp/iface.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iface.h,v 1.2 1999/02/06 03:22:37 brian Exp $
+ *	$Id: iface.h,v 1.3 1999/05/27 08:44:48 brian Exp $
  */
 
 struct iface_addr {
@@ -57,4 +57,6 @@ extern int iface_inAdd(struct iface *, struct in_addr, struct in_addr,
                      struct in_addr, int);
 extern int iface_inDelete(struct iface *, struct in_addr);
 extern int iface_Show(struct cmdargs const *);
+extern int iface_SetFlags(struct iface *, int);
+extern int iface_ClearFlags(struct iface *, int);
 extern void iface_Destroy(struct iface *);