Browse Source

[lua] add sys.net.Host, and make necessary changes to luasocket/luv externs

Justin Donaldson 8 years ago
parent
commit
9857747966
3 changed files with 115 additions and 3 deletions
  1. 85 0
      std/lua/_std/sys/net/Host.hx
  2. 27 0
      std/lua/lib/luasocket/socket/Dns.hx
  3. 3 3
      std/lua/lib/luv/net/Dns.hx

+ 85 - 0
std/lua/_std/sys/net/Host.hx

@@ -0,0 +1,85 @@
+/*
+ * Copyright (C)2005-2017 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package sys.net;
+ 
+
+import haxe.io.Bytes;
+import haxe.io.BytesInput;
+
+/**
+	A given IP host name.
+**/
+@:coreapi
+class Host {
+
+	/**
+		The provided host string.
+	**/
+	public var host(default,null) : String;
+
+	/**
+		The actual IP corresponding to the host.
+	**/
+	public var ip(default, null) : Int;
+	var _ip : String;
+
+	/**
+		Creates a new Host : the name can be an IP in the form "127.0.0.1" or an host name such as "google.com", in which case
+		the corresponding IP address is resolved using DNS. An exception occur if the host name could not be found.
+	**/
+	public function new( name : String ) : Void {
+		host = name;
+		if (lua.NativeStringTools.find(name, "(%d+)%.(%d+)%.(%d+)%.(%d+)").begin != null){
+			_ip = name;	
+		} else {
+			var res = lua.lib.luv.net.Dns.getaddrinfo(name);
+			_ip = res.result[1].addr; 
+			if (res.result == null) throw "Unrecognized node name";
+		}
+		var num = 0;
+		for (a in _ip.split(".")){
+			num = num * 256 + lua.Lua.tonumber(a);
+		}
+		ip = num;
+	}
+
+	/**
+		Returns the IP representation of the host
+	**/
+	public function toString() : String {
+		return _ip;
+	}
+
+	/**
+		Perform a reverse-DNS query to resolve a host name from an IP.
+	**/
+	public function reverse() : String {
+		return lua.lib.luv.net.Dns.getnameinfo({ip : _ip}).result;
+	}
+
+	/**
+		Returns the local computer host name
+	**/
+	static public function localhost() : String {
+		return lua.lib.luasocket.socket.Dns.gethostname();
+	}
+}

+ 27 - 0
std/lua/lib/luasocket/socket/Dns.hx

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C)2005-2017 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+package lua.lib.luasocket.socket;
+@:luaRequire("socket","dns")
+extern class Dns {
+	public static function gethostname() : String;
+}

+ 3 - 3
std/lua/lib/luv/net/Dns.hx

@@ -25,10 +25,10 @@ package lua.lib.luv.net;
 @:luaRequire("luv")
 extern class Dns {
 
-  @:overload(function(node : String, service : String, ?hints : AddrInfo, cb : String->Table<Int, AddrInfo>->Void) : Request {})
-  public static function getaddrinfo(node : String, service : String, ?hints : AddrInfo ) : Result<Table<Int,AddrInfo>>;
+  @:overload(function(node : String, ?service : String, ?hints : AddrInfo, cb : String->Table<Int, AddrInfo>->Void) : Request {})
+  public static function getaddrinfo(node : String, ?service : String, ?hints : AddrInfo ) : Result<Table<Int,AddrInfo>>;
 
-  @:overload(function(ip: String, port : Int, family : String, cb : String->AddrInfo->Void) : Request {})
+  @:overload(function(ip: String, ?port : Int, ?family : String, cb : String->AddrInfo->Void) : Request {})
   public static function getnameinfo(info:AddrInfo) : Result<String>;
 }