commit 98864456ede004f9877e3c46f471390b1442dd2f
author Maciej Żenczykowski <maze@google.com> Tue Jun 02 01:30:33 2020 -0700
committer Maciej Żenczykowski <maze@google.com> Tue Jun 02 15:10:33 2020 -0700
tree a0f0076050481c50e25650c9a2138c2acf620674
parent c9b0e6d1ab7e6ea200d4767689fb30f20fec92b6

cleanup - config_item_ip() and DEFAULT_IPV4_LOCAL_SUBNET

Test:
  git grep 'config_item_ip|DEFAULT_IPV4_LOCAL_SUBNET'
  comes up empty

Bug: 144730808
Test: atest clatd_test netd_integration_test
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0cb3fe5bae5f663d07a8cb63f2dd9ef9ca1a6dd8

config.c

diff --git a/config.c b/config.c
index 554db0e..f7c9724 100644
--- a/config.c
+++ b/config.c
@@ -35,33 +35,6 @@
 
 struct clat_config Global_Clatd_Config;
 
-/* function: config_item_ip
- * locates the config item, parses the ipv4 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 in_addr *config_item_ip(cnode *root, const char *item_name, const char *defaultvar,
-                               struct in_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_INET, tmp, ret_val_ptr);
-  if (status <= 0) {
-    logmsg(ANDROID_LOG_FATAL, "invalid IPv4 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
@@ -95,10 +68,6 @@
   Global_Clatd_Config.default_pdp_interface = strdup(uplink_interface);
   if (!Global_Clatd_Config.default_pdp_interface) goto failed;
 
-  if (!config_item_ip(root, "ipv4_local_subnet", DEFAULT_IPV4_LOCAL_SUBNET,
-                      &Global_Clatd_Config.ipv4_local_subnet))
-    goto failed;
-
   Global_Clatd_Config.ipv4_local_prefixlen = 29;
 
   return 1;

config.h

diff --git a/config.h b/config.h
index 555b968..32558ca 100644
--- a/config.h
+++ b/config.h
@@ -21,8 +21,6 @@
 #include <linux/if.h>
 #include <netinet/in.h>
 
-#define DEFAULT_IPV4_LOCAL_SUBNET "192.0.0.4"
-
 struct clat_config {
   struct in6_addr ipv6_local_subnet;
   struct in_addr ipv4_local_subnet;