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

Commit 526b838c authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Switch back to subsystem "net" for netlink events. 

The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".

Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.

[Cherry-pick of f3486134]

Bug: 10433320
Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
parent 96834569

include/sysutils/NetlinkEvent.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ public: 
    const static int NlActionChange;

    const static int NlActionLinkDown;

    const static int NlActionLinkUp;

    const static int NlActionAddressUpdated;

    const static int NlActionAddressRemoved;



    NetlinkEvent();

    virtual ~NetlinkEvent();

libsysutils/src/NetlinkEvent.cpp

+7 −4
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ const int NetlinkEvent::NlActionRemove = 2; 
const int NetlinkEvent::NlActionChange = 3;

const int NetlinkEvent::NlActionLinkUp = 4;

const int NetlinkEvent::NlActionLinkDown = 5;

const int NetlinkEvent::NlActionAddressUpdated = 6;

const int NetlinkEvent::NlActionAddressRemoved = 7;



NetlinkEvent::NetlinkEvent() {

    mAction = NlActionUnknown;
@@ -131,11 +133,12 @@ bool NetlinkEvent::parseIfAddrMessage(int type, struct ifaddrmsg *ifaddr, 
            }



            // Fill in interface information.

            mAction = (type == RTM_NEWADDR) ? NlActionAdd : NlActionRemove;

            mSubsystem = strdup("address");

            mAction = (type == RTM_NEWADDR) ? NlActionAddressUpdated :

                                              NlActionAddressRemoved;

            mSubsystem = strdup("net");

            asprintf(&mParams[0], "ADDRESS=%s/%d", addrstr,

                     ifaddr->ifa_prefixlen);

            asprintf(&mParams[1], "IFACE=%s", ifname);

            asprintf(&mParams[1], "INTERFACE=%s", ifname);

            asprintf(&mParams[2], "FLAGS=%u", ifaddr->ifa_flags);

            asprintf(&mParams[3], "SCOPE=%u", ifaddr->ifa_scope);

        } else if (rta->rta_type == IFA_CACHEINFO) {
@@ -205,7 +208,7 @@ bool NetlinkEvent::parseBinaryNetlinkMessage(char *buffer, int size) { 
                    mParams[0] = strdup(buffer);

                    mAction = (ifi->ifi_flags & IFF_LOWER_UP) ?

                      NlActionLinkUp : NlActionLinkDown;

                    mSubsystem = strdup("interface");

                    mSubsystem = strdup("net");

                    break;

                }