# HG changeset patch # User KaitoMaeshiro # Date 1643379305 -32400 # Node ID 1a42115e51bb628354bfb3db321b7a39c0620c58 # Parent 14222beab95b0d254d26a3a6cfacf2e8098077a0 fix diff -r 14222beab95b -r 1a42115e51bb Test/RewritingTest/IPAddress.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Test/RewritingTest/IPAddress.cs Fri Jan 28 23:15:05 2022 +0900 @@ -0,0 +1,20 @@ +using System; +using System.Net; + +namespace get_local_ip_address +{ + class Program + { + static void Main(string[] args) + { + String strHostName = string.Empty; + IPHostEntry ipEntry = Dns.GetHostEntry(Dns.GetHostName()); + IPAddress[] addr = ipEntry.AddressList; + + for (int i = 0; i < addr.Length; i++) + { + Console.WriteLine("IP Address {0}: {1} ", i, addr[i].ToString()); + } + } + } +} \ No newline at end of file diff -r 14222beab95b -r 1a42115e51bb Test/Topology/TreeTestTopology/StartTreeTestTopology.cs --- a/Test/Topology/TreeTestTopology/StartTreeTestTopology.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/Test/Topology/TreeTestTopology/StartTreeTestTopology.cs Fri Jan 28 23:15:05 2022 +0900 @@ -6,11 +6,11 @@ namespace Christie_net.Test.Topology.TreeTestTopology { - public class StartTreeTopology : StartCodeGear + public class StartTreeTestTopology : StartCodeGear { - public StartTreeTopology(CodeGearManager cgm) : base(cgm) { } + public StartTreeTestTopology(CodeGearManager cgm) : base(cgm) { } - public static void Main(string[] args) + public static void Main(String[] args) { int topologyManagerPort = 10000; int topologyNodePort = 10001; diff -r 14222beab95b -r 1a42115e51bb topology/HostMessage.cs --- a/topology/HostMessage.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/HostMessage.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,9 +1,8 @@ using System; using System.Net; -using System.Collections.Generic; +using Christie_net.datagear.dg; - -namespace Christie_net.topology { +namespace Christie_net.topology{ public class HostMessage /*: Cloneable*/ { private String hostName = ""; private int port ; @@ -19,19 +18,9 @@ public void setLocalHostAndPort(int port){ - hostName = Dns.GetHostName(); - hostName = Dns.GetHostAddresses(hostName).ToString(); + //localhostからIPアドレスを取得 + hostName = IPAddress.Loopback.ToString(); this.port = port; - /* - try - { - hostName = Dns.GetHostName(); - hostName = Dns.GetHostAddresses(hostName).ToString(); - this.port = port; - } catch (UnknownHostException e) { - e.printStackTrace(); - } - */ } public void setHostAndPort(HostMessage hostMessage) { diff -r 14222beab95b -r 1a42115e51bb topology/TopologyDataGear.cs --- a/topology/TopologyDataGear.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/TopologyDataGear.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,6 +1,4 @@ using System; -using System.Net; -using System.Collections; using System.Collections.Generic; namespace Christie_net.topology { diff -r 14222beab95b -r 1a42115e51bb topology/manager/CheckComingHost.cs --- a/topology/manager/CheckComingHost.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/CheckComingHost.cs Fri Jan 28 23:15:05 2022 +0900 @@ -2,7 +2,6 @@ using System.Collections.Generic; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology.manager; namespace Christie_net.topology.manager { diff -r 14222beab95b -r 1a42115e51bb topology/manager/ConfigWaiter.cs --- a/topology/manager/ConfigWaiter.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/ConfigWaiter.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using Christie_net.daemon; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology; namespace Christie_net.topology.manager { diff -r 14222beab95b -r 1a42115e51bb topology/manager/CreateHash.cs --- a/topology/manager/CreateHash.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/CreateHash.cs Fri Jan 28 23:15:05 2022 +0900 @@ -3,10 +3,8 @@ using System.Linq; using System.Security.Cryptography; using System.Collections.Generic; -using Christie_net.daemon; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology; namespace Christie_net.topology.manager { @@ -74,10 +72,17 @@ private String convertMD5(String raw) /*throws NoSuchAlgorithmException*/ { - + /* MessageDiges md = MessageDiges.getInstance("MD5"); md.update(raw.GetBytes()); byte[] hash = md.digest(); + */ + + var sha1 = SHA1Managed.Create(); + byte[] inputBytes = Encoding.ASCII.GetBytes(raw); + byte[] hash = sha1.ComputeHash(inputBytes); + + //return BitConverter.ToString(outputBytes).Replace("-", "").ToLower(); StringBuilder builder = new StringBuilder(); @@ -85,11 +90,11 @@ { if ((0xff & aHash) < 0x10) { - builder.Append("0" + Integer.ToHexString((0xff & aHash))); + builder.Append("0" + (0xff & aHash).ToString("x")); } else { - builder.Append(Integer.toHexString((0xff & aHash))); + builder.Append((0xff & aHash).ToString("x")); } } return builder.ToString(); diff -r 14222beab95b -r 1a42115e51bb topology/manager/CreateTreeTopology.cs --- a/topology/manager/CreateTreeTopology.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/CreateTreeTopology.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using Christie_net.daemon; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology.manager; namespace Christie_net.topology.manager { diff -r 14222beab95b -r 1a42115e51bb topology/manager/IncomingHosts.cs --- a/topology/manager/IncomingHosts.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/IncomingHosts.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,10 +1,8 @@ using System; -using System.Net.Sockets; using System.Collections.Generic; +using System.Linq; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology.manager; -using Microsoft.VisualBasic; namespace Christie_net.topology.manager { @@ -24,7 +22,8 @@ public override void Run(CodeGearManager cgm) { // not have or match cookie - String nodeName = nodeNames.poll(); + String nodeName = nodeNames.ElementAt(0); + nodeNames.RemoveFirst(); GetLocalDgm().Put("nodeNames", nodeNames); // Manager connect to Node @@ -66,7 +65,7 @@ GetLocalDgm().Put("topology", topology); - if (nodeNames.isEmpty()) {//文字列が空かどうかの判定 + if (nodeNames.Any()) {//文字列が空かどうかの判定 // configuration finish foreach (String key in resultParse.Keys) {//キーの取得 topoDG.setNodeName(key); diff -r 14222beab95b -r 1a42115e51bb topology/manager/Parent.cs --- a/topology/manager/Parent.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/Parent.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; namespace Christie_net.topology.manager { diff -r 14222beab95b -r 1a42115e51bb topology/manager/ParentManager.cs --- a/topology/manager/ParentManager.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/ParentManager.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; -using Christie_net.annotation; -using Christie_net.codegear; -using Christie_net.topology.manager; +using System.Linq; + namespace Christie_net.topology.manager { @@ -18,19 +17,19 @@ public String getMyParent() { checkChildNumber(); - return list.get(position).getName(); + return list.ElementAt(position).getName(); } public int getMyNumber() { checkChildNumber(); - int num = list.get(position).children(); - list.get(position).increment(); + int num = list.ElementAt(position).children(); + list.ElementAt(position).increment(); return num; } private void checkChildNumber() { for (;;next()) { - if (list.get(position).children() < maxChildren) + if (list.ElementAt(position).children() < maxChildren) break; } } @@ -50,7 +49,7 @@ public void replaceAndRemove(String remove, String replace) { Parent removeNode = find(remove); - Remove(replace); + //Remove(replace); removeNode.setName(replace); } @@ -63,20 +62,20 @@ Boolean found = false; int i = 0; for (;i list in topology.Values) { - Console.WriteLine(list.get(0).getRemoteNodeName() + " : "); + Console.WriteLine(list.ElementAt(0).getRemoteNodeName() + " : "); foreach (HostMessage host in list) { Console.WriteLine("[ " + host.getNodeName() + " " diff -r 14222beab95b -r 1a42115e51bb topology/manager/StartTopologyManager.cs --- a/topology/manager/StartTopologyManager.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/StartTopologyManager.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,9 +1,5 @@ -using System; -using System.Threading; -using Christie_net.annotation; using Christie_net.codegear; using Christie_net.topology.node; -using Christie_net.topology.manager; namespace Christie_net.topology.manager { diff -r 14222beab95b -r 1a42115e51bb topology/manager/TopologyFinish.cs --- a/topology/manager/TopologyFinish.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/TopologyFinish.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using Christie_net.daemon; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology; namespace Christie_net.topology.manager { diff -r 14222beab95b -r 1a42115e51bb topology/manager/TopologyManager.cs --- a/topology/manager/TopologyManager.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/TopologyManager.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using Christie_net.daemon; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology; namespace Christie_net.topology.manager { diff -r 14222beab95b -r 1a42115e51bb topology/manager/TopologyManagerConfig.cs --- a/topology/manager/TopologyManagerConfig.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/TopologyManagerConfig.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,7 +1,5 @@ using System; -using System.Threading; using Christie_net.daemon; -using Christie_net.topology.manager; namespace Christie_net.topology.manager { diff -r 14222beab95b -r 1a42115e51bb topology/manager/TopologyType.cs --- a/topology/manager/TopologyType.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/manager/TopologyType.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,6 +1,3 @@ -using System; -using System.Threading; - namespace Christie_net.topology.manager { public enum TopologyType { diff -r 14222beab95b -r 1a42115e51bb topology/node/ConfigurationFinish.cs --- a/topology/node/ConfigurationFinish.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/node/ConfigurationFinish.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,11 +1,5 @@ -using System; -using System.Threading; -using System.Collections.Generic; using Christie_net.annotation; -using Christie_net.daemon; using Christie_net.codegear; -using Christie_net.topology; -using Christie_net.topology.node; namespace Christie_net.topology.node diff -r 14222beab95b -r 1a42115e51bb topology/node/CreateConnectionList.cs --- a/topology/node/CreateConnectionList.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/node/CreateConnectionList.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,7 +1,6 @@ using System; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology; namespace Christie_net.topology.node diff -r 14222beab95b -r 1a42115e51bb topology/node/IncomingConnectionInfo.cs --- a/topology/node/IncomingConnectionInfo.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/node/IncomingConnectionInfo.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,7 +1,6 @@ using System; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology; namespace Christie_net.topology.node diff -r 14222beab95b -r 1a42115e51bb topology/node/PrepareToClose.cs --- a/topology/node/PrepareToClose.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/node/PrepareToClose.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,11 +1,7 @@ using System; -using System.Threading; using System.Collections.Generic; using Christie_net.annotation; -using Christie_net.daemon; using Christie_net.codegear; -using Christie_net.topology; -using Christie_net.topology.node; namespace Christie_net.topology.node diff -r 14222beab95b -r 1a42115e51bb topology/node/Start.cs --- a/topology/node/Start.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/node/Start.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,8 +1,5 @@ -using System; -using System.Threading; using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology; namespace Christie_net.topology.node { diff -r 14222beab95b -r 1a42115e51bb topology/node/StartTopologyNode.cs --- a/topology/node/StartTopologyNode.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/node/StartTopologyNode.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,8 +1,4 @@ -using System; -using System.Threading; -using Christie_net.annotation; using Christie_net.codegear; -using Christie_net.topology.manager; namespace Christie_net.topology.node diff -r 14222beab95b -r 1a42115e51bb topology/node/TopologyNode.cs --- a/topology/node/TopologyNode.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/node/TopologyNode.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,10 +1,5 @@ -using System; -using System.Threading; -using System.Collections.Generic; using Christie_net.annotation; -using Christie_net.daemon; using Christie_net.codegear; -using Christie_net.topology; namespace Christie_net.topology.node diff -r 14222beab95b -r 1a42115e51bb topology/node/TopologyNodeConfig.cs --- a/topology/node/TopologyNodeConfig.cs Thu Jan 27 18:05:42 2022 +0900 +++ b/topology/node/TopologyNodeConfig.cs Fri Jan 28 23:15:05 2022 +0900 @@ -1,7 +1,4 @@ using System; -using System.Threading; -using System.Collections.Generic; -using Christie_net.annotation; using Christie_net.daemon;