BSCP Looking Good
authorPhilipp Dunkel <Philipp Dunkel@d4452222-2f33-11de-9270-010000000000>
Mon, 27 Apr 2009 12:34:09 +0000 (12:34 +0000)
committerPhilipp Dunkel <Philipp Dunkel@d4452222-2f33-11de-9270-010000000000>
Mon, 27 Apr 2009 12:34:09 +0000 (12:34 +0000)
git-svn-id: http://svn.cacert.cl/Software/BirdShack@21 d4452222-2f33-11de-9270-010000000000

16 files changed:
TailFeather/trunk/src/bscp/Makefile [new file with mode: 0644]
TailFeather/trunk/src/bscp/comm.c [new file with mode: 0644]
TailFeather/trunk/src/bscp/comm.h [new file with mode: 0644]
TailFeather/trunk/src/bscp/crc.c [new file with mode: 0644]
TailFeather/trunk/src/bscp/crc.h [new file with mode: 0644]
TailFeather/trunk/src/bscp/packet.c [new file with mode: 0644]
TailFeather/trunk/src/bscp/packet.h [new file with mode: 0644]
TailFeather/trunk/src/bscp/simpletest.c [new file with mode: 0644]
TailFeather/trunk/src/bscp/stdpipe.c [new file with mode: 0644]
TailFeather/trunk/src/comm/Makefile [deleted file]
TailFeather/trunk/src/comm/comm.c [deleted file]
TailFeather/trunk/src/comm/comm.h [deleted file]
TailFeather/trunk/src/comm/crc.c [deleted file]
TailFeather/trunk/src/comm/crc.h [deleted file]
TailFeather/trunk/src/comm/packet.c [deleted file]
TailFeather/trunk/src/comm/packet.h [deleted file]

