From 6cf73eadc752b619bc7c38d0d1277891eccbf81d Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Thu, 17 Mar 2011 11:20:25 -0700 Subject: [PATCH] Kill IPv6 sockets as well as IPv4 sockets. Change-Id: Ib9e070e510d1a762295faf4dc673c9a6e8207a8d --- libnetutils/ifc_utils.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libnetutils/ifc_utils.c b/libnetutils/ifc_utils.c index e5c58b9b0..946c39de9 100644 --- a/libnetutils/ifc_utils.c +++ b/libnetutils/ifc_utils.c @@ -366,10 +366,12 @@ int ifc_disable(const char *ifname) int ifc_reset_connections(const char *ifname) { #ifdef HAVE_ANDROID_OS - int result; + int result, success; in_addr_t myaddr; struct ifreq ifr; + struct in6_ifreq ifr6; + /* IPv4. Clear connections on the IP address. */ ifc_init(); ifc_get_info(ifname, &myaddr, NULL, NULL); ifc_init_ifr(ifname, &ifr); @@ -377,6 +379,21 @@ int ifc_reset_connections(const char *ifname) result = ioctl(ifc_ctl_sock, SIOCKILLADDR, &ifr); ifc_close(); + /* + * IPv6. On Linux, when an interface goes down it loses all its IPv6 + * addresses, so we don't know which connections belonged to that interface + * So we clear all unused IPv6 connections on the device by specifying an + * empty IPv6 address. + */ + ifc_init6(); + // This implicitly specifies an address of ::, i.e., kill all IPv6 sockets. + memset(&ifr6, 0, sizeof(ifr6)); + success = ioctl(ifc_ctl_sock6, SIOCKILLADDR, &ifr6); + if (result == 0) { + result = success; + } + ifc_close6(); + return result; #else return 0;