X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.h;h=f40e14fc239eb5260844be6926e5af66309650a1;hp=23795e592b5e96c591a26c2575240339d9b8169c;hb=d397e8ca5dd492a1fac2e186e2a8b91ac8e463df;hpb=24f5ed4b8b6c3c6f27e84e731b7682d3a5cc29d0 diff --git a/utils.h b/utils.h index 23795e5..f40e14f 100644 --- a/utils.h +++ b/utils.h @@ -14,7 +14,9 @@ #ifndef __NETIFD_UTILS_H #define __NETIFD_UTILS_H +#include #include +#include #include #include #include @@ -96,10 +98,8 @@ static inline int fls(int x) x <<= 2; r -= 2; } - if (!(x & 0x80000000u)) { - x <<= 1; + if (!(x & 0x80000000u)) r -= 1; - } return r; } #endif @@ -107,11 +107,14 @@ static inline int fls(int x) unsigned int parse_netmask_string(const char *str, bool v6); bool split_netmask(char *str, unsigned int *netmask, bool v6); int parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask); +bool check_pid_path(int pid, const char *exe); char * format_macaddr(uint8_t *mac); uint32_t crc32_file(FILE *fp); +const char * uci_get_validate_string(const struct uci_blob_param_list *p, int i); + #ifdef __APPLE__ #define s6_addr32 __u6_addr.__u6_addr32 #endif