diff --git a/TailFeather/trunk/src/bscp/Makefile b/TailFeather/trunk/src/bscp/Makefile
new file mode 100644 (file)
index 0000000..8f874d3
--- /dev/null
@@ -0,0 +1,17 @@
+AR=ar
+CC=gcc
+
+stdpipe : stdpipe.o bscp.a
+       $(CC) -o stdpipe stdpipe.o bscp.a
+
+bscp.a : packet.o comm.o crc.o
+       $(AR) r bscp.a packet.o comm.o crc.o
+
+simpletest : simpletest.o
+       $(CC) -o simpletest simpletest.o
+
+clean :
+       rm -f stdpipe
+       rm -f simpletest
+       rm -f *.a
+       rm -f *.o
diff --git a/TailFeather/trunk/src/bscp/comm.c b/TailFeather/trunk/src/bscp/comm.c
new file mode 100644 (file)
index 0000000..7bf06eb
--- /dev/null
@@ -0,0 +1,105 @@
+/* 
+ For copyright information see copyright.txt of the project 
+ Author: Philipp Dunkel
+*/
+
+#include "comm.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+
+#ifndef COMM_FAULTMAX
+#define COMM_FAULTMAX 3
+#endif
+
+comm *comm_create(int readchnl, int writechnl) {
+       comm *chnl = (comm *)malloc(sizeof(comm));
+       if (NULL == chnl) {
+               return NULL;
+       }
+       if (comm_init(chnl, readchnl, writechnl) != 0) {
+               free(chnl);
+               return NULL;
+       }
+       return chnl;
+}
+int comm_init(comm *chnl, int readchnl, int writechnl) {
+       int result = 0;
+       chnl->read = readchnl;
+       chnl->write = writechnl;
+       chnl->faults = 0;
+       
+       result = pthread_mutex_init(&(chnl->readlock),NULL);
+       if (result != 0) {
+               return result;
+       }
+       
+       result = pthread_mutex_init(&(chnl->writelock),NULL);
+       if (result != 0) {
+               pthread_mutex_destroy(&(chnl->readlock));
+               return result;
+       }
+       
+       return result;
+}
+void comm_sync(comm *chnl) {
+       char buffer[3];
+       int cnt = 0;
+       int res = pthread_mutex_lock(&(chnl->writelock));
+       memset(buffer,0,3);
+       if (res != 0) return;
+       while (pthread_mutex_lock(&(chnl->readlock)) != 0) {
+               comm_put(chnl, buffer, 3);
+       }
+       while (cnt < 13) {
+               comm_get(chnl,buffer,1);
+               cnt = (buffer[0]==0)?(cnt+1):0;
+               buffer[0] = 0;
+               comm_put(chnl,buffer,3);
+       }
+       while ((buffer[0] && 0xFF) != 0xFF) {
+               comm_get(chnl,buffer,1);
+               if (((buffer[0] && 0xFF) != 0xFF) && (buffer[0] != 0)) {
+                       pthread_mutex_unlock(&(chnl->readlock));
+                       pthread_mutex_unlock(&(chnl->writelock));
+                       comm_sync(chnl);
+                       return;
+               }
+       }
+       chnl->faults=0;
+       pthread_mutex_unlock(&(chnl->readlock));
+       pthread_mutex_unlock(&(chnl->writelock));
+}
+int comm_get(comm *chnl, char *buf, int buflen) {
+       int res = pthread_mutex_lock(&(chnl->readlock));
+       if (res != 0) return -1;
+       res = read(chnl->read,buf,buflen);
+       pthread_mutex_unlock(&(chnl->readlock));
+       return res;
+}
+int comm_put(comm *chnl, const char *buf, const int buflen) {
+       int res = pthread_mutex_lock(&(chnl->writelock));
+       if (res != 0) return -1;
+       res = write(chnl->write,buf,buflen);
+       pthread_mutex_unlock(&(chnl->writelock));
+       return res;
+}
+void comm_fault(comm *chnl) {
+       if (pthread_mutex_lock(&(chnl->readlock)) != 0) return;
+       chnl->faults++;
+       pthread_mutex_unlock(&(chnl->readlock));
+       if (chnl->faults > COMM_FAULTMAX) {
+               comm_sync(chnl);
+       }
+}
+void comm_cleanup(comm *chnl) {
+       if (NULL == chnl) return;
+       pthread_mutex_destroy(&(chnl->readlock));
+       pthread_mutex_destroy(&(chnl->writelock));
+}
+void comm_destroy(comm *chnl) {
+       if (NULL == chnl) return;
+       comm_cleanup(chnl);
+       free(chnl);
+}
diff --git a/TailFeather/trunk/src/bscp/comm.h b/TailFeather/trunk/src/bscp/comm.h
new file mode 100644 (file)
index 0000000..fada551
--- /dev/null
@@ -0,0 +1,28 @@
+/* 
+ For copyright information see copyright.txt of the project 
+ Author: Philipp Dunkel
+*/
+
+#ifndef comm_h
+#define comm_h
+
+#include <pthread.h>
+
+struct comm_t {
+       int read;
+       int write;
+       int faults;
+       pthread_mutex_t readlock;
+       pthread_mutex_t writelock;
+};
+typedef struct comm_t comm;
+
+comm *comm_create(int readchnl, int writechnl);
+int comm_init(comm *chnl, int readchnl, int writechnl);
+int comm_get(comm *chnl, char *buf, int buflen);
+int comm_put(comm *chnl, const char *buf, const int buflen);
+void comm_fault(comm *chnl);
+void comm_cleanup(comm *chnl);
+void comm_destroy(comm *chnl);
+
+#endif
diff --git a/TailFeather/trunk/src/bscp/crc.c b/TailFeather/trunk/src/bscp/crc.c
new file mode 100644 (file)
index 0000000..d1a2457
--- /dev/null
@@ -0,0 +1,74 @@
+/* 
+ For copyright information see copyright.txt of the project 
+ Author: Philipp Dunkel
+*/
+
+#include "crc.h"
+
+static crc crctab[256] = {
+       0x00000000,
+       0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B,
+       0x1A864DB2, 0x1E475005, 0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6,
+       0x2B4BCB61, 0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD,
+       0x4C11DB70, 0x48D0C6C7, 0x4593E01E, 0x4152FDA9, 0x5F15ADAC,
+       0x5BD4B01B, 0x569796C2, 0x52568B75, 0x6A1936C8, 0x6ED82B7F,
+       0x639B0DA6, 0x675A1011, 0x791D4014, 0x7DDC5DA3, 0x709F7B7A,
+       0x745E66CD, 0x9823B6E0, 0x9CE2AB57, 0x91A18D8E, 0x95609039,
+       0x8B27C03C, 0x8FE6DD8B, 0x82A5FB52, 0x8664E6E5, 0xBE2B5B58,
+       0xBAEA46EF, 0xB7A96036, 0xB3687D81, 0xAD2F2D84, 0xA9EE3033,
+       0xA4AD16EA, 0xA06C0B5D, 0xD4326D90, 0xD0F37027, 0xDDB056FE,
+       0xD9714B49, 0xC7361B4C, 0xC3F706FB, 0xCEB42022, 0xCA753D95,
+       0xF23A8028, 0xF6FB9D9F, 0xFBB8BB46, 0xFF79A6F1, 0xE13EF6F4,
+       0xE5FFEB43, 0xE8BCCD9A, 0xEC7DD02D, 0x34867077, 0x30476DC0,
+       0x3D044B19, 0x39C556AE, 0x278206AB, 0x23431B1C, 0x2E003DC5,
+       0x2AC12072, 0x128E9DCF, 0x164F8078, 0x1B0CA6A1, 0x1FCDBB16,
+       0x018AEB13, 0x054BF6A4, 0x0808D07D, 0x0CC9CDCA, 0x7897AB07,
+       0x7C56B6B0, 0x71159069, 0x75D48DDE, 0x6B93DDDB, 0x6F52C06C,
+       0x6211E6B5, 0x66D0FB02, 0x5E9F46BF, 0x5A5E5B08, 0x571D7DD1,
+       0x53DC6066, 0x4D9B3063, 0x495A2DD4, 0x44190B0D, 0x40D816BA,
+       0xACA5C697, 0xA864DB20, 0xA527FDF9, 0xA1E6E04E, 0xBFA1B04B,
+       0xBB60ADFC, 0xB6238B25, 0xB2E29692, 0x8AAD2B2F, 0x8E6C3698,
+       0x832F1041, 0x87EE0DF6, 0x99A95DF3, 0x9D684044, 0x902B669D,
+       0x94EA7B2A, 0xE0B41DE7, 0xE4750050, 0xE9362689, 0xEDF73B3E,
+       0xF3B06B3B, 0xF771768C, 0xFA325055, 0xFEF34DE2, 0xC6BCF05F,
+       0xC27DEDE8, 0xCF3ECB31, 0xCBFFD686, 0xD5B88683, 0xD1799B34,
+       0xDC3ABDED, 0xD8FBA05A, 0x690CE0EE, 0x6DCDFD59, 0x608EDB80,
+       0x644FC637, 0x7A089632, 0x7EC98B85, 0x738AAD5C, 0x774BB0EB,
+       0x4F040D56, 0x4BC510E1, 0x46863638, 0x42472B8F, 0x5C007B8A,
+       0x58C1663D, 0x558240E4, 0x51435D53, 0x251D3B9E, 0x21DC2629,
+       0x2C9F00F0, 0x285E1D47, 0x36194D42, 0x32D850F5, 0x3F9B762C,
+       0x3B5A6B9B, 0x0315D626, 0x07D4CB91, 0x0A97ED48, 0x0E56F0FF,
+       0x1011A0FA, 0x14D0BD4D, 0x19939B94, 0x1D528623, 0xF12F560E,
+       0xF5EE4BB9, 0xF8AD6D60, 0xFC6C70D7, 0xE22B20D2, 0xE6EA3D65,
+       0xEBA91BBC, 0xEF68060B, 0xD727BBB6, 0xD3E6A601, 0xDEA580D8,
+       0xDA649D6F, 0xC423CD6A, 0xC0E2D0DD, 0xCDA1F604, 0xC960EBB3,
+       0xBD3E8D7E, 0xB9FF90C9, 0xB4BCB610, 0xB07DABA7, 0xAE3AFBA2,
+       0xAAFBE615, 0xA7B8C0CC, 0xA379DD7B, 0x9B3660C6, 0x9FF77D71,
+       0x92B45BA8, 0x9675461F, 0x8832161A, 0x8CF30BAD, 0x81B02D74,
+       0x857130C3, 0x5D8A9099, 0x594B8D2E, 0x5408ABF7, 0x50C9B640,
+       0x4E8EE645, 0x4A4FFBF2, 0x470CDD2B, 0x43CDC09C, 0x7B827D21,
+       0x7F436096, 0x7200464F, 0x76C15BF8, 0x68860BFD, 0x6C47164A,
+       0x61043093, 0x65C52D24, 0x119B4BE9, 0x155A565E, 0x18197087,
+       0x1CD86D30, 0x029F3D35, 0x065E2082, 0x0B1D065B, 0x0FDC1BEC,
+       0x3793A651, 0x3352BBE6, 0x3E119D3F, 0x3AD08088, 0x2497D08D,
+       0x2056CD3A, 0x2D15EBE3, 0x29D4F654, 0xC5A92679, 0xC1683BCE,
+       0xCC2B1D17, 0xC8EA00A0, 0xD6AD50A5, 0xD26C4D12, 0xDF2F6BCB,
+       0xDBEE767C, 0xE3A1CBC1, 0xE760D676, 0xEA23F0AF, 0xEEE2ED18,
+       0xF0A5BD1D, 0xF464A0AA, 0xF9278673, 0xFDE69BC4, 0x89B8FD09,
+       0x8D79E0BE, 0x803AC667, 0x84FBDBD0, 0x9ABC8BD5, 0x9E7D9662,
+       0x933EB0BB, 0x97FFAD0C, 0xAFB010B1, 0xAB710D06, 0xA6322BDF,
+       0xA2F33668, 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4
+};
+
+crc partial_crc(crc crcval, char *buf, int buflen) {
+       int idx = 0;
+       unsigned char byte = 0;
+       for (idx=0; idx < buflen; idx++) {
+               byte = 0x00 | buf[idx];
+               crcval = (crcval << 8) ^ crctab[(crcval >> 24) ^ byte];
+       }
+       return crcval;
+}
+crc calculate_crc(char *buf, int buflen) {
+       return partial_crc(0, buf, buflen);
+}
diff --git a/TailFeather/trunk/src/bscp/crc.h b/TailFeather/trunk/src/bscp/crc.h
new file mode 100644 (file)
index 0000000..658da8c
--- /dev/null
@@ -0,0 +1,16 @@
+/* 
+ For copyright information see copyright.txt of the project 
+ Author: Philipp Dunkel
+*/
+
+#ifndef crc_h
+#define crc_h
+
+#include <sys/types.h>
+
+typedef int32_t crc;
+
+crc partial_crc(crc crcval, char *buf, int buflen);
+crc calculate_crc(char *buf, int buflen);
+
+#endif
diff --git a/TailFeather/trunk/src/bscp/packet.c b/TailFeather/trunk/src/bscp/packet.c
new file mode 100644 (file)
index 0000000..2b09eb6
--- /dev/null
@@ -0,0 +1,87 @@
+/* 
+ For copyright information see copyright.txt of the project 
+ Author: Philipp Dunkel
+*/
+
+#include "packet.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "crc.h"
+
+void num2char(char *buf, const unsigned long value, const int bits) {
+       int idx = 0;
+       for (idx=0; idx < (bits/8); idx++) {
+               buf[idx] = (value << (bits - (idx * 8))) & 0xFF;
+       }
+}
+void char2num(unsigned long *value, const char *buf, const int bits) {
+       int idx = 0;
+       *value = 0;
+       for (idx=0; idx < (bits/8); idx++) {
+               *value = *value << 8;
+               *value |= buf[idx];
+       }
+}
+
+packet *packet_create(void *buf, const int buflen) {
+       packet *pkt = (packet*)malloc(sizeof(packet));
+       pkt->length = 0;
+       pkt->checksum = 0;
+       memset(pkt->data, 0, PACKET_MAXLEN + PACKET_HEADER + PACKET_FOOTER + 1);
+       if (NULL == buf) {
+               packet_setdata(pkt,buf,buflen);
+       }
+       return pkt;
+}
+
+int packet_setdata(packet *pkt, void *buf, const int length) {
+       int32_t len=0;
+       memset(pkt->data,0,PACKET_MAXLEN + PACKET_HEADER + PACKET_FOOTER + 1);
+       pkt->length = (length > PACKET_MAXLEN) ? PACKET_MAXLEN : length;
+       len = htonl(pkt->length);
+       memcpy(pkt->data, &len, PACKET_HEADER);
+       memcpy(pkt->data + PACKET_HEADER,buf,pkt->length);
+       pkt->checksum = calculate_crc(pkt->data,pkt->length+PACKET_HEADER);
+       memcpy(pkt->data + PACKET_HEADER + pkt->length,&(pkt->checksum),PACKET_FOOTER);
+}
+
+void packet_send(comm *channel, packet *pkt) {
+       if ((pkt->length < 1)||(pkt->length > PACKET_MAXLEN)) return;
+       comm_put(channel, pkt->data, pkt->length + PACKET_HEADER + PACKET_FOOTER);
+}
+
+packet *packet_recv(comm *channel) {
+       packet *pkt = packet_create(NULL,0);
+       if (packet_fetch(channel, pkt) == 0) {
+               return pkt;
+       }
+       packet_destroy(pkt);
+}
+int packet_fetch(comm *channel, packet *pkt) {
+       int32_t len=0;
+       if (comm_get(channel, (void*)&len, PACKET_HEADER) != PACKET_HEADER) return 1;
+       memcpy(pkt->data, &len, PACKET_HEADER);
+       pkt->length = ntohl(len);
+       comm_get(channel,pkt->data + PACKET_HEADER,pkt->length + PACKET_FOOTER);
+       memcpy(&(pkt->checksum),pkt->data+ PACKET_HEADER + pkt->length, PACKET_FOOTER);
+       if (pkt->checksum != calculate_crc(pkt->data,PACKET_HEADER + pkt->length)) {
+               comm_fault(channel);
+               return 1;
+       }
+       return 0;
+}
+
+void *packet_data(packet *pkt, int *len) {
+       *len = pkt->length;
+       return pkt->data + PACKET_HEADER;
+}
+
+void packet_destroy(packet *pkt) {
+       if (NULL == pkt) return;
+       pkt->length = 0;
+       pkt->checksum = 0;
+       free(pkt);
+}
diff --git a/TailFeather/trunk/src/bscp/packet.h b/TailFeather/trunk/src/bscp/packet.h
new file mode 100644 (file)
index 0000000..5641d90
--- /dev/null
@@ -0,0 +1,33 @@
+/* 
+ For copyright information see copyright.txt of the project 
+ Author: Philipp Dunkel
+*/
+
+#ifndef packet_h
+#define packet_h
+
+#include "comm.h"
+#include "crc.h"
+
+#include <sys/types.h>
+
+#define PACKET_MAXLEN 1024
+#define PACKET_HEADER 4
+#define PACKET_FOOTER 4
+
+struct packet_t {
+       char data[ PACKET_HEADER + PACKET_MAXLEN + PACKET_FOOTER + 1 ];
+       int32_t length;
+       int32_t checksum;
+};
+typedef struct packet_t packet;
+
+packet *packet_create(void *buf, const int buflen);
+void packet_send(comm *channel, packet *pkt);
+packet *packet_recv(comm *channel);
+int packet_fetch(comm *channel, packet *pkt);
+void *packet_data(packet *pkt, int *len);
+int packet_setdata(packet *pkt, void *buf, const int len);
+void packet_destroy(packet *pkt);
+
+#endif
diff --git a/TailFeather/trunk/src/bscp/simpletest.c b/TailFeather/trunk/src/bscp/simpletest.c
new file mode 100644 (file)
index 0000000..fc36128
--- /dev/null
@@ -0,0 +1,29 @@
+/* 
+ For copyright information see copyright.txt of the project 
+ Author: Philipp Dunkel
+*/
+
+#include <stdio.h>
+#include <unistd.h>
+
+extern char **environ;
+
+int main(int argc, char *argv[]) {
+       int pip[2];
+       if (pipe(pip)) {
+               fprintf(stderr,"Could not create redirect pipe!\n");
+               return -1;
+       }
+       if (dup2(pip[0],0) != 0) {
+               fprintf(stderr,"Could not redirect STDIN!\n");
+               return -1;
+       }
+       if (dup2(pip[1],1) != 1) {
+               fprintf(stderr,"Could not redirect STDOUT!\n");
+               return -1;
+       }
+        
+       execve("./stdpipe",argv,environ);
+       fprintf(stderr,"Could not execute ./stdpipe !\n");
+       return -1;
+}
\ No newline at end of file
diff --git a/TailFeather/trunk/src/bscp/stdpipe.c b/TailFeather/trunk/src/bscp/stdpipe.c
new file mode 100644 (file)
index 0000000..1355791
--- /dev/null
@@ -0,0 +1,91 @@
+/* 
+ For copyright information see copyright.txt of the project 
+ Author: Philipp Dunkel
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <signal.h>
+
+#include "packet.h"
+
+int running;
+comm iface;
+
+void bugout(int sig) {
+       if (!running) {
+               return;
+       }
+       running = 0;
+       comm_cleanup(&iface);
+       close(0);
+       close(1);
+       signal(SIGHUP,NULL);
+       signal(SIGINT,NULL);
+       signal(SIGTERM,NULL);
+}
+
+void *bscp2pipe(void *argdata) {
+       char **argv = (char **)argdata;
+       packet pkt;
+       void *data = NULL;
+       int length = 0;
+       int pipe = -1;
+       while (running) {
+               if (packet_fetch(&iface, &pkt) == 0) {
+                       data = packet_data(&pkt, &length);
+                       if (data && running) {
+                               pipe = open(argv[2],O_WRONLY);
+                               if (pipe > -1) {
+                                       write(pipe,data,length);
+                                       close(pipe);
+                               }
+                       }
+               }
+       }
+}
+void *pipe2bscp(void *argdata) {
+       char **argv = (char**)argdata;
+       packet pkt;
+       unsigned char data[PACKET_MAXLEN];
+       int length;
+       int pipe = -1;
+       while (running) {
+               pipe = open(argv[1],O_RDONLY);
+               if (running && (pipe > -1)) {
+                       length = read(pipe,data,PACKET_MAXLEN);
+                       close(pipe);
+                       if ((length > -1) && running) {
+                               packet_setdata(&pkt,data,length);
+                               packet_send(&iface, &pkt);
+                       }
+               }
+       }
+}
+int main(int argc, char *argv[]) {
+       pthread_t th_bscp2pipe;
+       pthread_t th_pipe2bscp;
+       
+       if (argc != 3) {
+               fprintf(stderr,"Usage: %s <pipe-in> <pipe-out>\n",argv[0]);
+               return -1;
+       }
+       running = 0;
+       signal(SIGHUP,bugout);
+       siginterrupt(SIGHUP, 1);
+       signal(SIGINT,bugout);
+       siginterrupt(SIGINT, 1);
+       signal(SIGTERM,bugout);
+       siginterrupt(SIGTERM, 1);
+
+       running = 1;
+       comm_init(&iface, 0, 1);
+       fprintf(stderr, "Starting Threads...\n");
+       pthread_create(&th_bscp2pipe, NULL, bscp2pipe, (void*)argv);
+       pthread_create(&th_pipe2bscp, NULL, pipe2bscp, (void*)argv);
+       pthread_join(th_bscp2pipe, NULL);
+       pthread_join(th_pipe2bscp, NULL);
+
+       return 0;
+}
diff --git a/TailFeather/trunk/src/comm/Makefile b/TailFeather/trunk/src/comm/Makefile
deleted file mode 100644 (file)
index 48f2fba..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AR=ar
-CC=gcc
-
-clean : 
-       rm -f *.o
diff --git a/TailFeather/trunk/src/comm/comm.c b/TailFeather/trunk/src/comm/comm.c
deleted file mode 100644 (file)
index f9ee148..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
- For copyright information see copyright.txt of the project 
- Author: Philipp Dunkel
-*/
-
-#include "comm.h"
-
-#include <stdlib.h>
-#include <strings.h>
-
-struct comm_t {
-       int read;
-       int write;
-};
-comm *comm_create(int readchnl, int writechnl) {
-       comm *channel = (comm *)malloc(sizeof(comm));
-       if (NULL == channel) {
-               return NULL;
-       }
-       channel->read = readchnl;
-       channel->write = writechnl;
-       return channel;
-}
-int comm_get(comm *chnl, char *buf, int buflen) {
-       return read(chnl->read,buf,buflen);
-}
-int comm_put(comm *chnl, const char *buf, const int buflen) {
-       return write(chnl->write,buf,buflen);
-}
diff --git a/TailFeather/trunk/src/comm/comm.h b/TailFeather/trunk/src/comm/comm.h
deleted file mode 100644 (file)
index e512195..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/* 
- For copyright information see copyright.txt of the project 
- Author: Philipp Dunkel
-*/
-
-#ifndef comm_h
-#define comm_h
-
-struct comm_t;
-typedef struct comm_t comm;
-
-comm *comm_create(int readchnl, int writechnl);
-int comm_get(comm *chnl, char *buf, int buflen);
-int comm_put(comm *chnl, const char *buf, const int buflen);
-
-#endif
diff --git a/TailFeather/trunk/src/comm/crc.c b/TailFeather/trunk/src/comm/crc.c
deleted file mode 100644 (file)
index f71ae37..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/* 
- For copyright information see copyright.txt of the project 
- Author: Philipp Dunkel
-*/
-
-#include "crc.h"
-
-static crc crctab[256] = {
-       0x00000000,
-       0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B,
-       0x1A864DB2, 0x1E475005, 0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6,
-       0x2B4BCB61, 0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD,
-       0x4C11DB70, 0x48D0C6C7, 0x4593E01E, 0x4152FDA9, 0x5F15ADAC,
-       0x5BD4B01B, 0x569796C2, 0x52568B75, 0x6A1936C8, 0x6ED82B7F,
-       0x639B0DA6, 0x675A1011, 0x791D4014, 0x7DDC5DA3, 0x709F7B7A,
-       0x745E66CD, 0x9823B6E0, 0x9CE2AB57, 0x91A18D8E, 0x95609039,
-       0x8B27C03C, 0x8FE6DD8B, 0x82A5FB52, 0x8664E6E5, 0xBE2B5B58,
-       0xBAEA46EF, 0xB7A96036, 0xB3687D81, 0xAD2F2D84, 0xA9EE3033,
-       0xA4AD16EA, 0xA06C0B5D, 0xD4326D90, 0xD0F37027, 0xDDB056FE,
-       0xD9714B49, 0xC7361B4C, 0xC3F706FB, 0xCEB42022, 0xCA753D95,
-       0xF23A8028, 0xF6FB9D9F, 0xFBB8BB46, 0xFF79A6F1, 0xE13EF6F4,
-       0xE5FFEB43, 0xE8BCCD9A, 0xEC7DD02D, 0x34867077, 0x30476DC0,
-       0x3D044B19, 0x39C556AE, 0x278206AB, 0x23431B1C, 0x2E003DC5,
-       0x2AC12072, 0x128E9DCF, 0x164F8078, 0x1B0CA6A1, 0x1FCDBB16,
-       0x018AEB13, 0x054BF6A4, 0x0808D07D, 0x0CC9CDCA, 0x7897AB07,
-       0x7C56B6B0, 0x71159069, 0x75D48DDE, 0x6B93DDDB, 0x6F52C06C,
-       0x6211E6B5, 0x66D0FB02, 0x5E9F46BF, 0x5A5E5B08, 0x571D7DD1,
-       0x53DC6066, 0x4D9B3063, 0x495A2DD4, 0x44190B0D, 0x40D816BA,
-       0xACA5C697, 0xA864DB20, 0xA527FDF9, 0xA1E6E04E, 0xBFA1B04B,
-       0xBB60ADFC, 0xB6238B25, 0xB2E29692, 0x8AAD2B2F, 0x8E6C3698,
-       0x832F1041, 0x87EE0DF6, 0x99A95DF3, 0x9D684044, 0x902B669D,
-       0x94EA7B2A, 0xE0B41DE7, 0xE4750050, 0xE9362689, 0xEDF73B3E,
-       0xF3B06B3B, 0xF771768C, 0xFA325055, 0xFEF34DE2, 0xC6BCF05F,
-       0xC27DEDE8, 0xCF3ECB31, 0xCBFFD686, 0xD5B88683, 0xD1799B34,
-       0xDC3ABDED, 0xD8FBA05A, 0x690CE0EE, 0x6DCDFD59, 0x608EDB80,
-       0x644FC637, 0x7A089632, 0x7EC98B85, 0x738AAD5C, 0x774BB0EB,
-       0x4F040D56, 0x4BC510E1, 0x46863638, 0x42472B8F, 0x5C007B8A,
-       0x58C1663D, 0x558240E4, 0x51435D53, 0x251D3B9E, 0x21DC2629,
-       0x2C9F00F0, 0x285E1D47, 0x36194D42, 0x32D850F5, 0x3F9B762C,
-       0x3B5A6B9B, 0x0315D626, 0x07D4CB91, 0x0A97ED48, 0x0E56F0FF,
-       0x1011A0FA, 0x14D0BD4D, 0x19939B94, 0x1D528623, 0xF12F560E,
-       0xF5EE4BB9, 0xF8AD6D60, 0xFC6C70D7, 0xE22B20D2, 0xE6EA3D65,
-       0xEBA91BBC, 0xEF68060B, 0xD727BBB6, 0xD3E6A601, 0xDEA580D8,
-       0xDA649D6F, 0xC423CD6A, 0xC0E2D0DD, 0xCDA1F604, 0xC960EBB3,
-       0xBD3E8D7E, 0xB9FF90C9, 0xB4BCB610, 0xB07DABA7, 0xAE3AFBA2,
-       0xAAFBE615, 0xA7B8C0CC, 0xA379DD7B, 0x9B3660C6, 0x9FF77D71,
-       0x92B45BA8, 0x9675461F, 0x8832161A, 0x8CF30BAD, 0x81B02D74,
-       0x857130C3, 0x5D8A9099, 0x594B8D2E, 0x5408ABF7, 0x50C9B640,
-       0x4E8EE645, 0x4A4FFBF2, 0x470CDD2B, 0x43CDC09C, 0x7B827D21,
-       0x7F436096, 0x7200464F, 0x76C15BF8, 0x68860BFD, 0x6C47164A,
-       0x61043093, 0x65C52D24, 0x119B4BE9, 0x155A565E, 0x18197087,
-       0x1CD86D30, 0x029F3D35, 0x065E2082, 0x0B1D065B, 0x0FDC1BEC,
-       0x3793A651, 0x3352BBE6, 0x3E119D3F, 0x3AD08088, 0x2497D08D,
-       0x2056CD3A, 0x2D15EBE3, 0x29D4F654, 0xC5A92679, 0xC1683BCE,
-       0xCC2B1D17, 0xC8EA00A0, 0xD6AD50A5, 0xD26C4D12, 0xDF2F6BCB,
-       0xDBEE767C, 0xE3A1CBC1, 0xE760D676, 0xEA23F0AF, 0xEEE2ED18,
-       0xF0A5BD1D, 0xF464A0AA, 0xF9278673, 0xFDE69BC4, 0x89B8FD09,
-       0x8D79E0BE, 0x803AC667, 0x84FBDBD0, 0x9ABC8BD5, 0x9E7D9662,
-       0x933EB0BB, 0x97FFAD0C, 0xAFB010B1, 0xAB710D06, 0xA6322BDF,
-       0xA2F33668, 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4
-};
-
-static crc partial_crc(crc crcval, char *buf, int buflen) {
-       int idx = 0;
-       unsigned char byte = 0;
-       for (idx=0; idx < buflen; idx++) {
-               byte = 0x00 | buf[idx];
-               crcval = (crcval << 8) ^ crctab[(crcval >> 24) ^ byte];
-       }
-       return crcval;
-}
-static crc calculate_crc(char *buf, int buflen) {
-       return partial_crc(0, buf, buflen);
-}
diff --git a/TailFeather/trunk/src/comm/crc.h b/TailFeather/trunk/src/comm/crc.h
deleted file mode 100644 (file)
index 0e62f64..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/* 
- For copyright information see copyright.txt of the project 
- Author: Philipp Dunkel
-*/
-
-#ifndef crc_h
-#define crc_h
-
-typedef unsigned long crc;
-
-static crc partial_crc(crc crcval, char *buf, int buflen);
-static crc calculate_crc(char *buf, int buflen);
-
-#endif
diff --git a/TailFeather/trunk/src/comm/packet.c b/TailFeather/trunk/src/comm/packet.c
deleted file mode 100644 (file)
index 6fa30be..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- For copyright information see copyright.txt of the project 
- Author: Philipp Dunkel
-*/
-
-#include "packet.h"
-#include <string.h>
-
-#include "crc.h"
-
-#define PACKET_MAXLEN 1024
-#define PACKET_HEADER 2
-#define PACKET_FOOTER 4
-
-struct packet_t {
-       char *data;
-       unsigned int length;
-       unsigned long chksum;
-};
-
-void num2char(char *buf, const long value, const int bits) {
-       int idx = 0;
-       for (idx=0; idx < (bits/8); idx++) {
-               buf[idx] = (value << (bits - (idx * 8))) & 0xFF;
-       }
-}
-void char2num(long *value, const char *buf, const int bits) {
-       int idx = 0;
-       *value = 0;
-       for (idx=0; idx < (bits/8); idx++) {
-               *value = *value << 8;
-               *value |= buf[idx];
-       }
-}
-
-packet *packet_create(const char *buf, const int buflen) {
-       packet *pkt = (packet*)malloc(sizeof(packet));
-       pkt->length = (bufflen>PACKET_MAXLEN)?PACKET_MAXLEN:buflen;
-       pkt->data = (char*)malloc(sizef(char) * (pkt->length + PACKET_HEADER + PACKET_FOOTER));
-       if (NULL == pkg->data) {
-               free(pkt->data);
-               return NULL;
-       }
-       memset(pkt->data, 0, (pkt->length + PACKET_HEADER + PACKET_FOOTER));
-       if (NULL == buf) {
-               packet_setdata(pkt,buf,pkt->length)
-       }
-       return pkt;
-}
-
-int packet_setdata(packet *pkt, const char *buf, const int len) {
-       pkt->length = (len > pkt->length) ? pkt->length : len;
-       num2char(pkt->data, pkt->length, 16);
-       memcpy(pkt->data + PACKET_HEADER,buf,pkt->length);
-       pkt->chksum = calculate_crc(pkt->data,pkt->length+PACKET_HEADER);
-       num2char(pkt->data + PACKET_HEADER + pkt->length, pkt->chksum,32);
-}
-
-void packet_send(comm *channel, packet *pkt) {
-       comm_put(channel, pkt->data, pkt->length + PACKET_HEADER + PACKET_FOOTER);
-       char chksum[PAKET_FOOTER];
-       comm_get(channel,chksum,PAKET_FOOTER);
-       char2num(&(pkt->chksum),chksum,32);
-       // TODO : Check the checksum and retry/resynchronize if needed
-}
-
-packet *packet_recv(comm *channel) {
-       char header[PACKET_HEADER];
-       packet *pkt = NULL;
-       comm_get(channel, header, PACKET_HEADER);
-       long len = 0;
-       char2num(&len, header, 16);
-       pkt = packet_create(NULL,len);
-       memcpy(pkt->data,header,PACKET_HEADER);
-       comm_get(channel,pkt->data + PACKET_HEADER,pkt->length + PACKET_FOOTER);
-       char2num(&(pkt->checksum),pkt->data + PACKET_HEADER + pkt->length, 32);
-       // TODO : Check the checksum and send it back if correct or start synchronize if needed
-}
-
-void packet_destroy(packet *pkt) {
-       if (NULL == pkt) return;
-       if (NULL != pkt->data) {
-               free(pkt->data);
-               pkt->data = NULL;
-       }
-       pkt->length = -1;
-       free(pkt);
-}
diff --git a/TailFeather/trunk/src/comm/packet.h b/TailFeather/trunk/src/comm/packet.h
deleted file mode 100644 (file)
index 334f053..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 
- For copyright information see copyright.txt of the project 
- Author: Philipp Dunkel
-*/
-
-#ifndef packet_h
-#define packet_h
-
-#include "comm.h"
-
-struct packet_t;
-typedef struct packet_t packet;
-
-packet *packet_create(const char *buf, const unsigned long buflen);
-void packet_send(comm *channel, packet *pkt);
-packet *packet_recv(comm *channel);
-void packet_destroy(packet *pkt);
-
-#endif