Changeset 2058 for Whitix/trunk

Timestamp:

05/27/09 08:08:10 (3 years ago)

Author:

mwhitworth

Message:

Add patch from Dan Fandrich: provide a implementation of endian conversion functions in user/posix/socket/socket.c.

Location:

Whitix/trunk/user/posix

Files:

• include/netinet/in.h (modified) (2 diffs)
• socket/socket.c (modified) (1 diff)

Whitix/trunk/user/posix/include/netinet/in.h

@@ -34 +34 @@
 
 #define INADDR_LOOPBACK         0x7F000001
+#define INADDR_ANY              0L
+#define INADDR_BROADCAST        0xFFFFFFFF
 
 struct ip_mreqn
@@ -44 +46 @@
 typedef unsigned long in_addr_t;
 
+extern unsigned short ntohs(unsigned short s);
+extern unsigned short htons(unsigned short s);
+extern unsigned long ntohl(unsigned long l);
+extern unsigned long htonl(unsigned long l);
+
 #endif

Whitix/trunk/user/posix/socket/socket.c

@@ -99 +99 @@
 }
 
+/* NOTE: The following functions are for little-endian systems only */
 unsigned short ntohs(unsigned short s)
 {
-        printf("ntohs\n");
-        return 0;
+        return ((s & 0x00ff) << 8) |
+               ((s & 0xff00) >> 8);
+
 }
 
-short htons(short s)
+unsigned short htons(unsigned short s)
 {
-        printf("htons\n");
-        return 0;
+        return ntohs(s);
 }
 
 unsigned long ntohl(unsigned long l)
 {
-        printf("ntohl\n");
-        return 0;
+        return ((l & 0x000000ffU) << 24) |
+               ((l & 0x0000ff00U) <<  8) |
+               ((l & 0x00ff0000U) >>  8) |
+               ((l & 0xff000000U) >> 24);
 }
 
-long htonl(long l)
+unsigned long htonl(unsigned long l)
 {
-        printf("htonl\n");
-        return 0;
+        return ntohl(l);
 }