Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

ifplugd: code shrink

Browse Source 
function                                             old     new   delta
detect_link                                          122     221     +99
api_modes                                              -       7      +7
maybe_up_new_iface                                    27      33      +6
ifplugd_main                                        1143    1089     -54
detect_link_auto                                     117       -    -117
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 2/1 up/down: 112/-171)          Total: -59 bytes

Signed-off-by: Maksym Kryzhanovskyy <xmaks@email.cz>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Maksym Kryzhanovskyy 2010-07-08 02:47:25 +02:00 committed by Denys Vlasenko
parent 1d36f24bcb
commit 9388b4e720
1 changed files with 35 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
networking/ifplugd.c
View File

@ -79,6 +79,7 @@ enum { // api mode
API_WLAN = 'w', API_WLAN = 'w',
API_IFF = 'i', API_IFF = 'i',
}; };
static const char api_modes[] ALIGN1 = "aempwi";
enum { // interface status enum { // interface status
IFSTATUS_ERR = -1, IFSTATUS_ERR = -1,
@ -95,6 +96,7 @@ struct globals {
smallint iface_last_status; smallint iface_last_status;
smallint iface_prev_status; smallint iface_prev_status;
smallint iface_exists; smallint iface_exists;
smallint api_method_num;
/* Used in getopt32, must have sizeof == sizeof(int) */ /* Used in getopt32, must have sizeof == sizeof(int) */
unsigned poll_time; unsigned poll_time;
@ -107,7 +109,6 @@ struct globals {
const char *extra_arg; const char *extra_arg;
smallint (*detect_link_func)(void); smallint (*detect_link_func)(void);
smallint (*cached_detect_link_func)(void);
}; };
#define G (*ptr_to_globals) #define G (*ptr_to_globals)
#define INIT_G() do { \ #define INIT_G() do { \
@ -239,8 +240,8 @@ static void maybe_up_new_iface(void)
G.iface, buf, driver_info.driver, driver_info.version); G.iface, buf, driver_info.driver, driver_info.version);
} }
#endif #endif
if (G.api_method_num == 0)
G.cached_detect_link_func = NULL; G.detect_link_func = NULL;
} }
static smallint detect_link_mii(void) static smallint detect_link_mii(void)
@ -348,7 +349,7 @@ static smallint detect_link_wlan(void)
return IFSTATUS_UP; return IFSTATUS_UP;
} }
static smallint detect_link_auto(void) static smallint detect_link(void)
{ {
static const struct { static const struct {
const char *name; const char *name;
@ -360,32 +361,6 @@ static smallint detect_link_auto(void)
{ "wireless extension", &detect_link_wlan }, { "wireless extension", &detect_link_wlan },
{ "IFF_RUNNING" , &detect_link_iff }, { "IFF_RUNNING" , &detect_link_iff },
}; };
int i;
smallint iface_status;
smallint sv_logmode;
if (G.cached_detect_link_func) {
iface_status = G.cached_detect_link_func();
if (iface_status != IFSTATUS_ERR)
return iface_status;
}
sv_logmode = logmode;
for (i = 0; i < ARRAY_SIZE(method); i++) {
logmode = LOGMODE_NONE;
iface_status = method[i].func();
logmode = sv_logmode;
if (iface_status != IFSTATUS_ERR) {
G.cached_detect_link_func = method[i].func;
bb_error_msg("using %s detection mode", method[i].name);
break;
}
}
return iface_status;
}
static smallint detect_link(void)
{
smallint status; smallint status;
if (!G.iface_exists) if (!G.iface_exists)
@ -398,20 +373,38 @@ static smallint detect_link(void)
if (!(option_mask32 & FLAG_NO_AUTO)) if (!(option_mask32 & FLAG_NO_AUTO))
up_iface(); up_iface();
if (!G.detect_link_func) {
if (G.api_method_num == 0) {
int i;
smallint sv_logmode;
sv_logmode = logmode;
for (i = 0; i < ARRAY_SIZE(method); i++) {
logmode = LOGMODE_NONE;
status = method[i].func();
logmode = sv_logmode;
if (status != IFSTATUS_ERR) {
G.detect_link_func = method[i].func;
bb_error_msg("using %s detection mode", method[i].name);
goto _2;
}
}
goto _1;
}
G.detect_link_func = method[G.api_method_num - 1].func;
}
status = G.detect_link_func(); status = G.detect_link_func();
_1:
if (status == IFSTATUS_ERR) { if (status == IFSTATUS_ERR) {
if (option_mask32 & FLAG_IGNORE_FAIL) if (option_mask32 & FLAG_IGNORE_FAIL)
status = IFSTATUS_DOWN; status = IFSTATUS_DOWN;
if (option_mask32 & FLAG_IGNORE_FAIL_POSITIVE) else if (option_mask32 & FLAG_IGNORE_FAIL_POSITIVE)
status = IFSTATUS_UP; status = IFSTATUS_UP;
else if (G.api_method_num == 0)
bb_error_msg("can't detect link status");
} }
_2:
if (status == IFSTATUS_ERR
&& G.detect_link_func == detect_link_auto
) {
bb_error_msg("can't detect link status");
}
if (status != G.iface_last_status) { if (status != G.iface_last_status) {
G.iface_prev_status = G.iface_last_status; G.iface_prev_status = G.iface_last_status;
G.iface_last_status = status; G.iface_last_status = status;
@ -523,6 +516,7 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
const char *iface_status_str; const char *iface_status_str;
struct pollfd netlink_pollfd[1]; struct pollfd netlink_pollfd[1];
unsigned opts; unsigned opts;
const char *api_mode_found;
#if ENABLE_FEATURE_PIDFILE #if ENABLE_FEATURE_PIDFILE
char *pidfile_name; char *pidfile_name;
pid_t pid_from_pidfile; pid_t pid_from_pidfile;
@ -551,29 +545,10 @@ int ifplugd_main(int argc UNUSED_PARAM, char **argv)
if (pid_from_pidfile > 0 && kill(pid_from_pidfile, 0) == 0) if (pid_from_pidfile > 0 && kill(pid_from_pidfile, 0) == 0)
bb_error_msg_and_die("daemon already running"); bb_error_msg_and_die("daemon already running");
#endif #endif
api_mode_found = strchr(api_modes, G.api_mode[0]);
switch (G.api_mode[0]) { if (!api_mode_found)
case API_AUTO:
G.detect_link_func = detect_link_auto;
break;
case API_ETHTOOL:
G.detect_link_func = detect_link_ethtool;
break;
case API_MII:
G.detect_link_func = detect_link_mii;
break;
case API_PRIVATE:
G.detect_link_func = detect_link_priv;
break;
case API_WLAN:
G.detect_link_func = detect_link_wlan;
break;
case API_IFF:
G.detect_link_func = detect_link_iff;
break;
default:
bb_error_msg_and_die("unknown API mode '%s'", G.api_mode); bb_error_msg_and_die("unknown API mode '%s'", G.api_mode);
} G.api_method_num = api_mode_found - api_modes;
if (!(opts & FLAG_NO_DAEMON)) if (!(opts & FLAG_NO_DAEMON))
bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv); bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);