Changeset 3098

Timestamp:

01/15/08 14:50:57 (11 months ago)

Author:

sean

Message:

Added darwin socket defs. This closes #702.

Files:

• trunk/tango/stdc/posix/arpa/inet.d (modified) (3 diffs)
• trunk/tango/stdc/posix/net/if_.d (modified) (1 diff)
• trunk/tango/stdc/posix/netinet/in_.d (modified) (4 diffs)
• trunk/tango/stdc/posix/netinet/tcp.d (modified) (1 diff)
• trunk/tango/stdc/posix/sys/socket.d (modified) (4 diffs)
• trunk/tango/stdc/posix/sys/uio.d (modified) (1 diff)

trunk/tango/stdc/posix/arpa/inet.d

@@ -46 +46 @@
-    struct in_addr
-    {
-;
+
-    }
-
@@ -63 +63 @@
-else version( darwin )
-{
+    alias uint16_t in_port_t; // TODO: verify
+    alias uint32_t in_addr_t; // TODO: verify
-
+    struct in_addr
+    {
+        in_addr_t s_addr;
+    }
+
+    const INET_ADDRSTRLEN = 16;
+
+    uint32_t htonl(uint32_t);
+    uint16_t htons(uint16_t);
+    uint32_t ntohl(uint32_t);
+    uint16_t ntohs(uint16_t);
+
+    in_addr_t inet_addr(char*);
+    char*     inet_ntoa(in_addr);
+    char*     inet_ntop(int, void*, char*, socklen_t);
+    int       inet_pton(int, char*, void*);
-}
-
@@ -80 +98 @@
-else version( darwin )
-{
-
+
-}

trunk/tango/stdc/posix/net/if_.d

@@ -48 +48 @@
-else version( darwin )
-{
+    struct if_nameindex_t
+    {
+        uint    if_index;
+        char*   if_name;
+    }
-
+    const IF_NAMESIZE = 16;
+
+    uint            if_nametoindex(char*);
+    char*           if_indextoname(uint, char*);
+    if_nameindex_t* if_nameindex();
+    void            if_freenameindex(if_nameindex_t*);
-}

trunk/tango/stdc/posix/netinet/in_.d

@@ -12 +12 @@
-public import tango.stdc.inttypes : uint32_t, uint16_t;
-public import tango.stdc.posix.arpa.inet;
+public import tango.stdc.posix.sys.socket; // for sa_family_t
-
-extern (C):
@@ -25 +26 @@
-in_addr_t
-
-
-
-
+ // from tango.stdc.posix.sys.socket
+   
+   
-
-struct in_addr
@@ -59 +60 @@
-version( linux )
-{
-    alias ushort sa_family_t;
-
-    private const __SOCK_SIZE__ = 16;
-
@@ -82 +81 @@
-    }
-
-c_ulong INADDR_ANY 
-c_ulong INADDR_BROADCAST 
+uint INADDR_ANY
+uint INADDR_BROADCAST
-}
-else version( darwin )
-{
+    private const __SOCK_SIZE__ = 16;
-
+    struct sockaddr_in
+    {
+        ubyte       sin_len;
+        sa_family_t sin_family;
+        in_port_t   sin_port;
+        in_addr     sin_addr;
+        ubyte[8]    sin_zero;
+    }
+
+    enum
+    {
+        IPPROTO_IP   = 0,
+        IPPROTO_ICMP = 1,
+        IPPROTO_TCP  = 6,
+        IPPROTO_UDP  = 17
+    }
+
+    const uint INADDR_ANY       = 0x00000000;
+    const uint INADDR_BROADCAST = 0xffffffff;
-}
-

trunk/tango/stdc/posix/netinet/tcp.d

@@ -26 +26 @@
-else version( darwin )
-{
-
+
-}

trunk/tango/stdc/posix/sys/socket.d

