From 533e31f4ea4853cd512d5c128838289dbef4758a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 2 Jun 2020 12:56:42 +0000 Subject: cleanup - config_item_ip6() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: git grep config_item_ip6 comes up empty Bug: 144730808 Test: atest clatd_test netd_integration_test Signed-off-by: Maciej Żenczykowski Original-Change: https://android-review.googlesource.com/1322224 Merged-In: I0338f7ac29fdb0de56bd4a500e2a827cab2c47f7 Change-Id: I0338f7ac29fdb0de56bd4a500e2a827cab2c47f7 --- config.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/config.c b/config.c index bcf77ba..554db0e 100644 --- a/config.c +++ b/config.c @@ -62,33 +62,6 @@ struct in_addr *config_item_ip(cnode *root, const char *item_name, const char *d return ret_val_ptr; } -/* function: config_item_ip6 - * locates the config item, parses the ipv6 address, and returns the pointer ret_val_ptr, or NULL on - * failure - * root - parsed configuration - * item_name - name of config item to locate - * defaultvar - value to use if config item isn't present - * ret_val_ptr - pointer for return value storage - */ -struct in6_addr *config_item_ip6(cnode *root, const char *item_name, const char *defaultvar, - struct in6_addr *ret_val_ptr) { - const char *tmp; - int status; - - if (!(tmp = config_str(root, item_name, defaultvar))) { - logmsg(ANDROID_LOG_FATAL, "%s config item needed", item_name); - return NULL; - } - - status = inet_pton(AF_INET6, tmp, ret_val_ptr); - if (status <= 0) { - logmsg(ANDROID_LOG_FATAL, "invalid IPv6 address specified for %s: %s", item_name, tmp); - return NULL; - } - - return ret_val_ptr; -} - /* function: ipv6_prefix_equal * compares the prefixes two ipv6 addresses. assumes the prefix lengths are both /64. * a1 - first address -- cgit v1.2.3