Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d49ee6d4 authored by Sreeram Ramachandran's avatar Sreeram Ramachandran Committed by Android Git Automerger
Browse files

am 18d5aa4d: am 69052994: Merge "Support resetting connections tied to any... 

am 18d5aa4d: am 69052994: Merge "Support resetting connections tied to any nonexistent address." into lmp-dev

* commit '18d5aa4d':
  Support resetting connections tied to any nonexistent address.
parents 8a4b028f 18d5aa4d

include/netutils/ifc.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ extern int ifc_disable(const char *ifname); 


#define RESET_IPV4_ADDRESSES 0x01

#define RESET_IPV6_ADDRESSES 0x02

#define RESET_IGNORE_INTERFACE_ADDRESS 0x04

#define RESET_ALL_ADDRESSES  (RESET_IPV4_ADDRESSES | RESET_IPV6_ADDRESSES)

extern int ifc_reset_connections(const char *ifname, const int reset_mask);

libnetutils/ifc_utils.c

+4 −2
Original line number Diff line number Diff line
@@ -599,14 +599,16 @@ int ifc_reset_connections(const char *ifname, const int reset_mask) 
{

#ifdef HAVE_ANDROID_OS

    int result, success;

    in_addr_t myaddr;

    in_addr_t myaddr = 0;

    struct ifreq ifr;

    struct in6_ifreq ifr6;



    if (reset_mask & RESET_IPV4_ADDRESSES) {

        /* IPv4. Clear connections on the IP address. */

        ifc_init();

        if (!(reset_mask & RESET_IGNORE_INTERFACE_ADDRESS)) {

            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);