Start 1.25.0 development cycle

[oweals/busybox.git] / networking / ifenslave.c

diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index 0b3ebf72adab89fb0c66e9c52e6fd3b2184b906c..6b234adee586d0e9b80e00f80d95b11088c70af5 100644 (file)
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -98,6 +98,32 @@
  *         set version to 1.1.0
  */
 
+//usage:#define ifenslave_trivial_usage
+//usage:       "[-cdf] MASTER_IFACE SLAVE_IFACE..."
+//usage:#define ifenslave_full_usage "\n\n"
+//usage:       "Configure network interfaces for parallel routing\n"
+//usage:     "\n       -c,--change-active      Change active slave"
+//usage:     "\n       -d,--detach             Remove slave interface from bonding device"
+//usage:     "\n       -f,--force              Force, even if interface is not Ethernet"
+/* //usage:  "\n       -r,--receive-slave      Create a receive-only slave" */
+//usage:
+//usage:#define ifenslave_example_usage
+//usage:       "To create a bond device, simply follow these three steps:\n"
+//usage:       "- ensure that the required drivers are properly loaded:\n"
+//usage:       "  # modprobe bonding ; modprobe <3c59x|eepro100|pcnet32|tulip|...>\n"
+//usage:       "- assign an IP address to the bond device:\n"
+//usage:       "  # ifconfig bond0 <addr> netmask <mask> broadcast <bcast>\n"
+//usage:       "- attach all the interfaces you need to the bond device:\n"
+//usage:       "  # ifenslave bond0 eth0 eth1 eth2\n"
+//usage:       "  If bond0 didn't have a MAC address, it will take eth0's. Then, all\n"
+//usage:       "  interfaces attached AFTER this assignment will get the same MAC addr.\n\n"
+//usage:       "  To detach a dead interface without setting the bond device down:\n"
+//usage:       "  # ifenslave -d bond0 eth1\n\n"
+//usage:       "  To set the bond device down and automatically release all the slaves:\n"
+//usage:       "  # ifconfig bond0 down\n\n"
+//usage:       "  To change active slave:\n"
+//usage:       "  # ifenslave -c bond0 eth0\n"
+
 #include "libbb.h"
 
 /* #include <net/if.h> - no. linux/if_bonding.h pulls in linux/if.h */
@@ -244,7 +270,7 @@ static int set_if_addr(char *master_ifname, char *slave_ifname)
                if (res < 0) {
                        ifr.ifr_addr.sa_family = AF_INET;
                        memset(ifr.ifr_addr.sa_data, 0,
-                              sizeof(ifr.ifr_addr.sa_data));
+                               sizeof(ifr.ifr_addr.sa_data));
                }
 
                res = set_ifrname_and_do_ioctl(ifra[i].s_ioctl, &ifr, slave_ifname);
@@ -520,7 +546,7 @@ int ifenslave_main(int argc UNUSED_PARAM, char **argv)
 #ifdef WHY_BOTHER
        /* Neither -c[hange] nor -d[etach] -> it's "enslave" then;
         * and -f[orce] is not there too. Check that it's ethernet. */
-       if (!(opt & (OPT_d|OPT_c|OPT_f)) {
+       if (!(opt & (OPT_d|OPT_c|OPT_f))) {
                /* The family '1' is ARPHRD_ETHER for ethernet. */
                if (master.hwaddr.ifr_hwaddr.sa_family != 1) {
                        bb_error_msg_and_die(
@@ -551,8 +577,8 @@ int ifenslave_main(int argc UNUSED_PARAM, char **argv)
                                /* Can't work with this slave, */
                                /* remember the error and skip it */
                                bb_perror_msg(
-                                       "skipping %s: can't get flags",
-                                       slave_ifname);
+                                       "skipping %s: can't get %s",
+                                       slave_ifname, "flags");
                                res = rv;
                                continue;
                        }
@@ -569,8 +595,8 @@ int ifenslave_main(int argc UNUSED_PARAM, char **argv)
                                /* Can't work with this slave, */
                                /* remember the error and skip it */
                                bb_perror_msg(
-                                       "skipping %s: can't get settings",
-                                       slave_ifname);
+                                       "skipping %s: can't get %s",
+                                       slave_ifname, "settings");
                                res = rv;
                                continue;
                        }