Closer to KNF, ANSI, and POSIX.

This commit is contained in:
mycroft 1995-01-15 08:55:59 +00:00
parent 7a7adcb788
commit d14504fe02

View File

@ -31,7 +31,7 @@
*/
#ifndef LINT
static char rcsid[] = "$Id: ypbind.c,v 1.16 1995/01/06 13:16:15 pk Exp $";
static char rcsid[] = "$Id: ypbind.c,v 1.17 1995/01/15 08:55:59 mycroft Exp $";
#endif
#include <sys/param.h>
@ -107,7 +107,7 @@ CLIENT *clnt;
{
static char res;
bzero((char *)&res, sizeof(res));
memset(&res, 0, sizeof(res));
return (void *)&res;
}
@ -122,16 +122,16 @@ CLIENT *clnt;
char path[MAXPATHLEN];
time_t now;
bzero((char *)&res, sizeof res);
memset(&res, 0, sizeof res);
res.ypbind_status = YPBIND_FAIL_VAL;
for (ypdb = ypbindlist; ypdb; ypdb = ypdb->dom_pnext)
if( strcmp(ypdb->dom_domain, argp) == 0)
if (!strcmp(ypdb->dom_domain, argp))
break;
if (ypdb == NULL) {
ypdb = (struct _dom_binding *)malloc(sizeof *ypdb);
bzero((char *)ypdb, sizeof *ypdb);
memset(ypdb, 0, sizeof *ypdb);
strncpy(ypdb->dom_domain, argp, sizeof ypdb->dom_domain);
ypdb->dom_vers = YPVERS;
ypdb->dom_alive = 0;
@ -185,7 +185,7 @@ CLIENT *clnt;
struct sockaddr_in *fromsin, bindsin;
static bool_t res;
bzero((char *)&res, sizeof(res));
memset(&res, 0, sizeof(res));
fromsin = svc_getcaller(transp);
switch (ypsetmode) {
@ -206,9 +206,10 @@ CLIENT *clnt;
if (argp->ypsetdom_vers != YPVERS)
return &res;
bzero((char *)&bindsin, sizeof bindsin);
memset(&bindsin, 0, sizeof bindsin);
bindsin.sin_family = AF_INET;
bindsin.sin_addr.s_addr = argp->ypsetdom_addr.s_addr;
bindsin.sin_len = sizeof(bindsin);
bindsin.sin_addr = argp->ypsetdom_addr;
bindsin.sin_port = argp->ypsetdom_port;
rpc_received(argp->ypsetdom_domain, &bindsin, 1);
@ -266,7 +267,7 @@ register SVCXPRT *transp;
svcerr_noproc(transp);
return;
}
bzero((char *)&argument, sizeof(argument));
memset(&argument, 0, sizeof(argument));
if (!svc_getargs(transp, xdr_argument, (caddr_t)&argument)) {
svcerr_decode(transp);
return;
@ -279,7 +280,8 @@ register SVCXPRT *transp;
}
main(argc, argv)
char **argv;
int argc;
char *argv[];
{
char path[MAXPATHLEN];
struct timeval tv;
@ -294,23 +296,21 @@ char **argv;
}
for (i = 1; i < argc; i++) {
if( strcmp("-ypset", argv[i]) == 0)
if (!strcmp("-ypset", argv[i]))
ypsetmode = YPSET_ALL;
else if (strcmp("-ypsetme", argv[i]) == 0)
else if (!strcmp("-ypsetme", argv[i]))
ypsetmode = YPSET_LOCAL;
}
/* blow away everything in BINDINGDIR */
#ifdef O_SHLOCK
lockfd = open(YPBINDLOCK, O_CREAT|O_SHLOCK|O_RDWR|O_TRUNC, 0644);
if (lockfd == -1) {
if ((lockfd = open(YPBINDLOCK, O_CREAT|O_SHLOCK|O_RDWR|O_TRUNC, 0644)) == -1) {
fprintf(stderr, "ypbind: cannot create %s\n", YPBINDLOCK);
exit(1);
}
#else
lockfd = open(YPBINDLOCK, O_CREAT|O_RDWR|O_TRUNC, 0644);
if (lockfd == -1) {
if ((lockfd = open(YPBINDLOCK, O_CREAT|O_RDWR|O_TRUNC, 0644)) == -1) {
fprintf(stderr, "ypbind: cannot create %s\n", YPBINDLOCK);
exit(1);
}
@ -348,7 +348,6 @@ char **argv;
fprintf(stderr, "cannot create tcp service.");
exit(1);
}
if (!svc_register(tcptransp, YPBINDPROG, YPBINDVERS, ypbindprog_2,
IPPROTO_TCP)) {
fprintf(stderr, "unable to register (YPBINDPROG, YPBINDVERS, tcp).");
@ -379,7 +378,7 @@ char **argv;
/* build initial domain binding, make it "unsuccessful" */
ypbindlist = (struct _dom_binding *)malloc(sizeof *ypbindlist);
bzero((char *)ypbindlist, sizeof *ypbindlist);
memset(ypbindlist, 0, sizeof *ypbindlist);
strncpy(ypbindlist->dom_domain, domainname, sizeof ypbindlist->dom_domain);
ypbindlist->dom_vers = YPVERS;
ypbindlist->dom_alive = 0;
@ -391,13 +390,13 @@ char **argv;
checkwork();
while (1) {
width = svc_maxfd;
if (rpcsock > width)
width = rpcsock;
if (pingsock > width)
width = pingsock;
width++;
fdsr = svc_fdset;
FD_SET(rpcsock, &fdsr);
FD_SET(pingsock, &fdsr);
@ -458,43 +457,43 @@ ping(ypdb)
struct _dom_binding *ypdb;
{
char *dom = ypdb->dom_domain;
struct rpc_msg rpcmsg;
struct rpc_msg msg;
char buf[1400];
enum clnt_stat st;
int outlen;
AUTH *rpcua;
XDR rpcxdr;
XDR xdr;
bzero((char *)&rpcxdr, sizeof rpcxdr);
bzero((char *)&rpcmsg, sizeof rpcmsg);
memset(&xdr, 0, sizeof xdr);
memset(&msg, 0, sizeof msg);
rpcua = authunix_create_default();
if (rpcua == (AUTH *)NULL) {
/*printf("cannot get unix auth\n");*/
return RPC_SYSTEMERROR;
}
rpcmsg.rm_direction = CALL;
rpcmsg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
rpcmsg.rm_call.cb_prog = YPPROG;
rpcmsg.rm_call.cb_vers = YPVERS;
rpcmsg.rm_call.cb_proc = YPPROC_DOMAIN_NONACK;
rpcmsg.rm_call.cb_cred = rpcua->ah_cred;
rpcmsg.rm_call.cb_verf = rpcua->ah_verf;
msg.rm_direction = CALL;
msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
msg.rm_call.cb_prog = YPPROG;
msg.rm_call.cb_vers = YPVERS;
msg.rm_call.cb_proc = YPPROC_DOMAIN_NONACK;
msg.rm_call.cb_cred = rpcua->ah_cred;
msg.rm_call.cb_verf = rpcua->ah_verf;
rpcmsg.rm_xid = (long)dom;
xdrmem_create(&rpcxdr, buf, sizeof buf, XDR_ENCODE);
if( (!xdr_callmsg(&rpcxdr, &rpcmsg)) ) {
msg.rm_xid = (long)dom;
xdrmem_create(&xdr, buf, sizeof buf, XDR_ENCODE);
if (!xdr_callmsg(&xdr, &msg)) {
st = RPC_CANTENCODEARGS;
AUTH_DESTROY(rpcua);
return st;
}
if( (!xdr_domainname(&rpcxdr, dom)) ) {
if (!xdr_domainname(&xdr, dom)) {
st = RPC_CANTENCODEARGS;
AUTH_DESTROY(rpcua);
return st;
}
outlen = (int)xdr_getpos(&rpcxdr);
xdr_destroy(&rpcxdr);
outlen = (int)xdr_getpos(&xdr);
xdr_destroy(&xdr);
if (outlen < 1) {
st = RPC_CANTENCODEARGS;
AUTH_DESTROY(rpcua);
@ -515,51 +514,51 @@ broadcast(ypdb)
struct _dom_binding *ypdb;
{
char *dom = ypdb->dom_domain;
struct rpc_msg rpcmsg;
struct rpc_msg msg;
char buf[1400], inbuf[8192];
char path[MAXPATHLEN];
enum clnt_stat st;
int outlen, i, sock, len;
struct sockaddr_in bsin;
struct sockaddr_in bindsin;
struct ifconf ifc;
struct ifreq ifreq, *ifr;
struct in_addr in;
AUTH *rpcua;
XDR rpcxdr;
XDR xdr;
rmtca.xdr_args = xdr_domainname;
rmtca.args_ptr = dom;
bzero((char *)&rpcxdr, sizeof rpcxdr);
bzero((char *)&rpcmsg, sizeof rpcmsg);
memset(&xdr, 0, sizeof xdr);
memset(&msg, 0, sizeof msg);
rpcua = authunix_create_default();
if (rpcua == (AUTH *)NULL) {
/*printf("cannot get unix auth\n");*/
return RPC_SYSTEMERROR;
}
rpcmsg.rm_direction = CALL;
rpcmsg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
rpcmsg.rm_call.cb_prog = PMAPPROG;
rpcmsg.rm_call.cb_vers = PMAPVERS;
rpcmsg.rm_call.cb_proc = PMAPPROC_CALLIT;
rpcmsg.rm_call.cb_cred = rpcua->ah_cred;
rpcmsg.rm_call.cb_verf = rpcua->ah_verf;
msg.rm_direction = CALL;
msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
msg.rm_call.cb_prog = PMAPPROG;
msg.rm_call.cb_vers = PMAPVERS;
msg.rm_call.cb_proc = PMAPPROC_CALLIT;
msg.rm_call.cb_cred = rpcua->ah_cred;
msg.rm_call.cb_verf = rpcua->ah_verf;
rpcmsg.rm_xid = (long)dom;
xdrmem_create(&rpcxdr, buf, sizeof buf, XDR_ENCODE);
if( (!xdr_callmsg(&rpcxdr, &rpcmsg)) ) {
msg.rm_xid = (long)dom;
xdrmem_create(&xdr, buf, sizeof buf, XDR_ENCODE);
if (!xdr_callmsg(&xdr, &msg)) {
st = RPC_CANTENCODEARGS;
AUTH_DESTROY(rpcua);
return st;
}
if( (!xdr_rmtcall_args(&rpcxdr, &rmtca)) ) {
if (!xdr_rmtcall_args(&xdr, &rmtca)) {
st = RPC_CANTENCODEARGS;
AUTH_DESTROY(rpcua);
return st;
}
outlen = (int)xdr_getpos(&rpcxdr);
xdr_destroy(&rpcxdr);
outlen = (int)xdr_getpos(&xdr);
xdr_destroy(&xdr);
if (outlen < 1) {
st = RPC_CANTENCODEARGS;
AUTH_DESTROY(rpcua);
@ -575,9 +574,10 @@ broadcast(ypdb)
unlink(path);
}
bzero((char *)&bsin, sizeof bsin);
bsin.sin_family = AF_INET;
bsin.sin_port = htons(PMAPPORT);
memset(&bindsin, 0, sizeof bindsin);
bindsin.sin_family = AF_INET;
bindsin.sin_len = sizeof(bindsin);
bindsin.sin_port = htons(PMAPPORT);
if (ypdb->dom_alive == 2) {
/*
@ -585,9 +585,9 @@ broadcast(ypdb)
* ypserver on other subnet was once bound,
* but rebooted and is now using a different port
*/
bsin.sin_addr = ypdb->dom_server_addr.sin_addr;
if (sendto(rpcsock, buf, outlen, 0, (struct sockaddr *)&bsin,
sizeof bsin) < 0)
bindsin.sin_addr = ypdb->dom_server_addr.sin_addr;
if (sendto(rpcsock, buf, outlen, 0, (struct sockaddr *)&bindsin,
sizeof bindsin) < 0)
perror("sendto");
}
/* find all networks and send the RPC packet out them all */
@ -636,9 +636,9 @@ broadcast(ypdb)
continue;
in = ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr;
bsin.sin_addr = in;
if( sendto(rpcsock, buf, outlen, 0, (struct sockaddr *)&bsin,
sizeof bsin) < 0 )
bindsin.sin_addr = in;
if (sendto(rpcsock, buf, outlen, 0, (struct sockaddr *)&bindsin,
sizeof bindsin) < 0)
perror("sendto");
}
close(sock);
@ -655,8 +655,8 @@ handle_replies()
XDR xdr;
recv_again:
bzero((char *)&xdr, sizeof(xdr));
bzero((char *)&msg, sizeof(msg));
memset(&xdr, 0, sizeof(xdr));
memset(&msg, 0, sizeof(msg));
msg.acpted_rply.ar_verf = _null_auth;
msg.acpted_rply.ar_results.where = (caddr_t)&rmtcr;
msg.acpted_rply.ar_results.proc = xdr_rmtcallres;
@ -703,8 +703,8 @@ handle_ping()
bool_t res;
recv_again:
bzero((char *)&xdr, sizeof(xdr));
bzero((char *)&msg, sizeof(msg));
memset(&xdr, 0, sizeof(xdr));
memset(&msg, 0, sizeof(msg));
msg.acpted_rply.ar_verf = _null_auth;
msg.acpted_rply.ar_results.where = (caddr_t)&res;
msg.acpted_rply.ar_results.proc = xdr_bool;
@ -761,14 +761,14 @@ int force;
return;
for (ypdb = ypbindlist; ypdb; ypdb = ypdb->dom_pnext)
if( strcmp(ypdb->dom_domain, dom) == 0)
if (!strcmp(ypdb->dom_domain, dom))
break;
if (ypdb == NULL) {
if (force == 0)
return;
ypdb = (struct _dom_binding *)malloc(sizeof *ypdb);
bzero((char *)ypdb, sizeof *ypdb);
memset(ypdb, 0, sizeof *ypdb);
strncpy(ypdb->dom_domain, dom, sizeof ypdb->dom_domain);
ypdb->dom_lockfd = -1;
ypdb->dom_pnext = ypbindlist;
@ -777,16 +777,15 @@ int force;
/* soft update, alive */
if (ypdb->dom_alive == 1 && force == 0) {
if (bcmp((char *)raddrp, (char *)&ypdb->dom_server_addr,
sizeof ypdb->dom_server_addr) == 0) {
if (!memcmp(&ypdb->dom_server_addr, raddrp,
sizeof ypdb->dom_server_addr)) {
ypdb->dom_alive = 1;
ypdb->dom_check_t = time(NULL) + 60; /* recheck binding in 60 sec */
}
return;
}
bcopy((char *)raddrp, (char *)&ypdb->dom_server_addr,
sizeof ypdb->dom_server_addr);
memcpy(&ypdb->dom_server_addr, raddrp, sizeof ypdb->dom_server_addr);
ypdb->dom_check_t = time(NULL) + 60; /* recheck binding in 60 seconds */
ypdb->dom_vers = YPVERS;
ypdb->dom_alive = 1;
@ -822,7 +821,7 @@ int force;
iov[1].iov_base = (caddr_t)&ybr;
iov[1].iov_len = sizeof ybr;
bzero(&ybr, sizeof ybr);
memset(&ybr, 0, sizeof ybr);
ybr.ypbind_status = YPBIND_SUCC_VAL;
ybr.ypbind_respbody.ypbind_bindinfo.ypbind_binding_addr = raddrp->sin_addr;
ybr.ypbind_respbody.ypbind_bindinfo.ypbind_binding_port = raddrp->sin_port;