Bryan O'Sullivan avatar Bryan O'Sullivan committed 894e3ad

Turned state machine diagram into a .dot file for readability.
Added Jeremy's copyright to source files he modified heavily.
Bumped version number.

Comments (0)

Files changed (7)

-version := 1.0.1
+version := 1.1
 
 prefix ?=
 bindir ?= $(prefix)/sbin
+all: state-machine.ps
+
+%.ps: %.dot
+	dot -Tps $< > $(patsubst %.dot,%.ps,$<)
+
+%.eps: %.ps
+	ps2epsi $< $(patsubst %.eps,%.ps,$<)

docs/state-machine.dot

+/* -*- c -*- */
+
+digraph state_machine {
+  insane [label="INSANE"];
+  probing [label="PROBING"];
+  down [label="DOWN"];
+  inactive [label="INACTIVE"];
+  inning [label="INNING"];
+  wait_in [label="WAIT_IN"];
+  outing [label="OUTING"];
+  downandout [label="DOWNANDOUT"];
+  active [label="ACTIVE"];
+  probing_up [label="PROBING_UP"];
+
+  insane -> probing [label="regained\nsanity"];
+
+  probing -> down [label="probe done"];
+  probing -> probing_up [label="up -> 1"];
+
+  down -> inactive [label="up -> 1"];
+
+  probing_up -> inactive [label="probe done"];
+
+  inactive -> inning [label="running -> 1"];
+
+  inning -> wait_in [label="running -> 0"];
+  inning -> active [label="in done OK"];
+
+  wait_in -> outing [label="in done"];
+
+  active -> outing [label="running -> 0"];
+
+  outing -> downandout [label="up -> 0"];
+  outing -> inactive [label="out done"];
+
+  downandout -> probing [label="out done"];
+}
  * if_info.c - track network interface information
  *
  * Copyright 2003 Key Research, Inc.
+ * Copyright 2003 Jeremy Fitzhardinge
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License,
 
 #include "netplug.h"
 
