davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-19 00:26:30 +09:00
Code Issues Releases Activity

disabled code causes crash on OSX, but not on linux even though it's not supporte on unix.

Browse Source
This commit is contained in:
RevoluPowered
2017-11-09 22:26:05 +00:00
committed by Gordon MacPherson
parent a7468f4f1c
commit 4c81cf3c03
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Lidgren.Network.userprefs Normal file
View File

@@ -0,0 +1,24 @@
<Properties StartupConfiguration="{6691874A-1766-4A08-A72A-B1132FAB8E58}|Default">
<MonoDevelop.Ide.Workbench ActiveDocument="Lidgren.Network/NetQueue.cs">
<Files>
<File FileName="UnitTests/Program.cs" Line="15" Column="1" />
<File FileName="Lidgren.Network/NetNatIntroduction.cs" Line="12" Column="27" />
<File FileName="Lidgren.Network/NetPeer.cs" Line="120" Column="1" />
<File FileName="Lidgren.Network/NetPeer.Internal.cs" Line="27" Column="1" />
<File FileName="Lidgren.Network/NetPeerConfiguration.cs" Line="130" Column="1" />
<File FileName="Lidgren.Network/NetPeer.LatencySimulation.cs" Line="38" Column="1" />
<File FileName="Lidgren.Network/NetPeerStatistics.cs" Line="53" Column="1" />
<File FileName="Lidgren.Network/NetQueue.cs" Line="86" Column="1" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/user/lidgren-network-gen3/UnitTests/Program.cs" relfile="UnitTests/Program.cs" line="12" column="4" />
<Breakpoint file="/Users/user/lidgren-network-gen3/Lidgren.Network/NetPeer.Internal.cs" relfile="Lidgren.Network/NetPeer.Internal.cs" line="111" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MultiItemStartupConfigurations />
<MonoDevelop.Ide.ItemProperties.UnitTests PreferredExecutionTarget="MonoDevelop.Default" />
</Properties>

8
Lidgren.Network/Lidgren.Network.csproj
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -34,7 +34,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE;__CONSTRAINED__</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -42,10 +42,10 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType></DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE;__CONSTRAINED__</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

8
Lidgren.Network/NetPeer.Internal.cs
View File

@@ -131,10 +131,10 @@ namespace Lidgren.Network
try try
{ {
const uint IOC_IN = 0x80000000; //const uint IOC_IN = 0x80000000;
const uint IOC_VENDOR = 0x18000000; //const uint IOC_VENDOR = 0x18000000;
uint SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12; //uint SIO_UDP_CONNRESET = IOC_IN | IOC_VENDOR | 12;
m_socket.IOControl((int)SIO_UDP_CONNRESET, new byte[] { Convert.ToByte(false) }, null); //m_socket.IOControl((int)SIO_UDP_CONNRESET, new byte[] { Convert.ToByte(false) }, null);
} }
catch catch
{ {