sin_family is not network order

sin_family isnt sent over the network and therefore doesnt need
htons().  sin_family is essential the same as domain, and no one
does socket(htons(AF_INET), ...)

Reviewed-on: http://gerrit.openafs.org/2891
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 60c4b248893f80431b2ea2a5d558c3536f86611a)
Change-Id: If507801c8df170a88044ff9c87b9a97c076ca222
Reviewed-on: http://gerrit.openafs.org/3045

diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c
index 45df72e71763d1c1ec836267d139a0aa4a74402a..952a95dc08964160b4936aa2302325c22af2ba32 100644 (file)
--- a/src/afsmonitor/afsmonitor.c
+++ b/src/afsmonitor/afsmonitor.c
@@ -3847,12 +3847,8 @@ afsmon_execute(void)
            }
            strncpy(curr_CM->hostName, he->h_name, HOST_NAME_LEN);      /* complete name */
            memcpy(&(curr_skt->sin_addr.s_addr), he->h_addr, 4);
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-           curr_skt->sin_family = AF_INET;             /*Internet family */
-#else
-           curr_skt->sin_family = htons(AF_INET);      /*Internet family */
-#endif
-           curr_skt->sin_port = htons(7001);   /*Cache Manager port */
+           curr_skt->sin_family = AF_INET;
+           curr_skt->sin_port = htons(7001);   /* Cache Manager port */
 #ifdef STRUCT_SOCKADDR_HAS_SA_LEN
            curr_skt->sin_len = sizeof(struct sockaddr_in);
 #endif

diff --git a/src/fsprobe/fsprobe_test.c b/src/fsprobe/fsprobe_test.c
index 4bd825aa11a29296b7f6c37501175dcac33d8a54..2481ed845b4de9c8b233d4e8534830ed74c67bdb 100644 (file)
--- a/src/fsprobe/fsprobe_test.c
+++ b/src/fsprobe/fsprobe_test.c
@@ -156,12 +156,8 @@ main(int argc, char **argv)
     /*
      * Fill in the socket array for bigbird, vice1, and vice2.
      */
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-    FSSktArray[0].sin_family = AF_INET;                /*Internet family */
-#else
-    FSSktArray[0].sin_family = htons(AF_INET); /*Internet family */
-#endif
-    FSSktArray[0].sin_port = htons(7000);      /*FileServer port */
+    FSSktArray[0].sin_family = AF_INET;
+    FSSktArray[0].sin_port = htons(7000);      /* FileServer port */
     he = hostutil_GetHostByName("servername1");
     if (he == NULL) {
        fprintf(stderr, "[%s] Can't get host info for servername1\n", rn);
@@ -169,12 +165,8 @@ main(int argc, char **argv)
     }
     memcpy(&(FSSktArray[0].sin_addr.s_addr), he->h_addr, 4);
 
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-    FSSktArray[1].sin_family = AF_INET;                /*Internet address family */
-#else
-    FSSktArray[1].sin_family = htons(AF_INET); /*Internet address family */
-#endif
-    FSSktArray[1].sin_port = htons(7000);      /*FileServer port */
+    FSSktArray[1].sin_family = AF_INET;
+    FSSktArray[1].sin_port = htons(7000);      /* FileServer port */
     he = hostutil_GetHostByName("servername2");
     if (he == NULL) {
        fprintf(stderr, "[%s] Can't get host info for servername2\n", rn);
@@ -182,12 +174,8 @@ main(int argc, char **argv)
     }
     memcpy(&(FSSktArray[1].sin_addr.s_addr), he->h_addr, 4);
 
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-    FSSktArray[2].sin_family = AF_INET;                /*Internet address family */
-#else
-    FSSktArray[2].sin_family = htons(AF_INET); /*Internet address family */
-#endif
-    FSSktArray[2].sin_port = htons(7000);      /*FileServer port */
+    FSSktArray[2].sin_family = AF_INET;
+    FSSktArray[2].sin_port = htons(7000);      /* FileServer port */
     he = hostutil_GetHostByName("servername3");
     if (he == NULL) {
        fprintf(stderr, "[%s] Can't get host info for servername3\n", rn);

diff --git a/src/scout/scout.c b/src/scout/scout.c
index 78e16d5a05c035764cca7538e5cc59a76e982631..9877ae1ce46138cce0e3140d9ff7589bcfeb9c81 100644 (file)
--- a/src/scout/scout.c
+++ b/src/scout/scout.c
@@ -1738,12 +1738,8 @@ execute_scout(int a_numservers, struct cmd_item *a_srvname, int a_pkg)
            return (-1);
        }
        memcpy(&(curr_skt->sin_addr.s_addr), he->h_addr, 4);
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-       curr_skt->sin_family = AF_INET;         /*Internet family */
-#else
-       curr_skt->sin_family = htons(AF_INET);  /*Internet family */
-#endif
-       curr_skt->sin_port = htons(7000);       /*FileServer port */
+       curr_skt->sin_family = AF_INET;
+       curr_skt->sin_port = htons(7000);       /* FileServer port */
 
        /*
         * Bump our pointers.

diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c
index 38b4a46543232f514f9814a2be1fee1e529d02d3..9404d9812a51436e42357d20054db764a7470ba3 100644 (file)
--- a/src/xstat/xstat_cm_test.c
+++ b/src/xstat/xstat_cm_test.c
@@ -1295,12 +1295,8 @@ RunTheTest(struct cmd_syndesc *a_s, void *arock)
      */
     curr_item = a_s->parms[P_CM_NAMES].items;
     for (currCM = 0; currCM < numCMs; currCM++) {
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-       CMSktArray[currCM].sin_family = AF_INET;        /*Internet family */
-#else
-       CMSktArray[currCM].sin_family = htons(AF_INET); /*Internet family */
-#endif
-       CMSktArray[currCM].sin_port = htons(7001);      /*Cache Manager port */
+       CMSktArray[currCM].sin_family = AF_INET;
+       CMSktArray[currCM].sin_port = htons(7001);      /* Cache Manager port */
        he = hostutil_GetHostByName(curr_item->data);
        if (he == NULL) {
            fprintf(stderr, "[%s] Can't get host info for '%s'\n", rn,

diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c
index 3765cee43360446c5e2c04e4575e47f1551ae7c7..4409e2ae172b63d0d1656af50e65a277defc55eb 100644 (file)
--- a/src/xstat/xstat_fs_test.c
+++ b/src/xstat/xstat_fs_test.c
@@ -707,12 +707,8 @@ RunTheTest(struct cmd_syndesc *a_s, void *dummy)
      */
     curr_item = a_s->parms[P_FS_NAMES].items;
     for (currFS = 0; currFS < numFSs; currFS++) {
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-       FSSktArray[currFS].sin_family = AF_INET;        /*Internet family */
-#else
-       FSSktArray[currFS].sin_family = htons(AF_INET); /*Internet family */
-#endif
-       FSSktArray[currFS].sin_port = htons(7000);      /*FileServer port */
+       FSSktArray[currFS].sin_family = AF_INET;
+       FSSktArray[currFS].sin_port = htons(7000);      /* FileServer port */
        he = hostutil_GetHostByName(curr_item->data);
        if (he == NULL) {
            fprintf(stderr, "[%s] Can't get host info for '%s'\n", rn,