From 7969eb06b0fb2e66b042214e9fed8c3d281a73bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl-Benedikt=20Kr=C3=BCger?= Date: Tue, 12 Jul 2011 13:08:21 +0200 Subject: [PATCH] server & client test --- kernel/client.c | 40 ++++++++++++++++++++-------------------- kernel/client.h | 2 +- kernel/server.h | 2 +- kernel/tests.c | 2 ++ 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/kernel/client.c b/kernel/client.c index 248fbd8e..dd9fab03 100644 --- a/kernel/client.c +++ b/kernel/client.c @@ -26,32 +26,32 @@ int cli_sendBuffer(Client* cli,void* pBuffer, unsigned int bufferlen) int cli_ConnectTo(Client* cli,char * pAdresse,unsigned short Port,int webAdresse) { - ClientEventArgs e; - cli->sSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); // Einen Socket erstellen - cli->wPort=Port; - cli->adAddr.sin_port = htons(cli->wPort); + ClientEventArgs e; + cli->sSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); // Einen Socket erstellen + cli->wPort=Port; + cli->adAddr.sin_port = htons(cli->wPort); - if (webAdresse) //Fall es sich um eine Internet Adresse Handelt - return -1; - else //Fall es sich um eine LAN Adresse im 127.0.0.1 Stil handelt - cli->adAddr.sin_addr.s_addr = inet_addr(pAdresse); + if (webAdresse) //Fall es sich um eine Internet Adresse Handelt + return -1; + else //Fall es sich um eine LAN Adresse im 127.0.0.1 Stil handelt + cli->adAddr.sin_addr.s_addr = inet_addr(pAdresse); - if (connect(cli->sSocket,(const struct sockaddr*)&cli->adAddr, sizeof(cli->adAddr))==0) - { + if (connect(cli->sSocket,(const struct sockaddr*)&cli->adAddr, sizeof(cli->adAddr))==0) + { create_kernel_task(&cli->bThread,cli_WaitForPacket,cli); - if (cli->_OnConnect != 0) - { - e.dwLen = 0; - e.pBuffer = 0; - cli->_OnConnect(&e); - } - return 0; - } - else - return -1; + if (cli->_OnConnect != 0) + { + e.dwLen = 0; + e.pBuffer = 0; + cli->_OnConnect(&e); + } + return 0; + } + else + return -1; }; int cli_DisconnectFrom(Client* cli) diff --git a/kernel/client.h b/kernel/client.h index aee71c7f..1c686c4d 100644 --- a/kernel/client.h +++ b/kernel/client.h @@ -1,7 +1,7 @@ #ifndef __CLIENT__ #define __CLIENT__ -#define DEF_BUFFERSIZE 8192 // Buffergröße für ein Packet +#define DEF_BUFFERSIZE 2048 // Buffergröße für ein Packet #ifndef LWIP_SOCKET #include diff --git a/kernel/server.h b/kernel/server.h index db3934f8..c0ad344e 100644 --- a/kernel/server.h +++ b/kernel/server.h @@ -20,7 +20,7 @@ typedef struct _ServerEventArgs void* pBuffer; } ServerEventArgs; -#define DEF_BUFFERSIZE 8192 +#define DEF_BUFFERSIZE 2048 typedef void (*ServerEventHandler)(ServerEventArgs*); diff --git a/kernel/tests.c b/kernel/tests.c index bff17c65..d9bfd6a2 100644 --- a/kernel/tests.c +++ b/kernel/tests.c @@ -177,6 +177,7 @@ void* server_task(void* e) Server srv; server_init(&srv,5555,2); + kprintf("created server"); srv._OnRead = srv_on_read; srv._OnDisconnect = srv_on_disc; sleep(2); @@ -314,6 +315,7 @@ void* client_task(void* e) Client cli; char netbuffer[256]; + kprintf("created client"); cli_init(&cli); cli._OnRead = cli_on_read; cli._OnDisconnect = cli_on_disc;