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

Commit 9da7c8a3 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Gerrit Code Review
Browse files

Merge "let's at least log the src mac as being the src mac, not the dst" into main

parents 6dbe50e3 92bb8742

core/java/android/net/metrics/WakeupEvent.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ public class WakeupEvent { 
    public String iface;

    public String iface;

    public int uid;

    public int uid;

    public int ethertype;

    public int ethertype;

    public MacAddress dstHwAddr;

    public MacAddress dstHwAddr;  // actually used to store a src mac address

    public String srcIp;

    public String srcIp;

    public String dstIp;

    public String dstIp;

    public int ipNextHeader;

    public int ipNextHeader;
@@ -44,7 +44,7 @@ public class WakeupEvent { 
        j.add(iface);

        j.add(iface);

        j.add("uid: " + Integer.toString(uid));

        j.add("uid: " + Integer.toString(uid));

        j.add("eth=0x" + Integer.toHexString(ethertype));

        j.add("eth=0x" + Integer.toHexString(ethertype));

        j.add("dstHw=" + dstHwAddr);

        j.add("srcMac=" + dstHwAddr);  // really!! http://b/292404319#comment11

        if (ipNextHeader > 0) {

        if (ipNextHeader > 0) {

            j.add("ipNxtHdr=" + ipNextHeader);

            j.add("ipNxtHdr=" + ipNextHeader);

            j.add("srcIp=" + srcIp);

            j.add("srcIp=" + srcIp);