Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Log NAT update descriptions when receiving netlink errors"

Browse Source 
am: 3506aaf992

Change-Id: I3a37cf51b0763e42752d35fc26f70c63d3707fae
This commit is contained in:
Erik Kline
2017-10-06 09:25:29 +00:00
committed by android-build-merger
parent 4910739237 3506aaf992
commit cb2860362b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/connectivity/tethering/OffloadController.java
View File

@@ -596,9 +596,10 @@ public class OffloadController {
} }
mNatUpdateCallbacksReceived++; mNatUpdateCallbacksReceived++;
final String natDescription = String.format("%s (%s, %s) -> (%s, %s)",
protoName, srcAddr, srcPort, dstAddr, dstPort);
if (DBG) { if (DBG) {
mLog.log(String.format("NAT timeout update: %s (%s, %s) -> (%s, %s)", mLog.log("NAT timeout update: " + natDescription);
protoName, srcAddr, srcPort, dstAddr, dstPort));
} }
final int timeoutSec = connectionTimeoutUpdateSecondsFor(proto); final int timeoutSec = connectionTimeoutUpdateSecondsFor(proto);
@@ -609,7 +610,7 @@ public class OffloadController {
NetlinkSocket.sendOneShotKernelMessage(OsConstants.NETLINK_NETFILTER, msg); NetlinkSocket.sendOneShotKernelMessage(OsConstants.NETLINK_NETFILTER, msg);
} catch (ErrnoException e) { } catch (ErrnoException e) {
mNatUpdateNetlinkErrors++; mNatUpdateNetlinkErrors++;
mLog.e("Error updating NAT conntrack entry: " + e mLog.e("Error updating NAT conntrack entry >" + natDescription + "<: " + e
+ ", msg: " + NetlinkConstants.hexify(msg)); + ", msg: " + NetlinkConstants.hexify(msg));
mLog.log("NAT timeout update callbacks received: " + mNatUpdateCallbacksReceived); mLog.log("NAT timeout update callbacks received: " + mNatUpdateCallbacksReceived);
mLog.log("NAT timeout update netlink errors: " + mNatUpdateNetlinkErrors); mLog.log("NAT timeout update netlink errors: " + mNatUpdateNetlinkErrors);