commit feae356660f87867c6244d5814f00957579a542f
author Steven Moreland <smoreland@google.com> Tue Oct 26 22:54:48 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 26 22:54:48 2021 +0000
tree 604bb6d3f1253a90aae993f487fe60cb4c98c7e5
parent 00db366a20f2cb2b26cf70ec913fb17bc264084f
parent b9d1e8ba610a6a209a306bd0f45ffec30d974b46

Merge "binderRpcTest: respect network byte order" am: 7701563c14 am: 366841d119 am: b9d1e8ba61

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1870034

Change-Id: I4d89af1a0a0bbd87c3e6f5aa236cc384c69f17e5

libs/binder/tests/binderRpcTest.cpp

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",