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

Commit 3506aaf9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Log NAT update descriptions when receiving netlink errors"

parents b7dc3a3b 4a8bcdef

services/core/java/com/android/server/connectivity/tethering/OffloadController.java

+4 −3
Original line number Diff line number Diff line
@@ -596,9 +596,10 @@ public class OffloadController { 
        }



        mNatUpdateCallbacksReceived++;

        final String natDescription = String.format("%s (%s, %s) -> (%s, %s)",

                protoName, srcAddr, srcPort, dstAddr, dstPort);

        if (DBG) {

            mLog.log(String.format("NAT timeout update: %s (%s, %s) -> (%s, %s)",

                     protoName, srcAddr, srcPort, dstAddr, dstPort));

            mLog.log("NAT timeout update: " + natDescription);

        }



        final int timeoutSec = connectionTimeoutUpdateSecondsFor(proto);
@@ -609,7 +610,7 @@ public class OffloadController { 
            NetlinkSocket.sendOneShotKernelMessage(OsConstants.NETLINK_NETFILTER, msg);

        } catch (ErrnoException e) {

            mNatUpdateNetlinkErrors++;

            mLog.e("Error updating NAT conntrack entry: " + e

            mLog.e("Error updating NAT conntrack entry >" + natDescription + "<: " + e

                    + ", msg: " + NetlinkConstants.hexify(msg));

            mLog.log("NAT timeout update callbacks received: " + mNatUpdateCallbacksReceived);

            mLog.log("NAT timeout update netlink errors: " + mNatUpdateNetlinkErrors);