From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/networking/vconfig.c | 112 +++++++++++++----------- 1 file changed, 62 insertions(+), 50 deletions(-) (limited to 'release/src/router/busybox/networking/vconfig.c') diff --git a/release/src/router/busybox/networking/vconfig.c b/release/src/router/busybox/networking/vconfig.c index d58c375f..00379fc2 100644 --- a/release/src/router/busybox/networking/vconfig.c +++ b/release/src/router/busybox/networking/vconfig.c @@ -4,51 +4,67 @@ * * Copyright (C) 2001 Manuel Novoa III * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 N/A */ -#include -#include -#include -#include +#include "libbb.h" #include -#include -#include -#include -#include "busybox.h" + +/* Stuff from linux/if_vlan.h, kernel version 2.4.23 */ +enum vlan_ioctl_cmds { + ADD_VLAN_CMD, + DEL_VLAN_CMD, + SET_VLAN_INGRESS_PRIORITY_CMD, + SET_VLAN_EGRESS_PRIORITY_CMD, + GET_VLAN_INGRESS_PRIORITY_CMD, + GET_VLAN_EGRESS_PRIORITY_CMD, + SET_VLAN_NAME_TYPE_CMD, + SET_VLAN_FLAG_CMD +}; +enum vlan_name_types { + VLAN_NAME_TYPE_PLUS_VID, /* Name will look like: vlan0005 */ + VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like: eth1.0005 */ + VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like: vlan5 */ + VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like: eth0.5 */ + VLAN_NAME_TYPE_HIGHEST +}; + +struct vlan_ioctl_args { + int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */ + char device1[24]; + + union { + char device2[24]; + int VID; + unsigned int skb_priority; + unsigned int name_type; + unsigned int bind_type; + unsigned int flag; /* Matches vlan_dev_info flags */ + } u; + + short vlan_qos; +}; #define VLAN_GROUP_ARRAY_LEN 4096 -#define SIOCSIFVLAN 0x8983 /* Set 802.1Q VLAN options */ +#define SIOCSIFVLAN 0x8983 /* Set 802.1Q VLAN options */ -/* On entry, table points to the length of the current string plus - * nul terminator plus data length for the subsequent entry. The - * return value is the last data entry for the matching string. */ +/* On entry, table points to the length of the current string + * plus NUL terminator plus data length for the subsequent entry. + * The return value is the last data entry for the matching string. */ static const char *xfind_str(const char *table, const char *str) { while (strcasecmp(str, table+1) != 0) { - if (!*(table += table[0])) { + table += table[0]; + if (!*table) { bb_show_usage(); } } return table - 1; } -static const char cmds[] = { +static const char cmds[] ALIGN1 = { 4, ADD_VLAN_CMD, 7, 'a', 'd', 'd', 0, 3, DEL_VLAN_CMD, 7, @@ -57,7 +73,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, @@ -70,13 +86,13 @@ static const char cmds[] = { 'm', 'a', 'p', 0, }; -static const char name_types[] = { +static const char name_types[] ALIGN1 = { VLAN_NAME_TYPE_PLUS_VID, 16, 'V', 'L', 'A', 'N', '_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D', 0, VLAN_NAME_TYPE_PLUS_VID_NO_PAD, 22, - 'V', 'L', 'A', 'N', + 'V', 'L', 'A', 'N', '_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D', '_', 'N', 'O', '_', 'P', 'A', 'D', 0, VLAN_NAME_TYPE_RAW_PLUS_VID, 15, @@ -89,8 +105,9 @@ static const char name_types[] = { '_', 'N', 'O', '_', 'P', 'A', 'D', 0, }; -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) MAIN_EXTERNALLY_VISIBLE; int vconfig_main(int argc, char **argv) { struct vlan_ioctl_args ifr; @@ -102,11 +119,10 @@ int vconfig_main(int argc, char **argv) } /* Don't bother closing the filedes. It will be closed on cleanup. */ - if (open(conf_file_name, O_RDONLY) < 0) { /* Is 802.1q is present? */ - bb_perror_msg_and_die("open %s", conf_file_name); - } + /* Will die if 802.1q is not present */ + xopen(conf_file_name, O_RDONLY); - memset(&ifr, 0, sizeof(struct vlan_ioctl_args)); + memset(&ifr, 0, sizeof(ifr)); ++argv; p = xfind_str(cmds+2, *argv); @@ -118,10 +134,7 @@ int vconfig_main(int argc, char **argv) if (ifr.cmd == SET_VLAN_NAME_TYPE_CMD) { /* set_name_type */ 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); - } - strcpy(ifr.device1, argv[1]); + strncpy_IFNAMSIZ(ifr.device1, argv[1]); p = argv[2]; /* I suppose one could try to combine some of the function calls below, @@ -130,21 +143,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); } } - if (((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) - || (ioctl(fd, SIOCSIFVLAN, &ifr) < 0) - ) { - bb_perror_msg_and_die("socket or 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; } - -- cgit v1.2.3-54-g00ecf