start_stop_daemon: NOMMU fixes, round 2 by Alex Landau <landau_alex@yahoo.com>

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

diff --git a/networking/vconfig.c b/networking/vconfig.c
index b90f41085d1220de8b26c9e0641ccb23d3b34a7c..4776e13248b4c8e766fb66210efaf5b0c2476e1c 100644 (file)
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -9,7 +9,7 @@
 
 /* BB_AUDIT SUSv3 N/A */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <net/if.h>
 
 /* Stuff from linux/if_vlan.h, kernel version 2.4.23 */
@@ -72,7 +72,7 @@ static const char cmds[] = {
        's', 'e', 't', '_',
        'n', 'a', 'm', 'e', '_',
        't', 'y', 'p', 'e', 0,
-       4, SET_VLAN_FLAG_CMD, 12,
+       5, SET_VLAN_FLAG_CMD, 12,
        's', 'e', 't', '_',
        'f', 'l', 'a', 'g', 0,
        5, SET_VLAN_EGRESS_PRIORITY_CMD, 18,
@@ -106,6 +106,7 @@ static const char name_types[] = {
 
 static const char conf_file_name[] = "/proc/net/vlan/config";
 
+int vconfig_main(int argc, char **argv);
 int vconfig_main(int argc, char **argv)
 {
        struct vlan_ioctl_args ifr;
@@ -118,7 +119,7 @@ int vconfig_main(int argc, char **argv)
 
        /* Don't bother closing the filedes.  It will be closed on cleanup. */
        /* Will die if 802.1q is not present */
-       xopen3(conf_file_name, O_RDONLY, 0);
+       xopen(conf_file_name, O_RDONLY);
 
        memset(&ifr, 0, sizeof(struct vlan_ioctl_args));
 
@@ -133,7 +134,7 @@ int vconfig_main(int argc, char **argv)
                ifr.u.name_type = *xfind_str(name_types+1, argv[1]);
        } else {
                if (strlen(argv[1]) >= IF_NAMESIZE) {
-                       bb_error_msg_and_die("if_name >= %d chars\n", IF_NAMESIZE);
+                       bb_error_msg_and_die("if_name >= %d chars", IF_NAMESIZE);
                }
                strcpy(ifr.device1, argv[1]);
                p = argv[2];
@@ -144,20 +145,20 @@ int vconfig_main(int argc, char **argv)
                 * doing so wouldn't save that much space and would also make maintainence
                 * more of a pain. */
                if (ifr.cmd == SET_VLAN_FLAG_CMD) { /* set_flag */
-                       ifr.u.flag = bb_xgetularg10_bnd(p, 0, 1);
+                       ifr.u.flag = xatoul_range(p, 0, 1);
+                       /* DM: in order to set reorder header, qos must be set */
+                       ifr.vlan_qos = xatoul_range(argv[3], 0, 7);
                } else if (ifr.cmd == ADD_VLAN_CMD) { /* add */
-                       ifr.u.VID = bb_xgetularg10_bnd(p, 0, VLAN_GROUP_ARRAY_LEN-1);
+                       ifr.u.VID = xatoul_range(p, 0, VLAN_GROUP_ARRAY_LEN-1);
                } else if (ifr.cmd != DEL_VLAN_CMD) { /* set_{egress|ingress}_map */
-                       ifr.u.skb_priority = bb_xgetularg10_bnd(p, 0, ULONG_MAX);
-                       ifr.vlan_qos = bb_xgetularg10_bnd(argv[3], 0, 7);
+                       ifr.u.skb_priority = xatou(p);
+                       ifr.vlan_qos = xatoul_range(argv[3], 0, 7);
                }
        }
 
        fd = xsocket(AF_INET, SOCK_STREAM, 0);
-       if (ioctl(fd, SIOCSIFVLAN, &ifr) < 0) {
-               bb_perror_msg_and_die("ioctl error for %s", *argv);
-       }
+       ioctl_or_perror_and_die(fd, SIOCSIFVLAN, &ifr,
+                                               "ioctl error for %s", *argv);
 
        return 0;
 }
-