[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18259 - in libmwmodem: . src src/include src/main
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18259 - in libmwmodem: . src src/include src/main |
|
Date: |
Tue, 22 Nov 2011 18:21:54 +0100 |
Author: ruppa
Date: 2011-11-22 18:21:54 +0100 (Tue, 22 Nov 2011)
New Revision: 18259
Removed:
libmwmodem/contrib/
libmwmodem/m4/
Modified:
libmwmodem/Makefile.am
libmwmodem/configure.ac
libmwmodem/libmwmodem.pc.in
libmwmodem/src/Makefile.am
libmwmodem/src/include/libmwmodem.h
libmwmodem/src/main/Makefile.am
libmwmodem/src/main/libmwmodem.c
Log:
Modified: libmwmodem/Makefile.am
===================================================================
--- libmwmodem/Makefile.am 2011-11-22 15:10:15 UTC (rev 18258)
+++ libmwmodem/Makefile.am 2011-11-22 17:21:54 UTC (rev 18259)
@@ -1,6 +1,6 @@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = contrib src doc m4 .
-EXTRA_DIST = acinclude.m4 libmwmodem.pc.in
+ACLOCAL_AMFLAGS = -I
+SUBDIRS = src doc .
+EXTRA_DIST = libmwmodem.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libmwmodem.pc
Modified: libmwmodem/configure.ac
===================================================================
--- libmwmodem/configure.ac 2011-11-22 15:10:15 UTC (rev 18258)
+++ libmwmodem/configure.ac 2011-11-22 17:21:54 UTC (rev 18259)
@@ -1,4 +1,14 @@
-AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
+AC_PREREQ(2.57)
+AC_INIT([libmwmodem], [00.00.01], [])
+AM_INIT_AUTOMAKE([libmwmodem], [00.00.01])
+AC_LIBTOOL_WIN32_DLL
+#C_PROG_LIBTOOL
+AC_CONFIG_FILES([
+libmwmode.h
+Makefile
+src/Makefile
+src/include/Makefile
+src/main/Makefile])
AC_OUTPUT
\ No newline at end of file
Modified: libmwmodem/libmwmodem.pc.in
===================================================================
--- libmwmodem/libmwmodem.pc.in 2011-11-22 15:10:15 UTC (rev 18258)
+++ libmwmodem/libmwmodem.pc.in 2011-11-22 17:21:54 UTC (rev 18259)
@@ -9,5 +9,4 @@
Requires:
Conflicts:
Libs: -L${libdir} -libmwmodem
-Libs.private: @MHD_LIBDEPS@
Cflags: -I${includedir}
Modified: libmwmodem/src/Makefile.am
===================================================================
--- libmwmodem/src/Makefile.am 2011-11-22 15:10:15 UTC (rev 18258)
+++ libmwmodem/src/Makefile.am 2011-11-22 17:21:54 UTC (rev 18259)
@@ -1,4 +1 @@
-if HAVE_Test
-tests = test
-endif
-SUBDIRS = include main $(tests) .
+SUBDIRS = include main .
Modified: libmwmodem/src/include/libmwmodem.h
===================================================================
--- libmwmodem/src/include/libmwmodem.h 2011-11-22 15:10:15 UTC (rev 18258)
+++ libmwmodem/src/include/libmwmodem.h 2011-11-22 17:21:54 UTC (rev 18259)
@@ -40,7 +40,7 @@
* BETA2 is 00.80.00.00
* FINAL is 01.80.00.00
*/
-#define MWMODEM_VERSION 0x00000100
+#define MWMODEM_VERSION 0x00000105
/**
* The default port for receiving the UDP packages
@@ -116,7 +116,7 @@
* Specified at the definition of MWMODEM_ModCode. And here used
* for specification of the used ModCode from this channel.
*/
- enum MWMODEM_ModCode modcod;
+ enum MWMODEM_ModCode modcode;
/**
* The microwave Modem has s queue for frames for every channel.
@@ -163,25 +163,27 @@
/**
* The list of actualy existing channels at the satellite modem.
- */
- const struct MWMODEM_Channel *channel;
+ */
+ //const struct MWMODEM_Channel *channel;
+ struct MWMODEM_Channel *channel;
};
/**
* This holds the instance of MWMODEM
*/
struct MWMODEM_Context{
- static int socket;
- MWMODEM_InformationCallback cb;
- void cls;
+ const int socket;
+ void *cb;
+ void *cls;
};
+
/**
* Higher function for receiving the informations about the microwave
satellite modem after parsing
* the received udp package from the modem.
*/
typedef void (*MWMODEM_InformationCallback)(void *cls,
- const struct MWMODEM_Package
*package);
+ const struct MWMODEM_Package
*package);
/**
* Initialisation of this library.
Modified: libmwmodem/src/main/Makefile.am
===================================================================
--- libmwmodem/src/main/Makefile.am 2011-11-22 15:10:15 UTC (rev 18258)
+++ libmwmodem/src/main/Makefile.am 2011-11-22 17:21:54 UTC (rev 18259)
@@ -1,8 +1,6 @@
AM_CPPFLAGS = \
- $(PLIBC_INCLUDE) \
-I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/main \
- @LIBGCRYPT_CFLAGS@
+ -I$(top_srcdir)/src/main
lib_LTLIBRARIES = \
libmwmodem.la
@@ -10,17 +8,3 @@
libmwmodem_la_SOURCES = \
libmwmodem.c libmwmodem.h
-
-if USE_COVERAGE
- AM_CFLAGS = --coverage
-endif
-
-check_PROGRAMS = \
- daemon_test
-
-TESTS = $(check_PROGRAMS)
-
-libmwmodem_test_SOURCES = \
- libmwmodem_test.c
-daemon_test_LDADD = \
- $(top_builddir)/src/main/libmwmodem.la
Modified: libmwmodem/src/main/libmwmodem.c
===================================================================
--- libmwmodem/src/main/libmwmodem.c 2011-11-22 15:10:15 UTC (rev 18258)
+++ libmwmodem/src/main/libmwmodem.c 2011-11-22 17:21:54 UTC (rev 18259)
@@ -21,71 +21,91 @@
#include "libmwmodem.h"
#include <sys/socket.h>
#include <stdint.h>
+#include <malloc.h>
uint32_t val;
-struct MWMODEM_Content * MWMODEM_init (uint16_t port, int af_int,
MWMODEM_Information_Callback cb, void *cb_cls)
+struct MWMODEM_Context * MWMODEM_init (uint16_t port, int af_int,
MWMODEM_InformationCallback cb, void *cb_cls)
{
- static struct MWMODEM_Content *content;
- content = malloc(sizeof(struct MWMODEM_Content));
- content.cb = cb;
+ static struct MWMODEM_Context *context;
+ struct sockaddr_in adress4;
+ struct sockaddr_in6 adress6;
+ void *adress;
- if (af_int==AF_INET||af_int==AF_INET6)content.socket = socket(af_int,
SOCK_DGRAM, IPPROTO_UDP);
+ context = malloc(sizeof(struct MWMODEM_Context));
+ (*context).cb = cb;
+
+ if (af_int==AF_INET||af_int==AF_INET6)(*context).socket =
socket(af_int, SOCK_DGRAM, IPPROTO_UDP);
else
{
printf("Error no correct AF_INET or AF_INET6 value!");
- return null;
+ return;
}
- if (content.socket==-1)
+ if ((*context).socket==-1)
{
printf("Error no socket created!");
- return null;
+ return;
}
- if (af_inet==AF_INET) struct sockaddr_in adress;
- else struct sockaddr_in6 adress;
+ if (af_int==AF_INET)
+ {
+ struct sockaddr_in adress;
+ }
+ else
+ {
+ struct sockaddr_in6 adress;
+ }
adress= malloc(sizeof(struct sockaddr_in));
memset( &adress, 0, sizeof (adress));
- adress.sin_family = af_int;
+ (*adress).sin_family = af_int;
if (port == 0)
{
- adress.sin_port = htons(MWMODEM_PORT);
+ (*adress).sin_port = htons(MWMODEM_PORT);
}
else
{
- adress.sin_port = htons(port);
+ (*adress).sin_port = htons(port);
}
- bind(content.socket, adress, sizeof(adress));
+ bind((*context).socket, adress, sizeof(adress));
free(adress);
- return content;
+ return context;
}
int MWMODEM_get_select_socket(struct MWMODEM_Context *fc)
{
- return fc.socket;
+ return (*fc).socket;
}
-void MWMODEM_run (struct MWMODEM_Content *fc)
+uint32_t charArrayToInt (char byte4[4])
{
+ val = (uint32_t)byte4[0]
+ |val + (uint32_t)byte4[1] << 8
+ |val + (uint32_t)byte4[2] << 16
+ |val +(uint32_t)byte4[3] << 24;
+ return val;
+}
+
+void MWMODEM_run (struct MWMODEM_Context *fc)
+{
struct MWMODEM_Package package;
char *buffer;
buffer = malloc(MWMODEM_MAXMESSLENGTH);
struct sockaddr *from;
socklen_t *from_length;
- recvfrom(fc.socket, *buffer, sizeof(buffer), 0, from, from_length);
+ recvfrom((*fc).socket, *buffer, sizeof(buffer), 0, from, from_length);
char byte4[4];
byte4[0]= buffer[0];
byte4[1]= buffer[1];
byte4[2]= buffer[2];
byte4[3]= buffer[3];
- if (true)//TODO deklination der Erkennungsmerkmale der Message
+ if (1==1)//TODO deklination der Erkennungsmerkmale der Message
{
package.header = ntohl(charArrayToInt(byte4));
@@ -116,45 +136,45 @@
{
currentBufferZelle+=1;
-
if(buffer[currentBufferZelle]<MWMODEM_ModCode.MWMODEM_MOD_DUMMY
-
&&buffer[currentBufferZelle]>MWMODEM_ModeCode.MWMODEM_MOD_RESERVED)
+
if(buffer[currentBufferZelle]>MWMODEM_ModCode.MWMODEM_MOD_DUMMY
+
&&buffer[currentBufferZelle]<MWMODEM_ModCode.MWMODEM_MOD_RESERVED)
{
switch(buffer[currentBufferZelle])
{
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_4;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_3 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_3;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_2_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_2_5;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_2 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_1_2;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_3_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_3_5;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_2_3 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_2_3;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_3_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_3_4;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_4_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_4_5;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_5_6 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_5_6;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_8_9 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_8_9;
- case
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_9_10 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_QPSK_9_10;
- case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_3_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_3_5;
- case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_2_3 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_2_3;
- case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_3_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_3_4;
- case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_5_6 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_5_6;
- case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_8_9 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_8_9;
- case
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_9_10 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_8PSK_9_10;
- case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_2_3 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_2_3;
- case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_3_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_3_4;
- case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_4_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_4_5;
- case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_5_6 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_5_6;
- case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_8_9 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_8_9;
- case
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_9_10 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_16APSK_9_10;
- case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_3_4 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_3_4;
- case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_4_5 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_4_5;
- case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_5_6 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_5_6;
- case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_8_9 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_8_9;
- case
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_9_10 : channel.modcode =
MWMODEM_ModeCode.MWMODEM_MOD_32APSK_9_10;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_1_4 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_1_4;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_1_3 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_1_3;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_2_5 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_2_5;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_1_2 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_1_2;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_3_5 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_3_5;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_2_3 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_2_3;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_3_4 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_3_4;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_4_5 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_4_5;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_5_6 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_5_6;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_8_9 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_8_9;
+ case
MWMODEM_ModCode.MWMODEM_MOD_QPSK_9_10 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_QPSK_9_10;
+ case
MWMODEM_ModCode.MWMODEM_MOD_8PSK_3_5 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_8PSK_3_5;
+ case
MWMODEM_ModCode.MWMODEM_MOD_8PSK_2_3 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_8PSK_2_3;
+ case
MWMODEM_ModCode.MWMODEM_MOD_8PSK_3_4 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_8PSK_3_4;
+ case
MWMODEM_ModCode.MWMODEM_MOD_8PSK_5_6 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_8PSK_5_6;
+ case
MWMODEM_ModCode.MWMODEM_MOD_8PSK_8_9 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_8PSK_8_9;
+ case
MWMODEM_ModCode.MWMODEM_MOD_8PSK_9_10 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_8PSK_9_10;
+ case
MWMODEM_ModCode.MWMODEM_MOD_16APSK_2_3 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_16APSK_2_3;
+ case
MWMODEM_ModCode.MWMODEM_MOD_16APSK_3_4 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_16APSK_3_4;
+ case
MWMODEM_ModCode.MWMODEM_MOD_16APSK_4_5 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_16APSK_4_5;
+ case
MWMODEM_ModCode.MWMODEM_MOD_16APSK_5_6 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_16APSK_5_6;
+ case
MWMODEM_ModCode.MWMODEM_MOD_16APSK_8_9 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_16APSK_8_9;
+ case
MWMODEM_ModCode.MWMODEM_MOD_16APSK_9_10 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_16APSK_9_10;
+ case
MWMODEM_ModCode.MWMODEM_MOD_32APSK_3_4 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_32APSK_3_4;
+ case
MWMODEM_ModCode.MWMODEM_MOD_32APSK_4_5 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_32APSK_4_5;
+ case
MWMODEM_ModCode.MWMODEM_MOD_32APSK_5_6 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_32APSK_5_6;
+ case
MWMODEM_ModCode.MWMODEM_MOD_32APSK_8_9 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_32APSK_8_9;
+ case
MWMODEM_ModCode.MWMODEM_MOD_32APSK_9_10 : channel.modcode =
MWMODEM_ModCode.MWMODEM_MOD_32APSK_9_10;
}
}
else
{
printf("Error no correct satellite
modcode!");
- return null;
+ return;
}
currentBufferZelle+=1;
@@ -180,29 +200,19 @@
currentBufferZelle+=1;
byte4[3] = buffer[currentBufferZelle];
channel.symbolratelimit =
ntohl(charArrayToInt(byte4));
- package.channel[i] = channel;
+ package.channel+i = channel;
currentBufferZelle+=1;
}
}
}
- else return null;
- fc.cb(fc.cls, package);
+ else return; //TODO
+ (*fc).cb((*fc).cls, package);
}
-void MWMODEM_free (struct MWMODWEM_Content *fc)
+void MWMODEM_free (struct MWMODEM_Context *fc)
{
- close(fc.socket);
- free(fc.socket);
- free(fc.cb);
- free(fc.cls);
+ close((*fc).socket);
+ free((*fc).cb);
+ free((*fc).cls);
free(fc);
}
-
-uint32_t charArrayToInt (char byte4[4])
-{
- val = (uint32_t)byte4[3]
- | (uint32_t)byte4[2] << 8
- | (uint32_t)byte4[1] << 16
- | (uint32_t)byte4[0] << 24;
- return val;
-}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18259 - in libmwmodem: . src src/include src/main,
gnunet <=