Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f443900d authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "binderRpcTest: respect network byte order" am: 7701563c am:... 

Merge "binderRpcTest: respect network byte order" am: 7701563c am: 366841d1 am: b9d1e8ba am: feae3566 am: 6ad4b43e

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

Change-Id: I11828b4b56ac5a57958819a8f2f3b20bfa4b4cff
parents b47287e4 6ad4b43e

libs/binder/tests/binderRpcTest.cpp

+6 −4
Original line number Diff line number Diff line
@@ -663,13 +663,15 @@ public: 
                                        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",