Merge v0.4.1 bugfix release

Author: clue

CHANGELOG.md

@@ -4,6 +4,11 @@ This file is a manually maintained list of changes for each release. Feel free
 to add your changes here when sending pull requests. Also send corrections if
 you spot any mistakes.
 
+## 0.4.1 (2014-06-13)
+
+* Fix: Uncaught Exception while processing ICMP rejection datagrams
+  ([#12](https://github.com/clue/datagram/pull/12))
+
 ## 0.4.0 (2014-03-03)
 
 * BC break: Unified socket addresses (string URIs instead of host+port)

src/Socket.php

@@ -4,6 +4,7 @@
 
 use React\EventLoop\LoopInterface;
 use Evenement\EventEmitter;
+use Exception;
 
 class Socket extends EventEmitter implements SocketInterface
 {
@@ -124,7 +125,7 @@ protected function handleReceive(&$peerAddress)
             // due to the nature of UDP, there's no way to tell which one exactly
             // $peer is not filled either
 
-            throw new \Exception('Invalid message');
+            throw new Exception('Invalid message');
         }
 
         $peerAddress = $this->sanitizeAddress($peerAddress);

tests/SocketTest.php

@@ -87,6 +87,32 @@ public function testClientSendHugeWillFail()
         $this->loop->run();
     }
 
+    public function testClientSendNoServerWillFail()
+    {
+        $promise = $this->factory->createClient('127.0.0.1:1234');
+        $client = $this->getValueFromResolvedPromise($promise);
+
+        // send a message to a socket that is not actually listening
+        // expect the remote end to reject this by sending an ICMP message
+        // which we will receive as an error message. This depends on the
+        // host to actually reject UDP datagrams, which not all systems do.
+        $client->send('hello');
+        $client->on('error', $this->expectCallableOnce());
+
+        $loop = $this->loop;
+        $client->on('error', function () use ($loop) {
+             $loop->stop();
+        });
+
+        $that = $this;
+        $this->loop->addTimer(1.0, function () use ($that, $loop) {
+            $loop->stop();
+            $that->markTestSkipped('UDP packet was not rejected after 0.5s, ignoring test');
+        });
+
+        $this->loop->run();
+    }
+
     public function testCreatePair()
     {
         $promise = $this->factory->createServer('127.0.0.1:0');