commit cc9bbc046aabbfde2ab2d74e7f65e607b65a6f99
author chenbruce <chenbruce@google.com> Tue Jun 15 17:38:14 2021 +0800
committer chenbruce <chenbruce@google.com> Wed Jun 16 10:43:45 2021 +0800
tree da3f0c5cebb6c3a8399097b7fff3968d6423743e
parent d1b3b803994921d81d77201814510ba19562a7b1

Rename nssocks to udpsocks

In original design, nssocks is for UDP sockets to nameservers.

Bug: 140857615
Test: cd packages/modules/DnsResolver && atest
Change-Id: Id58d6b0c77f565f8f51f78ee8d416f3cdb05da68

res_send.cpp

diff --git a/res_send.cpp b/res_send.cpp
index c0432fe..4498e65 100644
--- a/res_send.cpp
+++ b/res_send.cpp
@@ -932,7 +932,7 @@
 static std::vector<pollfd> extractUdpFdset(res_state statp, const short events = POLLIN) {
     std::vector<pollfd> fdset(statp->nsaddrs.size());
     for (size_t i = 0; i < statp->nsaddrs.size(); ++i) {
-        fdset[i] = {.fd = statp->nssocks[i], .events = events};
+        fdset[i] = {.fd = statp->udpsocks[i], .events = events};
     }
     return fdset;
 }
@@ -969,10 +969,10 @@
             android::net::Experiments::getInstance()->getFlag("keep_listening_udp", 0);
     if (keepListeningUdp) return udpRetryingPoll(statp, finish);
 
-    if (int n = retrying_poll(statp->nssocks[ns], POLLIN, finish); n <= 0) {
+    if (int n = retrying_poll(statp->udpsocks[ns], POLLIN, finish); n <= 0) {
         return ErrnoError();
     }
-    return std::vector<int>{statp->nssocks[ns]};
+    return std::vector<int>{statp->udpsocks[ns]};
 }
 
 bool ignoreInvalidAnswer(res_state statp, const sockaddr_storage& from, const uint8_t* buf,
@@ -1013,9 +1013,9 @@
     const sockaddr* nsap = reinterpret_cast<const sockaddr*>(&ss);
     const int nsaplen = sockaddrSize(nsap);
 
-    if (statp->nssocks[*ns] == -1) {
-        statp->nssocks[*ns].reset(socket(nsap->sa_family, SOCK_DGRAM | SOCK_CLOEXEC, 0));
-        if (statp->nssocks[*ns] < 0) {
+    if (statp->udpsocks[*ns] == -1) {
+        statp->udpsocks[*ns].reset(socket(nsap->sa_family, SOCK_DGRAM | SOCK_CLOEXEC, 0));
+        if (statp->udpsocks[*ns] < 0) {
             *terrno = errno;
             PLOG(DEBUG) << __func__ << ": socket(dg): ";
             switch (errno) {
@@ -1029,9 +1029,9 @@
         }
 
         const uid_t uid = statp->enforce_dns_uid ? AID_DNS : statp->uid;
-        resolv_tag_socket(statp->nssocks[*ns], uid, statp->pid);
+        resolv_tag_socket(statp->udpsocks[*ns], uid, statp->pid);
         if (statp->_mark != MARK_UNSET) {
-            if (setsockopt(statp->nssocks[*ns], SOL_SOCKET, SO_MARK, &(statp->_mark),
+            if (setsockopt(statp->udpsocks[*ns], SOL_SOCKET, SO_MARK, &(statp->_mark),
                            sizeof(statp->_mark)) < 0) {
                 *terrno = errno;
                 statp->closeSockets();
@@ -1042,13 +1042,13 @@
         // on the next socket operation when the server responds with an
         // ICMP port-unreachable error. This way we can detect the absence of
         // a nameserver without timing out.
-        if (random_bind(statp->nssocks[*ns], nsap->sa_family) < 0) {
+        if (random_bind(statp->udpsocks[*ns], nsap->sa_family) < 0) {
             *terrno = errno;
             dump_error("bind(dg)", nsap, nsaplen);
             statp->closeSockets();
             return (0);
         }
-        if (connect(statp->nssocks[*ns], nsap, (socklen_t)nsaplen) < 0) {
+        if (connect(statp->udpsocks[*ns], nsap, (socklen_t)nsaplen) < 0) {
             *terrno = errno;
             dump_error("connect(dg)", nsap, nsaplen);
             statp->closeSockets();
@@ -1056,7 +1056,7 @@
         }
         LOG(DEBUG) << __func__ << ": new DG socket";
     }
-    if (send(statp->nssocks[*ns], (const char*)buf, (size_t)buflen, 0) != buflen) {
+    if (send(statp->udpsocks[*ns], (const char*)buf, (size_t)buflen, 0) != buflen) {
         *terrno = errno;
         PLOG(DEBUG) << __func__ << ": send: ";
         statp->closeSockets();