Skip to content

fix start core on MAC OS #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tosterdev wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix start core on MAC OS #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4127f8c
fix: startup server on MACOS
tosterdev Jul 20, 2024
5ae7bef
fix
tosterdev Jul 20, 2024
a5be632
Format code fixed
tosterdev Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/MiNET/MiNET.Console/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

#endregion

using System;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.Sockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading;
using log4net;
using log4net.Config;
Expand Down Expand Up @@ -61,12 +61,15 @@ static void Main(string[] args)
Log.Info(MiNetServer.MiNET);
System.Console.WriteLine(MiNetServer.MiNET);

var currentProcess = Process.GetCurrentProcess();

var processorAffinity = Config.GetProperty("ProcessorAffinity", -1);
if (processorAffinity != -1)
if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
currentProcess.ProcessorAffinity = processorAffinity;
var currentProcess = Process.GetCurrentProcess();

var processorAffinity = Config.GetProperty("ProcessorAffinity", -1);
if (processorAffinity != -1)
{
currentProcess.ProcessorAffinity = processorAffinity;
}
}

var service = new MiNetServer();
Expand Down
10 changes: 5 additions & 5 deletions src/MiNET/MiNET/Net/RakNet/RakConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
using System.Net;
using System.Net.Sockets;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using log4net;
Expand Down Expand Up @@ -204,15 +205,14 @@ private static UdpClient CreateListener(IPEndPoint endpoint)
{
var listener = new UdpClient();

if (Environment.OSVersion.Platform != PlatformID.MacOSX)
if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
//_listener.Client.ReceiveBufferSize = 1600*40000;
listener.Client.ReceiveBufferSize = int.MaxValue;
//_listener.Client.SendBufferSize = 1600*40000;
listener.Client.SendBufferSize = int.MaxValue;

listener.DontFragment = false;
}

listener.DontFragment = false;
//listener.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReceiveTimeout, 500);
listener.EnableBroadcast = true;

if (Environment.OSVersion.Platform != PlatformID.Unix && Environment.OSVersion.Platform != PlatformID.MacOSX)
Expand Down