-#define INFOHASHSZ	16	/* must be a power of 2 */
+#define INFOHASHSZ      16      /* must be a power of 2 */
 static struct if_info *if_info[INFOHASHSZ];
 
 static const char *
 statename(enum ifstate s)
 {
     switch(s) {
-#define S(x)	case ST_##x: return #x
-	S(DOWN);
-	S(DOWNANDOUT);
-	S(PROBING);
-	S(PROBING_UP);
-	S(INACTIVE);
-	S(INNING);
-	S(WAIT_IN);
-	S(ACTIVE);
-	S(OUTING);
-	S(INSANE);
+#define S(x)    case ST_##x: return #x
+        S(DOWN);
+        S(DOWNANDOUT);
+        S(PROBING);
+        S(PROBING_UP);
+        S(INACTIVE);
+        S(INNING);
+        S(WAIT_IN);
+        S(ACTIVE);
+        S(OUTING);
+        S(INSANE);
 #undef S
     default: return "???";
     }
 flags_str(char *buf, unsigned int fl)
 {
     static struct flag {
-	const char *name;
-	unsigned int flag;
+        const char *name;
+        unsigned int flag;
     } flags[] = {
-#define  F(x)	{ #x, IFF_##x }
-	F(UP),
-	F(BROADCAST),
-	F(DEBUG),
-	F(LOOPBACK),
-	F(POINTOPOINT),
-	F(NOTRAILERS),
-	F(RUNNING),
-	F(NOARP),
-	F(PROMISC),
-	F(ALLMULTI),
-	F(MASTER),
-	F(SLAVE),
-	F(MULTICAST),
+#define  F(x)   { #x, IFF_##x }
+        F(UP),
+        F(BROADCAST),
+        F(DEBUG),
+        F(LOOPBACK),
+        F(POINTOPOINT),
+        F(NOTRAILERS),
+        F(RUNNING),
+        F(NOARP),
+        F(PROMISC),
+        F(ALLMULTI),
+        F(MASTER),
+        F(SLAVE),
+        F(MULTICAST),
 #undef F
     };
     char *cp = buf;
     *cp = '\0';
 
     for(int i = 0; i < sizeof(flags)/sizeof(*flags); i++) {
-	if (fl & flags[i].flag) {
-	    fl &= ~flags[i].flag;
-	    cp += sprintf(cp, "%s,", flags[i].name);
-	}
+        if (fl & flags[i].flag) {
+            fl &= ~flags[i].flag;
+            cp += sprintf(cp, "%s,", flags[i].name);
+        }
     }
 
     if (fl != 0)
-	cp += sprintf(cp, "%x,", fl);
+        cp += sprintf(cp, "%x,", fl);
 
     if (cp != buf)
-	cp[-1] = '\0';
+        cp[-1] = '\0';
 
     return buf;
 }
 for_each_iface(int (*func)(struct if_info *))
 {
     for(int i = 0; i < INFOHASHSZ; i++) {
-	for(struct if_info *info = if_info[i]; info != NULL; info = info->next) {
-	    if ((*func)(info))
-		return;
-	}
+        for(struct if_info *info = if_info[i]; info != NULL; info = info->next) {
+            if ((*func)(info))
+                return;
+        }
     }
 }
 
 /* Reevaluate the state machine based on the current state and flag settings */
-void 
+void
 ifsm_flagpoll(struct if_info *info)
 {
     enum ifstate state = info->state;
 
     switch(info->state) {
     case ST_DOWN:
-	if ((info->flags & (IFF_UP|IFF_RUNNING)) == 0)
-	    break;
-	/* FALLTHROUGH */
+        if ((info->flags & (IFF_UP|IFF_RUNNING)) == 0)
+            break;
+        /* FALLTHROUGH */
     case ST_INACTIVE:
-	if (!(info->flags & IFF_UP)) {
-	    assert(info->worker == -1);
-	    info->worker = run_netplug_bg(info->name, "probe");
-	    info->state = ST_PROBING;
-	}
-	if (info->flags & IFF_RUNNING) {
-	    assert(info->worker == -1);
-	    info->worker = run_netplug_bg(info->name, "in");
-	    info->state = ST_INNING;
-	}
-	break;
+        if (!(info->flags & IFF_UP)) {
+            assert(info->worker == -1);
+            info->worker = run_netplug_bg(info->name, "probe");
+            info->state = ST_PROBING;
+        }
+        if (info->flags & IFF_RUNNING) {
+            assert(info->worker == -1);
+            info->worker = run_netplug_bg(info->name, "in");
+            info->state = ST_INNING;
+        }
+        break;
 
     case ST_PROBING:
     case ST_PROBING_UP:
     case ST_WAIT_IN:
     case ST_DOWNANDOUT:
-	break;
+        break;
 
     case ST_INNING:
-	if (!(info->flags & IFF_RUNNING))
-	    info->state = ST_WAIT_IN;
-	break;
+        if (!(info->flags & IFF_RUNNING))
+            info->state = ST_WAIT_IN;
+        break;
 
     case ST_ACTIVE:
-	if (!(info->flags & IFF_RUNNING)) {
-	    assert(info->worker == -1);
-	    info->worker = run_netplug_bg(info->name, "out");
-	    info->state = ST_OUTING;
-	}
-	break;
+        if (!(info->flags & IFF_RUNNING)) {
+            assert(info->worker == -1);
+            info->worker = run_netplug_bg(info->name, "out");
+            info->state = ST_OUTING;
+        }
+        break;
 
     case ST_OUTING:
-	if (!(info->flags & IFF_UP))
-	    info->state = ST_DOWNANDOUT;
+        if (!(info->flags & IFF_UP))
+            info->state = ST_DOWNANDOUT;
 
     case ST_INSANE:
-	break;
+        break;
     }
 
     if (info->state != state)
-	do_log(LOG_DEBUG, "ifsm_flagpoll %s: moved from state %s to %s", 
-	       info->name, statename(state), statename(info->state));
+        do_log(LOG_DEBUG, "ifsm_flagpoll %s: moved from state %s to %s",
+               info->name, statename(state), statename(info->state));
 }
 
 /* if_info state machine transitions caused by interface flag changes (edge triggered) */
     unsigned int changed = (info->flags ^ newflags) & (IFF_RUNNING | IFF_UP);
 
     if (changed == 0)
-	return;
+        return;
 
     char buf1[512], buf2[512];
     do_log(LOG_INFO, "%s: state %s flags 0x%08x %s -> 0x%08x %s", info->name,
-	   statename(info->state),
-	   info->flags, flags_str(buf1, info->flags),
+           statename(info->state),
+           info->flags, flags_str(buf1, info->flags),
            newflags, flags_str(buf2, newflags));
 
     /* XXX put interface state-change rate limiting here */
     if (0 /* flapping */) {
-	info->state = ST_INSANE;
+        info->state = ST_INSANE;
     }
 
     if (changed & IFF_UP) {
-	if (newflags & IFF_UP) {
-	    switch(info->state) {
-	    case ST_DOWN:
-		info->state = ST_INACTIVE;
-		break;
+        if (newflags & IFF_UP) {
+            switch(info->state) {
+            case ST_DOWN:
+                info->state = ST_INACTIVE;
+                break;
 
-	    case ST_PROBING:
-		info->state = ST_PROBING_UP;
-		break;
+            case ST_PROBING:
+                info->state = ST_PROBING_UP;
+                break;
 
-	    default:
-		do_log(LOG_ERR, "%s: unexpected state %s for UP", info->name, statename(info->state));
-		exit(1);
-	    }
-	} else {
-	    /* interface went down */
-	    switch(info->state) {
-	    case ST_OUTING:
-		/* went down during an OUT script - OK */
-		info->state = ST_DOWNANDOUT;
-		break;
+            default:
+                do_log(LOG_ERR, "%s: unexpected state %s for UP", info->name, statename(info->state));
+                exit(1);
+            }
+        } else {
+            /* interface went down */
+            switch(info->state) {
+            case ST_OUTING:
+                /* went down during an OUT script - OK */
+                info->state = ST_DOWNANDOUT;
+                break;
 
-	    case ST_DOWN:
-		/* already down */
-		break;
+            case ST_DOWN:
+                /* already down */
+                break;
 
-	    default:
-		/* All other states: kill off any scripts currently
-		   running, and go into the PROBING state, attempting
-		   to bring it up */
-		kill_script(info->worker);
-		info->state = ST_PROBING;
+            default:
+                /* All other states: kill off any scripts currently
+                   running, and go into the PROBING state, attempting
+                   to bring it up */
+                kill_script(info->worker);
+                info->state = ST_PROBING;
 
-		assert(info->worker == -1);
-		info->worker = run_netplug_bg(info->name, "probe");	    
-	    }
-	}
+                assert(info->worker == -1);
+                info->worker = run_netplug_bg(info->name, "probe");
+            }
+        }
     }
 
     if (changed & IFF_RUNNING) {
-	switch(info->state) {
-	case ST_INACTIVE:
-	    assert(!(info->flags & IFF_RUNNING));
-	    assert(info->worker == -1);
+        switch(info->state) {
+        case ST_INACTIVE:
+            assert(!(info->flags & IFF_RUNNING));
+            assert(info->worker == -1);
 
-	    info->worker = run_netplug_bg(info->name, "in");
-	    info->state = ST_INNING;
-	    break;
+            info->worker = run_netplug_bg(info->name, "in");
+            info->state = ST_INNING;
+            break;
 
-	case ST_INNING:
-	    assert(info->flags & IFF_RUNNING);
-	    info->state = ST_WAIT_IN;
-	    break;
+        case ST_INNING:
+            assert(info->flags & IFF_RUNNING);
+            info->state = ST_WAIT_IN;
+            break;
 
-	case ST_WAIT_IN:
-	    /* unaffected by interface flag changing */
-	    break;
+        case ST_WAIT_IN:
+            /* unaffected by interface flag changing */
+            break;
 
-	case ST_ACTIVE:
-	    assert(info->flags & IFF_RUNNING);	    
-	    assert(info->worker == -1);
+        case ST_ACTIVE:
+            assert(info->flags & IFF_RUNNING);
+            assert(info->worker == -1);
 
-	    info->worker = run_netplug_bg(info->name, "out");
-	    info->state = ST_OUTING;
-	    break;
+            info->worker = run_netplug_bg(info->name, "out");
+            info->state = ST_OUTING;
+            break;
 
-	case ST_OUTING:
-	    /* always go to INACTIVE regardless of flag state */
-	    break;
+        case ST_OUTING:
+            /* always go to INACTIVE regardless of flag state */
+            break;
 
-	case ST_PROBING:
-	case ST_PROBING_UP:
-	    /* ignore running state */
-	    break;
+        case ST_PROBING:
+        case ST_PROBING_UP:
+            /* ignore running state */
+            break;
 
-	case ST_INSANE:
-	    /* stay insane until there's been quiet for a while, then
-	       down interface and switch to ST_DOWN */
-	    break;
+        case ST_INSANE:
+            /* stay insane until there's been quiet for a while, then
+               down interface and switch to ST_DOWN */
+            break;
 
-	case ST_DOWN:
-	case ST_DOWNANDOUT:
-	    /* badness: somehow interface became RUNNING without being
-	       UP - ignore it */
-	    break;
-	}
+        case ST_DOWN:
+        case ST_DOWNANDOUT:
+            /* badness: somehow interface became RUNNING without being
+               UP - ignore it */
+            break;
+        }
     }
 
-    do_log(LOG_DEBUG, "%s: moved to state %s; worker %d", 
-	   info->name, statename(info->state), info->worker);
+    do_log(LOG_DEBUG, "%s: moved to state %s; worker %d",
+           info->name, statename(info->state), info->worker);
     info->flags = newflags;
     info->lastchange = time(0);
 }
     assert(WIFEXITED(exitstatus) || WIFSIGNALED(exitstatus));
 
     int find_pid(struct if_info *i) {
-	if (i->worker == pid) {
-	    info = i;
-	    return 1;
-	}
-	return 0;
+        if (i->worker == pid) {
+            info = i;
+            return 1;
+        }
+        return 0;
     }
 
     info = NULL;
     for_each_iface(find_pid);
 
     if (info == NULL) {
-	do_log(LOG_INFO, "Unexpected child %d exited with status %d",
-	       pid, exitstatus);
-	return;
+        do_log(LOG_INFO, "Unexpected child %d exited with status %d",
+               pid, exitstatus);
+        return;
     }
 
     do_log(LOG_INFO, "%s: state %s pid %d exited status %d",
-	   info->name, statename(info->state), pid, exitstatus);
+           info->name, statename(info->state), pid, exitstatus);
 
     info->worker = -1;
 
     switch(info->state) {
     case ST_PROBING:
-	/* If we're still in PROBING state, then it means that the
-	   interface flags have not come up, even though the script
-	   finished.  Go back to DOWN and wait for the UP flag
-	   setting. */
-	if (!exitok)
+        /* If we're still in PROBING state, then it means that the
+           interface flags have not come up, even though the script
+           finished.  Go back to DOWN and wait for the UP flag
+           setting. */
+        if (!exitok)
             do_log(LOG_WARNING, "Could not bring %s back up", info->name);
 
-	info->state = ST_DOWN;
-	break;
+        info->state = ST_DOWN;
+        break;
 
     case ST_PROBING_UP:
-	/* regardless of script's exit status, the interface is
-	   actually up now, so just make it inactive */
-	info->state = ST_INACTIVE;
-	break;
+        /* regardless of script's exit status, the interface is
+           actually up now, so just make it inactive */
+        info->state = ST_INACTIVE;
+        break;
 
     case ST_DOWNANDOUT:
-	/* we were just waiting for the out script to finish - start a
-	   probe script for this interface */
-	info->state = ST_PROBING;
-	assert(info->worker == -1);
-	info->worker = run_netplug_bg(info->name, "probe");
-	break;
+        /* we were just waiting for the out script to finish - start a
+           probe script for this interface */
+        info->state = ST_PROBING;
+        assert(info->worker == -1);
+        info->worker = run_netplug_bg(info->name, "probe");
+        break;
 
     case ST_INNING:
-	if (exitok)
-	    info->state = ST_ACTIVE;
-	else
-	    info->state = ST_INSANE; /* ??? */
-	break;
+        if (exitok)
+            info->state = ST_ACTIVE;
+        else
+            info->state = ST_INSANE; /* ??? */
+        break;
 
     case ST_OUTING:
-	/* What if !exitok?  What if interface is still active? ->ST_INSANE? */
-	info->state = ST_INACTIVE;
-	break;
+        /* What if !exitok?  What if interface is still active? ->ST_INSANE? */
+        info->state = ST_INACTIVE;
+        break;
 
     case ST_WAIT_IN:
-	assert(info->worker == -1);
-	
-	info->worker = run_netplug_bg(info->name, "out");
-	info->state = ST_OUTING;
-	break;
+        assert(info->worker == -1);
+
+        info->worker = run_netplug_bg(info->name, "out");
+        info->state = ST_OUTING;
+        break;
 
     case ST_INACTIVE:
     case ST_ACTIVE:
     case ST_INSANE:
     case ST_DOWN:
-	do_log(LOG_ERR, "ifsm_scriptdone: %s: bad state %s for script termination", 
-	       info->name, statename(info->state));
-	exit(1);
+        do_log(LOG_ERR, "ifsm_scriptdone: %s: bad state %s for script termination",
+               info->name, statename(info->state));
+        exit(1);
     }
 
     do_log(LOG_DEBUG, "%s: moved to state %s", info->name, statename(info->state));
         i->index = info->ifi_index;
         *ip = i;
 
