Rewrite by Manuel Novoa III, very compact implimentation.
This commit is contained in:
Glenn L McGrath
parent
cb665093b8
commit
b4f3d7f594
@ -1,166 +1,140 @@
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <strings.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <net/if.h>
|
||||
#include <linux/if_vlan.h>
|
||||
#include <linux/sockios.h>
|
||||
#include <string.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
#include "busybox.h"
|
||||
#include <limits.h>
|
||||
#include "busybox.h"
|
||||
|
||||
#define VLAN_GROUP_ARRAY_LEN 4096
|
||||
#define SIOCSIFVLAN 0x8983 /* Set 802.1Q VLAN options */
|
||||
|
||||
/* This is rather specialized in that we're passing a 'char **' in
|
||||
* order to avoid the pointer dereference multiple times in the
|
||||
* actual calls below. */
|
||||
static unsigned long xstrtoul10(char **str, unsigned long max_val)
|
||||
{
|
||||
char *endptr;
|
||||
unsigned long r;
|
||||
|
||||
int vconfig_main(int argc, char** argv) {
|
||||
int fd;
|
||||
struct vlan_ioctl_args if_request;
|
||||
|
||||
char* cmd = NULL;
|
||||
char* if_name = NULL;
|
||||
unsigned int vid = 0;
|
||||
unsigned int skb_priority;
|
||||
unsigned short vlan_qos;
|
||||
unsigned int nm_type = VLAN_NAME_TYPE_PLUS_VID;
|
||||
r = strtoul(str[2], &endptr, 10);
|
||||
if ((r > max_val) || (*endptr != 0)) {
|
||||
show_usage();
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
char* conf_file_name = "/proc/net/vlan/config";
|
||||
/* On entry, table points to the length of the current string plus
|
||||
* nul terminator plus data lenght 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])) {
|
||||
show_usage();
|
||||
}
|
||||
}
|
||||
return table - 1;
|
||||
}
|
||||
|
||||
memset(&if_request, 0, sizeof(struct vlan_ioctl_args));
|
||||
|
||||
if ((argc < 3) || (argc > 5)) {
|
||||
error_msg_and_die("Expecting argc to be 3-5, inclusive. Was: %d\n",argc);
|
||||
}
|
||||
else {
|
||||
cmd = argv[1];
|
||||
|
||||
if (strcasecmp(cmd, "set_name_type") == 0) {
|
||||
if (strcasecmp(argv[2], "VLAN_PLUS_VID") == 0) {
|
||||
nm_type = VLAN_NAME_TYPE_PLUS_VID;
|
||||
}
|
||||
else if (strcasecmp(argv[2], "VLAN_PLUS_VID_NO_PAD") == 0) {
|
||||
nm_type = VLAN_NAME_TYPE_PLUS_VID_NO_PAD;
|
||||
}
|
||||
else if (strcasecmp(argv[2], "DEV_PLUS_VID") == 0) {
|
||||
nm_type = VLAN_NAME_TYPE_RAW_PLUS_VID;
|
||||
}
|
||||
else if (strcasecmp(argv[2], "DEV_PLUS_VID_NO_PAD") == 0) {
|
||||
nm_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD;
|
||||
}
|
||||
else {
|
||||
error_msg_and_die("Invalid name type.\n");
|
||||
}
|
||||
if_request.u.name_type = nm_type;
|
||||
}
|
||||
else {
|
||||
if_name = argv[2];
|
||||
if (strlen(if_name) > 15) {
|
||||
error_msg_and_die("ERROR: if_name must be 15 characters or less.\n");
|
||||
}
|
||||
strcpy(if_request.device1, if_name);
|
||||
}
|
||||
static const char cmds[] = {
|
||||
4, ADD_VLAN_CMD, 7,
|
||||
'a', 'd', 'd', 0,
|
||||
3, DEL_VLAN_CMD, 7,
|
||||
'r', 'e', 'm', 0,
|
||||
3, SET_VLAN_NAME_TYPE_CMD, 17,
|
||||
's', 'e', 't', '_',
|
||||
'n', 'a', 'm', 'e', '_',
|
||||
't', 'y', 'p', 'e', 0,
|
||||
4, SET_VLAN_FLAG_CMD, 12,
|
||||
's', 'e', 't', '_',
|
||||
'f', 'l', 'a', 'g', 0,
|
||||
5, SET_VLAN_EGRESS_PRIORITY_CMD, 18,
|
||||
's', 'e', 't', '_',
|
||||
'e', 'g', 'r', 'e', 's', 's', '_',
|
||||
'm', 'a', 'p', 0,
|
||||
5, SET_VLAN_INGRESS_PRIORITY_CMD, 16,
|
||||
's', 'e', 't', '_',
|
||||
'i', 'n', 'g', 'r', 'e', 's', 's', '_',
|
||||
'm', 'a', 'p', 0,
|
||||
};
|
||||
|
||||
if (argc == 4) {
|
||||
vid = atoi(argv[3]);
|
||||
if_request.u.VID = vid;
|
||||
}
|
||||
static const char name_types[] = {
|
||||
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',
|
||||
'_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D',
|
||||
'_', 'N', 'O', '_', 'P', 'A', 'D', 0,
|
||||
VLAN_NAME_TYPE_RAW_PLUS_VID, 15,
|
||||
'D', 'E', 'V',
|
||||
'_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D',
|
||||
0,
|
||||
VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, 20,
|
||||
'D', 'E', 'V',
|
||||
'_', 'P', 'L', 'U', 'S', '_', 'V', 'I', 'D',
|
||||
'_', 'N', 'O', '_', 'P', 'A', 'D', 0,
|
||||
};
|
||||
|
||||
if (argc == 5) {
|
||||
skb_priority = atoi(argv[3]);
|
||||
vlan_qos = atoi(argv[4]);
|
||||
if_request.u.skb_priority = skb_priority;
|
||||
if_request.vlan_qos = vlan_qos;
|
||||
}
|
||||
}
|
||||
|
||||
// Open up the /proc/vlan/config
|
||||
if ((fd = open(conf_file_name, O_RDONLY)) < 0) {
|
||||
error_msg("WARNING: Could not open /proc/net/vlan/config. Maybe you need to load the 8021q module, or maybe you are not using PROCFS??\n");
|
||||
}
|
||||
else {
|
||||
close(fd);
|
||||
}
|
||||
static const char conf_file_name[] = "/proc/net/vlan/config";
|
||||
|
||||
/* We use sockets now, instead of the file descriptor */
|
||||
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
|
||||
error_msg_and_die("FATAL: Couldn't open a socket..go figure!\n");
|
||||
}
|
||||
int vconfig_main(int argc, char **argv)
|
||||
{
|
||||
struct vlan_ioctl_args ifr;
|
||||
const char *p;
|
||||
int fd;
|
||||
|
||||
/* add */
|
||||
if (strcasecmp(cmd, "add") == 0) {
|
||||
if_request.cmd = ADD_VLAN_CMD;
|
||||
if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) {
|
||||
error_msg("ERROR: trying to add VLAN #%u to IF -:%s:- error: %s\n",
|
||||
vid, if_name, strerror(errno));
|
||||
}
|
||||
else {
|
||||
printf("Added VLAN with VID == %u to IF -:%s:-\n", vid, if_name);
|
||||
if (vid == 1) {
|
||||
error_msg("WARNING: VLAN 1 does not work with many switches,\nconsider another number if you have problems.\n");
|
||||
}
|
||||
}
|
||||
}//if
|
||||
else if (strcasecmp(cmd, "rem") == 0) {
|
||||
if_request.cmd = DEL_VLAN_CMD;
|
||||
if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) {
|
||||
error_msg("ERROR: trying to remove VLAN -:%s:- error: %s\n",
|
||||
if_name, strerror(errno));
|
||||
}
|
||||
else {
|
||||
printf("Removed VLAN -:%s:-\n", if_name);
|
||||
}
|
||||
}//if
|
||||
else if (strcasecmp(cmd, "set_egress_map") == 0) {
|
||||
if_request.cmd = SET_VLAN_EGRESS_PRIORITY_CMD;
|
||||
if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) {
|
||||
error_msg("ERROR: trying to set egress map on device -:%s:- error: %s\n",
|
||||
if_name, strerror(errno));
|
||||
}
|
||||
else {
|
||||
printf("Set egress mapping on device -:%s:- "
|
||||
"Should be visible in /proc/net/vlan/%s\n",
|
||||
if_name, if_name);
|
||||
}
|
||||
}
|
||||
else if (strcasecmp(cmd, "set_ingress_map") == 0) {
|
||||
if_request.cmd = SET_VLAN_INGRESS_PRIORITY_CMD;
|
||||
if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) {
|
||||
error_msg("ERROR: trying to set ingress map on device -:%s:- error: %s\n",
|
||||
if_name, strerror(errno));
|
||||
}
|
||||
else {
|
||||
printf("Set ingress mapping on device -:%s:- "
|
||||
"Should be visible in /proc/net/vlan/%s\n",
|
||||
if_name, if_name);
|
||||
}
|
||||
}
|
||||
else if (strcasecmp(cmd, "set_flag") == 0) {
|
||||
if_request.cmd = SET_VLAN_FLAG_CMD;
|
||||
if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) {
|
||||
error_msg("ERROR: trying to set flag on device -:%s:- error: %s\n",
|
||||
if_name, strerror(errno));
|
||||
}
|
||||
else {
|
||||
printf("Set flag on device -:%s:- "
|
||||
"Should be visible in /proc/net/vlan/%s\n",
|
||||
if_name, if_name);
|
||||
}
|
||||
}
|
||||
else if (strcasecmp(cmd, "set_name_type") == 0) {
|
||||
if_request.cmd = SET_VLAN_NAME_TYPE_CMD;
|
||||
if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) {
|
||||
error_msg("ERROR: trying to set name type for VLAN subsystem, error: %s\n",
|
||||
strerror(errno));
|
||||
}
|
||||
else {
|
||||
printf("Set name-type for VLAN subsystem."
|
||||
" Should be visible in /proc/net/vlan/config\n");
|
||||
}
|
||||
}
|
||||
else {
|
||||
error_msg_and_die("Unknown command -:%s:-\n", cmd);
|
||||
}
|
||||
if (argc < 3) {
|
||||
show_usage();
|
||||
}
|
||||
|
||||
/* 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? */
|
||||
perror_msg_and_die("open %s", conf_file_name);
|
||||
}
|
||||
|
||||
memset(&ifr, 0, sizeof(struct vlan_ioctl_args));
|
||||
|
||||
++argv;
|
||||
p = xfind_str(cmds+2, *argv);
|
||||
ifr.cmd = *p;
|
||||
if (argc != p[-1]) {
|
||||
show_usage();
|
||||
}
|
||||
|
||||
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) {
|
||||
error_msg_and_die("if_name >= %d chars\n", IF_NAMESIZE);
|
||||
}
|
||||
strcpy(ifr.device1, argv[1]);
|
||||
|
||||
/* I suppose one could try to combine some of the function calls below,
|
||||
* since ifr.u.flag, ifr.u.VID, and ifr.u.skb_priority are all same-sized
|
||||
* (unsigned) int members of a unions. But because of the range checking,
|
||||
* 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 = xstrtoul10(argv, 1);
|
||||
} else if (ifr.cmd == ADD_VLAN_CMD) { /* add */
|
||||
ifr.u.VID = xstrtoul10(argv, VLAN_GROUP_ARRAY_LEN-1);
|
||||
} else if (ifr.cmd != DEL_VLAN_CMD) { /* set_{egress|ingress}_map */
|
||||
ifr.u.skb_priority = xstrtoul10(argv, ULONG_MAX);
|
||||
ifr.vlan_qos = xstrtoul10(argv+1, 7);
|
||||
}
|
||||
}
|
||||
|
||||
if (((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
|
||||
|| (ioctl(fd, SIOCSIFVLAN, &ifr) < 0)
|
||||
) {
|
||||
perror_msg_and_die("socket or ioctl error for %s", *argv);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}/* main */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user