X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fslattach.c;h=2d1305e32abf6a9c08699baf5dd33fadb48ad305;hb=e695ac97fdd48808dd0a84d4725a063481a03c30;hp=3495df5988da15ada3ee6ed144da38d7e2daab43;hpb=833358798afe256352b4ba62a3d93e5273ce6533;p=oweals%2Fbusybox.git diff --git a/networking/slattach.c b/networking/slattach.c index 3495df598..2d1305e32 100644 --- a/networking/slattach.c +++ b/networking/slattach.c @@ -4,7 +4,7 @@ * * Author: Ignacio Garcia Perez (iggarpe at gmail dot com) * - * License: GPLv2 or later, see LICENSE file in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * * There are some differences from the standard net-tools slattach: * @@ -13,29 +13,33 @@ * - The -F options allows disabling of RTS/CTS flow control. */ +//usage:#define slattach_trivial_usage +//usage: "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE" +//usage:#define slattach_full_usage "\n\n" +//usage: "Attach network interface(s) to serial line(s)\n" +//usage: "\n -p PROT Set protocol (slip, cslip, slip6, clisp6 or adaptive)" +//usage: "\n -s SPD Set line speed" +//usage: "\n -e Exit after initializing device" +//usage: "\n -h Exit when the carrier is lost" +//usage: "\n -c PROG Run PROG when the line is hung up" +//usage: "\n -m Do NOT initialize the line in raw 8 bits mode" +//usage: "\n -L Enable 3-wire operation" +//usage: "\n -F Disable RTS/CTS flow control" + #include "libbb.h" -#include "libiproute/utils.h" /* invarg() */ - -/* Line discipline code table */ -static const char *const proto_names[] = { - "cslip"+1, /* 0 */ - "cslip", /* 1 */ - "cslip6"+1, /* 2 */ - "cslip6", /* 3 */ - "adaptive", /* 8 */ - NULL -}; +#include "common_bufsiz.h" +#include "libiproute/utils.h" /* invarg_1_to_2() */ struct globals { int handle; int saved_disc; struct termios saved_state; -}; -#define G (*(struct globals*)&bb_common_bufsiz1) +} FIX_ALIASING; +#define G (*(struct globals*)bb_common_bufsiz1) #define handle (G.handle ) #define saved_disc (G.saved_disc ) #define saved_state (G.saved_state ) -#define INIT_G() do {} while (0) +#define INIT_G() do { setup_common_bufsiz(); } while (0) /* @@ -50,11 +54,10 @@ static void save_state(void) bb_perror_msg_and_die("get state"); /* Save line discipline */ - if (ioctl(handle, TIOCGETD, &saved_disc) < 0) - bb_perror_msg_and_die("get discipline"); + xioctl(handle, TIOCGETD, &saved_disc); } -static int set_termios_state_and_warn(struct termios *state) +static int set_termios_state_or_warn(struct termios *state) { int ret; @@ -75,14 +78,13 @@ static int set_termios_state_and_warn(struct termios *state) * Go on after errors: we want to restore as many controlled ttys * as possible. */ -static void restore_state_and_exit(int exitcode) ATTRIBUTE_NORETURN; +static void restore_state_and_exit(int exitcode) NORETURN; static void restore_state_and_exit(int exitcode) { struct termios state; /* Restore line discipline */ - if (ioctl(handle, TIOCSETD, &saved_disc) < 0) { - bb_perror_msg("set discipline"); + if (ioctl_or_warn(handle, TIOCSETD, &saved_disc) < 0) { exitcode = 1; } @@ -90,12 +92,12 @@ static void restore_state_and_exit(int exitcode) memcpy(&state, &saved_state, sizeof(state)); cfsetispeed(&state, B0); cfsetospeed(&state, B0); - if (set_termios_state_and_warn(&state)) + if (set_termios_state_or_warn(&state)) exitcode = 1; sleep(1); /* Restore line status */ - if (set_termios_state_and_warn(&saved_state)) + if (set_termios_state_or_warn(&saved_state)) exit(EXIT_FAILURE); if (ENABLE_FEATURE_CLEAN_UP) close(handle); @@ -111,37 +113,44 @@ static void set_state(struct termios *state, int encap) int disc; /* Set line status */ - if (set_termios_state_and_warn(state)) + if (set_termios_state_or_warn(state)) goto bad; /* Set line discliple (N_SLIP always) */ disc = N_SLIP; - if (ioctl(handle, TIOCSETD, &disc) < 0) { - bb_perror_msg("set discipline"); + if (ioctl_or_warn(handle, TIOCSETD, &disc) < 0) { goto bad; } /* Set encapsulation (SLIP, CSLIP, etc) */ - if (ioctl(handle, SIOCSIFENCAP, &encap) < 0) { - bb_perror_msg("set encapsulation"); + if (ioctl_or_warn(handle, SIOCSIFENCAP, &encap) < 0) { bad: - restore_state_and_exit(1); + restore_state_and_exit(EXIT_FAILURE); } } -static void sig_handler(int signo) +static void sig_handler(int signo UNUSED_PARAM) { - restore_state_and_exit(0); + restore_state_and_exit(EXIT_SUCCESS); } -int slattach_main(int argc, char **argv); -int slattach_main(int argc, char **argv) +int slattach_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int slattach_main(int argc UNUSED_PARAM, char **argv) { + /* Line discipline code table */ + static const char proto_names[] ALIGN1 = + "slip\0" /* 0 */ + "cslip\0" /* 1 */ + "slip6\0" /* 2 */ + "cslip6\0" /* 3 */ + "adaptive\0" /* 8 */ + ; + int i, encap, opt; struct termios state; const char *proto = "cslip"; - const char *extcmd; /* Command to execute after hangup */ + const char *extcmd; /* Command to execute after hangup */ const char *baud_str; - int baud_code = -1; /* Line baud rate (system code) */ + int baud_code = -1; /* Line baud rate (system code) */ enum { OPT_p_proto = 1 << 0, @@ -157,17 +166,17 @@ int slattach_main(int argc, char **argv) INIT_G(); /* Parse command line options */ - opt = getopt32(argc, argv, "p:s:c:ehmLF", &proto, &baud_str, &extcmd); + opt = getopt32(argv, "p:s:c:ehmLF", &proto, &baud_str, &extcmd); /*argc -= optind;*/ argv += optind; if (!*argv) bb_show_usage(); - encap = index_in_str_array(proto_names, proto); + encap = index_in_strings(proto_names, proto); if (encap < 0) - invarg(proto, "protocol"); + invarg_1_to_2(proto, "protocol"); if (encap > 3) encap = 8; @@ -175,15 +184,17 @@ int slattach_main(int argc, char **argv) if (opt & OPT_s_baud) { baud_code = tty_value_to_baud(xatoi(baud_str)); if (baud_code < 0) - invarg(baud_str, "baud rate"); + invarg_1_to_2(baud_str, "baud rate"); } /* Trap signals in order to restore tty states upon exit */ if (!(opt & OPT_e_quit)) { - signal(SIGHUP, sig_handler); - signal(SIGINT, sig_handler); - signal(SIGQUIT, sig_handler); - signal(SIGTERM, sig_handler); + bb_signals(0 + + (1 << SIGHUP) + + (1 << SIGINT) + + (1 << SIGQUIT) + + (1 << SIGTERM) + , sig_handler); } /* Open tty */ @@ -209,6 +220,8 @@ int slattach_main(int argc, char **argv) state.c_cflag = CS8 | HUPCL | CREAD | ((opt & OPT_L_local) ? CLOCAL : 0) | ((opt & OPT_F_noflow) ? 0 : CRTSCTS); + cfsetispeed(&state, cfgetispeed(&saved_state)); + cfsetospeed(&state, cfgetospeed(&saved_state)); } if (opt & OPT_s_baud) { @@ -242,5 +255,5 @@ int slattach_main(int argc, char **argv) system(extcmd); /* Restore states and exit */ - restore_state_and_exit(0); + restore_state_and_exit(EXIT_SUCCESS); }