--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Network/SockAddr.hh	Wed Dec 17 00:40:22 2008 +0000
@@ -0,0 +1,122 @@
+#ifndef NETWORK_SOCKADDR_H
+#define NETWORK_SOCKADDR_H
+
+#include "Address.hh"
+
+/*
+ * Platform-specific includes
+ */
+#ifndef WIN32
+    // linux
+    #include <netinet/in.h>
+#else
+    #error "This network code won't compile on win32 :)"
+#endif
+
+
+/**
+ * This represents a `struct sockaddr` as used by the socket API.
+ *
+ * It can be used like a NetworkEndpoint, but it's also suitable for use with recvfrom/sendto
+ */
+class NetworkAddress : public NetworkEndpoint {
+    protected:
+        /**
+         * The machine-readable address
+         */
+        sockaddr_storage address;
+
+        /**
+         * The address length
+         */
+        socklen_t address_length;
+
+    public:
+        /**
+         * Construct an empty SockAddr for later update()
+         */
+        NetworkAddress (void);
+
+        /**
+         * Construct a NetworkAddress from a machine-readable address of the given length
+         */
+        NetworkAddress (const sockaddr *addr, socklen_t len);
+
+        /**
+         * Get a const sockaddr* in this address
+         *
+         * @return read-only sockaddr pointer
+         */
+        const sockaddr* get_sockaddr (void) const { return (const sockaddr *) &address; }
+
+        /**
+         * Get a mutable sockaddr* in this address
+         *
+         * @return writeable sockaddr pointer
+         */
+        sockaddr* get_sockaddr (void) { return (sockaddr *) &address; }
+
+        /**
+         * Get the current address length
+         *
+         * @return address length
+         */
+        socklen_t get_socklen (void) const { return address_length; }
+
+        /**
+         * Get a the address length pointer, initialized to the size of our sockaddr_storage.
+         *
+         * @return address length pointer
+         */
+        socklen_t* get_socklen_ptr (void) { address_length = sizeof(address); return &address_length; }
+
+        /**
+         * Copy given sockaddr/len + update
+         */
+        void set_sockaddr (const sockaddr *addr, socklen_t len);
+
+        /**
+         * Update internal state for NetworkAddress after sockaddr/socklen_ptr have been modified.
+         */
+        void update (void);
+        
+        /**
+         * Returns a "fake" addrinfo
+         */
+        virtual addrinfo* get_addrinfo (int family, int socktype, int protocol = 0, int flags = 0) const;
+
+        /**
+         * Free an addrinfo returned by get_addrinfo
+         */
+        virtual void free_addrinfo (addrinfo *info) const;
+
+        /**
+         * Equal-to comparison operator. Invalid addresses compare equal and are always smaller
+         */
+        bool operator== (const NetworkAddress &other) const {
+            return (address_length == other.address_length) && memcmp(&address, &other.address, address_length) == 0;
+        }
+
+        /**
+         * Not-equal-to comparison operator. Invalid addresses compare equal and are always smaller
+         */
+        bool operator!= (const NetworkAddress &other) const {
+            return (address_length != other.address_length) || memcmp(&address, &other.address, address_length) != 0;
+        }
+
+        /**
+         * Less-than comparison operator. Smaller addresses are always lesser.
+         */
+        bool operator< (const NetworkAddress &other) const {
+            return (address_length < other.address_length) || memcmp(&address, &other.address, other.address_length) < 0;
+        }
+
+        /**
+         * Greater-than comparison operator. Bigger addresses are always greater.
+         */
+        bool operator> (const NetworkAddress &other) const {
+            return (address_length > other.address_length) || memcmp(&address, &other.address, address_length) > 0;
+        }
+};
+
+#endif