[GNUnet-SVN] r18969 - in libmwmodem/src: main tests

[gnunet]

Author: ruppa
Date: 2012-01-04 11:21:55 +0100 (Wed, 04 Jan 2012)
New Revision: 18969

Modified:
   libmwmodem/src/main/libmwmodem.c
   libmwmodem/src/tests/libmwmodem_test_ipv4.c
Log:


Modified: libmwmodem/src/main/libmwmodem.c
===================================================================
--- libmwmodem/src/main/libmwmodem.c    2012-01-04 10:21:15 UTC (rev 18968)
+++ libmwmodem/src/main/libmwmodem.c    2012-01-04 10:21:55 UTC (rev 18969)
@@ -216,8 +216,7 @@
 
                hdr = (struct MWHeader*) buffer;
 
-               //if (hdr->header!=0x6a726f00)//TODO deklination der 
Erkennungsmerkmale der Message
-               if(0!=0)
+               if (ntohl(hdr->header)!=(uint32_t)0x6a726f00)
                {
                        fprintf(stderr, "Error: no MWModem compatible message 
received!\n");
                        return;
@@ -235,7 +234,7 @@
                        list = list2;
 
                        unsigned int i, currentBufferZelle;
-                       currentBufferZelle = 14;
+                       currentBufferZelle = 13;
                        for(i=0;i<package.num_channels; i++)
                        {
                                ptr = &buffer[currentBufferZelle];
@@ -263,7 +262,7 @@
                                                fprintf(stderr, "Error Frames 
out of borders!");
                                                return;
                                        }
-
+                                       printf("%d\n", ntohl(chl->datasent));
                                        channel.datasent = ntohl(chl->datasent);
 
                                        channel.symbolratelimit = 
ntohl(chl->symbolratelimit);

Modified: libmwmodem/src/tests/libmwmodem_test_ipv4.c
===================================================================
--- libmwmodem/src/tests/libmwmodem_test_ipv4.c 2012-01-04 10:21:15 UTC (rev 
18968)
+++ libmwmodem/src/tests/libmwmodem_test_ipv4.c 2012-01-04 10:21:55 UTC (rev 
18969)
@@ -33,8 +33,7 @@
 
 static void callback(void *cls, const struct MWMODEM_Package *package)
 {
-       if (0!=0)
-    //if (package->header != MW_MAGIC_NUMBER)
+    if (package->header != MW_MAGIC_NUMBER)
        {
            fprintf(stderr, "Error: failure of Test from MWMODEM_run in 
MWMODEM_InformationCallback at package->Header!\n");
                global_ret = 2;
@@ -62,13 +61,13 @@
 
        const struct MWMODEM_Channel *channel = &package->channel[0];
 
-       if (channel->modcode != 1)
+       if (channel->modcode != (uint8_t)1)
        {
                fprintf(stderr, "Error: failure of Test from MWMODEM_run in 
MWMODEM_InformationCallback at package->channel[0]->modcode!\n");
                global_ret = 6;
                return;
        }
-       if (channel->queue != 10)
+       if (channel->queue != 11)
        {
                fprintf(stderr, "Error: failure of Test from MWMODEM_run in 
MWMODEM_InformationCallback at package->channel[0]->queue!\n");
                global_ret = 7;
@@ -80,7 +79,7 @@
                global_ret = 8;
                return;
        }
-       if (channel->symbolratelimit != 10)
+       if (channel->symbolratelimit != 12)
        {
                fprintf(stderr, "Error: failure of Test from MWMODEM_run in 
MWMODEM_InformationCallback at package->channel[0]->symbolratelimit!\n");
                global_ret = 9;
@@ -126,46 +125,32 @@
 
 static int fillDataBuffer(struct MWHeader d, char buffer[24], int len)
 {
-  int i, j = 0;
-
-  for (i = sizeof(d.header) - 1; i >= 0 && j < len; i--, j++) {
-    buffer[j] = (char) (d.header >> i);
-  }
-
-  for (i = sizeof(d.time) - 1; i >= 0 && j < len; i--, j++) {
-    buffer[j] = (char) (d.time >> i);
-  }
-
-  for (i = sizeof(d.symbolrate) - 1; i >= 0 && j < len; i--, j++) {
-    buffer[j] = (char) (d.symbolrate >> i);
-  }
-
-  buffer[j] = (char) d.channelmax;
-  j+=1;
-
-  buffer[j] = (char) d.channel[d.channelmax-1].index;
-  j+=1;
-
-  buffer[j] = (char) d.channel[d.channelmax-1].modcod;
-  j+=1;
-
-  buffer[j] = (char) d.channel[d.channelmax-1].queue;
-  j+=1;
-
-  for (i = sizeof(d.channel[d.channelmax-1].datasent) - 1; i >= 0 && j < len; 
i--, j++) {
-     buffer[j] = (char) (d.channel[d.channelmax-1].datasent >> i);
-   }
-
-  for (i = sizeof(d.channel[d.channelmax-1].symbolratelimit) - 1; i >= 0 && j 
< len; i--, j++) {
-    buffer[j] = (char) (d.channel[d.channelmax-1].symbolratelimit >> i);
-  }
-
-  if (j > len) {
-    /* Error!  The buffer wasn't big enough. */
-    return -1;
-  } else {
-    return 0;
-  }
+       buffer[0] = d.header ;
+       buffer[1] = d.header >> 8;
+       buffer[2] = d.header  >> 16;
+       buffer[3] = d.header >> 24;
+       buffer[4] = d.time ;
+       buffer[5] = d.time >> 8;
+       buffer[6] = d.time >> 16;
+       buffer[7] = d.time >> 24;
+       buffer[8] = d.symbolrate;
+       buffer[9] = d.symbolrate >> 8;
+       buffer[10] = d.symbolrate >> 16;
+       buffer[11] = d.symbolrate >> 24;
+       buffer[12] = d.channelmax;
+       buffer[13] = d.channel[0].index;
+       buffer[14] = d.channel[0].modcod;
+       buffer[15] = d.channel[0].queue;
+       buffer[16] = d.channel[0].datasent;
+       buffer[17] = d.channel[0].datasent >> 8;
+       buffer[18] = d.channel[0].datasent >> 16;
+       buffer[19] = d.channel[0].datasent >> 24;
+       printf("%d\n", ntohl(d.channel[0].datasent));
+       buffer[20] = d.channel[0].symbolratelimit;
+       buffer[21] = d.channel[0].symbolratelimit >> 8;
+       buffer[22] = d.channel[0].symbolratelimit >> 16;
+       buffer[23] = d.channel[0].symbolratelimit >> 24;
+       return 0;
 }
 
 static int generatedata()//TODO
@@ -185,9 +170,9 @@
        struct MWChannel chl;
        chl.index = 0;
        chl.modcod = (uint8_t) 1;
-       chl.queue = 10;
+       chl.queue = 11;
        chl.datasent = htonl(10);
-       chl.symbolratelimit=htonl(10);
+       chl.symbolratelimit=htonl(12);
 
        struct MWChannel chlist[hdr.channelmax];
        chlist[0] = chl;