commit 7701563c1444eaa138836743dc187f561126588c
author Steven Moreland <smoreland@google.com> Tue Oct 26 21:54:12 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 26 21:54:12 2021 +0000
tree 617e01c045ae70e98cd9b1bb5a06fc86630e7b42
parent e8c59a5233125e6354332f29235c9337370263dd
parent 6a0dc96728e07362d3c19fed554669a43987790c

Merge "binderRpcTest: respect network byte order"

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