X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibnet.so_src%2Faddress.c;h=8887362d69a52a765023e5228e5162d019713642;hb=038439147795891da9d99ddbc10ebbbb0d9fca09;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..8887362d 100644
--- a/Usermode/Libraries/libnet.so_src/address.c
+++ b/Usermode/Libraries/libnet.so_src/address.c
@@ -7,8 +7,29 @@
  */
 #include <net.h>
 #include <stdint.h>
+//#include <stdio.h>
+#include <stdlib.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
@@ -17,43 +38,50 @@
  */
 static int Net_ParseIPv4Addr(const char *String, uint8_t *Addr)
 {
-	 int	i = 0;
 	 int	j;
-	 int	val;
+	const char *pos = String;
 	
-	for( j = 0; String[i] && j < 4; j ++ )
+	for( j = 0; *pos && j < 4; j ++ )
 	{
-		val = 0;
-		for( ; String[i] && String[i] != '.'; i++ )
-		{
-			if('0' > String[i] || String[i] > '9') {
-				#if DEBUG
-				printf("0<c<9 expected, '%c' found\n", String[i]);
-				#endif
-				return 0;
-			}
-			val = val*10 + String[i] - '0';
+		char	*end;
+		unsigned long val = strtoul(pos, &end, 10);
+		if( *end && *end != '.' ) {
+			#if DEBUG
+			_SysDebug("%s: Unexpected character, '%c' found", __func__, *end);
+			#endif
+			return 0;
+		}
+		if( *pos == '.' ) {
+			#if DEBUG
+			_SysDebug("%s: Two dots in a row", __func__);
+			#endif
+			return 0;
 		}
 		if(val > 255) {
 			#if DEBUG
-			printf("val > 255 (%i)\n", val);
+			_SysDebug("%s: val > 255 (%i)", __func__, val);
 			#endif
 			return 0;
 		}
+		#if DEBUG
+		_SysDebug("%s: Comp '%.*s' = %lu", __func__, end - pos, pos, val);
+		#endif
 		Addr[j] = val;
 		
-		if(String[i] == '.')
-			i ++;
+		pos = end;
+		
+		if(*pos == '.')
+			pos ++;
 	}
 	if( j != 4 ) {
 		#if DEBUG
-		printf("4 parts expected, %i found\n", j);
+		_SysDebug("%s: 4 parts expected, %i found", __func__, j);
 		#endif
 		return 0;
 	}
-	if(String[i] != '\0') {
+	if(*pos != '\0') {
 		#if DEBUG
-		printf("EOS != '\\0', '%c'\n", String[i]);
+		_SysDebug("%s: EOS != '\\0', '%c'", __func__, *pos);
 		#endif
 		return 0;
 	}
@@ -140,8 +168,8 @@ static int Net_ParseIPv6Addr(const char *String, uint8_t *Addr)
 	k = 0;
 	for( ; j < 8; j ++, k++)
 	{
-		Addr[j*2] = hi[k]>>8;
-		Addr[j*2+1] = hi[k]&0xFF;
+		Addr[j*2] = low[k]>>8;
+		Addr[j*2+1] = low[k]&0xFF;
 	}
 	
 	return 1;
@@ -166,3 +194,48 @@ int Net_ParseAddress(const char *String, void *Addr)
 	
 	return 0;
 }
+
+static const char *Net_PrintIPv4Address(const 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(const 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, const void *Address)
+{
+	switch( AddressType )
+	{
+	case 0:	return "";
+	
+	case 4:
+		return Net_PrintIPv4Address(Address);
+	
+	case 6:
+		return Net_PrintIPv6Address(Address);
+		
+	default:
+		return "BAD";
+	}
+}