OSDN Git Service

Support NAT keepalives
authorErik Kline <ek@google.com>
Mon, 19 Jun 2017 02:33:59 +0000 (11:33 +0900)
committerErik Kline <ek@google.com>
Fri, 8 Sep 2017 01:54:20 +0000 (10:54 +0900)
commitfc105bb6d8c44010f07cf157750b8b5bfc0d06aa
tree9b184f92ae50464a03316219fb16a6a9269b4f9c
parent9c57accc45c5fa16ccdf1be8ce5341633366a783
Support NAT keepalives

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
    - turned on debugging and walked around watching IpReachabilityMonitor
      force neighbors into NUD_PROBE state without error
    - observed NAT callbacks happening without any reported errors
    - watched:
        adb shell cat /proc/net/nf_conntrack | egrep '192[.]168[.]43[.]' | sort -n -k5
      for correct timeout updates

Bug: 29337859
Bug: 32163131

Merged-In: I82ac60e5ad79ec64a13df6ec56b5b51b223f8dde
Merged-In: I09bc685e821ec5e871576a54c4290edea4c5160b
Merged-In: I4d180369a8f64ee494b016656988252d98a09ba4
Change-Id: Icb23da64cfaa3a19f7bc75fba426a52b0994fb0f
(cherry picked from commit 7a65bc62fbe0391f88834ab27b32033d6b957c8b)
services/core/java/com/android/server/connectivity/tethering/OffloadController.java
services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java
services/net/java/android/net/ip/IpReachabilityMonitor.java
services/net/java/android/net/netlink/ConntrackMessage.java [new file with mode: 0644]
services/net/java/android/net/netlink/NetlinkSocket.java
services/net/java/android/net/netlink/RtNetlinkNeighborMessage.java
services/net/java/android/net/netlink/StructNfGenMsg.java [new file with mode: 0644]
services/net/java/android/net/netlink/StructNlAttr.java
tests/net/java/android/net/netlink/ConntrackMessageTest.java [new file with mode: 0644]