ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 436deea5: am 979203ee: Add reset_mask as parameter to ifc_reset_connections

Browse source 
* commit '436deea5bbd43ae402ca8ee5bbc7fed3daaf3fce':
  Add reset_mask as parameter to ifc_reset_connections
This commit is contained in:
Wink Saville 2011-07-08 12:28:18 -07:00 • committed by Android Git Automerger
commit 7da24861ea
2 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/netutils/ifc.h
View file

@ -34,7 +34,7 @@ extern int ifc_down(const char *name);
extern int ifc_enable(const char *ifname);
extern int ifc_disable(const char *ifname);
extern int ifc_reset_connections(const char *ifname);
extern int ifc_reset_connections(const char *ifname, const int reset_mask);
extern int ifc_get_addr(const char *name, in_addr_t *addr);
extern int ifc_set_addr(const char *name, in_addr_t addr);

54
libnetutils/ifc_utils.c
View file

@ -394,7 +394,11 @@ int ifc_disable(const char *ifname)
return result;
}
int ifc_reset_connections(const char *ifname)
#define RESET_IPV4_ADDRESSES 0x01
#define RESET_IPV6_ADDRESSES 0x02
#define RESET_ALL_ADDRESSES (RESET_IPV4_ADDRESSES | RESET_IPV6_ADDRESSES)
int ifc_reset_connections(const char *ifname, const int reset_mask)
{
#ifdef HAVE_ANDROID_OS
int result, success;
@ -402,28 +406,34 @@ int ifc_reset_connections(const char *ifname)
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);
init_sockaddr_in(&ifr.ifr_addr, myaddr);
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;
if (reset_mask & RESET_IPV4_ADDRESSES) {
/* IPv4. Clear connections on the IP address. */
ifc_init();
ifc_get_info(ifname, &myaddr, NULL, NULL);
ifc_init_ifr(ifname, &ifr);
init_sockaddr_in(&ifr.ifr_addr, myaddr);
result = ioctl(ifc_ctl_sock, SIOCKILLADDR, &ifr);
ifc_close();
} else {
result = 0;
}
if (reset_mask & RESET_IPV6_ADDRESSES) {
/*
* 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();
}
ifc_close6();
return result;
#else