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

Commit b982bce7 authored by JP Abgrall's avatar JP Abgrall
Browse files

Revert "libsysutils: NetlinkEvent: add support for interface xt_IDLETIMER events." 

This reverts commit 731d831e.

Now that the xt_IDLETIMER uses the KOBJECT_UEVENT netlink, this
change is not needed anymore.
parent 8d3ea1d1

include/sysutils/NetlinkEvent.h

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

    const static int NlActionLinkDown;

    const static int NlActionLinkUp;

    const static int NlActionIfaceActive;

    const static int NlActionIfaceIdle;



    NetlinkEvent();

    virtual ~NetlinkEvent();

libsysutils/src/NetlinkEvent.cpp

+1 −13
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <sys/socket.h>

#include <linux/if.h>

#include <linux/netfilter/nfnetlink.h>

#include <linux/netfilter/xt_IDLETIMER.h>

#include <linux/netfilter_ipv4/ipt_ULOG.h>

/* From kernel's net/netfilter/xt_quota2.c */

const int QLOG_NL_EVENT  = 112;
@@ -39,8 +38,6 @@ const int NetlinkEvent::NlActionRemove = 2; 
const int NetlinkEvent::NlActionChange = 3;

const int NetlinkEvent::NlActionLinkUp = 4;

const int NetlinkEvent::NlActionLinkDown = 5;

const int NetlinkEvent::NlActionIfaceActive = 6;

const int NetlinkEvent::NlActionIfaceIdle = 7;



NetlinkEvent::NetlinkEvent() {

    mAction = NlActionUnknown;
@@ -73,8 +70,7 @@ void NetlinkEvent::dump() { 
}



/*

 * Parse an binary message from a NETLINK_ROUTE netlink socket

 * and IDLETIMER netlink socket.

 * Parse an binary message from a NETLINK_ROUTE netlink socket.

 */

bool NetlinkEvent::parseBinaryNetlinkMessage(char *buffer, int size) {

    size_t sz = size;
@@ -131,14 +127,6 @@ bool NetlinkEvent::parseBinaryNetlinkMessage(char *buffer, int size) { 
            mSubsystem = strdup("qlog");

            mAction = NlActionChange;



        } else if (nh->nlmsg_type == NL_EVENT_TYPE_ACTIVE

                   || nh->nlmsg_type == NL_EVENT_TYPE_INACTIVE) {

            char *ifacename;

            ifacename = (char *)NLMSG_DATA(nh);

            asprintf(&mParams[0], "INTERFACE=%s", ifacename);

            mSubsystem = strdup("idletimer");

            mAction = (nh->nlmsg_type == NL_EVENT_TYPE_ACTIVE) ?

              NlActionIfaceActive : NlActionIfaceIdle;

        } else {

                SLOGD("Unexpected netlink message. type=0x%x\n", nh->nlmsg_type);

        }