network_cmds-245.16.tar.gz

[apple/network_cmds.git] / nfsd.tproj / nfsd.c

diff --git a/nfsd.tproj/nfsd.c b/nfsd.tproj/nfsd.c
index 1c5acec4a6f6fe29b2464210ee3afe532ed01ffd..3a97b6446baa3ab0c654b06c085ccf90ad62a216 100644 (file)
--- a/nfsd.tproj/nfsd.c
+++ b/nfsd.tproj/nfsd.c
@@ -173,7 +173,7 @@ main(argc, argv, envp)
                envp++;
        LastArg = envp[-1] + strlen(envp[-1]);
 
-#define        MAXNFSDCNT      20
+#define        MAXNFSDCNT      64
 #define        DEFNFSDCNT       4
        nfsdcnt = DEFNFSDCNT;
        cltpflag = reregister = tcpflag = tp4cnt = tp4flag = tpipcnt = 0;
@@ -190,7 +190,7 @@ main(argc, argv, envp)
                case 'n':
                        nfsdcnt = atoi(optarg);
                        if (nfsdcnt < 1 || nfsdcnt > MAXNFSDCNT) {
-                               warnx("nfsd count %d; reset to %d", DEFNFSDCNT);
+                               warnx("nfsd count %d; reset to %d", nfsdcnt, DEFNFSDCNT);
                                nfsdcnt = DEFNFSDCNT;
                        }
                        break;
@@ -232,7 +232,7 @@ main(argc, argv, envp)
        if (argc == 1) {
                nfsdcnt = atoi(argv[0]);
                if (nfsdcnt < 1 || nfsdcnt > MAXNFSDCNT) {
-                       warnx("nfsd count %d; reset to %d", DEFNFSDCNT);
+                       warnx("nfsd count %d; reset to %d", nfsdcnt, DEFNFSDCNT);
                        nfsdcnt = DEFNFSDCNT;
                }
        }
@@ -374,8 +374,14 @@ main(argc, argv, envp)
                inetaddr.sin_len = sizeof(inetaddr);
                if (bind(sock,
                    (struct sockaddr *)&inetaddr, sizeof(inetaddr)) < 0) {
-                       syslog(LOG_ERR, "can't bind udp addr");
-                       exit(1);
+                       /* socket may still be lingering from previous incarnation */
+                       /* wait a few seconds and try again */
+                       sleep(6);
+                       if (bind(sock,
+                           (struct sockaddr *)&inetaddr, sizeof(inetaddr)) < 0) {
+                               syslog(LOG_ERR, "can't bind udp addr");
+                               exit(1);
+                       }
                }
                if (!pmap_set(RPCPROG_NFS, 2, IPPROTO_UDP, NFS_PORT) ||
                    !pmap_set(RPCPROG_NFS, 3, IPPROTO_UDP, NFS_PORT)) {