Windows: Fix port assignment to use network byte order

Service port numbers are stored within sockaddr* structures
and returned by afsconf_FindService() in network byte order.
getAFSServer() and afsconf_GetAfsdbInfo() accept and return
service port numbers in network byte order.

When processing the special case for 7002 and 7003 in
afsconf_GetAfsdbInfo(), the comparisons must consistently
use network byte order.

When assigning port numbers for AFSDB lookups, getAFSServer()
must use network byte order.

Document the use of network byte order for each variable.

LICENSE MIT

Change-Id: I2163826e8a234a1d19474b2eba3d36335ba12afb
Reviewed-on: http://gerrit.openafs.org/830
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/WINNT/afsd/cm_config.c b/src/WINNT/afsd/cm_config.c
index b4f8ce5c8e6b2d1f41cb0afe71a7a2c8b4a79fee..3cc5b13ab16e54b2f2b9b6b2323702de021856d2 100644 (file)
--- a/src/WINNT/afsd/cm_config.c
+++ b/src/WINNT/afsd/cm_config.c
@@ -698,7 +698,7 @@ long cm_SearchCellByDNS(char *cellNamep, char *newCellNamep, int *ttl,
     int  cellHostAddrs[AFSMAXCELLHOSTS];
     char cellHostNames[AFSMAXCELLHOSTS][MAXHOSTCHARS];
     unsigned short ipRanks[AFSMAXCELLHOSTS];
-    unsigned short ports[AFSMAXCELLHOSTS];
+    unsigned short ports[AFSMAXCELLHOSTS];      /* network byte order */
     int numServers;
     int i;
     struct sockaddr_in vlSockAddr;
@@ -717,13 +717,13 @@ long cm_SearchCellByDNS(char *cellNamep, char *newCellNamep, int *ttl,
          strncasecmp(cellNamep, CM_IOCTL_FILENAME_NOSLASH, strlen(CM_IOCTL_FILENAME_NOSLASH)) == 0)
        return -1;
 
-    rc = getAFSServer("afs3-vlserver", "udp", cellNamep, 7003,
+    rc = getAFSServer("afs3-vlserver", "udp", cellNamep, htons(7003),
                       cellHostAddrs, cellHostNames, ports, ipRanks, &numServers, ttl);
     if (rc == 0 && numServers > 0) {     /* found the cell */
         for (i = 0; i < numServers; i++) {
             memcpy(&vlSockAddr.sin_addr.s_addr, &cellHostAddrs[i],
                    sizeof(long));
-            vlSockAddr.sin_port = htons(ports[i]);
+            vlSockAddr.sin_port = ports[i];
             vlSockAddr.sin_family = AF_INET;
             if (procp)
                 (*procp)(rockp, &vlSockAddr, cellHostNames[i], ipRanks[i]);

diff --git a/src/WINNT/afsd/cm_dns.c b/src/WINNT/afsd/cm_dns.c
index a42cad5d92299f1db7d374c6ae5d55d39bbefb6d..d8bce281f34d68bf76264ccae4e029954b574286 100644 (file)
--- a/src/WINNT/afsd/cm_dns.c
+++ b/src/WINNT/afsd/cm_dns.c
@@ -624,9 +624,10 @@ int DNSgetAddr(SOCKET commSock, char *hostName, struct in_addr *iNet)
 #endif /* DNSAPI_ENV */
 
 int getAFSServer(const char *service, const char *protocol, const char *cellName,
-                 unsigned short afsdbPort,
+                 unsigned short afsdbPort,  /* network byte order */
                  int *cellHostAddrs, char cellHostNames[][MAXHOSTCHARS],
-                 unsigned short ports[], unsigned short ipRanks[],
+                 unsigned short ports[],    /* network byte order */
+                 unsigned short ipRanks[],
                  int *numServers, int *ttl)
 {
 #ifndef DNSAPI_ENV
@@ -722,7 +723,7 @@ int getAFSServer(const char *service, const char *protocol, const char *cellName
                 StringCbCopyA(cellHostNames[*numServers], sizeof(cellHostNames[*numServers]),
                               pDnsIter->Data.SRV.pNameTarget);
                 ipRanks[*numServers] = pDnsIter->Data.SRV.wPriority;
-                ports[*numServers] = pDnsIter->Data.SRV.wPort;
+                ports[*numServers] = htons(pDnsIter->Data.SRV.wPort);
                 (*numServers)++;
 
                 if (!*ttl) 
@@ -790,7 +791,7 @@ int getAFSServer(const char *service, const char *protocol, const char *cellName
                     StringCbCopyA(cellHostNames[*numServers], sizeof(cellHostNames[*numServers]),
                                    pDnsIter->Data.Afsdb.pNameExchange);
                     ipRanks[*numServers] = 0;
-                    ports[*numServers] = htons(afsdbPort);
+                    ports[*numServers] = afsdbPort;
                     (*numServers)++;
 
                     if (!*ttl) 
@@ -853,10 +854,10 @@ int getAFSServer(const char *service, const char *protocol, const char *cellName
 }
 
 int getAFSServerW(const cm_unichar_t *service, const cm_unichar_t *protocol, const cm_unichar_t *cellName,
-                  unsigned short afsdbPort,
+                  unsigned short afsdbPort, /* network byte order */
                   int *cellHostAddrs,
                   cm_unichar_t cellHostNames[][MAXHOSTCHARS], 
-                  unsigned short ports[],
+                  unsigned short ports[],   /* network byte order */
                   unsigned short ipRanks[],
                   int *numServers, int *ttl)
 {
@@ -891,7 +892,7 @@ int getAFSServerW(const cm_unichar_t *service, const cm_unichar_t *protocol, con
                 StringCbCopyW(cellHostNames[*numServers], sizeof(cellHostNames[*numServers]),
                               pDnsIter->Data.SRV.pNameTarget);
                 ipRanks[*numServers] = pDnsIter->Data.SRV.wPriority;
-                ports[*numServers] = pDnsIter->Data.SRV.wPort;
+                ports[*numServers] = htons(pDnsIter->Data.SRV.wPort);
                 (*numServers)++;
                 
                 if (!*ttl) 
@@ -961,7 +962,7 @@ int getAFSServerW(const cm_unichar_t *service, const cm_unichar_t *protocol, con
                     StringCbCopyW(cellHostNames[*numServers], sizeof(cellHostNames[*numServers]),
                                   pDnsIter->Data.Afsdb.pNameExchange);
                     ipRanks[*numServers] = 0;
-                    ports[*numServers] = htons(afsdbPort);
+                    ports[*numServers] = afsdbPort;
                     (*numServers)++;
                 
                     if (!*ttl) 

diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index bfd78e940ab1d00d92e3bc222e1ad462e10c566c..cdb610780f36cb13c5f4fd868efbb4ca59189fbd 100644 (file)
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -1239,13 +1239,13 @@ afsconf_GetAfsdbInfo(char *acellName, char *aservice,
                     struct afsconf_cell *acellInfo)
 {
     afs_int32 i;
-    int tservice = afsconf_FindService(aservice);
+    int tservice = afsconf_FindService(aservice);   /* network byte order */
     const char *ianaName = afsconf_FindIANAName(aservice);
     struct afsconf_entry DNSce;
     afs_int32 cellHostAddrs[AFSMAXCELLHOSTS];
     char cellHostNames[AFSMAXCELLHOSTS][MAXHOSTCHARS];
     unsigned short ipRanks[AFSMAXCELLHOSTS];
-    unsigned short ports[AFSMAXCELLHOSTS];
+    unsigned short ports[AFSMAXCELLHOSTS];          /* network byte order */
     int numServers;
     int rc;
     int ttl;
@@ -1273,7 +1273,7 @@ afsconf_GetAfsdbInfo(char *acellName, char *aservice,
      * and that service happens to be the prservice or kaservice
      * then fallback to searching for afs3-vlserver and assigning
      * the port number here. */
-    if (rc < 0 && tservice == 7002 || tservice == 7004) {
+    if (rc < 0 && tservice == htons(7002) || tservice == htons(7004)) {
         rc = getAFSServer("afs3-vlserver", "udp", acellName, tservice,
                            cellHostAddrs, cellHostNames, ports, ipRanks, &numServers,
                            &ttl);