Merge branch 'master' of github.com:treeform/netty

Author: treeform

src/netty.nim

@@ -1,6 +1,7 @@
-import hashes, nativesockets, net, random, sequtils, streams, strformat, times
+import hashes, nativesockets, net, netty/hexprint, random, sequtils, streams,
+    strformat, times
 
-export Port
+export Port, hexprint
 
 const
   partMagic = uint32(0xFFDDFF33)

src/netty/flatty.nim

@@ -63,7 +63,7 @@ proc toFlatty[T](s: Stream, x: seq[T]) =
     s.toFlatty(e)
 
 proc fromFlatty[T](s: Stream, x: var seq[T]) =
-  let len = s.readUint64()
+  let len = s.readInt64()
   x.setLen(len)
   for i in 0 ..< len:
     s.fromFlatty(x[i])
@@ -107,7 +107,7 @@ proc toFlatty[K, V](s: Stream, x: Table[K, V]) =
     s.toFlatty(v)
 
 proc fromFlatty[K, V](s: Stream, x: var Table[K, V]) =
-  let len = s.readUint64()
+  let len = s.readInt64()
   for i in 0 ..< len:
     var
       k: K

tests/test-output.txt

@@ -43,3 +43,4 @@ single client disconnect
 testing maxUdpPacket and maxInFlight
 sent6006
 testing retry
+testing junk data

tests/test.nim

@@ -291,6 +291,38 @@ block:
 
   assert c2s.sendParts[0].sentTime != firstSentTime # We sent the part again
 
+block:
+  s.writeLine "testing junk data"
+
+  var server = newReactor("127.0.0.1", 2015)
+  var client = newReactor("127.0.0.1", 2016)
+
+  var c2s = client.connect(server.address)
+
+  client.rawSend(c2s.address, "asdf")
+
+  client.tick()
+  server.tick()
+
+  # No new connection, no crash
+  assert server.newConnections.len == 0
+  assert server.connections.len == 0
+
+  var stream = newStringStream()
+  stream.write(partMagic)
+  stream.write("aasdfasdfaasdfaasdfasdfsdfsdasdfasdfsaasdfasdffsadfaasdfasdfa")
+  stream.setPosition(0)
+  let packet = stream.readAll()
+
+  client.rawSend(c2s.address, packet)
+
+  client.tick()
+  server.tick()
+
+  # No new connection, no crash
+  assert server.newConnections.len == 0
+  assert server.connections.len == 0
+
 s.close()
 
 let (outp, _) = execCmdEx("git diff tests/test-output.txt")

tests/test_flatty.nim

@@ -103,4 +103,4 @@ assert arr.toFlatty.fromFlatty(array[3, int]) == arr
 var tup: tuple[count: int, id: byte, name: string] = (1, 2.byte, "3")
 assert tup.toFlatty.fromFlatty(tuple[count: int, id: byte, name: string]) == tup
 var tup2: tuple[foo: Foo, id: uint8] = (Foo(), 1.uint8)
-assert tup2.toFlatty.fromFlatty(tuple[foo: Foo, id: uint8] ) == tup2
+assert tup2.toFlatty.fromFlatty(tuple[foo: Foo, id: uint8]) == tup2

tests/vtune.nim

@@ -0,0 +1,56 @@
+import netty, strformat
+
+var server = newReactor("127.0.0.1", 2002)
+var client = newReactor("127.0.0.1", 2003)
+
+var c2s = client.connect(server.address)
+
+var l: int
+
+for i in 0 ..< 1000:
+  block:
+    var buffer = "large:"
+    for i in 0 ..< 1000:
+      buffer.add "<data>"
+
+    client.send(c2s, buffer)
+
+    for i in 0 ..< 10:
+      client.tick()
+      server.tick()
+
+      var a, b, c: Message
+      for msg in server.messages:
+        a = msg
+        b = msg
+        b = a
+        c = a
+        l += (a.data.len + b.data.len + c.data.len)
+
+  block:
+    var dataToSend = newSeq[string]()
+    for i in 0 ..< 1000:
+      dataToSend.add &"data #{i}, its cool!"
+
+    for d in dataToSend:
+      client.send(c2s, d)
+    for i in 0 ..< 1000:
+      client.tick()
+      server.tick()
+
+      var a, b, c: Message
+      for msg in server.messages:
+        var index = dataToSend.find(msg.data)
+        # make sure message is there
+        assert index != -1
+        dataToSend.delete(index)
+        a = msg
+        b = msg
+        b = a
+        c = a
+        l += (a.data.len + b.data.len + c.data.len)
+      if dataToSend.len == 0: break
+    # make sure all messages made it
+    assert dataToSend.len == 0, &"datatoSend.len: {datatoSend.len}"
+
+echo l