From a5ae9056e74a13d394c4bb6c36f9255214ffb68b Mon Sep 17 00:00:00 2001 From: Erik Kline Date: Fri, 6 Oct 2017 12:56:55 +0900 Subject: [PATCH] Log NAT update descriptions when receiving netlink errors Test: as follows - built - flashed - booted - runtest frameworks-net passes - new logging messages observed 2017-10-06T13:15:25.190 - [OffloadController] ERROR Error updating NAT conntrack entry >TCP (192.168.43.222, 58054) -> (198.35.26.112, 443)<: android.system.ErrnoException: NetlinkErrorMessage{... Bug: 29337859 Bug: 32163131 Bug: 64976634 Bug: 67396342 Change-Id: Ie05d4e6588d75f8a9798f40b68a317e24b3b5050 --- .../server/connectivity/tethering/OffloadController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/connectivity/tethering/OffloadController.java b/services/core/java/com/android/server/connectivity/tethering/OffloadController.java index 057704a56c4c4..cff216c70aef1 100644 --- a/services/core/java/com/android/server/connectivity/tethering/OffloadController.java +++ b/services/core/java/com/android/server/connectivity/tethering/OffloadController.java @@ -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);