Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

swconfig: remove obsolete portmapping feature

Browse source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2016-08-12 14:54:26 +02:00
parent 675407baa4
commit fca1eb349e
3 changed files with 0 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package/network/config/swconfig/src/cli.c
View file

@ -41,7 +41,6 @@ enum {
CMD_LOAD, CMD_LOAD,
CMD_HELP, CMD_HELP,
CMD_SHOW, CMD_SHOW,
CMD_PORTMAP,
}; };
static void static void
@ -285,10 +284,6 @@ int main(int argc, char **argv)
print_usage(); print_usage();
cmd = CMD_LOAD; cmd = CMD_LOAD;
ckey = argv[++i]; ckey = argv[++i];
} else if (!strcmp(arg, "portmap")) {
if (i + 1 < argc)
csegment = argv[++i];
cmd = CMD_PORTMAP;
} else if (!strcmp(arg, "show")) { } else if (!strcmp(arg, "show")) {
cmd = CMD_SHOW; cmd = CMD_SHOW;
} else { } else {
@ -362,9 +357,6 @@ int main(int argc, char **argv)
case CMD_HELP: case CMD_HELP:
list_attributes(dev); list_attributes(dev);
break; break;
case CMD_PORTMAP:
swlib_print_portmap(dev, csegment);
break;
case CMD_SHOW: case CMD_SHOW:
if (cport >= 0 || cvlan >= 0) { if (cport >= 0 || cvlan >= 0) {
if (cport >= 0) if (cport >= 0)

84
package/network/config/swconfig/src/swlib.c
View file

@ -46,11 +46,6 @@ static struct nla_policy port_policy[SWITCH_ATTR_MAX] = {
[SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG }, [SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG },
}; };
static struct nla_policy portmap_policy[SWITCH_PORTMAP_MAX] = {
[SWITCH_PORTMAP_SEGMENT] = { .type = NLA_STRING },
[SWITCH_PORTMAP_VIRT] = { .type = NLA_U32 },
};
static struct nla_policy link_policy[SWITCH_LINK_ATTR_MAX] = { static struct nla_policy link_policy[SWITCH_LINK_ATTR_MAX] = {
[SWITCH_LINK_FLAG_LINK] = { .type = NLA_FLAG }, [SWITCH_LINK_FLAG_LINK] = { .type = NLA_FLAG },
[SWITCH_LINK_FLAG_DUPLEX] = { .type = NLA_FLAG }, [SWITCH_LINK_FLAG_DUPLEX] = { .type = NLA_FLAG },
@ -701,41 +696,6 @@ struct swlib_scan_arg {
struct switch_dev *ptr; struct switch_dev *ptr;
}; };
static int
add_port_map(struct switch_dev *dev, struct nlattr *nla)
{
struct nlattr *p;
int err = 0, idx = 0;
int remaining;
dev->maps = malloc(sizeof(struct switch_portmap) * dev->ports);
if (!dev->maps)
return -1;
memset(dev->maps, 0, sizeof(struct switch_portmap) * dev->ports);
nla_for_each_nested(p, nla, remaining) {
struct nlattr *tb[SWITCH_PORTMAP_MAX+1];
if (idx >= dev->ports)
continue;
err = nla_parse_nested(tb, SWITCH_PORTMAP_MAX, p, portmap_policy);
if (err < 0)
continue;
if (tb[SWITCH_PORTMAP_SEGMENT] && tb[SWITCH_PORTMAP_VIRT]) {
dev->maps[idx].segment = strdup(nla_get_string(tb[SWITCH_PORTMAP_SEGMENT]));
dev->maps[idx].virt = nla_get_u32(tb[SWITCH_PORTMAP_VIRT]);
}
idx++;
}
out:
return err;
}
static int static int
add_switch(struct nl_msg *msg, void *arg) add_switch(struct nl_msg *msg, void *arg)
{ {
@ -773,8 +733,6 @@ add_switch(struct nl_msg *msg, void *arg)
dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]); dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]);
if (tb[SWITCH_ATTR_CPU_PORT]) if (tb[SWITCH_ATTR_CPU_PORT])
dev->cpu_port = nla_get_u32(tb[SWITCH_ATTR_CPU_PORT]); dev->cpu_port = nla_get_u32(tb[SWITCH_ATTR_CPU_PORT]);
if (tb[SWITCH_ATTR_PORTMAP])
add_port_map(dev, tb[SWITCH_ATTR_PORTMAP]);
if (!sa->head) { if (!sa->head) {
sa->head = dev; sa->head = dev;
@ -816,34 +774,6 @@ swlib_list(void)
swlib_priv_free(); swlib_priv_free();
} }
void
swlib_print_portmap(struct switch_dev *dev, char *segment)
{
int i;
if (segment) {
if (!strcmp(segment, "cpu")) {
printf("%d ", dev->cpu_port);
} else if (!strcmp(segment, "disabled")) {
for (i = 0; i < dev->ports; i++)
if (!dev->maps[i].segment)
printf("%d ", i);
} else for (i = 0; i < dev->ports; i++) {
if (dev->maps[i].segment && !strcmp(dev->maps[i].segment, segment))
printf("%d ", i);
}
} else {
printf("%s - %s\n", dev->dev_name, dev->name);
for (i = 0; i < dev->ports; i++)
if (i == dev->cpu_port)
printf("port%d:\tcpu\n", i);
else if (dev->maps[i].segment)
printf("port%d:\t%s.%d\n", i, dev->maps[i].segment, dev->maps[i].virt);
else
printf("port%d:\tdisabled\n", i);
}
}
struct switch_dev * struct switch_dev *
swlib_connect(const char *name) swlib_connect(const char *name)
{ {
@ -881,26 +811,12 @@ swlib_free_attributes(struct switch_attr **head)
*head = NULL; *head = NULL;
} }
static void
swlib_free_port_map(struct switch_dev *dev)
{
int i;
if (!dev || !dev->maps)
return;
for (i = 0; i < dev->ports; i++)
free(dev->maps[i].segment);
free(dev->maps);
}
void void
swlib_free(struct switch_dev *dev) swlib_free(struct switch_dev *dev)
{ {
swlib_free_attributes(&dev->ops); swlib_free_attributes(&dev->ops);
swlib_free_attributes(&dev->port_ops); swlib_free_attributes(&dev->port_ops);
swlib_free_attributes(&dev->vlan_ops); swlib_free_attributes(&dev->vlan_ops);
swlib_free_port_map(dev);
free(dev->name); free(dev->name);
free(dev->alias); free(dev->alias);
free(dev); free(dev);

12
package/network/config/swconfig/src/swlib.h
View file

@ -129,7 +129,6 @@ struct switch_dev {
struct switch_attr *ops; struct switch_attr *ops;
struct switch_attr *port_ops; struct switch_attr *port_ops;
struct switch_attr *vlan_ops; struct switch_attr *vlan_ops;
struct switch_portmap *maps;
struct switch_dev *next; struct switch_dev *next;
void *priv; void *priv;
}; };
@ -162,11 +161,6 @@ struct switch_port {
unsigned int flags; unsigned int flags;
}; };
struct switch_portmap {
unsigned int virt;
char *segment;
};
struct switch_port_link { struct switch_port_link {
int link:1; int link:1;
int duplex:1; int duplex:1;
@ -183,12 +177,6 @@ struct switch_port_link {
*/ */
void swlib_list(void); void swlib_list(void);
/**
* swlib_print_portmap: get portmap
* @dev: switch device struct
*/
void swlib_print_portmap(struct switch_dev *dev, char *segment);
/** /**
* swlib_connect: connect to the switch through netlink * swlib_connect: connect to the switch through netlink
* @name: name of the ethernet interface, * @name: name of the ethernet interface,