X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=utils.c;h=ba2695272ac9a1fac486ebdecc6f97544aaf54fb;hp=156b02549b72249d441f7f1e552378149789bde7;hb=HEAD;hpb=bfe5db1ea8018aaa940dc6e991110fac62b85516 diff --git a/utils.c b/utils.c index 156b025..ba26952 100644 --- a/utils.c +++ b/utils.c @@ -15,112 +15,203 @@ #include #include "utils.h" -int -avl_strcmp(const void *k1, const void *k2, void *ptr) -{ - return strcmp(k1, k2); -} +#include +#include +#include + +#ifdef __APPLE__ +#include +#endif void -vlist_init(struct vlist_tree *tree, avl_tree_comp cmp, vlist_update_cb update) +__vlist_simple_init(struct vlist_simple_tree *tree, int offset) { - tree->update = update; + INIT_LIST_HEAD(&tree->list); tree->version = 1; - - avl_init(&tree->avl, cmp, 0, tree); + tree->head_offset = offset; } void -vlist_delete(struct vlist_tree *tree, struct vlist_node *node) +vlist_simple_delete(struct vlist_simple_tree *tree, struct vlist_simple_node *node) { - if (!tree->no_delete) - avl_delete(&tree->avl, &node->avl); - tree->update(tree, NULL, node); + char *ptr; + + list_del(&node->list); + ptr = (char *) node - tree->head_offset; + free(ptr); } void -vlist_add(struct vlist_tree *tree, struct vlist_node *node, void *key) +vlist_simple_flush(struct vlist_simple_tree *tree) { - struct vlist_node *old_node = NULL; - struct avl_node *anode; - - node->avl.key = key; - node->version = tree->version; - - anode = avl_find(&tree->avl, key); - if (anode) { - old_node = container_of(anode, struct vlist_node, avl); - if (tree->keep_old || tree->no_delete) { - old_node->version = tree->version; - goto update_only; - } - - avl_delete(&tree->avl, anode); - } + struct vlist_simple_node *n, *tmp; - avl_insert(&tree->avl, &node->avl); + list_for_each_entry_safe(n, tmp, &tree->list, list) { + if ((n->version == tree->version || n->version == -1) && + tree->version != -1) + continue; -update_only: - tree->update(tree, node, old_node); + vlist_simple_delete(tree, n); + } } void -vlist_flush(struct vlist_tree *tree) +vlist_simple_replace(struct vlist_simple_tree *dest, struct vlist_simple_tree *old) { - struct vlist_node *node, *tmp; - - avl_for_each_element_safe(&tree->avl, node, avl, tmp) { - if ((node->version == tree->version || node->version == -1) && - tree->version != -1) - continue; + struct vlist_simple_node *n, *tmp; - vlist_delete(tree, node); + vlist_simple_update(dest); + list_for_each_entry_safe(n, tmp, &old->list, list) { + list_del(&n->list); + vlist_simple_add(dest, n); } + vlist_simple_flush(dest); } void -vlist_flush_all(struct vlist_tree *tree) +vlist_simple_flush_all(struct vlist_simple_tree *tree) { tree->version = -1; - vlist_flush(tree); + vlist_simple_flush(tree); } +unsigned int +parse_netmask_string(const char *str, bool v6) +{ + struct in_addr addr; + unsigned int ret; + char *err = NULL; -void -__vlist_simple_init(struct vlist_simple_tree *tree, int offset) + 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; +} + +bool +split_netmask(char *str, unsigned int *netmask, bool v6) { - INIT_LIST_HEAD(&tree->list); - tree->version = 1; - tree->head_offset = offset; + char *delim = strchr(str, '/'); + + if (delim) { + *(delim++) = 0; + + *netmask = parse_netmask_string(delim, v6); + } + return true; } -void -vlist_simple_delete(struct vlist_simple_tree *tree, struct vlist_simple_node *node) +int +parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask) { - char *ptr; + char *astr = alloca(strlen(str) + 1); + + strcpy(astr, str); + if (!split_netmask(astr, netmask, af == AF_INET6)) + return 0; + + if (af == AF_INET6) { + if (*netmask > 128) + return 0; + } else { + if (*netmask > 32) + return 0; + } - list_del(&node->list); - ptr = (char *) node - tree->head_offset; - free(ptr); + return inet_pton(af, astr, addr); } -void -vlist_simple_flush(struct vlist_simple_tree *tree) +char * +format_macaddr(uint8_t *mac) { - struct vlist_simple_node *n, *tmp; + static char str[sizeof("ff:ff:ff:ff:ff:ff ")]; - list_for_each_entry_safe(n, tmp, &tree->list, list) { - if ((n->version == tree->version || n->version == -1) && - tree->version != -1) - continue; + snprintf(str, sizeof(str), "%02x:%02x:%02x:%02x:%02x:%02x", + mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); - vlist_simple_delete(tree, n); + return str; +} + +uint32_t +crc32_file(FILE *fp) +{ + static uint32_t *crcvals = NULL; + if (!crcvals) { + crcvals = malloc(sizeof(*crcvals) * 256); + + for (size_t i = 0; i < 256; ++i) { + uint32_t c = i; + for (size_t j = 0; j < 8; ++j) + c = (c & 1) ? (0xEDB88320 ^ (c >> 1)) : (c >> 1); + crcvals[i] = c; + } } + + uint8_t buf[1024]; + size_t len; + uint32_t c = 0xFFFFFFFF; + + do { + len = fread(buf, 1, sizeof(buf), fp); + for (size_t i = 0; i < len; ++i) + c = crcvals[(c ^ buf[i]) & 0xFF] ^ (c >> 8); + } while (len == sizeof(buf)); + + return c ^ 0xFFFFFFFF; } -void -vlist_simple_flush_all(struct vlist_simple_tree *tree) +bool check_pid_path(int pid, const char *exe) { - tree->version = -1; - vlist_simple_flush(tree); + int proc_exe_len; + int exe_len = strlen(exe); + +#ifdef __APPLE__ + char proc_exe_buf[PROC_PIDPATHINFO_SIZE]; + + proc_exe_len = proc_pidpath(pid, proc_exe_buf, sizeof(proc_exe_buf)); +#else + char proc_exe[32]; + char *proc_exe_buf = alloca(exe_len); + + sprintf(proc_exe, "/proc/%d/exe", pid); + proc_exe_len = readlink(proc_exe, proc_exe_buf, exe_len); +#endif + + if (proc_exe_len != exe_len) + return false; + + return !memcmp(exe, proc_exe_buf, exe_len); +} + +static const char * const uci_validate_name[__BLOBMSG_TYPE_LAST] = { + [BLOBMSG_TYPE_STRING] = "string", + [BLOBMSG_TYPE_ARRAY] = "list(string)", + [BLOBMSG_TYPE_INT32] = "uinteger", + [BLOBMSG_TYPE_BOOL] = "bool", +}; + +const char* +uci_get_validate_string(const struct uci_blob_param_list *p, int i) +{ + if (p->validate[i]) + return p->validate[i]; + + else if (uci_validate_name[p->params[i].type]) + return uci_validate_name[p->params[i].type]; + + return p->validate[BLOBMSG_TYPE_STRING]; }