diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-11-12 00:47:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-12 00:47:56 +0000 |
| commit | c6ba801b9fb53de41124c2f7c82c3c58fab7286e (patch) | |
| tree | 7af13b820429bb59030e7abf7fad153d2dcbf475 | |
| parent | 65cbd15ead4a9058bfe07507c4471e7db856c64d (diff) | |
| parent | f9c9b71cccaa66826876046edd8c101141928967 (diff) | |
Merge "Revert "Revert "Fix sll_protocol in DhcpClient packet socket"""
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java | 3 | ||||
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -59,7 +59,7 @@ filegroup { srcs: [ "apishim/common/**/*.java", "apishim/29/**/*.java", - "apishim/current/**/*.java", + "apishim/30/**/*.java", ":net-module-utils-srcs", ], } diff --git a/apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java b/apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java index 9516e7c..748878a 100644 --- a/apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java +++ b/apishim/30/com/android/networkstack/apishim/SocketUtilsShimImpl.java @@ -44,7 +44,6 @@ public class SocketUtilsShimImpl @Override public SocketAddress makePacketSocketAddress( int protocol, int ifIndex, @NonNull byte[] hwAddr) { - // TODO: use new API (which takes protocol, ifIndex, hwAddr) once implemented - return SocketUtils.makePacketSocketAddress(ifIndex, hwAddr); + return SocketUtils.makePacketSocketAddress(protocol, ifIndex, hwAddr); } } diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index 0d56d63..889bfce 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -82,6 +82,7 @@ import com.android.internal.util.StateMachine; import com.android.internal.util.TrafficStatsConstants; import com.android.internal.util.WakeupMessage; import com.android.networkstack.R; +import com.android.networkstack.apishim.SocketUtilsShimImpl; import java.io.FileDescriptor; import java.io.IOException; @@ -389,7 +390,8 @@ public class DhcpClient extends StateMachine { } mHwAddr = mIface.macAddr.toByteArray(); - mInterfaceBroadcastAddr = makePacketSocketAddress(mIface.index, DhcpPacket.ETHER_BROADCAST); + mInterfaceBroadcastAddr = SocketUtilsShimImpl.newInstance().makePacketSocketAddress( + ETH_P_IP, mIface.index, DhcpPacket.ETHER_BROADCAST); return true; } |