Bunch of silly things to get Brunet to run on latest versions of Mono…

… and Win 7, extremely annoying silly things that you have to deal with when switching between Mono 4.0 to .Net 4.0
kingctan · Aug 7, 2013 · d17c9d9 · d17c9d9
1 parent b3c20d5
commit d17c9d9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/Brunet/Applications/default.build b/src/Brunet/Applications/default.build
@@ -20,7 +20,6 @@
         <include name="Brunet.Xmpp.dll"/>
         <include name="CookComputing.XmlRpcV2.dll" />
         <include name="ManagedOpenSsl.dll"/>
-        <include name="Mono.Security.dll" />
         <include name="NDesk.Options.dll"/>
         <include name="jabber-net.dll" />
         <include name="zlib.net.dll" />

diff --git a/src/Brunet/Node.cs b/src/Brunet/Node.cs
@@ -83,7 +83,6 @@ protected Node(Address addr) : this(addr, "global") { }
     protected Node(Address addr, string realm)
     {
       //Start with the address hashcode:
-
       _sync = new Object();
       lock(_sync)
       {
@@ -104,16 +103,17 @@ protected Node(Address addr, string realm)
         _running = 0;
         _send_pings = 1;
 
+        TransportAddress.TAType[] ord = new TransportAddress.TAType[6];
+        ord[0] = TransportAddress.TAType.S;
+        ord[1] = TransportAddress.TAType.SO;
+        ord[2] = TransportAddress.TAType.Function;
+        ord[3] = TransportAddress.TAType.Udp;
+        ord[4] = TransportAddress.TAType.Tcp;
+        ord[5] = TransportAddress.TAType.Relay;
+
         //The default is pretty good, but add fallback handling of Relay:
         var erp = DefaultERPolicy.Create(Brunet.Relay.RelayERPolicy.Instance,
-                                         addr,
-                                         TransportAddress.TAType.S,
-                                         TransportAddress.TAType.SO,
-                                         TransportAddress.TAType.Function,
-                                         TransportAddress.TAType.Udp,
-                                         TransportAddress.TAType.Tcp,
-                                         TransportAddress.TAType.Relay
-                                        );
+                                         addr, ord);
         _connection_table = new ConnectionTable(erp);
         _connection_table.ConnectionEvent += this.ConnectionHandler;
 

diff --git a/src/Brunet/Security/Utils/default.build b/src/Brunet/Security/Utils/default.build
@@ -9,7 +9,6 @@
     <copy todir="${build.dir}">
        <fileset basedir="${lib.dir}">
           <include name="Brunet.dll" />
-          <include name="Mono.Security.dll" />
        </fileset>
     </copy>
 

diff --git a/src/Brunet/Security/default.build b/src/Brunet/Security/default.build
@@ -9,7 +9,6 @@
     <copy todir="${build.dir}">
        <fileset basedir="${lib.dir}">
           <include name="ManagedOpenSsl.dll"/>
-          <include name="Mono.Security.dll" />
           <include name="Brunet.dll" />
           <include name="Brunet.Mock.dll" />
        </fileset>
@@ -42,7 +41,6 @@
        <fileset basedir="${lib.dir}">
           <include name="Brunet.dll" />
           <include name="ManagedOpenSsl.dll"/>
-          <include name="Mono.Security.dll" />
        </fileset>
     </copy>