X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibnet.so_src%2Faddress.c;h=0430c84d44def7cd4ee8d2904e684e0bd41abc81;hb=7536e8afcc3018c4ca2a4aa8f8422cf86a6c188c;hp=2b58444d04b41a8ad093c311da5a832f8989506e;hpb=d5834686ad14b66420060192445f06bce85db389;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libnet.so_src/address.c b/Usermode/Libraries/libnet.so_src/address.c
index 2b58444d..0430c84d 100644
--- a/Usermode/Libraries/libnet.so_src/address.c
+++ b/Usermode/Libraries/libnet.so_src/address.c
@@ -7,8 +7,28 @@
  */
 #include <net.h>
 #include <stdint.h>
+#include <stdio.h>
 #define DEBUG	0
 
+static inline uint32_t htonl(uint32_t v)
+{
+	return	  (((v >> 24) & 0xFF) <<  0)
+		| (((v >> 16) & 0xFF) <<  8)
+		| (((v >>  8) & 0xFF) << 16)
+		| (((v >>  0) & 0xFF) << 24);
+}
+static inline uint16_t htons(uint16_t v)
+{
+	return	  (((v >> 8) & 0xFF) <<  0)
+		| (((v >> 0) & 0xFF) <<  8);
+}
+#define htonb(v)	v
+#define ntohl(v)	htonl(v)
+#define ntohs(v)	htons(v)
+#define ntohb(v)	v
+
+#define __thread		// Disable TLS
+
 /**
  * \brief Read an IPv4 Address
  * \param String	IPv4 dotted decimal address
@@ -166,3 +186,48 @@ int Net_ParseAddress(const char *String, void *Addr)
 	
 	return 0;
 }
+
+static const char *Net_PrintIPv4Address(uint8_t *Address)
+{
+	static __thread char	ret[4*3+3+1];	// '255.255.255.255\0'
+	
+	sprintf(ret, "%i.%i.%i.%i", Address[0], Address[1], Address[2], Address[3]);
+	
+	return ret;
+}
+
+static const char *Net_PrintIPv6Address(uint16_t *Address)
+{
+	static __thread char	ret[8*4+7+1];	// 'FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF\0'
+	#if 0
+	// TODO: Zero compression
+	 int	zeroStart = 0, zeroEnd = 8;
+	for( i = 0; i < 8; i ++ ) {
+		if( 
+	}
+	#endif
+	
+	sprintf(ret, "%x:%x:%x:%x:%x:%x:%x:%x",
+		ntohs(Address[0]), ntohs(Address[1]), ntohs(Address[2]), ntohs(Address[3]),
+		ntohs(Address[4]), ntohs(Address[5]), ntohs(Address[6]), ntohs(Address[7])
+		);
+	
+	return ret;
+}
+
+const char *Net_PrintAddress(int AddressType, void *Address)
+{
+	switch( AddressType )
+	{
+	case 0:	return "";
+	
+	case 4:
+		return Net_PrintIPv4Address(Address);
+	
+	case 6:
+		return Net_PrintIPv6Address(Address);
+		
+	default:
+		return "BAD";
+	}
+}