From 9579974bf8269c67fe31e2f977d65b526623055a Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 18 Sep 2011 21:30:00 +0200 Subject: [PATCH] remove obsolete files --- kernel/Makefile | 2 +- kernel/client.c | 120 ----------------------------- kernel/client.h | 56 -------------- kernel/server.c | 199 ------------------------------------------------ kernel/server.h | 67 ---------------- kernel/shell.c | 76 ------------------ kernel/shell.h | 14 ---- kernel/tests.c | 153 ++----------------------------------- 8 files changed, 7 insertions(+), 680 deletions(-) delete mode 100644 kernel/client.c delete mode 100644 kernel/client.h delete mode 100644 kernel/server.c delete mode 100644 kernel/server.h delete mode 100644 kernel/shell.c delete mode 100644 kernel/shell.h diff --git a/kernel/Makefile b/kernel/Makefile index 5062f212..fabfe28e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,4 +1,4 @@ -C_source := main.c tasks.c syscall.c tests.c echo.c netio.c init.c server.c client.c shell.c +C_source := main.c tasks.c syscall.c tests.c echo.c netio.c init.c MODULE := kernel include $(TOPDIR)/Makefile.inc diff --git a/kernel/client.c b/kernel/client.c deleted file mode 100644 index 0c3982fb..00000000 --- a/kernel/client.c +++ /dev/null @@ -1,120 +0,0 @@ -#include "client.h" - -#include "../drivers/net/util.h" - -#define SOCKET_ERROR -1 - -int cli_sendBuffer(Client* cli,void* pBuffer, unsigned int bufferlen) -{ - int iResult; - ClientEventArgs e; - //abfragen ob client existiert!! wichtig - if (cli->sSocket != SOCKET_ERROR) - { - iResult= send(cli->sSocket,(char*)pBuffer,bufferlen,0); - if (cli->_OnWrite != 0) - { - e.dwLen = iResult; - e.pBuffer = pBuffer; - cli->_OnWrite(&e); - } - return iResult; - } - else - return -3; -} - -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); - - if (cli->sSocket == SOCKET_ERROR) - return -2; - - 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) - { - - create_kernel_task(&cli->bThread,cli_WaitForPacket,cli, NORMAL_PRIO); - - if (cli->_OnConnect != 0) - { - e.dwLen = 0; - e.pBuffer = 0; - cli->_OnConnect(&e); - } - return 0; - } - else - return -1; -}; - -int cli_DisconnectFrom(Client* cli) -{ - shutdown(cli->sSocket,2); - closesocket(cli->sSocket); - cli->sSocket = SOCKET_ERROR; - return 0; -} - -void cli_WaitForPacket(Client* cli) -{ - int iResult=1; - char pTmpBuffer[DEF_BUFFERSIZE+1]; - ClientEventArgs e; - - while (iResult > 0) - { - iResult = recv(cli->sSocket ,pTmpBuffer, DEF_BUFFERSIZE, 0); - if (iResult > 0) - { - pTmpBuffer[iResult]='\0'; - if (cli->_OnRead != 0) - { - e.dwLen = iResult; - e.pBuffer = pTmpBuffer; - cli->_OnRead( &e); - } - } - else //Verbindung geschlossen - { - cli->sSocket=SOCKET_ERROR; - if (cli->_OnDisconnect != 0) - { - e.dwLen = 0; - e.pBuffer = 0; - cli->_OnDisconnect( &e); - } - } - - } -}; - - -int cli_init(Client* cli) -{ - - cli->_OnConnect = 0; - cli->_OnWrite = 0; - cli->_OnRead = 0; - cli->_OnDisconnect = 0; - - cli->adAddr.sin_addr.s_addr = INADDR_ANY; // IP'S die der Client annehmen soll - cli->adAddr.sin_family = AF_INET; // AdressFamilie (TCP/IP) -// adAddr.sin_port = htons(iPort); // Port auf dem der Client erreichbar seien soll - - return NULL; -} - -int cli_destroy(Client* cli) -{ - closesocket(cli->sSocket);; - return NULL; -} diff --git a/kernel/client.h b/kernel/client.h deleted file mode 100644 index 1c686c4d..00000000 --- a/kernel/client.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef __CLIENT__ -#define __CLIENT__ - -#define DEF_BUFFERSIZE 2048 // Buffergröße für ein Packet - -#ifndef LWIP_SOCKET -#include -#endif - -#ifndef SOCKET -#define SOCKET int -#endif - - -#include - - -typedef struct _ClientEventArgs -{ - unsigned int dwLen; - void* pBuffer; -} ClientEventArgs; - - -typedef void (*ClientEventHandler)(ClientEventArgs*); - - -typedef struct _Client -{ -//Connection Handling -SOCKET sSocket; - -struct sockaddr_in adAddr; - -//Output Interfacte -unsigned short wPort; - -tid_t bThread; - -// Eventhandling -ClientEventHandler _OnConnect; -ClientEventHandler _OnDisconnect; -ClientEventHandler _OnRead; -ClientEventHandler _OnWrite; -} Client; - -int cli_sendBuffer(Client* cli,void* pBuffer, unsigned int bufferlen); -int cli_ConnectTo(Client* cli,char * pAdresse,unsigned short Port,int webAdresse); -int cli_DisconnectFrom(Client* cli); -void cli_WaitForPacket(Client* cli); - -cli_init(Client* cli); -cli_destroy(Client* cli); - - -#endif diff --git a/kernel/server.c b/kernel/server.c deleted file mode 100644 index 1d988eaa..00000000 --- a/kernel/server.c +++ /dev/null @@ -1,199 +0,0 @@ -#include "server.h" - -typedef int UINT_PTR; -#define SOCKET_ERROR -1 - - -int srv_sendBuffer(Server* srv, unsigned int cli,void* pBuffer, unsigned int dwLen) -{ - int result; - ServerEventArgs e; - //abfragen ob client existiert!! wichtig - if (srv->sConnections[cli] != SOCKET_ERROR) - { - result= send(srv->sConnections[cli],(char*)pBuffer,dwLen,0); - if (srv->_OnWrite!=0) - { - e.ClientID = cli; - e.dwLen = dwLen; - e.pBuffer = pBuffer; - srv->_OnWrite(&e); - } - - return result; - } - else - return -1; -} - -void srv_DisconnectClient(Server* srv, unsigned int cli) -{ - ServerEventArgs e; - closesocket(srv->sConnections[cli]); - srv->sConnections[cli]=SOCKET_ERROR; - srv->dwConnections--; - if (srv->_OnDisconnect!=0) - { - e.ClientID = cli; - e.dwLen = 0; - e.pBuffer = 0; - srv->_OnDisconnect(&e); - } - - memset(&srv->ConnectionsAddr[cli],0,sizeof(struct sockaddr_in)); -} -void* srv_WaitForConnection(Server* srv) -{ - SOCKET tmpClient; - struct sockaddr_in tmpAddr; - int tmpAddrLen; - ServerEventArgs e; - ServerThreadArgs* t; - unsigned int i; - - - do - { - if (srv->dwConnections < srv->dwMaximumConnections) - { - tmpAddrLen = sizeof(struct sockaddr); - if ((tmpClient=accept(srv->sSocket,(struct sockaddr*)&tmpAddr,&tmpAddrLen)) != SOCKET_ERROR) - { - for(i=0;idwMaximumConnections;i++) - { - if (srv->sConnections[i] == SOCKET_ERROR) - { - srv->sConnections[i] = tmpClient; - srv->ConnectionsAddr[i] = tmpAddr; - srv->dwConnections++; - - if(srv->_OnConnect!=0) - { - e.ClientID = i; - e.dwLen = 0; - e.pBuffer =0; - srv->_OnConnect(&e); - } - - t = (ServerThreadArgs*) kmalloc(sizeof(ServerThreadArgs)); - t->ID = i; - t->srv = srv; - create_kernel_task(&srv->bThreads[i],srv_WaitForPacket,t, NORMAL_PRIO); - - break; - } - } - } - } - else - { - } - }while(1); - - return NULL; - -} -void* srv_WaitForPacket(ServerThreadArgs* t) -{ - int iResult=1; - char pTmpBuffer[DEF_BUFFERSIZE+1]; - ServerEventArgs e; - Server* srv = t->srv; - int cli = t->ID; - - while (iResult > 0) - { - iResult = recv(srv->sConnections[cli] ,pTmpBuffer, DEF_BUFFERSIZE, 0); - if (iResult > 0) - { - pTmpBuffer[iResult]='\0'; - if(srv->_OnRead!=0) - { - e.ClientID = cli; - e.dwLen = iResult; - e.pBuffer = pTmpBuffer; - srv->_OnRead(&e); - } - } - else //Verbindung geschlossen - { - closesocket(srv->sConnections[cli]); - srv->sConnections[cli]=SOCKET_ERROR; - if(srv->_OnDisconnect!=0) - { - e.ClientID = cli; - e.dwLen = 0; - e.pBuffer = 0; - srv->_OnDisconnect(&e); - } - memset(&srv->ConnectionsAddr[cli],0,sizeof(struct sockaddr_in)); - srv->dwConnections--; - iResult=-1; - } - } - return NULL; -} - -int server_init(Server* srv, unsigned short Port, unsigned int dwMaxConnections) -{ - struct sockaddr_in tmpAddr; - int tmpAddrLen; - ServerThreadArgs t; - tmpAddrLen = sizeof(struct sockaddr); - - // Unregister Events - srv->_OnConnect=0; - srv->_OnRead=0; - srv->_OnDisconnect=0; - srv->_OnWrite=0; - - // Allocate needed Memory - srv->sConnections=(SOCKET*)kmalloc(sizeof(SOCKET)*dwMaxConnections); - srv->ConnectionsAddr =(struct sockaddr_in*) kmalloc(sizeof(struct sockaddr_in)*dwMaxConnections); - srv->bThreads = (tid_t*)kmalloc(sizeof(tid_t)*dwMaxConnections); - - if (!srv->sConnections || !srv->ConnectionsAddr || !srv->bThreads) - { - kprintf("low on mem -%d- -%d- -%d-",srv->sConnections ,srv->ConnectionsAddr,srv->bThreads); - return -1; - } - - srv->dwMaximumConnections=dwMaxConnections; - - memset(srv->sConnections,0xFF,sizeof(SOCKET)*dwMaxConnections); - memset(srv->ConnectionsAddr,0x00,sizeof(struct sockaddr_in)*dwMaxConnections); - - srv->dwConnections=0; - srv->wPort = Port; - - srv->adAddr.sin_addr.s_addr = INADDR_ANY; // IP'S die der Server annehmen soll - srv->adAddr.sin_family = AF_INET; // AdressFamilie (TCP/IP) - srv->adAddr.sin_port = htons(srv->wPort); // Port auf dem der server erreichbar seien soll - - srv->sSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); // Einen Socket erstellen - - bind( srv->sSocket,(const struct sockaddr *) &srv->adAddr, sizeof(srv->adAddr)); // Der Server an die Adresse binden; - listen(srv->sSocket,srv->dwMaximumConnections); // Den Server in listenig State versetzen - - create_kernel_task(&srv->bThread_listen,srv_WaitForConnection,srv, NORMAL_PRIO); -// sConnections[0] = accept(sSocket,(struct sockaddr*)&tmpAddr,&tmpAddrLen); -// t.ID = 0; -// bthread_create(&bThreads[0],NULL,(start_routine) srv_WaitForPacket,&t); -} - -int server_destroy(Server* srv) -{ - unsigned int i; - for (i=0;idwMaximumConnections;i++) - { - if (srv->sConnections[i] != SOCKET_ERROR)closesocket(srv->sConnections[i]); - //bthread_terminate(&srv->bThreads[i],0x00); - } - closesocket(srv->sSocket); - //bthread_terminate(&srv->bThread_listen,0x00); - -// free(srv->sConnections); -// free(srv->ConnectionsAddr); -// free(srv->bThreads); - -} diff --git a/kernel/server.h b/kernel/server.h deleted file mode 100644 index c0ad344e..00000000 --- a/kernel/server.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef __SERVER__ -#define __SERVER__ - - -#ifdef WIN32 -#include -#else -#include -#endif - -#ifndef LWIP_SOCKET -#include -#endif - - -typedef struct _ServerEventArgs -{ - unsigned int ClientID; - unsigned int dwLen; - void* pBuffer; -} ServerEventArgs; - -#define DEF_BUFFERSIZE 2048 - -typedef void (*ServerEventHandler)(ServerEventArgs*); - -#ifndef SOCKET -#define SOCKET int -#endif - - -typedef struct _Server -{ - SOCKET sSocket; - unsigned int* sConnections; - struct sockaddr_in adAddr; - unsigned short wPort; - unsigned int dwConnections; - unsigned int dwMaximumConnections; - - struct sockaddr_in* ConnectionsAddr; - - tid_t bThread_listen; - tid_t* bThreads; - - ServerEventHandler _OnConnect; - ServerEventHandler _OnDisconnect; - ServerEventHandler _OnRead; - ServerEventHandler _OnWrite; -} Server; - -typedef struct _ServerThreadArgs -{ - Server* srv; - unsigned int ID; -} ServerThreadArgs; - - -int srv_sendBuffer(Server* srv,unsigned int cli,void* pBuffer, unsigned int dwLen); -void srv_DisconnectClient(Server* srv,unsigned int cli); -void* srv_WaitForConnection(Server* srv); -void* srv_WaitForPacket(ServerThreadArgs* t); - -int server_init(Server* srv,unsigned short Port, unsigned int dwMaxConnections); -int server_destroy(Server* srv); - -#endif diff --git a/kernel/shell.c b/kernel/shell.c deleted file mode 100644 index b7df2362..00000000 --- a/kernel/shell.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "shell.h" - -#include "server.h" -#include "client.h" - -#include - -static Server srv; -static int emac_id = -1; - -static Client cli; - -static int iamsrv = 0; - -char shellbuffer[512]; - - -void shelldebugprint(char* x) -{ - kprintf("debugprinting : %s",x); - if (iamsrv) - srv_sendBuffer(&srv,emac_id,x,strlen(x)); - else - cli_sendBuffer(&cli,x,strlen(x)); -} - -void shell_on_connect(ServerEventArgs* e) -{ - kprintf("connection from %s:%d",inet_ntoa(srv.ConnectionsAddr[e->ClientID].sin_addr),ntohs(srv.ConnectionsAddr[e->ClientID].sin_port)); - kprintf("connehx: 0x%.8X",srv.ConnectionsAddr[e->ClientID].sin_addr); - // if (srv.ConnectionsAddr[e->ClientID].sin_addr.s_addr > 0xC0A80031 || srv.ConnectionsAddr[e->ClientID].sin_addr.s_addr < 0xC0A80001) - if (srv.ConnectionsAddr[e->ClientID].sin_addr.s_addr == 0xFE04A8C0) - { - emac_id = e->ClientID; - kprintf("bmc connected"); - } - else - kprintf("link engaged\n"); -} - -void shell_on_disconnect(ServerEventArgs* e) -{ - kprintf("connection lost from %s:%d",inet_ntoa(srv.ConnectionsAddr[e->ClientID].sin_addr),ntohs(srv.ConnectionsAddr[e->ClientID].sin_port)); -} - -void shell_on_read(ServerEventArgs* e) -{ - if (emac_id != -1 && e->ClientID != emac_id) - srv_sendBuffer(&srv,emac_id,e->pBuffer,e->dwLen); - else - // else commandos oder so - srv_sendBuffer(&srv,emac_id,e->pBuffer,e->dwLen); -} - -void shell_init(int srv_or_cli) -{ - if (!srv_or_cli) - { - iamsrv = 1; - kprintf("server init"); - server_init(&srv,23,49); - srv._OnConnect = shell_on_connect; - srv._OnDisconnect = shell_on_disconnect; - srv._OnRead = shell_on_read; - } - else - { - sleep(3); - kprintf("client init"); - cli_init(&cli); - while (cli_ConnectTo(&cli,"192.168.0.1",23,0)); - sleep(1); - - } - -} diff --git a/kernel/shell.h b/kernel/shell.h deleted file mode 100644 index 6924c567..00000000 --- a/kernel/shell.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef SHELL_H -#define SHELL_H - -#include - -void shelldebugprint(char* x); - -void shell_init(int srv_or_cli); - -extern char shellbuffer[512]; - -#define SHELLDEBUGPRINTF(x,...) ksnprintf(shellbuffer,sizeof(shellbuffer),x,##__VA_ARGS__);shelldebugprint(shellbuffer); - -#endif // SHELL_H diff --git a/kernel/tests.c b/kernel/tests.c index 232d8748..7077229d 100644 --- a/kernel/tests.c +++ b/kernel/tests.c @@ -32,16 +32,8 @@ #include #include #include -#include - #include -#include - -#include "client.h" -#include "server.h" - -#include "shell.h" - +#include #endif static sem_t consuming, producing; @@ -282,163 +274,30 @@ static int join_test(void* arg) return 0; } -#if defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK) - -#define SHELLDEBUGPRINTF(x,...) kprintf(x,##__VA_ARGS__); - -static int srv_cnt = 0; -static Server srv; -void srv_on_read(ServerEventArgs* e) -{ - // kprintf("%i:",srv_cnt); - // hex_dump(e->dwLen,e->pBuffer); - // srv_cnt++; -/* printf("%i:",cnt); - puts(e->pBuffer); - puts("\n"); - cnt++; - */ -} - -void srv_on_disc(ServerEventArgs*e ) -{ - kprintf("connection lost!!!\n"); -} - -void srv_on_conn(ServerEventArgs* e) -{ - int i = 0, err = 0; - int tmp1,tmp2; - char buff[1024]; - - SHELLDEBUGPRINTF("someone finally connected\n"); - - tmp1 = get_clock_tick(); - for (i = 0; i < 1024*4; i++) - { - err = srv_sendBuffer(&srv,e->ClientID,buff,sizeof(buff)); - if ( err < 0) - { - SHELLDEBUGPRINTF("err: %d", err); - } - - if (!(i%10)) - { - SHELLDEBUGPRINTF("\r-%d-",i); - } - - } - tmp2 = get_clock_tick(); - -// SHELLDEBUGPRINTF("send with %f kb/s",((float)i*sizeof(buff))/(tmp2-tmp1)); - SHELLDEBUGPRINTF("send %d bytes in %d ticks",i*sizeof(buff),(tmp2-tmp1)); -} - -void* server_task(void* e) -{ - SHELLDEBUGPRINTF("created server\n"); - - server_init(&srv,5555,2); - - srv._OnRead = srv_on_read; - srv._OnDisconnect = srv_on_disc; - srv._OnConnect = srv_on_conn; - - while(1) - sleep(2); - - return NULL; -} - -static int cli_cnt = 0; -void cli_on_read(ClientEventArgs* e) -{ - kprintf("\r-%d-",cli_cnt); - cli_cnt++; -// printf("%i:",cnt); -// hex_dump(e->dwLen,e->pBuffer); -// cnt++; -/* puts(e->pBuffer); - puts("\n"); - cnt++; -*/ -} - -void cli_on_disc(ClientEventArgs*e ) -{ - kprintf("connection lost!!!\n"); -} - - -void* client_task(void* e) -{ - int err = -2; - Client cli; - char netbuffer[256]; - kprintf("created client"); - cli_init(&cli); - cli._OnRead = cli_on_read; - cli._OnDisconnect = cli_on_disc; - sleep(2); - - SHELLDEBUGPRINTF("Client is ready...\n"); - while (err) - { - sleep(1); - err = cli_ConnectTo(&cli,"192.168.0.1",5555,0); - SHELLDEBUGPRINTF("retry connect err = %d socket: %d\n",err,cli.sSocket); - } - SHELLDEBUGPRINTF("connected\n"); - - sleep(1); - err = cli_sendBuffer(&cli,"Hallo Welt",sizeof("Hallo Welt")); - SHELLDEBUGPRINTF("send message err = %d\n",err); - - - while(1) - sleep(2); - - return NULL; -} -#endif - int test_init(void) { // char* argv[] = {"/bin/mshell", NULL}; char* argv[] = {"/bin/tests", NULL}; -// char* server_argv[] = {"/bin/server", "6789", NULL}; + char* server_argv[] = {"/bin/server", "6789", NULL}; // char* client_argv[] = {"/bin/client", "127.0.0.1", "6789", NULL}; sem_init(&producing, 1); sem_init(&consuming, 0); mailbox_int32_init(&mbox); -#if defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK) - -// shell_init(RCCE_ue()); -// -// sleep(10); -// SHELLDEBUGPRINTF("hello World! I AM CORE NO. %d =) \n",RCCE_ue()); - -// if (!RCCE_ue()) -// create_kernel_task(NULL,server_task,NULL); -// else -// create_kernel_task(NULL,client_task,NULL); -#endif - - create_kernel_task(NULL, foo, "Hello from foo1", NORMAL_PRIO); - create_kernel_task(NULL, join_test, NULL, NORMAL_PRIO); + //create_kernel_task(NULL, foo, "Hello from foo1", NORMAL_PRIO); + //create_kernel_task(NULL, join_test, NULL, NORMAL_PRIO); //create_kernel_task(NULL, producer, , NORMAL_PRIO); //create_kernel_task(NULL, consumer, NULL, NORMAL_PRIO); //create_kernel_task(NULL, mail_ping, NULL, NORMAL_PRIO); //create_kernel_task(NULL, mail_noise, NULL, NORMAL_PRIO); //create_kernel_task(NULL, svm_test, NULL, NORMAL_PRIO); //create_user_task(NULL, "/bin/hello", argv); - create_user_task(NULL, "/bin/tests", argv); + //create_user_task(NULL, "/bin/tests", argv); //create_user_task(NULL, "/bin/jacobi", argv); //create_user_task(NULL, "/bin/mshell", argv); //create_user_task(NULL, "/bin/jacobi", argv); - //create_user_task(NULL, "/bin/server", server_argv); + create_user_task(NULL, "/bin/server", server_argv); //sleep(5); //create_user_task(NULL, "/bin/client", client_argv);