From 1a98a6a1c6f52ab9feb0694a664095c259733b87 Mon Sep 17 00:00:00 2001 From: Nathan Woodburn Date: Sun, 18 Jun 2023 19:42:05 +1000 Subject: [PATCH] main: Add option to set custom hip 02 ip and port --- FireWallet/MainForm.cs | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/FireWallet/MainForm.cs b/FireWallet/MainForm.cs index e451145..1ab1454 100644 --- a/FireWallet/MainForm.cs +++ b/FireWallet/MainForm.cs @@ -127,7 +127,7 @@ namespace FireWallet } else { - // Wait until the Node is connected + // Wait until the Node is connected before closing the splash while (true) { string status = await APIGet("",false); @@ -141,11 +141,8 @@ namespace FireWallet { Thread.Sleep(100); } - } } - - Application.DoEvents(); } AddLog("Loaded"); @@ -155,11 +152,11 @@ namespace FireWallet this.WindowState = FormWindowState.Minimized; this.Show(); this.WindowState = FormWindowState.Normal; - textBoxaccountpassword.Focus(); } private void MainForm_Closing(object sender, FormClosingEventArgs e) { + // Close HSD before closing FireWallet AddLog("Closing"); if (HSDProcess != null) { @@ -167,7 +164,6 @@ namespace FireWallet HSDProcess.Kill(); AddLog("HSD Closed"); Thread.Sleep(1000); - try { HSDProcess.Dispose(); @@ -179,10 +175,6 @@ namespace FireWallet } } #endregion - - - - #region Settings private async Task LoadNode() { @@ -1353,7 +1345,19 @@ namespace FireWallet // Create an instance of LookupClient using the custom options - NameServer nameServer = new NameServer(IPAddress.Parse("127.0.0.1"), 5350); + string ip = "127.0.0.1"; + int port = 5350; + + if (UserSettings.ContainsKey("hip-02-ip")) + { + ip = UserSettings["hip-02-ip"]; + } + if (UserSettings.ContainsKey("hip-02-port")) + { + port = int.Parse(UserSettings["hip-02-port"]); + } + + NameServer nameServer = new NameServer(IPAddress.Parse(ip), port); var options = new LookupClientOptions(nameServer); options.EnableAuditTrail = true; options.UseTcpOnly = true; @@ -1362,18 +1366,11 @@ namespace FireWallet options.RequestDnsSecRecords = true; options.Timeout = TimeSpan.FromSeconds(5); - var client = new LookupClient(options); - // Perform the DNS lookup for the specified domain using DNSSec - var result = client.Query(domain, QueryType.A); - - - - // Display the DNS lookup results foreach (var record in result.Answers.OfType()) {