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

[gnunet]

Author: ruppa
Date: 2011-12-20 18:02:24 +0100 (Tue, 20 Dec 2011)
New Revision: 18727

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    2011-12-20 16:41:19 UTC (rev 18726)
+++ libmwmodem/src/main/libmwmodem.c    2011-12-20 17:02:24 UTC (rev 18727)
@@ -257,6 +257,12 @@
 
                                        channel.queue = (uint8_t) chl->queue;
 
+                                       if (channel.queue> 64 || channel.queue 
<0)
+                                       {
+                                               fprintf(stderr, "Error Frames 
out of borders!");
+                                               return;
+                                       }
+
                                        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 2011-12-20 16:41:19 UTC (rev 
18726)
+++ libmwmodem/src/tests/libmwmodem_test_ipv4.c 2011-12-20 17:02:24 UTC (rev 
18727)
@@ -28,11 +28,10 @@
 
 void Callback(void *cls, const struct MWMODEM_Package *package)
 {
-//     if (package->header !=((uint32_t) "joh0"))
-       if (package->header != package->header)
+       if (package->header !=(0x6a726f00))
        {
                printf("Error: failure of Test from MWMODEM_run in 
MWMODEM_InformationCallback at package->Header!\n");
-//             return;
+               return;
        }
        if ((package->time.tv_nsec!=(1*MWMODEM_TACT_NANO_SEC)% (1000 * 1000 * 
1000))&&
                                
(package->time.tv_sec!=(1*MWMODEM_TACT_NANO_SEC)/ (1000 * 1000 * 1000)))
@@ -118,6 +117,7 @@
   uint32_t time;
   uint32_t symbolrate;
   uint8_t channelmax;
+  struct MWChannel *channel;
 };
 
 int generatedata()//TODO
@@ -125,8 +125,27 @@
        const struct sockaddr *address;
        struct sockaddr_in address4;
        socklen_t alen;
+       char *buffer;
        int s;
 
+       struct MWHeader hdr;
+       hdr.header = htons((uint32_t)0x6a726f00);
+       hdr.time= htons(1);
+       hdr.symbolrate=htons(100);
+       hdr.channelmax=htons(1);
+
+       struct MWChannel chl;
+       chl.index = htons(0);
+       chl.modcod = htons(1);
+       chl.queue = htons(10);
+       chl.datasent = htons(10);
+       chl.symbolratelimit=htons(10);
+
+       struct MWChannel chlist[hdr.channelmax];
+       chlist[0] = chl;
+       hdr.channel =chlist;
+       buffer = (char) hdr;
+
        s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
        if (-1==s) return -1;
@@ -144,8 +163,11 @@
 
        alen = sizeof (address4);
 
+       if (-1== sendto(s, buffer, sizeof(MWHeader), 0, address, alen))
+       {
+               return -1;
+       }
 
-
        return 0;
 }