Re: NFS-method

[Grahame Bowland <grahame angrygoats net>]

On Tue, 2003-06-10 at 14:28, Grahame Bowland wrote:
> Hi all,
> 
> I saw some reference to NFS support in Ximian Desktop 2, or whatever.
> Does this mean someone has cleaned up / fixed modules/nfs-method.c? It
> doesn't seem to be working in HEAD.
> 
> Given that it's commented out of the default build, are there any
> objections to me commiting patches to modules/nfs-method*? I already
> have CVS access, I just don't want to annoy anyone by breaking the
> rules.
> 
> (I'll leave NFS method commented out in the Makefile.am)

Ok to commit the attached patch? With this patch, if you uncomment the
nfs-method parts of modules/Makefile.am, nfs support works fine.

Cheers
Grahame

Index: nfs-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/nfs-method.c,v
retrieving revision 1.9
diff -u -r1.9 nfs-method.c
--- nfs-method.c	2 Nov 2001 11:15:50 -0000	1.9
+++ nfs-method.c	10 Jun 2003 08:08:55 -0000
@@ -133,12 +133,11 @@
 		} else if (*success == ECOMM) {
 			/* this error is evil, only way around it is 
 			   to destroy the RPC connection and start over
+               
+               for now, leave it like this. It appears to have 
+               stopped happening in recent Linux libcs, unsure about 
+               *BSD.
 			*/
-
-			/* FIXME
-			 * do something intelligent, don't just fail out
-			 * FIXME
-			 */
 #endif
 		} else if ((rv == RPC_CANTSEND) || /* can't send */ 
 			   (rv == RPC_CANTRECV) || /* can't receive */
@@ -153,7 +152,7 @@
 			/* retry... this error is one we can recover from
 			 * something like a lost UDP packet or a cosmic ray :)
 			 */
-			g_print("NFS_METHOD: retrying due to an error (retry_count = %d.\n", retry_count);
+			g_print("NFS_METHOD: retrying due to an RPC error (error code is %d, retry_count = %d)\n", rv, retry_count);
 		} else {
 			/* unknown error probably no point retrying, all bad */
 			g_print("Error fatal, giving up.\n");
@@ -1201,7 +1200,6 @@
 		   GnomeVFSMethodHandle **method_handle,
 		   GnomeVFSURI *uri,
 		   GnomeVFSFileInfoOptions options,
-		   const GnomeVFSDirectoryFilter *filter,
 		   GnomeVFSContext *context)
 
 {
Index: nfs-method.h
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/nfs-method.h,v
retrieving revision 1.1
diff -u -r1.1 nfs-method.h
--- nfs-method.h	23 Oct 2000 16:52:41 -0000	1.1
+++ nfs-method.h	10 Jun 2003 08:08:55 -0000
@@ -27,7 +27,7 @@
 
 #include "nfs-method_nfs_prot.h"
 #include "nfs-method_mount.h"
-#include "gnome-vfs-module.h"
+#include <libgnomevfs/gnome-vfs-module.h>
 
 typedef struct NfsServerConnection {
 	char *hostname;