src - FreeBSD source tree

diff options


context:
space:
mode:

author	Simon J. Gerraty <sjg@FreeBSD.org>	2013-09-05 20:18:59 +0000
committer	Simon J. Gerraty <sjg@FreeBSD.org>	2013-09-05 20:18:59 +0000
commit	d1d015864103b253b3fcb2f72a0da5b0cfeb31b6 (patch)
tree	22b131dceb13c3df96da594fbaadb693504797c7 /sbin/etherswitchcfg
parent	12d4083451fc39b3e831d4ea0bfa67d3b32cfb54 (diff)
parent	b6f49c23a36f329cbf1e7f28078e17fd87f0e245 (diff)

Merge from head

Notes

Notes: svn path=/projects/bmake/; revision=255263

Diffstat (limited to 'sbin/etherswitchcfg')

-rw-r--r--

sbin/etherswitchcfg/etherswitchcfg.8

-rw-r--r--

sbin/etherswitchcfg/etherswitchcfg.c

231

2 files changed, 266 insertions, 24 deletions

diff --git a/sbin/etherswitchcfg/etherswitchcfg.8 b/sbin/etherswitchcfg/etherswitchcfg.8
index 4f3bc92494a4..a8b8d1a9649f 100644
--- a/sbin/etherswitchcfg/etherswitchcfg.8
+++ b/sbin/etherswitchcfg/etherswitchcfg.8

@@ -11,12 +11,16 @@

.Ar info

.Nm

.Op Fl "f control file"

+.Ar config

+.Ar command parameter

+.Nm

+.Op Fl "f control file"

.Ar phy

.Ar phy.register[=value]

.Nm

.Op Fl "f control file"

.Ar port%d

-.Ar command parameter

+.Ar [flags] command parameter

.Nm

.Op Fl "f control file"

.Ar reg

@@ -46,6 +50,14 @@ Produce more verbose output.

Without this flag, lines that represent inactive or empty configuration

options are omitted.

.El

+.Ss config

+The config command provides access to global switch configuration

+parameters.

+It support the following commands:

+.Bl -tag -width ".Ar vlan_mode mode" -compact

+.It Ar vlan_mode mode

+Sets the switch VLAN mode (depends on the hardware).

+.El

.Ss phy

The phy command provides access to the registers of the PHYs attached

to or integrated into the switch controller.

@@ -57,24 +69,57 @@ is usually the port number, and

is the register number.

Both can be provided as decimal, octal or hexadecimal numbers in any of the formats

understood by

-.Xr strtol 4 .

+.Xr strtol 3 .

To set the register value, use the form instance.register=value.

.Ss port

The port command selects one of the ports of the switch.

It supports the following commands:

-.Bl -tag -width ".Ar vlangroup number" -compact

-.It Ar vlangroup number

-Sets the VLAN group number that is used to process incoming frames that are not tagged.

+.Bl -tag -width ".Ar pvid number" -compact

+.It Ar pvid number

+Sets the default port VID that is used to process incoming frames that are not tagged.

.It Ar media mediaspec

Specifies the physical media configuration to be configured for a port.

.It Ar mediaopt mediaoption

-Specifies a list of media options for a port. See

+Specifies a list of media options for a port.

+See

.Xr ifconfig 8

for details on

.Ar media

and

.Ar mediaopt .

.El

+And the following flags (please note that not all flags

+are supporterd by all switch drivers):

+.Bl -tag -width ".Ar addtag" -compact

+.It Ar addtag

+Add VLAN tag to each packet sent by the port.

+.It Ar -addtag

+Disable the add VLAN tag option.

+.It Ar striptag

+Strip the VLAN tags from the packets sent by the port.

+.It Ar -striptag

+Disable the strip VLAN tag option.

+.It Ar firstlock

+This options makes the switch port lock on the first MAC address it seems.

+After that, usually you need to reset the switch to learn different

+MAC addresses.

+.It Ar -firstlock

+Disable the first lock option.

+Note that sometimes you need to reset the

+switch to really disable this option.

+.It Ar dropuntagged

+Drop packets without a VLAN tag.

+.It Ar -dropuntagged

+Disable the drop untagged packets option.

+.It Ar doubletag

+Enable QinQ for the port.

+.It Ar -doubletag

