Changeset 649 for trunk

Timestamp:

Oct 19, 2008, 11:25:55 AM (16 years ago)

Author:

OverTaker

Message:

IPHostEntry,Dnsクラスを半分実装。getaddrinfoがXPSP1以降にしかないので、gethostbyname版の実装もあとでします。

Location:

trunk/ab5.0/ablib/src/Classes/System/Net

Files:

• Dns.ab (added)
• EndPoint.ab (modified) (1 diff)
• IPAddress.ab (modified) (3 diffs)
• IPEndPoint.ab (modified) (3 diffs)
• IPHostEntry.ab (added)
• SocketAddress.ab (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/System/Net/EndPoint.ab

@@ -21 +21 @@
     @return SocketAddressを元に作成したEndPoint
     */
-    Function Create(address As SocketAddress) As EndPoint
-        socketAddress = address
+    Static Function Create(address As SocketAddress) As EndPoint
+        Dim point = New EndPoint
+        point.socketAddress = address
+        Return point
     End Function
 

trunk/ab5.0/ablib/src/Classes/System/Net/IPAddress.ab

@@ -47 +47 @@
     @note  このコンストラクタはライブラリ内のみで使用する目的で作られています。
     */
-    Sub IPAddress(address As SocketAddress)
-        family = address.AddressFamily
+    Sub IPAddress(addr As *sockaddr)
+        family = addr.sa_family
         Select Case family
             Case AF_INET
-                Dim addr4 = address.Items As *sockaddr_in
+                Dim addr4 = addr As *sockaddr_in
                 size = SizeOf(in_addr)
                 item = malloc(size)
                 memcpy(item, VarPtr(addr4->sin_addr.s_addr), size)
             Case AF_INET6
-                Dim addr6 = address.Items As *sockaddr_in6
+                Dim addr6 = addr As *sockaddr_in6
                 size = SizeOf(in6_addr)
                 item = malloc(size)
@@ -63 +63 @@
                 Throw New NotSupportedException("IPAddress: Not Supported AddressFamily.")
         End Select
+    End Sub
+
+    /*!
+    @brief コンストラクタ
+    @param IPアドレスを表したバイト列
+    @param IPアドレスの長さ
+    @note  このコンストラクタはライブラリ内のみで使用する目的で作られています。
+    */
+    Sub IPAddress(af As DWord, address As *Byte, len As Long)
+        family = af
+        size = len
+        item = malloc(size)
+        memcpy(item, address, size)
     End Sub
 
@@ -213 +226 @@
     */
     Static Function Any() As IPAddress
-        Return New IPAddress(0)
+        Return New IPAddress(0 As DWord)
     End Function
 

trunk/ab5.0/ablib/src/Classes/System/Net/IPEndPoint.ab

@@ -15 +15 @@
     Inherits EndPoint
 Public
+
+    /*!
+    @brief  コンストラクタ
+    */
+    Sub IPEndPoint()
+    End Sub
 
     /*!
@@ -61 +67 @@
     */
     Function Address() As IPAddress
-        Return New IPAddress(socketAddress)
+        Return New IPAddress(socketAddress.Items)
     End Function
 
@@ -96 +102 @@
                 Throw New NotSupportedException("IPEndPoint.Port: Unknown AddressFamily.")
         End Select
+    End Function
+
+    /*!
+    @brief  SocketAddressクラスから作成する
+    @param  SocketAddressクラス
+    @return SocketAddressを元に作成したIPEndPoint
+    */
+    Static Function Create(address As SocketAddress) As IPEndPoint
+        Dim point = New IPEndPoint
+        point.socketAddress = address
+        Return point
     End Function
 

trunk/ab5.0/ablib/src/Classes/System/Net/SocketAddress.ab

@@ -38 +38 @@
     Sub SocketAddress(family As Sockets.AddressFamily, size As Long)
         init(family, size)
+    End Sub
+
+    /*!
+    @brief  コンストラクタ。sockaddrを指定して初期化する
+    @param  sockaddr構造体
+    @note   このコンストラクタはライブラリ内でのみ使用する目的で作られています。
+    */
+    Sub SocketAddress(addr As *sockaddr, len As Long)
+        itemSize = len
+        item = malloc(itemSize)
+        memcpy(item, addr, itemSize)
     End Sub