Changeset 1587 for trunk/CrypP2P


Ignore:
Timestamp:
Jun 4, 2010, 4:33:13 PM (12 years ago)
Author:
Paul Lelgemann
Message:

+ CrypP2P: Added configuration option for "Use local local address detection" (defaults to false)
o Minor bugfixes in PeerToPeer(Publisher|Subscriber), which seem to handle an unconnected p2p network wrong

Location:
trunk/CrypP2P
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypP2P/Internal/P2PBase.cs

    r1585 r1587  
    111111                    settings.LoadDefaults();
    112112                    settings.ConnectInternal = true;
    113                     settings.LocalReceivingPort = P2PSettings.Default.LocalPort;
    114                     settings.UseLocalAddressDetection = true;
     113                    settings.LocalReceivingPort = P2PSettings.Default.LocalReceivingPort;
     114                    settings.UseLocalAddressDetection = P2PSettings.Default.UseLocalAddressDetection;
    115115                    settings.AutoReconnect = false;
    116116                    settings.NoDelay = false;
  • trunk/CrypP2P/P2PSettings.Designer.cs

    r1579 r1587  
    135135        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    136136        [global::System.Configuration.DefaultSettingValueAttribute("0")]
    137         public int LocalPort {
     137        public int LocalReceivingPort {
    138138            get {
    139                 return ((int)(this["LocalPort"]));
     139                return ((int)(this["LocalReceivingPort"]));
    140140            }
    141141            set {
    142                 this["LocalPort"] = value;
     142                this["LocalReceivingPort"] = value;
    143143            }
    144144        }
     
    155155            }
    156156        }
     157       
     158        [global::System.Configuration.UserScopedSettingAttribute()]
     159        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     160        [global::System.Configuration.DefaultSettingValueAttribute("False")]
     161        public bool UseLocalAddressDetection {
     162            get {
     163                return ((bool)(this["UseLocalAddressDetection"]));
     164            }
     165            set {
     166                this["UseLocalAddressDetection"] = value;
     167            }
     168        }
    157169    }
    158170}
  • trunk/CrypP2P/P2PSettings.settings

    r1579 r1587  
    3030      <Value Profile="(Default)" />
    3131    </Setting>
    32     <Setting Name="LocalPort" Type="System.Int32" Scope="User">
     32    <Setting Name="LocalReceivingPort" Type="System.Int32" Scope="User">
    3333      <Value Profile="(Default)">0</Value>
    3434    </Setting>
     
    3636      <Value Profile="(Default)">10</Value>
    3737    </Setting>
     38    <Setting Name="UseLocalAddressDetection" Type="System.Boolean" Scope="User">
     39      <Value Profile="(Default)">False</Value>
     40    </Setting>
    3841  </Settings>
    3942</SettingsFile>
  • trunk/CrypP2P/app.config

    r1579 r1587  
    3535                <value />
    3636            </setting>
    37             <setting name="LocalPort" serializeAs="String">
     37            <setting name="LocalReceivingPort" serializeAs="String">
    3838                <value>0</value>
    3939            </setting>
     
    4141                <value>10</value>
    4242            </setting>
     43            <setting name="UseLocalAddressDetection" serializeAs="String">
     44                <value>False</value>
     45            </setting>
    4346        </Cryptool.P2P.P2PSettings>
    4447    </userSettings>
Note: See TracChangeset for help on using the changeset viewer.