+Disable QinQ for the port.

+.It Ar ingress

+Enable the ingress filter on the port.

+.It Ar -ingress

+Disable the ingress filter.

+.El

.Ss reg

The reg command provides access to the registers of the switch controller.

.Ss vlangroup

@@ -104,7 +149,7 @@ Configure VLAN group 1 with a VID of 2 and makes ports 0 and 5 members,

while excluding all other ports.

Port 5 will send and receive tagged frames, while port 0 will be untagged.

Incoming untagged frames on port 0 are assigned to vlangroup1.

-.Dl # etherswitchcfg vlangroup1 vlan 2 members 0,5t port0 vlangroup 1

+.Dl # etherswitchcfg vlangroup1 vlan 2 members 0,5t port0 pvid 2

.Sh SEE ALSO

.Xr etherswitch 4

.Sh HISTORY

diff --git a/sbin/etherswitchcfg/etherswitchcfg.c b/sbin/etherswitchcfg/etherswitchcfg.c
index ea2cec8bd7e7..1eef832edb71 100644
--- a/sbin/etherswitchcfg/etherswitchcfg.c
+++ b/sbin/etherswitchcfg/etherswitchcfg.c

@@ -58,6 +58,7 @@ void print_media_word_ifconfig(int);

enum cmdmode {

MODE_NONE = 0,

MODE_PORT,

+ MODE_CONFIG,

MODE_VLANGROUP,

MODE_REGISTER,

MODE_PHYREG

@@ -68,6 +69,7 @@ struct cfg {

int verbose;

int mediatypes;

const char *controlfile;

+ etherswitch_conf_t conf;

etherswitch_info_t info;

enum cmdmode mode;

int unit;

@@ -82,7 +84,37 @@ struct cmds {

static struct cmds cmds[];

-static void usage(void);

+/*

+ * Print a value a la the %b format of the kernel's printf.

+ * Stolen from ifconfig.c.

+ */

+static void

+printb(const char *s, unsigned v, const char *bits)

+ int i, any = 0;

+ char c;

+ if (bits && *bits == 8)

+ printf("%s=%o", s, v);

+ else

+ printf("%s=%x", s, v);

+ bits++;

+ if (bits) {

+ putchar('<');

+ while ((i = *bits++) != '\0') {

+ if (v & (1 << (i-1))) {

+ if (any)

+ putchar(',');

+ any = 1;

+ for (; (c = *bits) > 32; bits++)

+ putchar(c);

+ } else

+ for (; *bits > 32; bits++)

+ ;

+ }

+ putchar('>');

+ }

static int

read_register(struct cfg *cfg, int r)

@@ -131,18 +163,61 @@ write_phyregister(struct cfg *cfg, int phy, int reg, int val)

}

static void

-set_port_vlangroup(struct cfg *cfg, char *argv[])

+set_port_vid(struct cfg *cfg, char *argv[])

{

int v;

etherswitch_port_t p;

v = strtol(argv[1], NULL, 0);

- if (v < 0 || v >= cfg->info.es_nvlangroups)

- errx(EX_USAGE, "vlangroup must be between 0 and %d", cfg->info.es_nvlangroups-1);

+ if (v < 0 || v > IEEE802DOT1Q_VID_MAX)

+ errx(EX_USAGE, "pvid must be between 0 and %d",

+ IEEE802DOT1Q_VID_MAX);

+ bzero(&p, sizeof(p));

+ p.es_port = cfg->unit;

+ if (ioctl(cfg->fd, IOETHERSWITCHGETPORT, &p) != 0)

+ err(EX_OSERR, "ioctl(IOETHERSWITCHGETPORT)");

+ p.es_pvid = v;

+ if (ioctl(cfg->fd, IOETHERSWITCHSETPORT, &p) != 0)

+ err(EX_OSERR, "ioctl(IOETHERSWITCHSETPORT)");

+static void

+set_port_flag(struct cfg *cfg, char *argv[])

+ char *flag;

+ int n;

+ uint32_t f;

+ etherswitch_port_t p;

+ n = 0;

+ f = 0;

+ flag = argv[0];

+ if (strcmp(flag, "none") != 0) {

+ if (*flag == '-') {

+ n++;

+ flag++;

+ }

+ if (strcasecmp(flag, "striptag") == 0)

+ f = ETHERSWITCH_PORT_STRIPTAG;

+ else if (strcasecmp(flag, "addtag") == 0)

+ f = ETHERSWITCH_PORT_ADDTAG;

+ else if (strcasecmp(flag, "firstlock") == 0)

+ f = ETHERSWITCH_PORT_FIRSTLOCK;

+ else if (strcasecmp(flag, "dropuntagged") == 0)

+ f = ETHERSWITCH_PORT_DROPUNTAGGED;

+ else if (strcasecmp(flag, "doubletag") == 0)

+ f = ETHERSWITCH_PORT_DOUBLE_TAG;

+ else if (strcasecmp(flag, "ingress") == 0)

+ f = ETHERSWITCH_PORT_INGRESS;

+ }

+ bzero(&p, sizeof(p));

p.es_port = cfg->unit;

if (ioctl(cfg->fd, IOETHERSWITCHGETPORT, &p) != 0)

err(EX_OSERR, "ioctl(IOETHERSWITCHGETPORT)");

- p.es_vlangroup = v;

+ if (n)

+ p.es_flags &= ~f;

+ else

+ p.es_flags |= f;

if (ioctl(cfg->fd, IOETHERSWITCHSETPORT, &p) != 0)

err(EX_OSERR, "ioctl(IOETHERSWITCHSETPORT)");

}

@@ -288,6 +363,66 @@ set_phyregister(struct cfg *cfg, char *arg)

}

static void

+set_vlan_mode(struct cfg *cfg, char *argv[])

+ etherswitch_conf_t conf;

+ bzero(&conf, sizeof(conf));

+ conf.cmd = ETHERSWITCH_CONF_VLAN_MODE;

+ if (strcasecmp(argv[1], "isl") == 0)

+ conf.vlan_mode = ETHERSWITCH_VLAN_ISL;

+ else if (strcasecmp(argv[1], "port") == 0)

+ conf.vlan_mode = ETHERSWITCH_VLAN_PORT;

+ else if (strcasecmp(argv[1], "dot1q") == 0)

+ conf.vlan_mode = ETHERSWITCH_VLAN_DOT1Q;

+ else if (strcasecmp(argv[1], "dot1q4k") == 0)

+ conf.vlan_mode = ETHERSWITCH_VLAN_DOT1Q_4K;

+ else if (strcasecmp(argv[1], "qinq") == 0)

+ conf.vlan_mode = ETHERSWITCH_VLAN_DOUBLE_TAG;

+ else

+ conf.vlan_mode = 0;

+ if (ioctl(cfg->fd, IOETHERSWITCHSETCONF, &conf) != 0)

+ err(EX_OSERR, "ioctl(IOETHERSWITCHSETCONF)");

+static void

+print_config(struct cfg *cfg)

+ const char *c;

+ /* Get the device name. */

+ c = strrchr(cfg->controlfile, '/');

+ if (c != NULL)

+ c = c + 1;

+ else

+ c = cfg->controlfile;

+ /* Print VLAN mode. */

+ if (cfg->conf.cmd & ETHERSWITCH_CONF_VLAN_MODE) {

+ printf("%s: VLAN mode: ", c);

+ switch (cfg->conf.vlan_mode) {

+ case ETHERSWITCH_VLAN_ISL:

+ printf("ISL\n");

+ break;

+ case ETHERSWITCH_VLAN_PORT:

+ printf("PORT\n");

+ break;

+ case ETHERSWITCH_VLAN_DOT1Q:

+ printf("DOT1Q\n");

+ break;

+ case ETHERSWITCH_VLAN_DOT1Q_4K:

+ printf("DOT1Q4K\n");

+ break;

+ case ETHERSWITCH_VLAN_DOUBLE_TAG:

+ printf("QinQ\n");

+ break;

+ default:

+ printf("none\n");

+ }

+static void

print_port(struct cfg *cfg, int port)

{

etherswitch_port_t p;

@@ -301,7 +436,10 @@ print_port(struct cfg *cfg, int port)

if (ioctl(cfg->fd, IOETHERSWITCHGETPORT, &p) != 0)

err(EX_OSERR, "ioctl(IOETHERSWITCHGETPORT)");

printf("port%d:\n", port);

- printf("\tvlangroup: %d\n", p.es_vlangroup);

+ if (cfg->conf.vlan_mode == ETHERSWITCH_VLAN_DOT1Q)

+ printf("\tpvid: %d\n", p.es_pvid);

+ printb("\tflags", p.es_flags, ETHERSWITCH_PORT_FLAGS_BITS);

+ printf("\n");

printf("\tmedia: ");

print_media_word(p.es_ifmr.ifm_current, 1);

if (p.es_ifmr.ifm_active != p.es_ifmr.ifm_current) {

@@ -333,10 +471,14 @@ print_vlangroup(struct cfg *cfg, int vlangroup)

vg.es_vlangroup = vlangroup;

if (ioctl(cfg->fd, IOETHERSWITCHGETVLANGROUP, &vg) != 0)

err(EX_OSERR, "ioctl(IOETHERSWITCHGETVLANGROUP)");

- if (cfg->verbose == 0 && vg.es_member_ports == 0)

+ if ((vg.es_vid & ETHERSWITCH_VID_VALID) == 0)

return;

+ vg.es_vid &= ETHERSWITCH_VID_MASK;

printf("vlangroup%d:\n", vlangroup);

- printf("\tvlan: %d\n", vg.es_vid);

+ if (cfg->conf.vlan_mode == ETHERSWITCH_VLAN_PORT)

+ printf("\tport: %d\n", vg.es_vid);

+ else

+ printf("\tvlan: %d\n", vg.es_vid);

printf("\tmembers ");

comma = 0;

if (vg.es_member_ports != 0)

@@ -366,9 +508,16 @@ print_info(struct cfg *cfg)

c = c + 1;

else

c = cfg->controlfile;

- if (cfg->verbose)

- printf("%s: %s with %d ports and %d VLAN groups\n",

- c, cfg->info.es_name, cfg->info.es_nports, cfg->info.es_nvlangroups);

+ if (cfg->verbose) {

+ printf("%s: %s with %d ports and %d VLAN groups\n", c,

+ cfg->info.es_name, cfg->info.es_nports,

+ cfg->info.es_nvlangroups);

+ printf("%s: ", c);

+ printb("VLAN capabilities", cfg->info.es_vlan_caps,

+ ETHERSWITCH_VLAN_CAPS_BITS);

+ printf("\n");

+ }

+ print_config(cfg);

for (i=0; i<cfg->info.es_nports; i++) {

print_port(cfg, i);

}

@@ -378,9 +527,23 @@ print_info(struct cfg *cfg)

}

static void

-usage(void)

+usage(struct cfg *cfg __unused, char *argv[] __unused)

{

fprintf(stderr, "usage: etherswitchctl\n");

+ fprintf(stderr, "\tetherswitchcfg [-f control file] info\n");

+ fprintf(stderr, "\tetherswitchcfg [-f control file] config "

+ "command parameter\n");

+ fprintf(stderr, "\t\tconfig commands: vlan_mode\n");

+ fprintf(stderr, "\tetherswitchcfg [-f control file] phy "

+ "phy.register[=value]\n");

+ fprintf(stderr, "\tetherswitchcfg [-f control file] portX "

+ "[flags] command parameter\n");

+ fprintf(stderr, "\t\tport commands: pvid, media, mediaopt\n");

+ fprintf(stderr, "\tetherswitchcfg [-f control file] reg "

+ "register[=value]\n");

+ fprintf(stderr, "\tetherswitchcfg [-f control file] vlangroupX "

+ "command parameter\n");

+ fprintf(stderr, "\t\tvlangroup commands: vlan, members\n");

exit(EX_USAGE);

}

@@ -392,6 +555,15 @@ newmode(struct cfg *cfg, enum cmdmode mode)

switch (cfg->mode) {

case MODE_NONE:

break;

+ case MODE_CONFIG:

+ /*

+ * Read the updated the configuration (it can be different

+ * from the last time we read it).

+ */

+ if (ioctl(cfg->fd, IOETHERSWITCHGETCONF, &cfg->conf) != 0)

+ err(EX_OSERR, "ioctl(IOETHERSWITCHGETCONF)");

+ print_config(cfg);

+ break;

case MODE_PORT:

print_port(cfg, cfg->unit);

break;

@@ -428,7 +600,7 @@ main(int argc, char *argv[])

case '?':

/* FALLTHROUGH */

default:

- usage();

+ usage(&cfg, argv);

}

argc -= optind;

argv += optind;

@@ -437,6 +609,8 @@ main(int argc, char *argv[])

err(EX_UNAVAILABLE, "Can't open control file: %s", cfg.controlfile);

if (ioctl(cfg.fd, IOETHERSWITCHGETINFO, &cfg.info) != 0)

err(EX_OSERR, "ioctl(IOETHERSWITCHGETINFO)");

+ if (ioctl(cfg.fd, IOETHERSWITCHGETCONF, &cfg.conf) != 0)

+ err(EX_OSERR, "ioctl(IOETHERSWITCHGETCONF)");

if (argc == 0) {

print_info(&cfg);

return (0);

@@ -453,21 +627,31 @@ main(int argc, char *argv[])

newmode(&cfg, MODE_PORT);

} else if (sscanf(argv[0], "vlangroup%d", &cfg.unit) == 1) {

if (cfg.unit < 0 || cfg.unit >= cfg.info.es_nvlangroups)

- errx(EX_USAGE, "port unit must be between 0 and %d", cfg.info.es_nvlangroups);

+ errx(EX_USAGE,

+ "vlangroup unit must be between 0 and %d",

+ cfg.info.es_nvlangroups - 1);

newmode(&cfg, MODE_VLANGROUP);

+ } else if (strcmp(argv[0], "config") == 0) {

+ newmode(&cfg, MODE_CONFIG);

} else if (strcmp(argv[0], "phy") == 0) {

newmode(&cfg, MODE_PHYREG);

} else if (strcmp(argv[0], "reg") == 0) {

newmode(&cfg, MODE_REGISTER);

+ } else if (strcmp(argv[0], "help") == 0) {

+ usage(&cfg, argv);

} else {

errx(EX_USAGE, "Unknown command \"%s\"", argv[0]);

}

break;

case MODE_PORT:

+ case MODE_CONFIG:

case MODE_VLANGROUP:

for(i=0; cmds[i].name != NULL; i++) {

- if (cfg.mode == cmds[i].mode && strcmp(argv[0], cmds[i].name) == 0

- && argc >= cmds[i].args) {

+ if (cfg.mode == cmds[i].mode && strcmp(argv[0], cmds[i].name) == 0) {

+ if (argc < (cmds[i].args + 1)) {

+ printf("%s needs an argument\n", cmds[i].name);

+ break;

+ }

(cmds[i].f)(&cfg, argv);

argc -= cmds[i].args;

argv += cmds[i].args;

@@ -502,9 +686,22 @@ main(int argc, char *argv[])

}

static struct cmds cmds[] = {

- { MODE_PORT, "vlangroup", 1, set_port_vlangroup },

+ { MODE_PORT, "pvid", 1, set_port_vid },

{ MODE_PORT, "media", 1, set_port_media },

{ MODE_PORT, "mediaopt", 1, set_port_mediaopt },

+ { MODE_PORT, "addtag", 0, set_port_flag },

+ { MODE_PORT, "-addtag", 0, set_port_flag },

+ { MODE_PORT, "ingress", 0, set_port_flag },

+ { MODE_PORT, "-ingress", 0, set_port_flag },

+ { MODE_PORT, "striptag", 0, set_port_flag },

+ { MODE_PORT, "-striptag", 0, set_port_flag },

+ { MODE_PORT, "doubletag", 0, set_port_flag },

+ { MODE_PORT, "-doubletag", 0, set_port_flag },

+ { MODE_PORT, "firstlock", 0, set_port_flag },

+ { MODE_PORT, "-firstlock", 0, set_port_flag },

+ { MODE_PORT, "dropuntagged", 0, set_port_flag },

+ { MODE_PORT, "-dropuntagged", 0, set_port_flag },

+ { MODE_CONFIG, "vlan_mode", 1, set_vlan_mode },

{ MODE_VLANGROUP, "vlan", 1, set_vlangroup_vid },

{ MODE_VLANGROUP, "members", 1, set_vlangroup_members },

{ 0, NULL, 0, NULL }