ipsec-332.100.1.tar.gz

[apple/ipsec.git] / ipsec-tools / racoon / grabmyaddr.c

diff --git a/ipsec-tools/racoon/grabmyaddr.c b/ipsec-tools/racoon/grabmyaddr.c
index c8bcaeebaaf50fc26a9f905da8bbe721961f3f27..db04bf287ffa44a24f64da277e10abe7fa583724 100644 (file)
--- a/ipsec-tools/racoon/grabmyaddr.c
+++ b/ipsec-tools/racoon/grabmyaddr.c
@@ -79,6 +79,7 @@ static int suitable_ifaddr (const char *, const struct sockaddr *);
 #ifdef INET6
 static int suitable_ifaddr6 (const char *, const struct sockaddr *);
 #endif
+static bool exclude_interfaces(const char *);
 
 #ifndef HAVE_GETIFADDRS
 static unsigned int
@@ -177,6 +178,10 @@ grab_myaddrs()
                )
                        continue;
 
+               if (exclude_interfaces(ifap->ifa_name)) {
+                       continue;
+               }
+
                if (!suitable_ifaddr(ifap->ifa_name, ifap->ifa_addr)) {
                        plog(ASL_LEVEL_DEBUG, 
                                "unsuitable address: %s %s\n",
@@ -256,6 +261,23 @@ grab_myaddrs()
        freeifaddrs(ifa0);
 }
 
+static bool
+exclude_interfaces(ifname)
+       const char *ifname;
+{
+       if (ifname == NULL) {
+               return false;
+       }
+
+       if (strnstr(ifname, "awdl", IFNAMSIZ) != NULL) {
+               return true;
+       } else if (strnstr(ifname, "llw", IFNAMSIZ) != NULL) {
+               return true;
+       }
+
+       return false;
+}
+
 
 /*
  * check the interface is suitable or not
@@ -498,7 +520,6 @@ update_myaddrs(void *unused)
     isakmp_close_unused();
     autoconf_myaddrsport();
     isakmp_open();
-    ASIKEUpdateLocalAddressesFromIKE();
 }