-	/* initialize state machine fields */
-	i->state = ST_DOWN;
-	i->lastchange = 0;
-	i->worker = -1;
+        /* initialize state machine fields */
+        i->state = ST_DOWN;
+        i->lastchange = 0;
+        i->worker = -1;
     }
     return i;
 }
  * lib.c - random library routines
  *
  * Copyright 2003 Key Research, Inc.
+ * Copyright 2003 Jeremy Fitzhardinge
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License,
     va_start(ap, fmt);
 
     if (pri == LOG_DEBUG && !debug)
-	return;
+        return;
 
     if (use_syslog) {
         vsyslog(pri, fmt, ap);
         return pid;
     }
 
-    setpgrp();			/* become group leader */
+    setpgrp();                  /* become group leader */
 
     do_log(LOG_INFO, "%s %s %s -> %d", NP_SCRIPT, ifname, action, getpid());
 
     return WIFEXITED(status) ? WEXITSTATUS(status) : -WTERMSIG(status);
 }
 
-/* 
+/*
    Synchronously kill a script
 
    Assumes the pid is actually a leader of a group.  Kills first with
     sigset_t mask, origmask;
 
     if (pid == -1)
-	return;
+        return;
 
     assert(pid > 0);
-    
+
     /* Block SIGCHLD while we go around killing things, so the SIGCHLD
        handler doesn't steal things behind our back. */
     sigemptyset(&mask);
 
     /* ask nicely */
     if (killpg(pid, SIGTERM) == -1) {
-	do_log(LOG_ERR, "Can't kill script pgrp %d: %m", pid);
-	goto done;
+        do_log(LOG_ERR, "Can't kill script pgrp %d: %m", pid);
+        goto done;
     }
 
     sleep(1);
     ret = waitpid(pid, &status, WNOHANG);
 
     if (ret == -1) {
-	do_log(LOG_ERR, "Failed to wait for %d: %m?!", pid);
-	goto done;
+        do_log(LOG_ERR, "Failed to wait for %d: %m?!", pid);
+        goto done;
     } else if (ret == 0) {
-	/* no more Mr. nice guy */
-	if (killpg(pid, SIGKILL) == -1) {
-	    do_log(LOG_ERR, "2nd kill %d failed: %m?!", pid);
-	    goto done;
-	}
-	ret = waitpid(pid, &status, 0);
-    } 
+        /* no more Mr. nice guy */
+        if (killpg(pid, SIGKILL) == -1) {
+            do_log(LOG_ERR, "2nd kill %d failed: %m?!", pid);
+            goto done;
+        }
+        ret = waitpid(pid, &status, 0);
+    }
 
     assert(ret == pid);
 
  * main.c - daemon startup and link monitoring
  *
  * Copyright 2003 Key Research, Inc.
