From c8badae6ad83f175b62e7762a37f0b5eb6d18a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Benedikt=20Kr=C3=BCger?=
 <benedikt.krueger@rwth-aachen.de>
Date: Tue, 2 Aug 2011 13:19:12 +0200
Subject: [PATCH] merge  && test for master

---
 kernel/tests.c | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/kernel/tests.c b/kernel/tests.c
index 6f1fb2af..f4518198 100644
--- a/kernel/tests.c
+++ b/kernel/tests.c
@@ -150,36 +150,19 @@ void srv_on_disc(ServerEventArgs*e )
 }
 
 void srv_on_conn(ServerEventArgs* e)
-{
-    kprintf("someone finally connected\n");
-}
-
-#define SHELLDEBUGPRINTF(x,...) kprintf(x,##__VA_ARGS__);
-
-void* server_task(void* e)
 {
     int i = 0, err = 0;
     int tmp1,tmp2;
     char buff[32];
 
-    Server	srv;
-
-    server_init(&srv,5555,2);
-    kprintf("created server\n");
-    srv._OnRead = srv_on_read;
-    srv._OnDisconnect = srv_on_disc;
-    srv._OnConnect = srv_on_conn;
-    sleep(5);
-    SHELLDEBUGPRINTF("sending...\n");
-    srv_sendBuffer(&srv,0,"Hello you!",sizeof("Hello you!"));
-    sleep(1);
+    kprintf("someone finally connected\n");
 
     tmp1 = get_clock_tick();
     for (i = 0; i < 1024*4*4*4; i++)
     {
             sleep(1);
 
-            err = srv_sendBuffer(&srv,0,buff,sizeof(buff));
+            err = srv_sendBuffer(&srv,e->ClientID,buff,sizeof(buff));
             if ( err < 0)
                     SHELLDEBUGPRINTF("err: %d", err);
 
@@ -191,6 +174,22 @@ void* server_task(void* e)
     tmp2 = get_clock_tick();
 
     kprintf("send with %f kb/s",	((float)i*sizeof(buff))/(tmp2-tmp1));
+}
+
+#define SHELLDEBUGPRINTF(x,...) kprintf(x,##__VA_ARGS__);
+
+void* server_task(void* e)
+{
+    Server	srv;
+
+    server_init(&srv,5555,2);
+    kprintf("created server\n");
+    srv._OnRead = srv_on_read;
+    srv._OnDisconnect = srv_on_disc;
+    srv._OnConnect = srv_on_conn;
+
+    while(1)
+        sleep(2);
 
     return NULL;