stv0g/metalsvm
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

server & client test

Browse source
This commit is contained in:
Carl-Benedikt Krüger 2011-07-12 13:08:21 +02:00
parent b8a66f260e
commit 7969eb06b0
4 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
kernel/client.c
View file

@ -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)

2
kernel/client.h
View file

@ -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 <lwip/sockets.h>

2
kernel/server.h
View file

@ -20,7 +20,7 @@ typedef struct _ServerEventArgs
void* pBuffer;
} ServerEventArgs;
#define DEF_BUFFERSIZE 8192
#define DEF_BUFFERSIZE 2048
typedef void (*ServerEventHandler)(ServerEventArgs*);

2
kernel/tests.c
View file

@ -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;