| commit | b9d1e8ba610a6a209a306bd0f45ffec30d974b46 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Oct 26 22:36:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 26 22:36:04 2021 +0000 |
| tree | 4d637840147594da971c850f91e4b695183351a3 | |
| parent | af1a5c829de1f5fff1a22487152fc6953730723b [diff] | |
| parent | 366841d11915f8ee6f3f3af8d8de0cf0c9c95c49 [diff] |
Merge "binderRpcTest: respect network byte order" am: 7701563c14 am: 366841d119 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1870034 Change-Id: If022380e9eed239073850a4b1c627d66e15991a4
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp index 0cbb880..7bbe3d7 100644 --- a/libs/binder/tests/binderRpcTest.cpp +++ b/libs/binder/tests/binderRpcTest.cpp
@@ -663,13 +663,15 @@ break; case AF_INET: CHECK_EQ(len, sizeof(sockaddr_in)); - service->port = reinterpret_cast<const sockaddr_in*>(addr) - ->sin_port; + service->port = + ntohs(reinterpret_cast<const sockaddr_in*>(addr) + ->sin_port); break; case AF_INET6: CHECK_EQ(len, sizeof(sockaddr_in)); - service->port = reinterpret_cast<const sockaddr_in6*>(addr) - ->sin6_port; + service->port = + ntohs(reinterpret_cast<const sockaddr_in6*>(addr) + ->sin6_port); break; default: LOG_ALWAYS_FATAL("Unrecognized address family %d",