joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup: Remove unused "ipv6_local_address".

Browse source 
This was originally used on the "clat" interface. That interface is not created
anymore (since the switch to using a raw socket). Note that the v6 address used
on the raw socket is a combination of the plat subnet plus a host ID, and not
this link-local address.

Also fixup default values to match clatd.conf values.

Change-Id: I3470a02e6798b65cae0f8d7f074ce51fb0647e6a
This commit is contained in:
Sreeram Ramachandran 2014-10-23 09:38:19 -07:00
commit 74151e9d0c
3 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
clatd.conf
View file

@ -5,9 +5,6 @@ ipv6_host_id ::464
# ipv4 subnet for the local traffic to use. This is a /32 host address
ipv4_local_subnet 192.0.0.4
# ipv6 extra link local address for the ip6 iface.
ipv6_local_address fe80::c000:0004
# get the plat_subnet from dns lookups (requires DNS64)
plat_from_dns64 yes
# hostname to use to lookup plat subnet. must contain only A records

6
config.c
View file

@ -196,7 +196,7 @@ void config_generate_local_ipv6_subnet(struct in6_addr *interface_ip) {
int subnet_from_interface(cnode *root, const char *interface) {
union anyip *interface_ip;
if(!config_item_ip6(root, "ipv6_host_id", "::200:5E10:0:0", &Global_Clatd_Config.ipv6_host_id))
if(!config_item_ip6(root, "ipv6_host_id", "::464", &Global_Clatd_Config.ipv6_host_id))
return 0;
interface_ip = getinterface_ip(interface, AF_INET6);
@ -252,9 +252,6 @@ int read_config(const char *file, const char *uplink_interface, const char *plat
if(!config_item_ip(root, "ipv4_local_subnet", DEFAULT_IPV4_LOCAL_SUBNET, &Global_Clatd_Config.ipv4_local_subnet))
goto failed;
if(!config_item_ip6(root, "ipv6_local_address", DEFAULT_IPV6_LOCAL_ADDRESS, &Global_Clatd_Config.ipv6_local_address))
goto failed;
if(plat_prefix) { // plat subnet is coming from the command line
if(inet_pton(AF_INET6, plat_prefix, &Global_Clatd_Config.plat_subnet) <= 0) {
logmsg(ANDROID_LOG_FATAL,"invalid IPv6 address specified for plat prefix: %s", plat_prefix);
@ -295,7 +292,6 @@ void dump_config() {
logmsg(ANDROID_LOG_DEBUG,"mtu = %d",Global_Clatd_Config.mtu);
logmsg(ANDROID_LOG_DEBUG,"ipv4mtu = %d",Global_Clatd_Config.ipv4mtu);
logmsg(ANDROID_LOG_DEBUG,"ipv6_local_address = %s",inet_ntop(AF_INET6, &Global_Clatd_Config.ipv6_local_address, charbuffer, sizeof(charbuffer)));
logmsg(ANDROID_LOG_DEBUG,"ipv6_local_subnet = %s",inet_ntop(AF_INET6, &Global_Clatd_Config.ipv6_local_subnet, charbuffer, sizeof(charbuffer)));
logmsg(ANDROID_LOG_DEBUG,"ipv4_local_subnet = %s",inet_ntop(AF_INET, &Global_Clatd_Config.ipv4_local_subnet, charbuffer, sizeof(charbuffer)));
logmsg(ANDROID_LOG_DEBUG,"plat_subnet = %s",inet_ntop(AF_INET6, &Global_Clatd_Config.plat_subnet, charbuffer, sizeof(charbuffer)));

6
config.h
View file

@ -21,14 +21,12 @@
#include <netinet/in.h>
#include <sys/system_properties.h>
#define DEFAULT_IPV4_LOCAL_SUBNET "192.168.255.1"
#define DEFAULT_IPV6_LOCAL_ADDRESS "fe80::c000:0004"
#define DEFAULT_IPV4_LOCAL_SUBNET "192.0.0.4"
#define DEFAULT_DNS64_DETECTION_HOSTNAME "ipv4.google.com"
#define DEFAULT_DNS64_DETECTION_HOSTNAME "ipv4only.arpa"
struct clat_config {
int16_t mtu, ipv4mtu;
struct in6_addr ipv6_local_address;
struct in6_addr ipv6_local_subnet;
struct in6_addr ipv6_host_id;
struct in_addr ipv4_local_subnet;