[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20482 - in libmwmodem/src: include main tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20482 - in libmwmodem/src: include main tests |
Date: |
Tue, 13 Mar 2012 16:26:51 +0100 |
Author: ruppa
Date: 2012-03-13 16:26:51 +0100 (Tue, 13 Mar 2012)
New Revision: 20482
Modified:
libmwmodem/src/include/libmwmodem.h
libmwmodem/src/main/libmwmodem.c
libmwmodem/src/tests/libmwmodem_test_ipv4.c
Log:
ipv4 test final
Modified: libmwmodem/src/include/libmwmodem.h
===================================================================
--- libmwmodem/src/include/libmwmodem.h 2012-03-13 14:46:36 UTC (rev 20481)
+++ libmwmodem/src/include/libmwmodem.h 2012-03-13 15:26:51 UTC (rev 20482)
@@ -55,6 +55,11 @@
#define MWMODEM_TACT_NANO_SEC 37
/**
+ * MWMODEM Header Code
+ */
+#define MWMODEM_HEADER 0x6a726f00
+
+/**
* Definition of all existend Modcodes of DVB-S2 with a Prefix (MOD_).
* Code Rates 1/4 are written 1_4!
* Defined at
http://www.etsi.org/deliver/etsi_en/302300_302399/302307/01.02.01_60/en_302307v010201p.pdf.
Modified: libmwmodem/src/main/libmwmodem.c
===================================================================
--- libmwmodem/src/main/libmwmodem.c 2012-03-13 14:46:36 UTC (rev 20481)
+++ libmwmodem/src/main/libmwmodem.c 2012-03-13 15:26:51 UTC (rev 20482)
@@ -219,7 +219,7 @@
hdr = (struct MWHeader*) buffer;
- if (ntohl(hdr->header)!=(uint32_t)0x6a726f00)
+ if (ntohl(hdr->header)!=(uint32_t)MWMODEM_HEADER)
{
fprintf(stderr, "Error: no MWModem compatible message
received!\n");
return;
@@ -241,14 +241,14 @@
for(i=0;i<package.num_channels; i++)
{
ptr = malloc(4);
- memcpy((char *)ptr,(const char *)
buffer+currentBufferZelle, 1);
+ memcpy((char *)ptr,(const char *)
buffer+currentBufferZelle, 3);
chl = (struct MWChannel_1Byte_fields *) ptr;//
later: bus errors on SPARC architectures
currentBufferZelle +=3;
ptr = malloc(16);
- memcpy((char *)ptr, (const char *)
buffer+currentBufferZelle, 4);
+ memcpy((char *)ptr, (const char *)
buffer+currentBufferZelle, 8);
chl2 = (struct MWChannel_4Byte_fields *) ptr;
@@ -269,7 +269,7 @@
channel.queue = (uint8_t) chl->queue;
- if (channel.queue> 64 || channel.queue
<0)
+ if (channel.queue> MWMODEM_MAX_QUEUE ||
channel.queue <0)
{
fprintf(stderr, "Error Frames
out of borders!");
free(list);
Modified: libmwmodem/src/tests/libmwmodem_test_ipv4.c
===================================================================
--- libmwmodem/src/tests/libmwmodem_test_ipv4.c 2012-03-13 14:46:36 UTC (rev
20481)
+++ libmwmodem/src/tests/libmwmodem_test_ipv4.c 2012-03-13 15:26:51 UTC (rev
20482)
@@ -26,6 +26,7 @@
#include <stdint.h>
#include <errno.h>
#include <malloc.h>
+#include <stdlib.h>
#define MW_MAGIC_NUMBER 0x6a726f00
@@ -35,20 +36,20 @@
{
ASSERT (package->header == MW_MAGIC_NUMBER);
- ASSERT (package->time.tv_nsec!=(1*MWMODEM_TACT_NANO_SEC)% (1000 * 1000
* 1000));
- ASSERT (package->time.tv_sec!=(1*MWMODEM_TACT_NANO_SEC)/ (1000 * 1000 *
1000));
+ ASSERT (package->time.tv_nsec==(1*MWMODEM_TACT_NANO_SEC)% (1000 * 1000
* 1000));
+ ASSERT (package->time.tv_sec==(1*MWMODEM_TACT_NANO_SEC)/ (1000 * 1000 *
1000));
- ASSERT (package->symbolrate!=100);
+ ASSERT (package->symbolrate==100);
- ASSERT (package->num_channels!=1);
+ ASSERT (package->num_channels==1);
- ASSERT (package->channel[0].modcode != 1);
+ ASSERT (package->channel[0].modcode == 1);
- ASSERT (package->channel[0].queue != 11);
+ ASSERT (package->channel[0].queue == 11);
- ASSERT (package->channel[0].datasent != 10);
+ ASSERT (package->channel[0].datasent == 10);
- ASSERT (package->channel[0].symbolratelimit != 12);
+ ASSERT (package->channel[0].symbolratelimit == 12);
}
static int testgetsocket(struct MWMODEM_Context *context)
@@ -83,7 +84,7 @@
struct MWChannel *channel;
};
-static int fillDataBuffer(struct MWHeader d, char buffer[24], int num_channels)
+static int fillDataBuffer(struct MWHeader d, char *buffer, int num_channels)
{
buffer[0] = d.header ;
buffer[1] = d.header >> 8;
@@ -133,7 +134,7 @@
const struct sockaddr *address;
struct sockaddr_in address4;
socklen_t alen;
- char buffer[24];
+ char buffer[323];
int s;
struct MWHeader hdr;
@@ -153,7 +154,7 @@
chlist[0] = chl;
hdr.channel =chlist;
- if (-1 == fillDataBuffer(hdr, buffer, 24))
+ if (-1 == fillDataBuffer(hdr, &buffer, 24))
{
fprintf(stderr, "Error, the buffer was too small for the data
to send!\n");
return -1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20482 - in libmwmodem/src: include main tests,
gnunet <=