+ * Copyright 2003 Jeremy Fitzhardinge
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License,
     char *name = RTA_DATA(attrs[IFLA_IFNAME]);
 
     if (!if_match(name)) {
-	do_log(LOG_INFO, "%s: ignoring event", name);
-	return 0;
+        do_log(LOG_INFO, "%s: ignoring event", name);
+        return 0;
     }
 
     struct if_info *i = if_info_get_interface(hdr, attrs);
 
 struct child_exit
 {
-    pid_t	pid;
-    int		status;
+    pid_t       pid;
+    int         status;
 };
 
 static int child_handler_pipe[2];
     int ret;
 
     assert(sig == SIGCHLD);
-    
+
     ce.pid = info->si_pid;
     ret = waitpid(info->si_pid, &ce.status, 0);
     if (ret == info->si_pid)
-	write(child_handler_pipe[1], &ce, sizeof(ce));
+        write(child_handler_pipe[1], &ce, sizeof(ce));
 }
 
 /* Poll the existing interface state, so we can catch any state
     static int sockfd = -1;
 
     if (sockfd == -1) {
-	sockfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
-	if (sockfd == -1) {
-	    do_log(LOG_ERR, "can't create interface socket: %m");
-	    exit(1);
-	}
+        sockfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
+        if (sockfd == -1) {
+            do_log(LOG_ERR, "can't create interface socket: %m");
+            exit(1);
+        }
     }
 
     int pollflags(struct if_info *info) {
-	struct ifreq ifr;
-	
-	if (!if_match(info->name))
-	    return 0;
+        struct ifreq ifr;
 
-	memcpy(ifr.ifr_name, info->name, sizeof(ifr.ifr_name));
-	if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
-	    do_log(LOG_ERR, "%s: can't get flags: %m", info->name);
-	else {
-	    ifsm_flagchange(info, ifr.ifr_flags);
-	    ifsm_flagpoll(info);
-	}
+        if (!if_match(info->name))
+            return 0;
 
-	return 0;
+        memcpy(ifr.ifr_name, info->name, sizeof(ifr.ifr_name));
+        if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0)
+            do_log(LOG_ERR, "%s: can't get flags: %m", info->name);
+        else {
+            ifsm_flagchange(info, ifr.ifr_flags);
+            ifsm_flagpoll(info);
+        }
+
+        return 0;
     }
 
     for_each_iface(pollflags);
 
     while ((c = getopt(argc, argv, "DFPc:hi:p:")) != EOF) {
         switch (c) {
-	case 'D':
-	    debug = 1;
-	    break;
+        case 'D':
+            debug = 1;
+            break;
         case 'F':
             foreground = 1;
             break;
     }
 
     if (pipe(child_handler_pipe) == -1) {
-	do_log(LOG_ERR, "can't create pipe: %m");
-	exit(1);
+        do_log(LOG_ERR, "can't create pipe: %m");
+        exit(1);
     }
 
     if (fcntl(child_handler_pipe[0], F_SETFL, O_NONBLOCK) == -1) {
-	do_log(LOG_ERR, "can't set pipe non-blocking: %m");
-	exit(1);
+        do_log(LOG_ERR, "can't set pipe non-blocking: %m");
+        exit(1);
     }
-    
+
     struct sigaction sa;
     sa.sa_sigaction = child_handler;
     sa.sa_flags = SA_RESTART | SA_SIGINFO;
     sigfillset(&sa.sa_mask);
 
     if (sigaction(SIGCHLD, &sa, NULL) == -1) {
-	do_log(LOG_ERR, "can't set SIGCHLD handler: %m");
-	exit(1);
+        do_log(LOG_ERR, "can't set SIGCHLD handler: %m");
+        exit(1);
     }
 
     int fd = netlink_open();
     netlink_receive_dump(fd, if_info_save_interface, NULL);
 
     if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1) {
-	do_log(LOG_ERR, "can't set socket non-blocking: %m");
-	exit(1);
+        do_log(LOG_ERR, "can't set socket non-blocking: %m");
+        exit(1);
     }
 
     struct pollfd fds[] = {
-	{ fd, POLLIN, 0 },
-	{ child_handler_pipe[0], POLLIN, 0 },
+        { fd, POLLIN, 0 },
+        { child_handler_pipe[0], POLLIN, 0 },
     };
 
     {
-	/* Run over each of the interfaces we know and care about, and
-	   make sure the state machine has done the appropriate thing
-	   for their current state. */
-	int poll_flags(struct if_info *i) {
-	    if (if_match(i->name))
-		ifsm_flagpoll(i);
-	    return 0;
-	}
-	for_each_iface(poll_flags);
+        /* Run over each of the interfaces we know and care about, and
+           make sure the state machine has done the appropriate thing
+           for their current state. */
+        int poll_flags(struct if_info *i) {
+            if (if_match(i->name))
+                ifsm_flagpoll(i);
+            return 0;
+        }
+        for_each_iface(poll_flags);
     }
 
     for(;;) {
-	int ret;
+        int ret;
 
-	/* Make sure we don't miss anything interesting */
-	poll_interfaces();
+        /* Make sure we don't miss anything interesting */
+        poll_interfaces();
 
-	ret = poll(fds, sizeof(fds)/sizeof(fds[0]), -1);
+        ret = poll(fds, sizeof(fds)/sizeof(fds[0]), -1);
 
-	if (ret == -1) {
-	    if (errno == EINTR)
-		continue;
-	    do_log(LOG_ERR, "poll failed: %m");
-	    exit(1);
-	}
-	if (ret == 0)
-	    continue;		/* XXX??? */
+        if (ret == -1) {
+            if (errno == EINTR)
+                continue;
+            do_log(LOG_ERR, "poll failed: %m");
+            exit(1);
+        }
+        if (ret == 0)
+            continue;           /* XXX??? */
 
-	if (fds[0].revents & POLLIN) {
-	    /* interface flag state change */
-	    if (netlink_listen(fd, handle_interface, NULL) == 0)
-		break;		/* done */
-	}
+        if (fds[0].revents & POLLIN) {
+            /* interface flag state change */
+            if (netlink_listen(fd, handle_interface, NULL) == 0)
+                break;          /* done */
+        }
 
-	if (fds[1].revents & POLLIN) {
-	    /* netplug script finished */
-	    int ret;
-	    struct child_exit ce;
-		
-	    do {
-		ret = read(child_handler_pipe[0], &ce, sizeof(ce));
+        if (fds[1].revents & POLLIN) {
+            /* netplug script finished */
+            int ret;
+            struct child_exit ce;
 
-		assert(ret == 0 || ret == -1 || ret == sizeof(ce));
-		
-		if (ret == sizeof(ce))
-		    ifsm_scriptdone(ce.pid, ce.status);
-		else if (ret == -1 && errno != EAGAIN) {
-		    do_log(LOG_ERR, "pipe read failed: %m");
-		    exit(1);
-		}
-	    } while(ret == sizeof(ce));
-	}
+            do {
+                ret = read(child_handler_pipe[0], &ce, sizeof(ce));
+
+                assert(ret == 0 || ret == -1 || ret == sizeof(ce));
+
+                if (ret == sizeof(ce))
+                    ifsm_scriptdone(ce.pid, ce.status);
+                else if (ret == -1 && errno != EAGAIN) {
+                    do_log(LOG_ERR, "pipe read failed: %m");
+                    exit(1);
+                }
+            } while(ret == sizeof(ce));
+        }
     }
 
     return 0;
-%define version 1.0.1
+%define version 1.1
 %define release 1
 %define sysconfig /etc/sysconfig/network-scripts
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.