Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/vconfig.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/vconfig.c (modified) (8 diffs)

branches/2.2.5/mindi-busybox/networking/vconfig.c

@@ -10 +10 @@
 /* BB_AUDIT SUSv3 N/A */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
+#include "libbb.h"
 #include <net/if.h>
-#include <string.h>
-#include <limits.h>
-#include "busybox.h"
 
 /* Stuff from linux/if_vlan.h, kernel version 2.4.23 */
@@ -70 +64 @@
 }
 
-static const char cmds[] = {
+static const char cmds[] ALIGN1 = {
     4, ADD_VLAN_CMD, 7,
     'a', 'd', 'd', 0,
@@ -79 +73 @@
     '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,
@@ -92 +86 @@
 };
 
-static const char name_types[] = {
+static const char name_types[] ALIGN1 = {
     VLAN_NAME_TYPE_PLUS_VID, 16,
     'V', 'L', 'A', 'N',
@@ -111 +105 @@
 };
 
-static const char conf_file_name[] = "/proc/net/vlan/config";
+static const char conf_file_name[] ALIGN1 = "/proc/net/vlan/config";
 
+int vconfig_main(int argc, char **argv);
 int vconfig_main(int argc, char **argv)
 {
@@ -125 +120 @@
     /* Don't bother closing the filedes.  It will be closed on cleanup. */
     /* Will die if 802.1q is not present */
-    bb_xopen3(conf_file_name, O_RDONLY, 0);
+    xopen(conf_file_name, O_RDONLY);
 
     memset(&ifr, 0, sizeof(struct vlan_ioctl_args));
@@ -140 +135 @@
     } 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]);
@@ -151 +146 @@
          * 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 = bb_xsocket(AF_INET, SOCK_STREAM, 0);
-    if (ioctl(fd, SIOCSIFVLAN, &ifr) < 0) {
-        bb_perror_msg_and_die("ioctl error for %s", *argv);
-    }
+    fd = xsocket(AF_INET, SOCK_STREAM, 0);
+    ioctl_or_perror_and_die(fd, SIOCSIFVLAN, &ifr,
+                        "ioctl error for %s", *argv);
 
     return 0;
 }
-