nfs-utils: Remove excess log reporting

[nfs-utils.git] / support / nfs / rpcmisc.c

diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index 22ea62c1a88f5d8458968c4fe82cf88dc802025a..eb5629aec07af9297f95385d2f26d1e8a38fe2d5 100644 (file)
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c
@@ -39,7 +39,7 @@
 #endif
 
 static void    closedown(int sig);
-int    makesock(int port, int proto);
+static int     makesock(int port, int proto);
 
 #define _RPCSVC_CLOSEDOWN      120
 int    _rpcpmstart = 0;
@@ -47,7 +47,9 @@ int   _rpcfdtype = 0;
 int    _rpcsvcdirty = 0;
 
 void
-rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport)
+rpc_init(char *name, int prog, int vers,
+        void (*dispatch)(struct svc_req *, register SVCXPRT *),
+        int defport)
 {
        struct sockaddr_in saddr;
        SVCXPRT *transp;
@@ -87,10 +89,8 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport)
                        }
                        if (defport == 0)
                                sock = RPC_ANYSOCK;
-                       else if ((sock = makesock(defport, IPPROTO_UDP)) < 0) {
-                               xlog(L_FATAL, "%s: cannot make a UDP socket\n",
-                                               name);
-                       }
+                       else
+                               sock = makesock(defport, IPPROTO_UDP);
                }
                if (sock == RPC_ANYSOCK)
                        sock = svcudp_socket (prog, 1);
@@ -117,10 +117,8 @@ rpc_init(char *name, int prog, int vers, void (*dispatch)(), int defport)
                        }
                        if (defport == 0)
                                sock = RPC_ANYSOCK;
-                       else if ((sock = makesock(defport, IPPROTO_TCP)) < 0) {
-                               xlog(L_FATAL, "%s: cannot make a TCP socket\n",
-                                               name);
-                       }
+                       else
+                               sock = makesock(defport, IPPROTO_TCP);
                }
                if (sock == RPC_ANYSOCK)
                        sock = svctcp_socket (prog, 1);
@@ -164,112 +162,42 @@ int sig;
        (void) alarm(_RPCSVC_CLOSEDOWN);
 }
 
-int makesock(int port, int proto)
+/*
+ * Create listener socket for a given port
+ *
+ * Return an open network socket on success; otherwise return -1
+ * if some error occurs.
+ */
+static int
+makesock(int port, int proto)
 {
        struct sockaddr_in sin;
-       int     s;
-       int     sock_type;
-       int     val;
+       int     sock, sock_type, val;
 
        sock_type = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
-       s = socket(AF_INET, sock_type, proto);
-       if (s < 0) {
-               xlog(L_FATAL, "Could not make a socket: %s\n",
+       sock = socket(AF_INET, sock_type, proto);
+       if (sock < 0) {
+               xlog(L_FATAL, "Could not make a socket: %s",
                                        strerror(errno));
-               return (-1);
+               return -1;
        }
        memset((char *) &sin, 0, sizeof(sin));
        sin.sin_family = AF_INET;
-       sin.sin_addr.s_addr = INADDR_ANY;
+       sin.sin_addr.s_addr = htonl(INADDR_ANY);
        sin.sin_port = htons(port);
 
        val = 1;
        if (proto == IPPROTO_TCP)
-               if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+               if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
                               &val, sizeof(val)) < 0)
-                       xlog(L_ERROR, "setsockopt failed: %s\n",
+                       xlog(L_ERROR, "setsockopt failed: %s",
                             strerror(errno));
 
-#if 0
-       /* I was told it didn't work with gigabit ethernet.
-          Don't bothet with it.  H.J. */
-#ifdef SO_SNDBUF
-       {
-               int sblen, rblen;
-
-               /* 1024 for rpc & transport overheads */
-               sblen = rblen = socksz + 1024;
-               if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &sblen, sizeof sblen) < 0 ||
-                   setsockopt(s, SOL_SOCKET, SO_RCVBUF, &rblen, sizeof rblen) < 0)
-                       xlog(L_ERROR, "setsockopt failed: %s\n", strerror(errno));
-       }
-#endif                         /* SO_SNDBUF */
-#endif
-
-       if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) == -1) {
-               xlog(L_FATAL, "Could not bind name to socket: %s\n",
+       if (bind(sock, (struct sockaddr *) &sin, sizeof(sin)) == -1) {
+               xlog(L_FATAL, "Could not bind name to socket: %s",
                                        strerror(errno));
-               return (-1);
+               return -1;
        }
-       return (s);
-}
 
-
-/* Log an incoming call. */
-void
-rpc_logcall(struct svc_req *rqstp, char *xname, char *arg)
-{
-       char            buff[1024];
-       int             buflen=sizeof(buff);
-       int             len;
-       char            *sp;
-       int             i;
-
-       if (!xlog_enabled(D_CALL))
-               return;
-
-       sp = buff;
-       switch (rqstp->rq_cred.oa_flavor) {
-       case AUTH_NULL:
-               sprintf(sp, "NULL");
-               break;
-       case AUTH_UNIX: {
-               struct authunix_parms *unix_cred;
-               time_t time;
-               struct tm *tm;
-
-               unix_cred = (struct authunix_parms *) rqstp->rq_clntcred;
-               time = unix_cred->aup_time;
-               tm = localtime(&time);
-               snprintf(sp, buflen, "UNIX %d/%d/%d %02d:%02d:%02d %s %d.%d",
-                       tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
-                       tm->tm_hour, tm->tm_min, tm->tm_sec,
-                       unix_cred->aup_machname,
-                       unix_cred->aup_uid,
-                       unix_cred->aup_gid);
-               sp[buflen-1] = 0;
-               len = strlen(sp);
-               sp += buflen;
-               buflen -= len;
-               if ((int) unix_cred->aup_len > 0) {
-                       snprintf(sp, buflen, "+%d", unix_cred->aup_gids[0]);
-                       sp[buflen-1] = 0;
-                       len = strlen(sp);
-                       sp += buflen;
-                       buflen -= len;
-                       for (i = 1; i < unix_cred->aup_len; i++) {
-                               snprintf(sp, buflen, ",%d", 
-                                       unix_cred->aup_gids[i]);
-                               sp[buflen-1] = 0;
-                               len = strlen(sp);
-                               sp += buflen;
-                               buflen -= len;
-                       }
-               }
-               }
-               break;
-       default:
-               sprintf(sp, "CRED %d", rqstp->rq_cred.oa_flavor);
-       }
-       xlog(D_CALL, "%s [%s]\n\t%s\n", xname, buff, arg);
+       return sock;
 }