Attachment 302152 Details for Bug 441559 – tested nsm patch

[patch] tested nsm patch

nlmnotify.patch (text/plain), 1.59 KB, created by Janne Karhunen on 2008-04-11 18:14:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Janne Karhunen

Created: 2008-04-11 18:14:15 UTC

Size: 1.59 KB

patch

obsolete

>--- rmtcall.c.org	2008-04-11 14:11:52.000000000 -0400
>+++ rmtcall.c	2008-04-11 14:09:14.000000000 -0400
>@@ -36,6 +36,9 @@
> #include <string.h>
> #include <unistd.h>
> #include <ifaddrs.h>
>+#include <sys/stat.h>
>+#include <fcntl.h>
>+#include <errno.h>
> #include "sm_inter.h"
> #include "statd.h"
> #include "notlist.h"
>@@ -46,6 +49,34 @@
> 
> static unsigned long	xid = 0;	/* RPC XID counter */
> static int		sockfd = -1;	/* notify socket */
>+static int		ifset = 0;	
>+
>+/*
>+ * Notify lockd of non-standard binding 
>+ */
>+inline void
>+nlm_nsm_set(unsigned int addr)
>+{
>+	ssize_t sz = 0;
>+	char buf[20];
>+	int fd;
>+
>+	if ( ifset )
>+		return ;
>+
>+	sprintf (&buf[0],"%u",addr);
>+
>+	fd = open ("/proc/sys/fs/nfs/nlm_nsm_interface", O_RDWR);
>+	if (fd > 0) {
>+		sz = write (fd,&buf,strlen((char*)&buf));
>+		if ( sz == -1 )
>+			note(N_CRIT, "statd: write: %s\n", strerror(errno));
>+		close (fd);
>+	} else
>+		note(N_CRIT, "statd: -n was specified with with no kernel support?\n");
>+
>+	ifset = 1;
>+}  
> 
> /*
>  * Initialize callback socket
>@@ -72,11 +103,13 @@ statd_get_socket(int port)
> 	 * If a local hostname is given (-n option to statd), bind to the address
> 	 * specified. This is required to support clients that ignore the mon_name in
> 	 * the statd protocol but use the source address from the request packet.
>+	 * Lockd needs also to be notified as it rejects non-local callbacks.
> 	 */
> 	if (MY_NAME) {
> 		struct hostent *hp = gethostbyname(MY_NAME);
> 		if (hp)
> 			sin.sin_addr = *(struct in_addr *) hp->h_addr;
>+                nlm_nsm_set ((unsigned int)sin.sin_addr.s_addr);
> 	}
> 	if (port != 0) {
> 		sin.sin_port = htons(port);

Actions: View | Diff

Attachments on bug 441559: 302005 | 302006 | 302152 | 302153 | 304538 | 309071