2002-10-23 Moritz Schulte <moritz@duesseldorf.ccc.de>

	* netfs.c (netfs_attempt_lookup): Return ENOTDIR instead of
	EOPNOTSUPP in case the user tries to look something up beneath a
	port node.
	(netfs_S_io_read): Correct the netio specific hack, make it apply
	only for PORT_NODEs.
	(netfs_attempt_create_file): Clear *np and unlocked &dir->lock.
	(netfs_attempt_write): Set err to EISDIR if trying to write to a
	node, which is not a PORT_NODE.
	(netfs_attempt_read): Set *len to 0, if trying to read from a
	node, which is not a PORT_NODE, otherwise try to read from socket
	via socket_recv; update *len to nread after successfull reading.
	* main.c: Declare ul_node static.
	* lib.h: Include comments from lib.c.
	* version.h: Updated.
	* protocol.c (PROTOCOL_INIT): New macro, used in initializing
	protocols array.
	(protocol_socket_open_tcp): Renamed to protocol_socket_open_TCP.
	(protocol_socket_open_udp): Renamed to protocol_socket_open_UDP.
	(protocol_find_node): Cleanup.
	* main.c: Assigned Copyright to FSF.
	* Makefile: Likewise.
	* lib.c: Likewise.
	* lib.h: Likewise.
	* netfs.c: Likewise.
	* netio.h: Likewise.
	(PROTOCOL_NAME_TCP): Defined to "tcp".
	(PROTOCOL_NAME_UDP): Defined to "udp".
	Typedef for socket_open_func_t.
	(OPENONLY_STATE_MODES): Remove definition.
	Added some comments.
	* node.c: Likewise.
	* node.h: Likewise.
	* protocol.c: Likewise.
	(protocol_socket_open_std): Added static keyword.
	(protocol_socket_open_tcp): Likewise.
	(protocol_socket_open_udp): Likewise.
	Declared protocol_socket_open_tcp and protocol_socket_open_udp.
	* protocol.h: Likewise.
	* protocol.c (protocol_register_protocols): Renamed to
	protocol_register_default ...
	* protocol.h: Likewise.
	* main.c (main): ... and used.
	* netfs.c (netfs_attempt_mkdir): Call protocol_register to create
	protocol directories beneath the root directory.
	(netfs_attempt_rmdir): Cleanup.

2002-10-22  Moritz Schulte  <moritz@duesseldorf.ccc.de>

	* protocol.c (protocol_register): Don't take "id" and
	"socket_open_func" arguments.
	(protocol_register): Don't allocate new protocol structure for the
	node, instead use a pointer to the static protocols structure.
	(protocol_find_by_name): New function.
	(protocol_register_protocols): Rewritten to iterate over protocols
	list.
	* protocol.h (protocol_register): Likewise.
	* node.c (node_destroy): Don't free np->nn->protocol.
	* netio.h (struct protocol): Typedef to protocol_t.
	* protocol.c (protocols): New array, initialized with protocol
	information.
	* netfs.c (netfs_attempt_lookup): Use strcmp instead of
	STRING_EQUAL.
	* lib.h: Remove STRING_EQUAL definition.

1 files changed, 83 insertions, 50 deletions

diff --git a/netfs.c b/netfs.c
index 149732b8a..e4adf8e0f 100644
--- a/netfs.c
+++ b/netfs.c
@@ -1,5 +1,6 @@
 /* netio - creates socket ports via the filesystem
-   Copyright (C) 2001, 02 Moritz Schulte <moritz@duesseldorf.ccc.de>
+   Copyright (C) 2001, 02 Free Software Foundation, Inc.
+   Written by Moritz Schulte.
  
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -55,15 +56,16 @@ netfs_attempt_lookup (struct iouser *user, struct node *dir,
 		      char *name, struct node **node)
 {
   error_t err;
+
   err = fshelp_access (&dir->nn_stat, S_IEXEC, user);
   if (err)
     goto out;
-  if (STRING_EQUAL (name, "."))
+  if (! strcmp (name, "."))
     {
       *node = dir;
       netfs_nref (*node);
     }
-  else if (STRING_EQUAL (name, ".."))
+  else if (! strcmp (name, ".."))
     {
       *node = dir->nn->dir;
       netfs_nref (*node);
@@ -81,7 +83,8 @@ netfs_attempt_lookup (struct iouser *user, struct node *dir,
 	    netfs_nref (*node);
 	}
       else
-	err = EOPNOTSUPP; /* FIXME?  */
+	/* Trying to look something inside beneath a port node.  */
+	err = ENOTDIR;
     }
 
  out:
@@ -237,6 +240,7 @@ error_t
 netfs_attempt_sync (struct iouser *cred, struct node *np,
 		    int wait)
 {
+  
   return EOPNOTSUPP;
 }
 
@@ -272,7 +276,18 @@ error_t
 netfs_attempt_mkdir (struct iouser *user, struct node *dir,
 		     char *name, mode_t mode)
 {
-  return EOPNOTSUPP;
+  error_t err = 0;
+
+  /* Creating of protocol directories is allowed.  */
+  if (dir->nn->dir)
+    err = EOPNOTSUPP;
+  else
+    {
+      err = protocol_register (name);
+      if (err == ENOENT)
+	err = EOPNOTSUPP;
+    }
+  return err;
 }
 
 /* Attempt to remove directory named NAME in DIR (which is locked) for
@@ -281,10 +296,14 @@ error_t
 netfs_attempt_rmdir (struct iouser *user, 
 		     struct node *dir, char *name)
 {
-  /* Let's allow unlinking of protocol directories.  */
+  error_t err = 0;
+
+  /* Removing of protocol directories is allowed.  */
   if (dir->nn->dir)
