summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2022-04-30 14:33:14 +0200
committerDenys Vlasenko2022-04-30 14:33:14 +0200
commit002d6ee46d7a188aff9530cf21363b4cf7795dc4 (patch)
tree3aae1cbf4f1d3a2522e040ecc5f8540ebf7d961d
parent8456c21c09189da8eadb78ef5cc7fdb9825fbc13 (diff)
downloadbusybox-002d6ee46d7a188aff9530cf21363b4cf7795dc4.zip
busybox-002d6ee46d7a188aff9530cf21363b4cf7795dc4.tar.gz
ifplugd: split -a into -a and -A, latter disables upping in iface creation
-a meant both "don't up iface before each link detection" and "don't up iface when it newly appears". But they are not the same. I have a dock station where eth1 appears when I attach the notebook to it (looks like it's hanging off a USB bus). IOW: appearance of this interface is functionally equivalent to attaching ethernet cable. ifplugd meant to be able to *automatically* handle this case. Currently, with -a, it couldn't: newly appearing iface stayed down, user had to manually up it. function old new delta packed_usage 34253 34296 +43 .rodata 104876 104877 +1 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/0 up/down: 44/0) Total: 44 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/ifplugd.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index c4b6b95..0b55bf4 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -28,6 +28,7 @@
//usage: "\n -a Don't up interface at each link probe"
//usage: "\n -M Monitor creation/destruction of interface"
//usage: "\n (otherwise it must exist)"
+//usage: "\n -A Don't up newly appeared interface"
//usage: "\n -r PROG Script to run"
//usage: "\n -x ARG Extra argument for script"
//usage: "\n -I Don't exit on nonzero exit code from script"
@@ -94,7 +95,7 @@ Netlink code then can be just dropped (1k or more?)
#define IFPLUGD_ENV_CURRENT "IFPLUGD_CURRENT"
enum {
- FLAG_NO_AUTO = 1 << 0, // -a, Do not enable interface automatically
+ FLAG_NO_AUTO = 1 << 0, // -a, Don't up interface at each link probe
FLAG_NO_DAEMON = 1 << 1, // -n, Do not daemonize
FLAG_NO_SYSLOG = 1 << 2, // -s, Do not use syslog, use stderr instead
FLAG_IGNORE_FAIL = 1 << 3, // -f, Ignore detection failure, retry instead (failure is treated as DOWN)
@@ -111,14 +112,15 @@ enum {
FLAG_INITIAL_DOWN = 1 << 14, // -l, Run "down" script on startup if no cable is detected
FLAG_EXTRA_ARG = 1 << 15, // -x, Specify an extra argument for action script
FLAG_MONITOR = 1 << 16, // -M, Use interface monitoring
+ FLAG_NO_UP_NEW_IFACE = 1 << 17, // -A, Don't up newly appeared interface
#if ENABLE_FEATURE_PIDFILE
- FLAG_KILL = 1 << 17, // -k, Kill a running daemon
+ FLAG_KILL = 1 << 18, // -k, Kill a running daemon
#endif
};
#if ENABLE_FEATURE_PIDFILE
-# define OPTION_STR "+ansfFi:r:It:+u:+d:+m:pqlx:Mk"
+# define OPTION_STR "+ansfFi:r:It:+u:+d:+m:pqlx:MAk"
#else
-# define OPTION_STR "+ansfFi:r:It:+u:+d:+m:pqlx:M"
+# define OPTION_STR "+ansfFi:r:It:+u:+d:+m:pqlx:MA"
#endif
enum { // interface status
@@ -387,7 +389,7 @@ static void up_iface(void)
static void maybe_up_new_iface(void)
{
- if (!(option_mask32 & FLAG_NO_AUTO))
+ if (!(option_mask32 & FLAG_NO_UP_NEW_IFACE))
up_iface();
#if 0 /* bloat */