diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-09-12 11:46:17 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-09-12 11:46:17 +0200 |
commit | 3bd56db589071948eebd30b00cda7ef1fb38a61b (patch) | |
tree | 51ce67ccfadba42b29d06d7c81a9534810b7c4e5 /proto.c | |
parent | aa446207119b958eb51c6b9d447cd03a011927bd (diff) | |
download | netifd-3bd56db589071948eebd30b00cda7ef1fb38a61b.tar.gz |
move ip address parsing code to proto.c
Diffstat (limited to 'proto.c')
-rw-r--r-- | proto.c | 57 |
1 files changed, 57 insertions, 0 deletions
@@ -2,12 +2,69 @@ #include <stdlib.h> #include <stdio.h> +#include <arpa/inet.h> +#include <netinet/in.h> + #include "netifd.h" #include "interface.h" +#include "interface-ip.h" #include "proto.h" static struct avl_tree handlers; +static bool +split_netmask(char *str, unsigned int *netmask) +{ + char *delim, *err = NULL; + + delim = strchr(str, '/'); + if (delim) { + *(delim++) = 0; + + *netmask = strtoul(delim, &err, 10); + if (err && *err) + return false; + } + return true; +} + +static int +parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask) +{ + char *astr = alloca(strlen(str) + 1); + + strcpy(astr, str); + if (!split_netmask(astr, netmask)) + return 0; + + if (af == AF_INET6) { + if (*netmask > 128) + return 0; + } else { + if (*netmask > 32) + return 0; + } + + return inet_pton(af, str, addr); +} + +struct device_addr * +proto_parse_ip_addr_string(const char *str, bool v6, int mask) +{ + struct device_addr *addr; + int af = v6 ? AF_INET6 : AF_INET; + + addr = calloc(1, sizeof(*addr)); + addr->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4; + addr->mask = mask; + if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) { + free(addr); + return NULL; + } + return addr; +} + + void add_proto_handler(struct proto_handler *p) { if (!handlers.comp) |