-    return EOPNOTSUPP;
-  return protocol_unregister (name);
+    err = EOPNOTSUPP;
+  else
+    err = protocol_unregister (name);
+  return err;
 }
 
 /* Create a link in DIR with name NAME to FILE for USER. Note that
@@ -315,6 +334,8 @@ error_t
 netfs_attempt_create_file (struct iouser *user, struct node *dir,
 			   char *name, mode_t mode, struct node **np)
 {
+  *np = 0;
+  mutex_unlock (&dir->lock);
   return EOPNOTSUPP;
 }
 
@@ -333,6 +354,7 @@ netfs_check_open_permissions (struct iouser *user, struct node *np,
 			      int flags, int newnode)
 {
   error_t err = 0;
+
   if (! err && (flags & O_READ))
     err = fshelp_access (&np->nn_stat, S_IREAD, user);
   if (! err && (flags & O_WRITE))
@@ -350,39 +372,40 @@ netfs_attempt_read (struct iouser *cred, struct node *np,
 		    off_t offset, size_t *len, void *data)
 {
   error_t err = 0;
+
   if (! (np->nn->flags & PORT_NODE))
     *len = 0;
-  {
-    addr_port_t addrport;
-    char *bufp = (char *) data;
-    mach_msg_type_number_t nread = *len;
-    mach_port_t *ports;
-    mach_msg_type_number_t nports;
-    char *cdata = NULL;
-    mach_msg_type_number_t clen = 0;
-    int flags = 0;
-    
-    if (err)
-      goto out;
-    err = socket_recv (np->nn->sock, &addrport, flags, &bufp, &nread, 
-		       &ports, &nports, &cdata, &clen, &flags,
-		       nread);
-    if (err)
-      goto out;
+  else
+    {
+      addr_port_t addrport;
+      char *bufp = (char *) data;
+      mach_msg_type_number_t nread = *len;
+      mach_port_t *ports;
+      mach_msg_type_number_t nports;
+      char *cdata = NULL;
+      mach_msg_type_number_t clen = 0;
+      int flags = 0;
     
-    mach_port_deallocate (mach_task_self (), addrport);
-    vm_deallocate (mach_task_self (), (vm_address_t) cdata, clen);
-    if (bufp != (char *) data)
-      {
-	memcpy ((char *) data, bufp, nread);
-	vm_deallocate (mach_task_self (), (vm_address_t) bufp, nread);
-      }
-  }
- out:
+      err = socket_recv (np->nn->sock, &addrport, flags, &bufp, &nread, 
+			 &ports, &nports, &cdata, &clen, &flags,
+			 *len);
+      if (! err)
+	{
+	  mach_port_deallocate (mach_task_self (), addrport);
+	  vm_deallocate (mach_task_self (), (vm_address_t) cdata, clen);
+	  if (bufp != (char *) data)
+	    {
+	      memcpy ((char *) data, bufp, nread);
+	      vm_deallocate (mach_task_self (), (vm_address_t) bufp, nread);
+	    }
+	  *len = nread;
+	}
+    }
+
   return err;
 }
 
-/* Write to the locked file NP for user CRED starting at OFSET and
+/* Write to the locked file NP for user CRED starting at OFFSET and
    continuing for up to *LEN bytes from DATA.  Set *LEN to the amount
    successfully written upon return.  */
 error_t
@@ -390,14 +413,19 @@ netfs_attempt_write (struct iouser *cred, struct node *np,
 		     off_t offset, size_t *len, void *data)
 {
   error_t err = 0;
-  if (! np->nn->connected)
-    err = node_connect_socket (np);
-  if (err)
-    goto out;
-  err = socket_send (np->nn->sock, MACH_PORT_NULL, 0, (char *) data,
-		     *len, NULL, MACH_MSG_TYPE_COPY_SEND, 0, NULL, 0,
-		     (int *) len);
- out:
+
+  if (np->nn->flags & PORT_NODE)
+    {
+      if (! np->nn->connected)
+	err = node_connect_socket (np);
+      if (! err)
+	err = socket_send (np->nn->sock, MACH_PORT_NULL, 0, (char *) data,
+			   *len, NULL, MACH_MSG_TYPE_COPY_SEND, 0, NULL, 0,
+			   (int *) len);
+    }
+  else
+    err = EISDIR;
+
   return err;
 }
 
@@ -556,6 +584,7 @@ block_for_reading (socket_t sock)
   mach_port_t reply_port;
   int type = SELECT_READ;
   error_t err;
+
   do
     {
       reply_port = mach_reply_port ();
@@ -587,13 +616,17 @@ netfs_S_io_read (struct protid *user,
 
   node = user->po->np;
 
-  /* This is our special hack.  */
-  if (! node->nn->connected)
-    err = node_connect_socket (node);
-  if (err || node->nn->flags & PORT_NODE)
-    err = block_for_reading (node->nn->sock);
-  if (err)
-    return err;
+  /* This is our special hack; applies only to PORT_NODEs.  */
+  if (node->nn->flags & PORT_NODE)
+    {
+      err = 0;
+      if (! node->nn->connected)
+	err = node_connect_socket (node);
+      if (! err)
+	err = block_for_reading (node->nn->sock);
+      if (err)
+	return err;
+    }
 
   mutex_lock (&user->po->np->lock);