* as is, with no warranty expressed or implied.
*/
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <sys/types.h>
#include <sys/ioctl.h>
#include <time.h>
#include "nfslib.h"
+#if SIZEOF_SOCKLEN_T - 0 == 0
+#define socklen_t int
+#endif
+
static void closedown(int sig);
int makesock(int port, int proto);
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;
int sock;
- int asize;
+ socklen_t asize;
asize = sizeof(saddr);
sock = 0;
if (getsockname(0, (struct sockaddr *) &saddr, &asize) == 0
&& saddr.sin_family == AF_INET) {
- int ssize = sizeof (int);
- _rpcfdtype = 0;
+ socklen_t ssize = sizeof (int);
+ int fdtype = 0;
if (getsockopt(0, SOL_SOCKET, SO_TYPE,
- (char *)&_rpcfdtype, &ssize) == -1)
+ (char *)&fdtype, &ssize) == -1)
xlog(L_FATAL, "getsockopt failed: %s", strerror(errno));
- _rpcpmstart = 1;
- } else {
+ /* inetd passes a UDP socket or a listening TCP socket.
+ * listen will fail on a connected TCP socket(passed by rsh).
+ */
+ if (!(fdtype == SOCK_STREAM && listen(0,5) == -1)) {
+ _rpcfdtype = fdtype;
+ _rpcpmstart = 1;
+ }
+ }
+ if (!_rpcpmstart) {
pmap_unset(prog, vers);
sock = RPC_ANYSOCK;
}
sin.sin_port = htons(port);
val = 1;
- if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) < 0)
- xlog(L_ERROR, "setsockopt failed: %s\n", strerror(errno));
+ if (proto == IPPROTO_TCP)
+ if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+ &val, sizeof(val)) < 0)
+ xlog(L_ERROR, "setsockopt failed: %s\n",
+ strerror(errno));
#if 0
/* I was told it didn't work with gigabit ethernet.
}
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;
- struct tm *tm;
-
- unix_cred = (struct authunix_parms *) rqstp->rq_clntcred;
- tm = localtime(&unix_cred->aup_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);
-}