static struct avl_tree handlers;
+unsigned int
+parse_netmask_string(const char *str, bool v6)
+{
+ struct in_addr addr;
+ unsigned int ret;
+ char *err = NULL;
+
+ if (!strchr(str, '.')) {
+ ret = strtoul(str, &err, 0);
+ if (err && *err)
+ goto error;
+
+ return ret;
+ }
+
+ if (v6)
+ goto error;
+
+ if (inet_aton(str, &addr) != 1)
+ goto error;
+
+ return 32 - fls(~(ntohl(addr.s_addr)));
+
+error:
+ return ~0;
+}
+
static bool
-split_netmask(char *str, unsigned int *netmask)
+split_netmask(char *str, unsigned int *netmask, bool v6)
{
- char *delim, *err = NULL;
+ char *delim = strchr(str, '/');
- delim = strchr(str, '/');
if (delim) {
*(delim++) = 0;
- *netmask = strtoul(delim, &err, 10);
- if (err && *err)
- return false;
+ *netmask = parse_netmask_string(delim, v6);
}
return true;
}
char *astr = alloca(strlen(str) + 1);
strcpy(astr, str);
- if (!split_netmask(astr, netmask))
+ if (!split_netmask(astr, netmask, af == AF_INET6))
return 0;
if (af == AF_INET6) {
interface_proto_event(struct interface_proto_state *proto,
enum interface_proto_cmd cmd, bool force)
{
- enum interface_event ev;
+ enum interface_proto_event ev;
int ret;
ret = proto->cb(proto, cmd, force);
switch(cmd) {
case PROTO_CMD_SETUP:
- ev = IFEV_UP;
+ ev = IFPEV_UP;
break;
case PROTO_CMD_TEARDOWN:
- ev = IFEV_DOWN;
+ ev = IFPEV_DOWN;
break;
default:
return -EINVAL;