Rewrite by Manuel Novoa III, very compact implimentation.

This commit is contained in:
Glenn L McGrath 2003-02-08 23:11:19 +00:00
parent cb665093b8
commit b4f3d7f594

View File

@ -1,166 +1,140 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <strings.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <net/if.h>
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/sockios.h>
#include <string.h> #include <string.h>
#include <sys/socket.h> #include <limits.h>
#include <sys/types.h> #include "busybox.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) { r = strtoul(str[2], &endptr, 10);
int fd; if ((r > max_val) || (*endptr != 0)) {
struct vlan_ioctl_args if_request; show_usage();
}
char* cmd = NULL; return r;
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;
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)); static const char cmds[] = {
4, ADD_VLAN_CMD, 7,
if ((argc < 3) || (argc > 5)) { 'a', 'd', 'd', 0,
error_msg_and_die("Expecting argc to be 3-5, inclusive. Was: %d\n",argc); 3, DEL_VLAN_CMD, 7,
} 'r', 'e', 'm', 0,
else { 3, SET_VLAN_NAME_TYPE_CMD, 17,
cmd = argv[1]; 's', 'e', 't', '_',
'n', 'a', 'm', 'e', '_',
if (strcasecmp(cmd, "set_name_type") == 0) { 't', 'y', 'p', 'e', 0,
if (strcasecmp(argv[2], "VLAN_PLUS_VID") == 0) { 4, SET_VLAN_FLAG_CMD, 12,
nm_type = VLAN_NAME_TYPE_PLUS_VID; 's', 'e', 't', '_',
} 'f', 'l', 'a', 'g', 0,
else if (strcasecmp(argv[2], "VLAN_PLUS_VID_NO_PAD") == 0) { 5, SET_VLAN_EGRESS_PRIORITY_CMD, 18,
nm_type = VLAN_NAME_TYPE_PLUS_VID_NO_PAD; 's', 'e', 't', '_',
} 'e', 'g', 'r', 'e', 's', 's', '_',
else if (strcasecmp(argv[2], "DEV_PLUS_VID") == 0) { 'm', 'a', 'p', 0,
nm_type = VLAN_NAME_TYPE_RAW_PLUS_VID; 5, SET_VLAN_INGRESS_PRIORITY_CMD, 16,
} 's', 'e', 't', '_',
else if (strcasecmp(argv[2], "DEV_PLUS_VID_NO_PAD") == 0) { 'i', 'n', 'g', 'r', 'e', 's', 's', '_',
nm_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD; 'm', 'a', 'p', 0,
} };
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);
}
if (argc == 4) { static const char name_types[] = {
vid = atoi(argv[3]); VLAN_NAME_TYPE_PLUS_VID, 16,
if_request.u.VID = vid; '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) { static const char conf_file_name[] = "/proc/net/vlan/config";
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);
}
/* We use sockets now, instead of the file descriptor */ int vconfig_main(int argc, char **argv)
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) { {
error_msg_and_die("FATAL: Couldn't open a socket..go figure!\n"); struct vlan_ioctl_args ifr;
} const char *p;
int fd;
/* add */ if (argc < 3) {
if (strcasecmp(cmd, "add") == 0) { show_usage();
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", /* Don't bother closing the filedes. It will be closed on cleanup. */
vid, if_name, strerror(errno)); if (open(conf_file_name, O_RDONLY) < 0) { /* Is 802.1q is present? */
} perror_msg_and_die("open %s", conf_file_name);
else { }
printf("Added VLAN with VID == %u to IF -:%s:-\n", vid, if_name);
if (vid == 1) { memset(&ifr, 0, sizeof(struct vlan_ioctl_args));
error_msg("WARNING: VLAN 1 does not work with many switches,\nconsider another number if you have problems.\n");
} ++argv;
} p = xfind_str(cmds+2, *argv);
}//if ifr.cmd = *p;
else if (strcasecmp(cmd, "rem") == 0) { if (argc != p[-1]) {
if_request.cmd = DEL_VLAN_CMD; show_usage();
if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) { }
error_msg("ERROR: trying to remove VLAN -:%s:- error: %s\n",
if_name, strerror(errno)); if (ifr.cmd == SET_VLAN_NAME_TYPE_CMD) { /* set_name_type */
} ifr.u.name_type = *xfind_str(name_types+1, argv[1]);
else { } else {
printf("Removed VLAN -:%s:-\n", if_name); if (strlen(argv[1]) >= IF_NAMESIZE) {
} error_msg_and_die("if_name >= %d chars\n", IF_NAMESIZE);
}//if }
else if (strcasecmp(cmd, "set_egress_map") == 0) { strcpy(ifr.device1, argv[1]);
if_request.cmd = SET_VLAN_EGRESS_PRIORITY_CMD;
if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) { /* I suppose one could try to combine some of the function calls below,
error_msg("ERROR: trying to set egress map on device -:%s:- error: %s\n", * since ifr.u.flag, ifr.u.VID, and ifr.u.skb_priority are all same-sized
if_name, strerror(errno)); * (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
else { * more of a pain. */
printf("Set egress mapping on device -:%s:- " if (ifr.cmd == SET_VLAN_FLAG_CMD) { /* set_flag */
"Should be visible in /proc/net/vlan/%s\n", ifr.u.flag = xstrtoul10(argv, 1);
if_name, if_name); } 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 */
else if (strcasecmp(cmd, "set_ingress_map") == 0) { ifr.u.skb_priority = xstrtoul10(argv, ULONG_MAX);
if_request.cmd = SET_VLAN_INGRESS_PRIORITY_CMD; ifr.vlan_qos = xstrtoul10(argv+1, 7);
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));
} if (((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
else { || (ioctl(fd, SIOCSIFVLAN, &ifr) < 0)
printf("Set ingress mapping on device -:%s:- " ) {
"Should be visible in /proc/net/vlan/%s\n", perror_msg_and_die("socket or ioctl error for %s", *argv);
if_name, if_name); }
}
} return 0;
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);
}
return 0;
}/* main */