Call rx_SetNoJumbo earlier

For ubik server processes, rx_SetNoJumbo needs to be called before
ubik initialization for it to effect the communication between
dbservers; otherwise, full database transfers may result in Rx
jumbograms on the wire regardless of the jumbo/nojumbo setting. Move
the call to rx_SetNoJumbo to before ubik initialization to avoid this.

Also move the call to rx_SetNoJumbo to immediately after rx_Init* for
all server processes, for consistency. Move similar calls to
rx_SetMaxMTU for the same reason.

Reviewed-on: http://gerrit.openafs.org/7350
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 0debf2d2274db1ea862bfdc2ef767372f1fa77e3)

Change-Id: Iacb1afa853281e856bbb70f39c6ac9a81f210d0d
Reviewed-on: http://gerrit.openafs.org/9121
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 533c50fa49176b89c1d5a35dc158a55cb3241815..de3e49155d6cb4fdfde54ecec4e4d412f8ffca98 100644 (file)
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -1111,6 +1111,13 @@ main(int argc, char **argv, char **envp)
        exit(code);
     }
 
+    /* Disable jumbograms */
+    rx_SetNoJumbo();
+
+    if (rxMaxMTU != -1) {
+       rx_SetMaxMTU(rxMaxMTU);
+    }
+
     code = LWP_CreateProcess(BozoDaemon, BOZO_LWP_STACKSIZE, /* priority */ 1,
                             /* param */ NULL , "bozo-the-clown",
                             &bozo_pid);
@@ -1173,13 +1180,6 @@ main(int argc, char **argv, char **envp)
        bozo_CreatePidFile("bosserver", NULL, getpid());
     }
 
-    /* Disable jumbograms */
-    rx_SetNoJumbo();
-
-    if (rxMaxMTU != -1) {
-       rx_SetMaxMTU(rxMaxMTU);
-    }
-
     tservice = rx_NewServiceHost(host, 0, /* service id */ 1,
                                 "bozo", securityClasses, numClasses,
                                 BOZO_ExecuteRequest);

diff --git a/src/budb/server.c b/src/budb/server.c
index 9fd3bc2cb3d10c2be35a5fb7a573fc992b9bcc9e..94a37ac4b6fe703395dd31dcf14e353e9f93b1cd 100644 (file)
--- a/src/budb/server.c
+++ b/src/budb/server.c
@@ -552,6 +552,9 @@ main(int argc, char **argv)
        }
     }
 
+    /* Disable jumbograms */
+    rx_SetNoJumbo();
+
     code = ubik_ServerInitByInfo (globalConfPtr->myHost,
                                  htons(AFSCONF_BUDBPORT),
                                  &cellinfo,
@@ -568,9 +571,6 @@ main(int argc, char **argv)
     afsconf_BuildServerSecurityObjects(BU_conf, 0,
                                       &securityClasses, &numClasses);
 
-    /* Disable jumbograms */
-    rx_SetNoJumbo();
-
     tservice =
        rx_NewServiceHost(host, 0, BUDB_SERVICE, "BackupDatabase",
                          securityClasses, numClasses, BUDB_ExecuteRequest);

diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c
index 074656527fcf4d2878cea81eac4195979e55a319..51d59201e207682db2e5484ed0285e0cacd1166f 100644 (file)
--- a/src/kauth/kaserver.c
+++ b/src/kauth/kaserver.c
@@ -391,6 +391,9 @@ main(int argc, char *argv[])
        }
     }
 
+    /* Disable jumbograms */
+    rx_SetNoJumbo();
+
     if (servers)
        code =
            ubik_ServerInit(myHost, htons(AFSCONF_KAUTHPORT), serverList,
@@ -407,9 +410,6 @@ main(int argc, char *argv[])
 
     sca[RX_SCINDEX_NULL] = rxnull_NewServerSecurityObject();
 
-    /* Disable jumbograms */
-    rx_SetNoJumbo();
-
     tservice =
        rx_NewServiceHost(host, 0, KA_AUTHENTICATION_SERVICE,
                          "AuthenticationService", sca, 1, KAA_ExecuteRequest);

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 53925ae06e7606c18b2140f990bb48497bd6c9b6..13786c02a4575c96f98a48dd3a25bb79c98e8f4d 100644 (file)
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -506,6 +506,13 @@ main(int argc, char **argv)
        }
     }
 
+    /* Disable jumbograms */
+    rx_SetNoJumbo();
+
+    if (rxMaxMTU != -1) {
+       rx_SetMaxMTU(rxMaxMTU);
+    }
+
     code =
        ubik_ServerInitByInfo(myHost, htons(AFSCONF_PROTPORT), &info, clones,
                              pr_dbaseName, &dbase);
@@ -520,13 +527,6 @@ main(int argc, char **argv)
     afsconf_BuildServerSecurityObjects(prdir, 0, &securityClasses,
                                       &numClasses);
 
-    /* Disable jumbograms */
-    rx_SetNoJumbo();
-
-    if (rxMaxMTU != -1) {
-       rx_SetMaxMTU(rxMaxMTU);
-    }
-
     tservice =
        rx_NewServiceHost(host, 0, PRSRV, "Protection Server", securityClasses,
                          numClasses, PR_ExecuteRequest);

diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index 1eeae562cde710c0139e15fda16b0ff93f3dee0f..5deab49806eed452f7aaa4e439037ead3da75636 100644 (file)
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -342,6 +342,13 @@ main(int argc, char **argv)
        }
     }
 
+    if (!rxJumbograms) {
+       rx_SetNoJumbo();
+    }
+    if (rxMaxMTU != -1) {
+       rx_SetMaxMTU(rxMaxMTU);
+    }
+
     ubik_nBuffers = 512;
     ubik_CRXSecurityProc = afsconf_ClientAuth;
     ubik_CRXSecurityRock = (char *)tdir;
@@ -356,12 +363,6 @@ main(int argc, char **argv)
        printf("vlserver: Ubik init failed: %s\n", afs_error_message(code));
        exit(2);
     }
-    if (!rxJumbograms) {
-       rx_SetNoJumbo();
-    }
-    if (rxMaxMTU != -1) {
-       rx_SetMaxMTU(rxMaxMTU);
-    }
     rx_SetRxDeadTime(50);
 
     memset(HostAddress, 0, sizeof(HostAddress));