Formerly pfinet.h.~11~

1 files changed, 26 insertions, 2 deletions

diff --git a/pfinet/pfinet.h b/pfinet/pfinet.h
index a65129c4..16a3d164 100644
--- a/pfinet/pfinet.h
+++ b/pfinet/pfinet.h
@@ -18,9 +18,13 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
+#ifndef PFINET_H_
+#define PFINET_H_
+
 #include <device/device.h>
 #include <hurd/ports.h>
 #include <linux/netdevice.h>
+#include <hurd/trivfs.h>
 
 extern device_t master_device;
 
@@ -31,6 +35,8 @@ extern struct proto_ops *proto_ops;
 struct mutex global_lock;
 
 struct port_bucket *pfinet_bucket;
+struct port_class *addrport_class;
+struct port_class *socketport_class;
 
 extern struct device ether_dev;
 
@@ -39,7 +45,6 @@ struct sock_user
 {
   struct port_info pi;
   int isroot;
-  struct task_struct *task;
   struct socket *sock;
 };
 
@@ -48,13 +53,32 @@ struct sock_addr
 {
   struct port_info pi;
   size_t len;
-  char address[0];
+  struct sockaddr address[0];
 };
 
 int ethernet_demuxer (mach_msg_header_t *, mach_msg_header_t *);
 void setup_ethernet_device (void);
+void become_task_protid (struct trivfs_protid *);
+void become_task (struct sock_user *);
+struct sock_user *make_sock_user (struct socket *, int);
+error_t make_sockaddr_port (struct socket *, int, 
+			    mach_port_t *, mach_msg_type_name_t *);
+void init_devices (void);
+void init_mapped_time (void);
+void inet_proto_init (struct net_proto *);
+void ip_rt_add (short, u_long, u_long, u_long, struct device *, 
+		u_short, u_long);
+int tcp_readable (struct sock *);
+
+
+struct sock_user *begin_using_socket_port (socket_t);
+struct sock_addr *begin_using_sockaddr_port (socket_t);
+void end_using_socket_port (struct sock_user *);
+void end_using_sockaddr_port (struct sock_addr *);
 
 /* MiG bogosity */
 typedef struct sock_user *sock_user_t;
 typedef struct sock_addr *sock_addr_t;
+typedef struct trivfs_protid *trivfs_protid_t;
 
+#endif