add portmap support to userland
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 36284
This commit is contained in:
parent
fff58a5801
commit
04dcd12c91
4 changed files with 95 additions and 2 deletions
|
@ -26,7 +26,8 @@ TARGET_CPPFLAGS := \
|
|||
-D_GNU_SOURCE \
|
||||
-I$(STAGING_DIR)/usr/include/libnl-tiny \
|
||||
-I$(PKG_BUILD_DIR) \
|
||||
$(TARGET_CPPFLAGS)
|
||||
$(TARGET_CPPFLAGS) \
|
||||
-I$(LINUX_DIR)/user_headers/include
|
||||
|
||||
define Build/Prepare
|
||||
mkdir -p $(PKG_BUILD_DIR)
|
||||
|
|
|
@ -41,6 +41,7 @@ enum {
|
|||
CMD_LOAD,
|
||||
CMD_HELP,
|
||||
CMD_SHOW,
|
||||
CMD_PORTMAP,
|
||||
};
|
||||
|
||||
static void
|
||||
|
@ -214,6 +215,7 @@ int main(int argc, char **argv)
|
|||
int cvlan = -1;
|
||||
char *ckey = NULL;
|
||||
char *cvalue = NULL;
|
||||
char *csegment = NULL;
|
||||
|
||||
if((argc == 2) && !strcmp(argv[1], "list")) {
|
||||
swlib_list();
|
||||
|
@ -252,6 +254,10 @@ int main(int argc, char **argv)
|
|||
print_usage();
|
||||
cmd = CMD_LOAD;
|
||||
ckey = argv[++i];
|
||||
} else if (!strcmp(arg, "portmap")) {
|
||||
if (i + 1 < argc)
|
||||
csegment = argv[++i];
|
||||
cmd = CMD_PORTMAP;
|
||||
} else if (!strcmp(arg, "show")) {
|
||||
cmd = CMD_SHOW;
|
||||
} else {
|
||||
|
@ -324,6 +330,9 @@ int main(int argc, char **argv)
|
|||
case CMD_HELP:
|
||||
list_attributes(dev);
|
||||
break;
|
||||
case CMD_PORTMAP:
|
||||
swlib_print_portmap(dev, csegment);
|
||||
break;
|
||||
case CMD_SHOW:
|
||||
if (cport >= 0 || cvlan >= 0) {
|
||||
if (cport >= 0)
|
||||
|
|
|
@ -41,11 +41,16 @@ static struct genl_family *family;
|
|||
static struct nlattr *tb[SWITCH_ATTR_MAX + 1];
|
||||
static int refcount = 0;
|
||||
|
||||
static struct nla_policy port_policy[] = {
|
||||
static struct nla_policy port_policy[SWITCH_ATTR_MAX] = {
|
||||
[SWITCH_PORT_ID] = { .type = NLA_U32 },
|
||||
[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 inline void *
|
||||
swlib_alloc(size_t size)
|
||||
{
|
||||
|
@ -573,6 +578,41 @@ struct swlib_scan_arg {
|
|||
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
|
||||
add_switch(struct nl_msg *msg, void *arg)
|
||||
{
|
||||
|
@ -610,6 +650,8 @@ add_switch(struct nl_msg *msg, void *arg)
|
|||
dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]);
|
||||
if (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) {
|
||||
sa->head = dev;
|
||||
|
@ -655,6 +697,34 @@ swlib_list(void)
|
|||
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 *
|
||||
swlib_connect(const char *name)
|
||||
{
|
||||
|
|
|
@ -109,6 +109,7 @@ enum swlib_port_flags {
|
|||
struct switch_dev;
|
||||
struct switch_attr;
|
||||
struct switch_port;
|
||||
struct switch_port_map;
|
||||
struct switch_val;
|
||||
struct uci_package;
|
||||
|
||||
|
@ -123,6 +124,7 @@ struct switch_dev {
|
|||
struct switch_attr *ops;
|
||||
struct switch_attr *port_ops;
|
||||
struct switch_attr *vlan_ops;
|
||||
struct switch_portmap *maps;
|
||||
struct switch_dev *next;
|
||||
void *priv;
|
||||
};
|
||||
|
@ -154,11 +156,22 @@ struct switch_port {
|
|||
unsigned int flags;
|
||||
};
|
||||
|
||||
struct switch_portmap {
|
||||
unsigned int virt;
|
||||
const char *segment;
|
||||
};
|
||||
|
||||
/**
|
||||
* swlib_list: list all switches
|
||||
*/
|
||||
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
|
||||
* @name: name of the ethernet interface,
|
||||
|
|
Loading…
Reference in a new issue