X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Frmtcall.c;h=816a6f368fa208d12313de3f1721d297401cf42a;hp=f01faba06e1a7be80a5c0c3c344cccc1fd58e776;hb=fc023f58a146bca6e67b26878ff35f2368b19f58;hpb=9ee7da8230adead93a1b42b1ac2c78e02227fe15 diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c index f01faba..816a6f3 100644 --- a/utils/statd/rmtcall.c +++ b/utils/statd/rmtcall.c @@ -20,12 +20,15 @@ * it won't if it's worth its money). */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include +#endif #include #include #include #include +#include #include #include #include @@ -34,10 +37,18 @@ #include #include #include +#ifdef HAVE_IFADDRS_H +#include +#endif /* HAVE_IFADDRS_H */ #include "sm_inter.h" #include "statd.h" #include "notlist.h" #include "log.h" +#include "ha-callout.h" + +#if SIZEOF_SOCKLEN_T - 0 == 0 +#define socklen_t int +#endif #define MAXMSGSIZE (2048 / sizeof(unsigned int)) @@ -48,7 +59,7 @@ static int sockfd = -1; /* notify socket */ * Initialize callback socket */ int -statd_get_socket(int port) +statd_get_socket(void) { struct sockaddr_in sin; @@ -56,7 +67,7 @@ statd_get_socket(int port) return sockfd; if ((sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { - log(L_CRIT, "Can't create socket: %m"); + note(N_CRIT, "Can't create socket: %m"); return -1; } @@ -64,77 +75,15 @@ statd_get_socket(int port) memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_port = port; + sin.sin_addr.s_addr = INADDR_ANY; + if (bindresvport(sockfd, &sin) < 0) { - dprintf(L_WARNING, + dprintf(N_WARNING, "process_hosts: can't bind to reserved port\n"); } - return sockfd; } -/* - * Try to resolve host name for notify/callback request - * - * When compiled with RESTRICTED_STATD defined, we expect all - * host names to be dotted quads. See monitor.c for details. --okir - */ -#ifdef RESTRICTED_STATD -static int -try_to_resolve(notify_list *lp) -{ - char *hname; - - if (NL_TYPE(lp) == NOTIFY_REBOOT) - hname = NL_MON_NAME(lp); - else - hname = NL_MY_NAME(lp); - if (!inet_aton(hname, &(NL_ADDR(lp)))) { - log(L_ERROR, "%s is not an dotted-quad address", hname); - NL_TIMES(lp) = 0; - return 0; - } - - /* XXX: In order to handle multi-homed hosts, we could do - * a reverse lookup, a forward lookup, and cycle through - * all the addresses. - */ - return 1; -} -#else -static int -try_to_resolve(notify_list *lp) -{ - struct hostent *hp; - char *hname; - - if (NL_TYPE(lp) == NOTIFY_REBOOT) - hname = NL_MON_NAME(lp); - else - hname = NL_MY_NAME(lp); - - dprintf(L_DEBUG, "Trying to resolve %s.", hname); - if (!(hp = gethostbyname(hname))) { - herror("gethostbyname"); - NL_TIMES(lp) -= 1; - return 0; - } - - if (hp->h_addrtype != AF_INET) { - log(L_ERROR, "%s is not an AF_INET address", hname); - NL_TIMES(lp) = 0; - return 0; - } - - /* FIXME: should try all addresses for multi-homed hosts in - * alternation because one interface might be down/unreachable. */ - NL_ADDR(lp) = *(struct in_addr *) hp->h_addr; - - dprintf(L_DEBUG, "address of %s is %s", hname, inet_ntoa(NL_ADDR(lp))); - return 1; -} -#endif - static unsigned long xmit_call(int sockfd, struct sockaddr_in *sin, u_int32_t prog, u_int32_t vers, u_int32_t proc, @@ -181,7 +130,7 @@ xmit_call(int sockfd, struct sockaddr_in *sin, /* Encode the RPC header part and payload */ if (!xdr_callmsg(xdrs, &mesg) || !func(xdrs, obj)) { - dprintf(L_WARNING, "xmit_mesg: can't encode RPC message!\n"); + dprintf(N_WARNING, "xmit_mesg: can't encode RPC message!\n"); xdr_destroy(xdrs); return 0; } @@ -191,9 +140,9 @@ xmit_call(int sockfd, struct sockaddr_in *sin, if ((err = sendto(sockfd, msgbuf, msglen, 0, (struct sockaddr *) sin, sizeof(*sin))) < 0) { - dprintf(L_WARNING, "xmit_mesg: sendto failed: %m"); + dprintf(N_WARNING, "xmit_mesg: sendto failed: %m"); } else if (err != msglen) { - dprintf(L_WARNING, "xmit_mesg: short write: %m\n"); + dprintf(N_WARNING, "xmit_mesg: short write: %m\n"); } xdr_destroy(xdrs); @@ -208,12 +157,12 @@ recv_rply(int sockfd, struct sockaddr_in *sin, u_long *portp) struct rpc_msg mesg; notify_list *lp = NULL; XDR xdr, *xdrs = &xdr; - int alen = sizeof(*sin); + socklen_t alen = sizeof(*sin); /* Receive message */ if ((msglen = recvfrom(sockfd, msgbuf, sizeof(msgbuf), 0, (struct sockaddr *) sin, &alen)) < 0) { - dprintf(L_WARNING, "recv_rply: recvfrom failed: %m"); + dprintf(N_WARNING, "recv_rply: recvfrom failed: %m"); return NULL; } @@ -225,18 +174,18 @@ recv_rply(int sockfd, struct sockaddr_in *sin, u_long *portp) mesg.rm_reply.rp_acpt.ar_results.proc = (xdrproc_t) xdr_void; if (!xdr_replymsg(xdrs, &mesg)) { - log(L_WARNING, "recv_rply: can't decode RPC message!\n"); + note(N_WARNING, "recv_rply: can't decode RPC message!\n"); goto done; } if (mesg.rm_reply.rp_stat != 0) { - log(L_WARNING, "recv_rply: [%s] RPC status %d\n", + note(N_WARNING, "recv_rply: [%s] RPC status %d\n", inet_ntoa(sin->sin_addr), mesg.rm_reply.rp_stat); goto done; } if (mesg.rm_reply.rp_acpt.ar_stat != 0) { - log(L_WARNING, "recv_rply: [%s] RPC status %d\n", + note(N_WARNING, "recv_rply: [%s] RPC status %d\n", inet_ntoa(sin->sin_addr), mesg.rm_reply.rp_acpt.ar_stat); goto done; @@ -253,13 +202,13 @@ recv_rply(int sockfd, struct sockaddr_in *sin, u_long *portp) strncpy (addr, inet_ntoa(lp->addr), sizeof (addr) - 1); addr [sizeof (addr) - 1] = '\0'; - dprintf(L_WARNING, "address mismatch: " + dprintf(N_WARNING, "address mismatch: " "expected %s, got %s\n", addr, inet_ntoa(sin->sin_addr)); } if (lp->port == 0) { if (!xdr_u_long(xdrs, portp)) { - log(L_WARNING, "recv_rply: [%s] " + note(N_WARNING, "recv_rply: [%s] " "can't decode reply body!\n", inet_ntoa(sin->sin_addr)); lp = NULL; @@ -287,10 +236,8 @@ process_entry(int sockfd, notify_list *lp) u_int32_t proc, vers, prog; /* __u32 proc, vers, prog; */ - if (lp->addr.s_addr == INADDR_ANY && !try_to_resolve(lp)) - return NL_TIMES(lp); if (NL_TIMES(lp) == 0) { - log(L_DEBUG, "Cannot notify %s, giving up.\n", + note(N_DEBUG, "Cannot notify %s, giving up.\n", inet_ntoa(NL_ADDR(lp))); return 0; } @@ -300,43 +247,24 @@ process_entry(int sockfd, notify_list *lp) sin.sin_port = lp->port; /* LH - moved address into switch */ - switch (NL_TYPE(lp)) { - case NOTIFY_REBOOT: - prog = SM_PROG; - vers = SM_VERS; - proc = SM_NOTIFY; + prog = NL_MY_PROG(lp); + vers = NL_MY_VERS(lp); + proc = NL_MY_PROC(lp); - /* Use source address for notify replies */ - sin.sin_addr = lp->addr; + /* __FORCE__ loopback for callbacks to lockd ... */ + /* Just in case we somehow ignored it thus far */ + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - func = (xdrproc_t) xdr_stat_chge; - objp = &SM_stat_chge; - break; - case NOTIFY_CALLBACK: - prog = NL_MY_PROG(lp); - vers = NL_MY_VERS(lp); - proc = NL_MY_PROC(lp); - - /* __FORCE__ loopback for callbacks to lockd ... */ - /* Just in case we somehow ignored it thus far */ - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - - func = (xdrproc_t) xdr_status; - objp = &new_status; - new_status.mon_name = NL_MON_NAME(lp); - new_status.state = NL_STATE(lp); - memcpy(new_status.priv, NL_PRIV(lp), SM_PRIV_SIZE); - break; - default: - log(L_ERROR, "notify_host: unknown notify type %d", - NL_TYPE(lp)); - return 0; - } + func = (xdrproc_t) xdr_status; + objp = &new_status; + new_status.mon_name = NL_MON_NAME(lp); + new_status.state = NL_STATE(lp); + memcpy(new_status.priv, NL_PRIV(lp), SM_PRIV_SIZE); lp->xid = xmit_call(sockfd, &sin, prog, vers, proc, func, objp); if (!lp->xid) { - log(L_WARNING, "notify_host: failed to notify %s\n", - inet_ntoa(lp->addr)); + note(N_WARNING, "notify_host: failed to notify port %d\n", + ntohs(lp->port)); } NL_TIMES(lp) -= 1; @@ -368,15 +296,10 @@ process_reply(FD_SET_TYPE *rfds) nlist_insert_timer(¬ify, lp); return 1; } - log(L_WARNING, "recv_rply: [%s] service %d not registered", - inet_ntoa(lp->addr), - NL_TYPE(lp) == NOTIFY_REBOOT? SM_PROG : NL_MY_PROG(lp)); - } else if (NL_TYPE(lp) == NOTIFY_REBOOT) { - dprintf(L_DEBUG, "Notification of %s succeeded.", - NL_MON_NAME(lp)); - xunlink(SM_BAK_DIR, NL_MON_NAME(lp), 0); + note(N_WARNING, "recv_rply: [%s] service %d not registered", + inet_ntoa(lp->addr), NL_MY_PROG(lp)); } else { - dprintf(L_DEBUG, "Callback to %s (for %d) succeeded.", + dprintf(N_DEBUG, "Callback to %s (for %d) succeeded.", NL_MY_NAME(lp), NL_MON_NAME(lp)); } nlist_free(¬ify, lp); @@ -395,7 +318,7 @@ process_notify_list(void) time_t now; int fd; - if ((fd = statd_get_socket(0)) < 0) + if ((fd = statd_get_socket()) < 0) return 0; while ((entry = notify) != NULL && NL_WHEN(entry) < time(&now)) { @@ -403,19 +326,13 @@ process_notify_list(void) NL_WHEN(entry) = time(NULL) + NOTIFY_TIMEOUT; nlist_remove(¬ify, entry); nlist_insert_timer(¬ify, entry); - } else if (NL_TYPE(entry) == NOTIFY_CALLBACK) { - log(L_ERROR, + } else { + note(N_ERROR, "Can't callback %s (%d,%d), giving up.", NL_MY_NAME(entry), NL_MY_PROG(entry), NL_MY_VERS(entry)); nlist_free(¬ify, entry); - } else { - log(L_ERROR, - "Can't notify %s, giving up.", - NL_MON_NAME(entry)); - xunlink(SM_BAK_DIR, NL_MON_NAME(entry), 0); - nlist_free(¬ify, entry); } }