From 5bcd7260d3b7645042984a588579408db52727a4 Mon Sep 17 00:00:00 2001
From: Jeena Paradies <spam@jeenaparadies.net>
Date: Tue, 12 Apr 2011 18:29:47 +0200
Subject: [PATCH] pong-bot bugfixes

---
 games/Pong-bots/ggs-network.rb | 13 ++++++-------
 games/Pong-bots/pong-bot.rb    |  2 ++
 games/Pong-bots/test.rb        | 24 ++++++++++++++++++++++++
 src/ggs_protocol.erl           |  1 +
 4 files changed, 33 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 games/Pong-bots/pong-bot.rb
 create mode 100644 games/Pong-bots/test.rb

diff --git a/games/Pong-bots/ggs-network.rb b/games/Pong-bots/ggs-network.rb
index 1a1e820..7b61322 100644
--- a/games/Pong-bots/ggs-network.rb
+++ b/games/Pong-bots/ggs-network.rb
@@ -25,16 +25,15 @@ class GGSNetwork
   protected
   
   def connect(host, port)
-    gs = TCPSocket.open(host, port)
-    @socket = gs.accept
-    Thread.start(@socket) { |s| read(s) }
+    @socket = TCPSocket.new(host, port)
+    read
   end
   
   def write(message)
     @socket.write(message)
   end
   
-  def read(s)
+  def read
     loop do
       headers = {}
       size = 0
@@ -45,7 +44,7 @@ class GGSNetwork
         headers[key] = value
       end
 
-      if headers.contains?("Content-Size")
+      if headers.has_key?("Content-Size")
         headers["Content-Size"].to_i.times do
           args << @socket.recv
         end
@@ -56,7 +55,7 @@ class GGSNetwork
   end
   
   def receivedCommand(headers, data)
-    if headers.contains? "Client-Command"
+    if headers.has_key? "Client-Command"
       command = headers["Client-Command"]
       case command
       when "hello"
@@ -71,7 +70,7 @@ class GGSNetwork
   
   def makeMessage(serverOrGame, command, args)
     message =<<MESSAGE
-Token: #{@game_t oken}
+Token: #{@game_token}
 #{serverOrGame}-Command: #{command}
 Content-Length: #{args.length}
 
diff --git a/games/Pong-bots/pong-bot.rb b/games/Pong-bots/pong-bot.rb
old mode 100644
new mode 100755
index 33c2fbc..de24dde
--- a/games/Pong-bots/pong-bot.rb
+++ b/games/Pong-bots/pong-bot.rb
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby -wKU
 
+$: << "."
+
 require 'ggs-network.rb'
 require 'ggs-delegate.rb'
 
diff --git a/games/Pong-bots/test.rb b/games/Pong-bots/test.rb
new file mode 100644
index 0000000..c690e04
--- /dev/null
+++ b/games/Pong-bots/test.rb
@@ -0,0 +1,24 @@
+#!/usr/bin/ruby
+
+def func1
+   i=0
+   while i<=2
+      puts "func1 at: #{Time.now}"
+      sleep(2)
+      i=i+1
+   end
+end
+
+def func2
+   j=0
+   while j<=2
+      puts "func2 at: #{Time.now}"
+      sleep(1)
+      j=j+1
+   end
+end
+
+puts "Started At #{Time.now}"
+t1=Thread.new{func1()}
+t2=Thread.new{func2()}
+puts "End at #{Time.now}"
\ No newline at end of file
diff --git a/src/ggs_protocol.erl b/src/ggs_protocol.erl
index 711de46..3176429 100644
--- a/src/ggs_protocol.erl
+++ b/src/ggs_protocol.erl
@@ -65,6 +65,7 @@ expect_headers({char, $\n}, {Pid,_}, {Strings, Remains}) ->
     [LastMessage|_] = Strings,
     case LastMessage of
         "" -> % We have a data section.. Last line should thus be the content length.
+              % FIXME: the Content-Length doesn't have to be the last Header line
             [LastMessage, SecondLast | Rest] = Strings,
             case re:split(SecondLast, ": ", [{return, list}]) of
                 ["Content-Length", X] ->