Fix macOS server socket

solcloud · Jun 15, 2024 · ec4e673 · ec4e673
1 parent 5e0ec6d
commit ec4e673
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/server/src/Net/ClueSocket.php b/server/src/Net/ClueSocket.php
@@ -20,14 +20,15 @@ public function __construct(string $bindAddress)
         try {
             $this->socket = (new Factory())->createServer($bindAddress);
             $this->resource = $this->socket->getResource(); // @phpstan-ignore-line
+            socket_set_nonblock($this->resource);
         } catch (Exception $ex) {
             throw new NetException($ex->getMessage(), $ex->getCode(), $ex);
         }
     }
 
     public function sendTo(Client $client, string &$msg): void
     {
-        $ret = @socket_sendto($this->resource, $msg, strlen($msg), MSG_EOR, $client->ip, $client->port);
+        $ret = @socket_sendto($this->resource, $msg, strlen($msg), 0, $client->ip, $client->port);
         if ($ret === false) {
             $code = socket_last_error($this->resource);
             throw new NetException(socket_strerror($code), $code);
@@ -36,7 +37,7 @@ public function sendTo(Client $client, string &$msg): void
 
     public function receive(?string &$peerAddress, ?int &$peerPort, int $readMaxBytes = 100): ?string
     {
-        $ret = @socket_recvfrom($this->resource, $buffer, $readMaxBytes, MSG_DONTWAIT, $peerAddress, $peerPort);
+        $ret = @socket_recvfrom($this->resource, $buffer, $readMaxBytes, 0, $peerAddress, $peerPort);
         if ($ret === false) {
             $code = socket_last_error($this->resource);
             if ($code !== SOCKET_EWOULDBLOCK) {