X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.c;h=ba2695272ac9a1fac486ebdecc6f97544aaf54fb;hp=e01b633c09e0143ebf98dbdb62ef77deecacaf73;hb=d397e8ca5dd492a1fac2e186e2a8b91ac8e463df;hpb=7a51f23e7034157dee8e00910513d95e935eeab6 diff --git a/utils.c b/utils.c index e01b633..ba26952 100644 --- a/utils.c +++ b/utils.c @@ -119,7 +119,6 @@ int parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask) { char *astr = alloca(strlen(str) + 1); - int ret = 0; strcpy(astr, str); if (!split_netmask(astr, netmask, af == AF_INET6)) @@ -133,23 +132,7 @@ parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask) return 0; } - ret = inet_pton(af, astr, addr); - if (ret > 0) { - if (af == AF_INET) { - struct in_addr *ip4_addr = (struct in_addr *)addr; - uint32_t host_addr = ntohl(ip4_addr->s_addr); - - if (IN_EXPERIMENTAL(host_addr)) { - return 0; - } - } - else if (af == AF_INET6) { - if (IN6_IS_ADDR_MULTICAST((struct in6_addr *)addr)) { - return 0; - } - } - } - return ret; + return inet_pton(af, astr, addr); } char *