2001-03-21 H.J. Lu <hjl@lucon.org>

[nfs-utils.git] / utils / statd / rmtcall.c

diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c
index 7745538a8f0b2a18ac511830d8142b0d5e2fb4b0..f01faba06e1a7be80a5c0c3c344cccc1fd58e776 100644 (file)
--- a/utils/statd/rmtcall.c
+++ b/utils/statd/rmtcall.c
@@ -4,6 +4,7 @@
  * Modified by H.J. Lu, 1998.
  * Modified by Lon Hohberger, Oct. 2000
  *   - Bugfix handling client responses.
+ *   - Paranoia on NOTIFY_CALLBACK case
  *
  * NSM for Linux.
  */
@@ -29,6 +30,7 @@
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_rmt.h>
+#include <time.h>
 #include <netdb.h>
 #include <string.h>
 #include <unistd.h>
@@ -45,8 +47,8 @@ static int            sockfd = -1;    /* notify socket */
 /*
  * Initialize callback socket
  */
-static int
-get_socket(void)
+int
+statd_get_socket(int port)
 {
        struct sockaddr_in      sin;
 
@@ -62,6 +64,7 @@ get_socket(void)
 
        memset(&sin, 0, sizeof(sin));
        sin.sin_family = AF_INET;
+       sin.sin_port = port;
        if (bindresvport(sockfd, &sin) < 0) {
                dprintf(L_WARNING,
                        "process_hosts: can't bind to reserved port\n");
@@ -295,13 +298,17 @@ process_entry(int sockfd, notify_list *lp)
        memset(&sin, 0, sizeof(sin));
        sin.sin_family = AF_INET;
        sin.sin_port   = lp->port;
-       sin.sin_addr   = lp->addr;
+       /* LH - moved address into switch */
 
        switch (NL_TYPE(lp)) {
        case NOTIFY_REBOOT:
                prog = SM_PROG;
                vers = SM_VERS;
                proc = SM_NOTIFY;
+
+               /* Use source address for notify replies */
+               sin.sin_addr   = lp->addr;
+
                func = (xdrproc_t) xdr_stat_chge;
                objp = &SM_stat_chge;
                break;
@@ -309,6 +316,11 @@ process_entry(int sockfd, notify_list *lp)
                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);
@@ -383,7 +395,7 @@ process_notify_list(void)
        time_t          now;
        int             fd;
 
-       if ((fd = get_socket()) < 0)
+       if ((fd = statd_get_socket(0)) < 0)
                return 0;
 
        while ((entry = notify) != NULL && NL_WHEN(entry) < time(&now)) {