--- a/src/Network/Socket.hh	Tue Dec 16 23:21:26 2008 +0000
+++ b/src/Network/Socket.hh	Wed Dec 17 00:40:22 2008 +0000
@@ -6,6 +6,7 @@
 
 #include "../Error.hh"
 #include "Address.hh"
+#include "SockAddr.hh"
 #include "Reactor.hh"
 
 /*
@@ -128,7 +129,7 @@
         /**
          * Bind to a specific local address
          */ 
-        void bind (const NetworkAddress &addr);
+        void bind (const NetworkEndpoint &addr);
 
         /**
          * Put socket into listen mode
@@ -158,11 +159,14 @@
         /**
          * Establish a new connection
          */
-        void connect (const NetworkAddress &addr);
+        void connect (const NetworkEndpoint &addr);
 
         /**
          * Send, optionally using the specific destination
          *
+         * @param buf bytes to send
+         * @param size how many bytes to try and send
+         * @param dest optional specific destination address
          * @return number of bytes sent, zero if busy
          * @throw NetworkSocketError on error
          */
@@ -171,6 +175,9 @@
         /**
          * Recv, optionally storing the source in src
          *
+         * @param buf where to recv into
+         * @param size how many bytes to try and receive
+         * @param src optionally store source address
          * @return number of bytes received, zero if none available
          * @throw NetworkSocketEOFError if the connection was closed
          * @throw NetworkSocketError on error