@@ -152 +152 @@
-    struct msghdr
-    {
-    
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
+
-    }
-
@@ -286 +286 @@
-{
-    alias uint   socklen_t;
+    alias ubyte  sa_family_t;
+
+    struct sockaddr
+    {
+        ubyte       sa_len;
+        sa_family_t sa_family;
+        byte[14]    sa_data;
+    }
+
+    private enum : size_t
+    {
+        _SS_PAD1    = long.sizeof - ubyte.sizeof - sa_family_t.sizeof,
+        _SS_PAD2    = 128 - ubyte.sizeof - sa_family_t.sizeof - _SS_PAD1 - long.sizeof
+    }
+
+    struct sockaddr_storage
+    {
+         ubyte          ss_len;
+         sa_family_t    ss_family;
+         byte[_SS_PAD1] __ss_pad1;
+         long           __ss_align;
+         byte[_SS_PAD2] __ss_pad2;
+    }
+
+    struct msghdr
+    {
+        void*     msg_name;
+        socklen_t msg_namelen;
+        iovec*    msg_iov;
+        int       msg_iovlen;
+        void*     msg_control;
+        socklen_t msg_controllen;
+        int       msg_flags;
+    }
+
+    struct cmsghdr
+    {
+         socklen_t cmsg_len;
+         int       cmsg_level;
+         int       cmsg_type;
+    }
+
+    enum : uint
+    {
+        SCM_RIGHTS = 0x01
+    }
+
+    /+
+    CMSG_DATA(cmsg)     ((unsigned char *)(cmsg) + \
+                         ALIGN(sizeof(struct cmsghdr)))
+    CMSG_NXTHDR(mhdr, cmsg) \
+                        (((unsigned char *)(cmsg) + ALIGN((cmsg)->cmsg_len) + \
+                         ALIGN(sizeof(struct cmsghdr)) > \
+                         (unsigned char *)(mhdr)->msg_control +(mhdr)->msg_controllen) ? \
+                         (struct cmsghdr *)0 /* NULL */ : \
+                         (struct cmsghdr *)((unsigned char *)(cmsg) + ALIGN((cmsg)->cmsg_len)))
+    CMSG_FIRSTHDR(mhdr) ((struct cmsghdr *)(mhdr)->msg_control)
+    +/
+
+    struct linger
+    {
+        int l_onoff;
+        int l_linger;
+    }
+
+    enum
+    {
+        SOCK_DGRAM      = 2,
+        SOCK_SEQPACKET  = 5,
+        SOCK_STREAM     = 1
+    }
+
+    enum : uint
+    {
+        SOL_SOCKET      = 0xffff
+    }
+
+    enum : uint
+    {
+        SO_ACCEPTCONN   = 0x0002,
+        SO_BROADCAST    = 0x0020,
+        SO_DEBUG        = 0x0001,
+        SO_DONTROUTE    = 0x0010,
+        SO_ERROR        = 0x1007,
+        SO_KEEPALIVE    = 0x0008,
+        SO_LINGER       = 0x1080,
+        SO_OOBINLINE    = 0x0100,
+        SO_RCVBUF       = 0x1002,
+        SO_RCVLOWAT     = 0x1004,
+        SO_RCVTIMEO     = 0x1006,
+        SO_REUSEADDR    = 0x1006,
+        SO_SNDBUF       = 0x1001,
+        SO_SNDLOWAT     = 0x1003,
+        SO_SNDTIMEO     = 0x1005,
+        SO_TYPE         = 0x1008
+    }
+
+    enum
+    {
+        SOMAXCONN       = 128
+    }
+
+    enum : uint
+    {
+        MSG_CTRUNC      = 0x20,
+        MSG_DONTROUTE   = 0x4,
+        MSG_EOR         = 0x8,
+        MSG_OOB         = 0x1,
+        MSG_PEEK        = 0x2,
+        MSG_TRUNC       = 0x10,
+        MSG_WAITALL     = 0x40
+    }
+
+    enum
+    {
+        AF_INET         = 2,
+        AF_UNIX         = 1,
+        AF_UNSPEC       = 0
+    }
+
+    enum
+    {
+        SHUT_RD,
+        SHUT_WR,
+        SHUT_RDWR
+    }
+
+    int     accept(int, sockaddr*, socklen_t*);
+    int     bind(int, sockaddr*, socklen_t);
+    int     connect(int, sockaddr*, socklen_t);
+    int     getpeername(int, sockaddr*, socklen_t*);
+    int     getsockname(int, sockaddr*, socklen_t*);
+    int     getsockopt(int, int, int, void*, socklen_t*);
+    int     listen(int, int);
+    ssize_t recv(int, void*, size_t, int);
+    ssize_t recvfrom(int, void*, size_t, int, sockaddr*, socklen_t*);
+    ssize_t recvmsg(int, msghdr*, int);
+    ssize_t send(int, void*, size_t, int);
+    ssize_t sendmsg(int, msghdr*, int);
+    ssize_t sendto(int, void*, size_t, int, sockaddr*, socklen_t);
+    int     setsockopt(int, int, int, void*, socklen_t);
+    int     shutdown(int, int);
+    int     socket(int, int, int);
+    int     sockatmark(int);
+    int     socketpair(int, int, int, int[2]);
-}
-
@@ -302 +447 @@
-    }
-}
+else version( darwin )
+{
+    enum
+    {
+        AF_INET6    = 30
+    }
+}
-
-//
@@ -317 +469 @@
-    }
-}
+else version( darwin )
+{
+    enum
+    {
+        SOCK_RAW    = 3
+    }
+}

trunk/tango/stdc/posix/sys/uio.d

@@ -42 +42 @@
-    ssize_t writev(int, iovec*, int);
-}
+else version( darwin )
+{
+    struct iovec
+    {
+        void*  iov_base;
+        size_t iov_len;
+    }
+
+    ssize_t readv(int, iovec*, int);
+    ssize_t writev(int, iovec*, int);
+}