[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5815 - in GNUnet: . m4 src/applications/advertising src/ap
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r5815 - in GNUnet: . m4 src/applications/advertising src/applications/transport src/include src/server src/transports |
|
Date: |
Thu, 6 Dec 2007 18:04:04 -0700 (MST) |
Author: grothoff
Date: 2007-12-06 18:04:03 -0700 (Thu, 06 Dec 2007)
New Revision: 5815
Modified:
GNUnet/configure.ac
GNUnet/m4/Makefile.in
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/transport/transport.c
GNUnet/src/include/gnunet_transport.h
GNUnet/src/include/gnunet_transport_service.h
GNUnet/src/server/connection.c
GNUnet/src/server/connection.h
GNUnet/src/server/gnunet-transport-check.c
GNUnet/src/server/handler.c
GNUnet/src/server/handler.h
GNUnet/src/transports/Makefile.am
GNUnet/src/transports/http.c
GNUnet/src/transports/nat.c
GNUnet/src/transports/tcp.c
GNUnet/src/transports/tcp6.c
GNUnet/src/transports/tcp_helper.c
GNUnet/src/transports/test.c
GNUnet/src/transports/test_repeat.c
GNUnet/src/transports/udp.c
GNUnet/src/transports/udp6.c
GNUnet/src/transports/udp_helper.c
Log:
missed transport API renaming
Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/configure.ac 2007-12-07 01:04:03 UTC (rev 5815)
@@ -502,7 +502,39 @@
AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
+# libesmtp
+esmtp=0
+AC_MSG_CHECKING([for libesmtp])
+AC_ARG_WITH(esmtp,
+ [ --with-esmtp=PFX Base of libesmtp installation],
+ [AC_MSG_RESULT([$with_esmtp])
+ case $with_esmtp in
+ no)
+ ;;
+ yes)
+ AC_CHECK_HEADERS(libesmtp.h,
+ AC_CHECK_LIB([esmtp], [smtp_start_session],
+ esmtp=1))
+ ;;
+ *)
+ LDFLAGS="-L$with_esmtp/lib $LDFLAGS"
+ CPPFLAGS="-I$with_esmtp/include $CPPFLAGS"
+ AC_CHECK_HEADERS(libesmtp.h,
+ AC_CHECK_LIB([esmtp], [smtp_start_session],
+ EXT_LIB_PATH="-L$with_esmtp/lib $EXT_LIB_PATH"
+ esmtp=1))
+ ;;
+ esac
+ ],
+ [AC_MSG_RESULT([--with-esmtp not specified])
+ AC_CHECK_HEADERS(libesmtp.h,
+ AC_CHECK_LIB([esmtp], [smtp_start_session],
+ esmtp=1))])
+AM_CONDITIONAL(HAVE_ESMTP, test x$esmtp = x1)
+AC_DEFINE_UNQUOTED([HAVE_ESMTP], $esmtp, [We have libesmtp])
+
+
# GNU adns
adns=0
AC_CHECK_LIB([adns],[adns_init])
@@ -778,6 +810,11 @@
AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be
installed.])
fi
+if test "$esmtp" != 1
+then
+ AC_MSG_NOTICE([NOTICE: libesmtp not found, smtp transport will not be
installed.])
+fi
+
if test "$ipv6" = "0"
then
AC_MSG_NOTICE([NOTICE: IPv6 support will NOT be compiled.])
Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/m4/Makefile.in 2007-12-07 01:04:03 UTC (rev 5815)
@@ -70,6 +70,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLDIR = @DLLDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
@@ -104,6 +105,7 @@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
+LIBPREFIX = @LIBPREFIX@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
@@ -129,6 +131,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
POSUB = @POSUB@
+QMAKE = @QMAKE@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2007-12-07 01:03:44 UTC
(rev 5814)
+++ GNUnet/src/applications/advertising/advertising.c 2007-12-07 01:04:03 UTC
(rev 5815)
@@ -578,7 +578,7 @@
* that we exist (called for each transport)...
*/
static void
-broadcasthelloTransport (TransportAPI * tapi, void *cls)
+broadcasthelloTransport (GNUNET_TransportAPI * tapi, void *cls)
{
const int *prob = cls;
SendData sd;
Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c 2007-12-07 01:03:44 UTC
(rev 5814)
+++ GNUnet/src/applications/transport/transport.c 2007-12-07 01:04:03 UTC
(rev 5815)
@@ -34,7 +34,7 @@
#define DEBUG_TRANSPORT GNUNET_NO
-static CoreAPIForTransport ctapi;
+static GNUNET_CoreAPIForTransport ctapi;
static GNUNET_CoreAPIForPlugins *coreAPI;
@@ -45,7 +45,7 @@
* (in size/NULLs) after gnunetd has started
* to go multi-threaded!
*/
-static TransportAPI **tapis = NULL;
+static GNUNET_TransportAPI **tapis = NULL;
static unsigned int tapis_count = 0;
@@ -107,7 +107,7 @@
static void
createSignedhello (void *cls)
{
- TransportAPI *tapi = cls;
+ GNUNET_TransportAPI *tapi = cls;
GNUNET_mutex_lock (tapis_lock);
GNUNET_free_non_null (tapi->hello);
tapi->hello = tapi->createhello ();
@@ -157,7 +157,7 @@
* Add an implementation of a transport protocol.
*/
static int
-addTransport (TransportAPI * tapi)
+addTransport (GNUNET_TransportAPI * tapi)
{
if (tapi->protocolNumber >= tapis_count)
GNUNET_array_grow (tapis, tapis_count, tapi->protocolNumber + 1);
@@ -469,7 +469,7 @@
static GNUNET_MessageHello *
transportCreatehello (unsigned short ttype)
{
- TransportAPI *tapi;
+ GNUNET_TransportAPI *tapi;
GNUNET_MessageHello *hello;
GNUNET_mutex_lock (tapis_lock);
@@ -585,7 +585,7 @@
static void
initHello (void *cls)
{
- TransportAPI *tapi = cls;
+ GNUNET_TransportAPI *tapi = cls;
GNUNET_MessageHello *hello;
createSignedhello (tapi);
@@ -599,7 +599,7 @@
static void
-doneHelper (TransportAPI * tapi, void *unused)
+doneHelper (GNUNET_TransportAPI * tapi, void *unused)
{
/* In the (rare) case that we shutdown transports
before the cron-jobs had a chance to run, stop
@@ -632,7 +632,7 @@
* receiving messages.
*/
static void
-startTransports (P2P_PACKETProcessor mpp)
+startTransports (GNUNET_TransportPacketProcessor mpp)
{
int i;
@@ -660,7 +660,7 @@
}
static void
-initHelper (TransportAPI * tapi, void *unused)
+initHelper (GNUNET_TransportAPI * tapi, void *unused)
{
/* Creation of HELLOs takes longer if a locally
unresolvable hostname ((Dyn)DNS) was specified
@@ -702,8 +702,8 @@
provide_module_transport (GNUNET_CoreAPIForPlugins * capi)
{
static GNUNET_Transport_ServiceAPI ret;
- TransportAPI *tapi;
- TransportMainMethod tptr;
+ GNUNET_TransportAPI *tapi;
+ GNUNET_TransportMainMethod tptr;
char *dso;
char *next;
char *pos;
Modified: GNUnet/src/include/gnunet_transport.h
===================================================================
--- GNUnet/src/include/gnunet_transport.h 2007-12-07 01:03:44 UTC (rev
5814)
+++ GNUnet/src/include/gnunet_transport.h 2007-12-07 01:04:03 UTC (rev
5815)
@@ -79,7 +79,7 @@
*/
unsigned int size;
-} P2P_PACKET;
+} GNUNET_TransportPacket;
/**
* Function that is to be used to process messages
@@ -87,7 +87,7 @@
*
* @param mp the message, freed by the callee once processed!
*/
-typedef void (*P2P_PACKETProcessor) (P2P_PACKET * mp);
+typedef void (*GNUNET_TransportPacketProcessor) (GNUNET_TransportPacket * mp);
/**
* This header file contains a draft for the gnunetd
@@ -134,7 +134,7 @@
* Data was received (potentially encrypted), make the core process
* it.
*/
- P2P_PACKETProcessor receive;
+ GNUNET_TransportPacketProcessor receive;
/**
* Load a service module of the given name. This function must be
@@ -161,7 +161,7 @@
int (*assertUnused) (GNUNET_TSession * tsession);
-} CoreAPIForTransport;
+} GNUNET_CoreAPIForTransport;
/**
@@ -170,18 +170,18 @@
* gnunetd calls "inittransport_XXX" on every transport-api, passing a
* struct with gnunetd core services to the transport api, and getting
* a struct with services provided by the transport api back (or null
- * on error). The return value of init is of type TransportAPI.
+ * on error). The return value of init is of type GNUNET_TransportAPI.
*
* Example:
*
- * TransportAPI * inittransport_XXX(CoreTransportAPI * api) {
+ * GNUNET_TransportAPI * inittransport_XXX(CoreGNUNET_TransportAPI * api) {
* if (api->version != 0)
* return NULL;
* // ...
* return myApi;
* }
*
- * The type of inittransport_XXX is TransportMainMethod.
+ * The type of inittransport_XXX is GNUNET_TransportMainMethod.
*/
typedef struct
{
@@ -351,7 +351,7 @@
int (*testWouldTry) (GNUNET_TSession * tsession, unsigned int size,
int important);
-} TransportAPI;
+} GNUNET_TransportAPI;
/**
* This header file contains a draft of the methods that every
@@ -359,20 +359,20 @@
* that gnunetd calls "inittransport_XXX" on every transport-api, passing a
struct
* with gnunetd core services to the transport api, and getting a
* struct with services provided by the transport api back (or null
- * on error). The return value of init is of type TransportAPI.
+ * on error). The return value of init is of type GNUNET_TransportAPI.
*
* Example:
*
- * TransportAPI * inittransport_XXX(CoreTransportAPI * api) {
+ * GNUNET_TransportAPI * inittransport_XXX(CoreGNUNET_TransportAPI * api) {
* if (api->version != 0)
* return NULL;
* // ...
* return myApi;
* }
*
- * The type of inittransport_XXX is TransportMainMethod.
+ * The type of inittransport_XXX is GNUNET_TransportMainMethod.
*/
-typedef TransportAPI *(*TransportMainMethod) (CoreAPIForTransport *);
+typedef GNUNET_TransportAPI *(*GNUNET_TransportMainMethod)
(GNUNET_CoreAPIForTransport *);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/include/gnunet_transport_service.h
===================================================================
--- GNUnet/src/include/gnunet_transport_service.h 2007-12-07 01:03:44 UTC
(rev 5814)
+++ GNUnet/src/include/gnunet_transport_service.h 2007-12-07 01:04:03 UTC
(rev 5815)
@@ -40,7 +40,7 @@
/**
* Type of the per-transport callback method.
*/
-typedef void (*GNUNET_TransportCallback) (TransportAPI * tapi, void *data);
+typedef void (*GNUNET_TransportCallback) (GNUNET_TransportAPI * tapi, void
*data);
/**
* @brief Transport service definition.
@@ -52,7 +52,7 @@
* Actually start the transport services and begin
* receiving messages.
*/
- void (*start) (P2P_PACKETProcessor mpp);
+ void (*start) (GNUNET_TransportPacketProcessor mpp);
/**
* Stop the transport services, stop receiving messages.
@@ -68,7 +68,7 @@
/**
* Add an implementation of a transport protocol.
*/
- int (*add) (TransportAPI * tapi);
+ int (*add) (GNUNET_TransportAPI * tapi);
/**
* Iterate over all available transport mechanisms.
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/server/connection.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -1077,7 +1077,7 @@
if (be->session.mtu == 0)
{
- totalMessageSize = sizeof (P2P_PACKET_HEADER);
+ totalMessageSize = sizeof (GNUNET_TransportPacket_HEADER);
deadline = (GNUNET_CronTime) - 1L; /* infinity */
i = 0;
@@ -1123,7 +1123,7 @@
else
{
entry->knapsackSolution = GNUNET_NO;
- if (totalMessageSize == sizeof (P2P_PACKET_HEADER))
+ if (totalMessageSize == sizeof (GNUNET_TransportPacket_HEADER))
{
/* if the highest-priority message does not yet
fit, wait for send window to grow so that
@@ -1134,9 +1134,9 @@
}
i++;
}
- if ((totalMessageSize == sizeof (P2P_PACKET_HEADER)) ||
+ if ((totalMessageSize == sizeof (GNUNET_TransportPacket_HEADER)) ||
(((*priority) < GNUNET_EXTREME_PRIORITY) &&
- ((totalMessageSize / sizeof (P2P_PACKET_HEADER)) < 4) &&
+ ((totalMessageSize / sizeof (GNUNET_TransportPacket_HEADER)) < 4) &&
(deadline > GNUNET_get_time () + 500 * GNUNET_CRON_MILLISECONDS) &&
(GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 16) != 0)))
{
@@ -1163,7 +1163,7 @@
{
(*priority) = approximateKnapsack (be,
be->session.mtu -
- sizeof (P2P_PACKET_HEADER));
+ sizeof
(GNUNET_TransportPacket_HEADER));
#if DEBUG_COLLECT_PRIO
FPRINTF (prioFile, "%llu 0 %u\n", GNUNET_get_time (),
*priority);
@@ -1173,7 +1173,7 @@
{
(*priority) = solveKnapsack (be,
be->session.mtu -
- sizeof (P2P_PACKET_HEADER));
+ sizeof
(GNUNET_TransportPacket_HEADER));
#if DEBUG_COLLECT_PRIO
FPRINTF (prioFile, "%llu 1 %u\n", GNUNET_get_time (),
*priority);
@@ -1184,7 +1184,7 @@
{ /* never approximate < 50% CPU load */
(*priority) = solveKnapsack (be,
be->session.mtu -
- sizeof (P2P_PACKET_HEADER));
+ sizeof (GNUNET_TransportPacket_HEADER));
#if DEBUG_COLLECT_PRIO
FPRINTF (prioFile, "%llu 2 %u\n", GNUNET_get_time (), *priority);
#endif
@@ -1200,7 +1200,7 @@
}
}
if ((j == 0) ||
- (totalMessageSize > be->session.mtu - sizeof (P2P_PACKET_HEADER)))
+ (totalMessageSize > be->session.mtu - sizeof
(GNUNET_TransportPacket_HEADER)))
{
GNUNET_GE_BREAK (ectx, 0);
GNUNET_GE_LOG (ectx,
@@ -1209,7 +1209,7 @@
_
("`%s' selected %d out of %d messages (MTU: %d).\n"),
__FUNCTION__, j, be->sendBufferSize,
- be->session.mtu - sizeof (P2P_PACKET_HEADER));
+ be->session.mtu - sizeof
(GNUNET_TransportPacket_HEADER));
for (j = 0; j < be->sendBufferSize; j++)
GNUNET_GE_LOG (ectx,
@@ -1521,7 +1521,7 @@
for (i = 0; i < ret; i++)
{
entry = entries[i];
- if (entry->len <= be->session.mtu - sizeof (P2P_PACKET_HEADER))
+ if (entry->len <= be->session.mtu - sizeof
(GNUNET_TransportPacket_HEADER))
continue;
ret--;
for (j = i; j < ret; j++)
@@ -1532,7 +1532,7 @@
be->consider_transport_switch = GNUNET_YES;
fragmentation->fragment (&be->session.sender,
be->session.mtu -
- sizeof (P2P_PACKET_HEADER), entry->pri,
+ sizeof (GNUNET_TransportPacket_HEADER),
entry->pri,
entry->transmissionTime, entry->len,
entry->callback, entry->closure);
GNUNET_free (entry);
@@ -1586,7 +1586,7 @@
unsigned int p;
unsigned int rsi;
SendCallbackList *pos;
- P2P_PACKET_HEADER *p2pHdr;
+ GNUNET_TransportPacket_HEADER *p2pHdr;
unsigned int priority;
char *plaintextMsg;
void *encryptedMsg;
@@ -1628,8 +1628,8 @@
return GNUNET_NO; /* deferr further */
}
if (totalMessageSize == 0)
- totalMessageSize = EXPECTED_MTU + sizeof (P2P_PACKET_HEADER);
- GNUNET_GE_ASSERT (ectx, totalMessageSize > sizeof (P2P_PACKET_HEADER));
+ totalMessageSize = EXPECTED_MTU + sizeof (GNUNET_TransportPacket_HEADER);
+ GNUNET_GE_ASSERT (ectx, totalMessageSize > sizeof
(GNUNET_TransportPacket_HEADER));
if ((be->session.mtu != 0) && (totalMessageSize > be->session.mtu))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -1697,7 +1697,7 @@
fails, return (but clean up garbage) */
if (GNUNET_SYSERR == outgoingCheck (priority,
totalMessageSize /
- sizeof (P2P_PACKET_HEADER)))
+ sizeof (GNUNET_TransportPacket_HEADER)))
{
expireSendBufferEntries (be);
be->inSendBuffer = GNUNET_NO;
@@ -1726,11 +1726,11 @@
/* build message */
plaintextMsg = GNUNET_malloc (totalMessageSize);
- p2pHdr = (P2P_PACKET_HEADER *) plaintextMsg;
+ p2pHdr = (GNUNET_TransportPacket_HEADER *) plaintextMsg;
p2pHdr->timeStamp = htonl (GNUNET_get_time_int32 (NULL));
p2pHdr->sequenceNumber = htonl (be->lastSequenceNumberSend);
p2pHdr->bandwidth = htonl (be->idealized_limit);
- p = sizeof (P2P_PACKET_HEADER);
+ p = sizeof (GNUNET_TransportPacket_HEADER);
for (i = 0; i < stotal; i++)
{
SendEntry *entry = entries[i];
@@ -1813,7 +1813,7 @@
p - sizeof (GNUNET_HashCode),
(GNUNET_HashCode *) encryptedMsg);
ret = GNUNET_AES_encrypt (&p2pHdr->sequenceNumber, p - sizeof
(GNUNET_HashCode), &be->skey_local, (const GNUNET_AES_InitializationVector *)
encryptedMsg, /* IV */
- &((P2P_PACKET_HEADER *) encryptedMsg)->
+ &((GNUNET_TransportPacket_HEADER *) encryptedMsg)->
sequenceNumber);
if (stats != NULL)
stats->change (stat_encrypted, p - sizeof (GNUNET_HashCode));
@@ -1838,7 +1838,7 @@
if (rsnSize > 0)
{
- j = sizeof (P2P_PACKET_HEADER);
+ j = sizeof (GNUNET_TransportPacket_HEADER);
while (j < p)
{
GNUNET_MessageHeader *part =
@@ -1919,12 +1919,12 @@
return;
}
if ((be->session.mtu != 0) &&
- (se->len > be->session.mtu - sizeof (P2P_PACKET_HEADER)))
+ (se->len > be->session.mtu - sizeof (GNUNET_TransportPacket_HEADER)))
{
be->consider_transport_switch = GNUNET_YES;
/* this message is so big that it must be fragmented! */
fragmentation->fragment (&be->session.sender,
- be->session.mtu - sizeof (P2P_PACKET_HEADER),
+ be->session.mtu - sizeof
(GNUNET_TransportPacket_HEADER),
se->pri,
se->transmissionTime,
se->len, se->callback, se->closure);
@@ -2920,7 +2920,7 @@
*/
int
checkHeader (const GNUNET_PeerIdentity * sender,
- P2P_PACKET_HEADER * msg, unsigned short size)
+ GNUNET_TransportPacket_HEADER * msg, unsigned short size)
{
BufferEntry *be;
int res;
@@ -2933,7 +2933,7 @@
ENTRY ();
GNUNET_GE_ASSERT (ectx, msg != NULL);
GNUNET_GE_ASSERT (ectx, sender != NULL);
- if (size < sizeof (P2P_PACKET_HEADER))
+ if (size < sizeof (GNUNET_TransportPacket_HEADER))
{
IF_GELOG (ectx,
GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
@@ -3528,7 +3528,7 @@
cron = cm;
GNUNET_GE_ASSERT (ectx,
GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD ==
- sizeof (P2P_PACKET_HEADER));
+ sizeof (GNUNET_TransportPacket_HEADER));
GNUNET_GE_ASSERT (ectx, sizeof (P2P_hangup_MESSAGE) == 68);
ENTRY ();
scl_nextHead = NULL;
@@ -3874,28 +3874,28 @@
{
char *buf;
int ret;
- P2P_PACKET_HEADER *hdr;
+ GNUNET_TransportPacket_HEADER *hdr;
ENTRY ();
GNUNET_GE_ASSERT (ectx, tsession != NULL);
if ((transport->getMTU (tsession->ttype) > 0) &&
(transport->getMTU (tsession->ttype) <
- size + sizeof (P2P_PACKET_HEADER)))
+ size + sizeof (GNUNET_TransportPacket_HEADER)))
{
GNUNET_GE_BREAK (ectx, 0);
return GNUNET_SYSERR;
}
- buf = GNUNET_malloc (size + sizeof (P2P_PACKET_HEADER));
- hdr = (P2P_PACKET_HEADER *) buf;
+ buf = GNUNET_malloc (size + sizeof (GNUNET_TransportPacket_HEADER));
+ hdr = (GNUNET_TransportPacket_HEADER *) buf;
hdr->sequenceNumber = 0;
hdr->timeStamp = 0;
hdr->bandwidth = 0;
- memcpy (&buf[sizeof (P2P_PACKET_HEADER)], msg, size);
+ memcpy (&buf[sizeof (GNUNET_TransportPacket_HEADER)], msg, size);
GNUNET_hash (&hdr->sequenceNumber,
- size + sizeof (P2P_PACKET_HEADER) - sizeof (GNUNET_HashCode),
+ size + sizeof (GNUNET_TransportPacket_HEADER) - sizeof
(GNUNET_HashCode),
&hdr->hash);
ret =
- transport->send (tsession, buf, size + sizeof (P2P_PACKET_HEADER),
+ transport->send (tsession, buf, size + sizeof
(GNUNET_TransportPacket_HEADER),
GNUNET_YES);
GNUNET_free (buf);
EXIT ();
Modified: GNUnet/src/server/connection.h
===================================================================
--- GNUnet/src/server/connection.h 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/server/connection.h 2007-12-07 01:04:03 UTC (rev 5815)
@@ -50,7 +50,7 @@
GNUNET_Int32Time timeStamp;
/* desired bandwidth, 0 for plaintext messages! */
unsigned int bandwidth;
-} P2P_PACKET_HEADER; /* 76 bytes */
+} GNUNET_TransportPacket_HEADER; /* 76 bytes */
/* ***************** GNUnet core internals ************ */
@@ -85,7 +85,7 @@
* GNUNET_SYSERR if it was malformed
*/
int checkHeader (const GNUNET_PeerIdentity * sender,
- P2P_PACKET_HEADER * msg, unsigned short size);
+ GNUNET_TransportPacket_HEADER * msg, unsigned short size);
/**
* Consider switching the transport mechanism used for contacting the
Modified: GNUnet/src/server/gnunet-transport-check.c
===================================================================
--- GNUnet/src/server/gnunet-transport-check.c 2007-12-07 01:03:44 UTC (rev
5814)
+++ GNUnet/src/server/gnunet-transport-check.c 2007-12-07 01:04:03 UTC (rev
5815)
@@ -97,7 +97,7 @@
* Test the given transport API.
*/
static void
-testTAPI (TransportAPI * tapi, void *ctx)
+testTAPI (GNUNET_TransportAPI * tapi, void *ctx)
{
int *res = ctx;
GNUNET_MessageHello *helo;
Modified: GNUnet/src/server/handler.c
===================================================================
--- GNUnet/src/server/handler.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/server/handler.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -76,7 +76,7 @@
static GNUNET_Identity_ServiceAPI *identity;
-static P2P_PACKET *bufferQueue_[QUEUE_LENGTH];
+static GNUNET_TransportPacket *bufferQueue_[QUEUE_LENGTH];
static int bq_firstFree_;
@@ -597,14 +597,14 @@
GNUNET_GE_BREAK (NULL, 0);
return;
}
- ret = checkHeader (sender, (P2P_PACKET_HEADER *) msg, size);
+ ret = checkHeader (sender, (GNUNET_TransportPacket_HEADER *) msg, size);
if (ret == GNUNET_SYSERR)
return; /* message malformed or failed to decrypt */
if ((ret == GNUNET_YES) && (tsession != NULL) && (sender != NULL))
considerTakeover (sender, tsession);
injectMessage (sender,
- &msg[sizeof (P2P_PACKET_HEADER)],
- size - sizeof (P2P_PACKET_HEADER), ret, tsession);
+ &msg[sizeof (GNUNET_TransportPacket_HEADER)],
+ size - sizeof (GNUNET_TransportPacket_HEADER), ret, tsession);
}
/**
@@ -615,7 +615,7 @@
static void *
threadMain (void *cls)
{
- P2P_PACKET *mp;
+ GNUNET_TransportPacket *mp;
while (mainShutdownSignal == NULL)
{
@@ -648,7 +648,7 @@
* (receive implementation).
*/
void
-core_receive (P2P_PACKET * mp)
+core_receive (GNUNET_TransportPacket * mp)
{
if ((mp->tsession != NULL) &&
(0 !=
Modified: GNUnet/src/server/handler.h
===================================================================
--- GNUnet/src/server/handler.h 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/server/handler.h 2007-12-07 01:04:03 UTC (rev 5815)
@@ -67,7 +67,7 @@
* implementation). Detects if the message is encrypted, possibly
* decrypts and calls injectMessage.
*/
-void core_receive (P2P_PACKET * mp);
+void core_receive (GNUNET_TransportPacket * mp);
/**
* Register a method as a handler for specific message
Modified: GNUnet/src/transports/Makefile.am
===================================================================
--- GNUnet/src/transports/Makefile.am 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/Makefile.am 2007-12-07 01:04:03 UTC (rev 5815)
@@ -19,6 +19,12 @@
httptransport = libgnunettransport_http.la
endif
+if !MINGW
+if HAVE_ESMTP
+ smtptransport = libgnunettransport_smtp.la
+endif
+endif
+
SUBDIRS = . $(build_upnp)
noinst_LTLIBRARIES = \
@@ -37,11 +43,6 @@
TESTS = $(check_PROGRAMS)
-
-if !MINGW
-# smtptransport = libgnunettransport_smtp.la
-endif
-
libgnunetip_la_SOURCES = \
ip.c ip.h
libgnunetip_la_LIBADD = \
@@ -54,13 +55,13 @@
libgnunettransport_tcp.la \
libgnunettransport_udp.la \
libgnunettransport_nat.la \
- $(v6transports) $(httptransport)
+ $(v6transports) $(httptransport) $(smtptransport)
-#libgnunettransport_smtp_la_SOURCES = smtp.c
-#libgnunettransport_smtp_la_LIBADD = \
-# $(top_builddir)/src/util/libgnunetutil.la -lesmtp
-#libgnunettransport_smtp_la_LDFLAGS = \
-# -export-dynamic -avoid-version -module
+libgnunettransport_smtp_la_SOURCES = smtp.c
+libgnunettransport_smtp_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la -lesmtp
+libgnunettransport_smtp_la_LDFLAGS = \
+ -export-dynamic -avoid-version -module
libgnunettransport_http_la_SOURCES = http.c
libgnunettransport_http_la_LIBADD = \
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/http.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -386,7 +386,7 @@
/**
* apis (our advertised API and the core api )
*/
-static CoreAPIForTransport *coreAPI;
+static GNUNET_CoreAPIForTransport *coreAPI;
static GNUNET_Stats_ServiceAPI *stats;
@@ -1006,7 +1006,7 @@
int i;
unsigned int have;
GNUNET_MessageHeader *hdr;
- P2P_PACKET *mp;
+ GNUNET_TransportPacket *mp;
unsigned int cpy;
unsigned int poff;
@@ -1185,7 +1185,7 @@
}
if (put->rpos2 < ntohs (hdr->size) - sizeof (GNUNET_MessageHeader))
break;
- mp = GNUNET_malloc (sizeof (P2P_PACKET));
+ mp = GNUNET_malloc (sizeof (GNUNET_TransportPacket));
mp->msg = put->rbuff2;
mp->sender = httpSession->sender;
mp->tsession = httpSession->tsession;
@@ -1225,7 +1225,7 @@
size_t poff = 0;
size_t cpy;
GNUNET_MessageHeader *hdr;
- P2P_PACKET *mp;
+ GNUNET_TransportPacket *mp;
ENTER ();
httpSession->cs.client.last_get_activity = GNUNET_get_time ();
@@ -1272,7 +1272,7 @@
if (httpSession->cs.client.rpos2 <
ntohs (hdr->size) - sizeof (GNUNET_MessageHeader))
break;
- mp = GNUNET_malloc (sizeof (P2P_PACKET));
+ mp = GNUNET_malloc (sizeof (GNUNET_TransportPacket));
mp->msg = httpSession->cs.client.rbuff2;
mp->sender = httpSession->sender;
mp->tsession = httpSession->tsession;
@@ -2031,7 +2031,19 @@
{
timeout = ms;
have_tv = MHD_YES;
- }
+ }
+ else
+ {
+ /* curl_multi_timeout is buggy, don't believe
+ it --- otherwise we may sit here forever on
+ connect...; this is a bug which can be
+ demonstrated using the daemontest_post_loop
+ testcase from MHD. Once fixed in CURL, this
+ else-clause should be removed.
+ */
+ timeout = 500;
+ have_tv = MHD_YES;
+ }
GNUNET_mutex_unlock (curllock);
STEP ();
FD_SET (signal_pipe[0], &rs);
@@ -2237,10 +2249,10 @@
* The exported method. Makes the core api available
* via a global and returns the udp transport API.
*/
-TransportAPI *
-inittransport_http (CoreAPIForTransport * core)
+GNUNET_TransportAPI *
+inittransport_http (GNUNET_CoreAPIForTransport * core)
{
- static TransportAPI httpAPI;
+ static GNUNET_TransportAPI httpAPI;
ENTER ();
coreAPI = core;
Modified: GNUnet/src/transports/nat.c
===================================================================
--- GNUnet/src/transports/nat.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/nat.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -44,9 +44,9 @@
/* *********** globals ************* */
/* apis (our advertised API and the core api ) */
-static TransportAPI natAPI;
+static GNUNET_TransportAPI natAPI;
-static CoreAPIForTransport *coreAPI;
+static GNUNET_CoreAPIForTransport *coreAPI;
/* *************** API implementation *************** */
@@ -202,8 +202,8 @@
* The exported method. Makes the core api available via a global and
* returns the nat transport API.
*/
-TransportAPI *
-inittransport_nat (CoreAPIForTransport * core)
+GNUNET_TransportAPI *
+inittransport_nat (GNUNET_CoreAPIForTransport * core)
{
coreAPI = core;
natAPI.protocolNumber = GNUNET_TRANSPORT_PROTOCOL_NUMBER_NAT;
Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/tcp.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -80,7 +80,7 @@
/* *********** globals ************* */
-static TransportAPI tcpAPI;
+static GNUNET_TransportAPI tcpAPI;
static GNUNET_UPnP_ServiceAPI *upnp;
@@ -551,8 +551,8 @@
* The exported method. Makes the core api available
* via a global and returns the udp transport API.
*/
-TransportAPI *
-inittransport_tcp (CoreAPIForTransport * core)
+GNUNET_TransportAPI *
+inittransport_tcp (GNUNET_CoreAPIForTransport * core)
{
ectx = core->ectx;
cfg = core->cfg;
Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/tcp6.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -80,7 +80,7 @@
/* *********** globals ************* */
-static TransportAPI tcp6API;
+static GNUNET_TransportAPI tcp6API;
static struct GNUNET_IPv6NetworkSet *filteredNetworks_;
@@ -508,8 +508,8 @@
* The exported method. Makes the core api available
* via a global and returns the udp transport API.
*/
-TransportAPI *
-inittransport_tcp6 (CoreAPIForTransport * core)
+GNUNET_TransportAPI *
+inittransport_tcp6 (GNUNET_CoreAPIForTransport * core)
{
ectx = core->ectx;
cfg = core->cfg;
Modified: GNUnet/src/transports/tcp_helper.c
===================================================================
--- GNUnet/src/transports/tcp_helper.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/tcp_helper.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -95,7 +95,7 @@
/**
* apis (our advertised API and the core api )
*/
-static CoreAPIForTransport *coreAPI;
+static GNUNET_CoreAPIForTransport *coreAPI;
static GNUNET_Stats_ServiceAPI *stats;
@@ -234,7 +234,7 @@
GNUNET_TSession *tsession = sock_ctx;
TCPSession *tcpSession;
unsigned int len;
- P2P_PACKET *mp;
+ GNUNET_TransportPacket *mp;
const TCPWelcome *welcome;
if (GNUNET_SYSERR == tcpAssociate (tsession))
@@ -280,7 +280,7 @@
tcpDisconnect (tsession);
return GNUNET_SYSERR;
}
- mp = GNUNET_malloc (sizeof (P2P_PACKET));
+ mp = GNUNET_malloc (sizeof (GNUNET_TransportPacket));
mp->msg = GNUNET_malloc (len - sizeof (GNUNET_MessageHeader));
memcpy (mp->msg, &msg[1], len - sizeof (GNUNET_MessageHeader));
mp->sender = tcpSession->sender;
Modified: GNUnet/src/transports/test.c
===================================================================
--- GNUnet/src/transports/test.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/test.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -46,7 +46,7 @@
/**
* Transport being tested.
*/
-static TransportAPI *transport;
+static GNUNET_TransportAPI *transport;
/**
* What response do we currently expect to receive?
@@ -101,7 +101,7 @@
* the "server" should validate that it got the right reply.
*/
static void
-receive (P2P_PACKET * mp)
+receive (GNUNET_TransportPacket * mp)
{
unsigned int retries;
GNUNET_TSession *tsession;
@@ -164,9 +164,9 @@
int
main (int argc, char *const *argv)
{
- CoreAPIForTransport api;
+ GNUNET_CoreAPIForTransport api;
struct GNUNET_PluginHandle *plugin;
- TransportMainMethod init;
+ GNUNET_TransportMainMethod init;
void (*done) ();
GNUNET_PeerIdentity me;
char *trans;
@@ -175,7 +175,7 @@
GNUNET_TSession *tsession;
GNUNET_MessageHello *hello;
- memset (&api, 0, sizeof (CoreAPIForTransport));
+ memset (&api, 0, sizeof (GNUNET_CoreAPIForTransport));
pid = fork ();
res = GNUNET_init (argc,
argv,
Modified: GNUnet/src/transports/test_repeat.c
===================================================================
--- GNUnet/src/transports/test_repeat.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/test_repeat.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -48,7 +48,7 @@
/**
* Transport being tested.
*/
-static TransportAPI *transport;
+static GNUNET_TransportAPI *transport;
/**
* What response do we currently expect to receive?
@@ -103,7 +103,7 @@
* the "server" should validate that it got the right reply.
*/
static void
-receive (P2P_PACKET * mp)
+receive (GNUNET_TransportPacket * mp)
{
unsigned int retries;
GNUNET_TSession *tsession;
@@ -166,9 +166,9 @@
int
main (int argc, char *const *argv)
{
- CoreAPIForTransport api;
+ GNUNET_CoreAPIForTransport api;
struct GNUNET_PluginHandle *plugin;
- TransportMainMethod init;
+ GNUNET_TransportMainMethod init;
void (*done) ();
GNUNET_PeerIdentity me;
char *trans;
@@ -178,7 +178,7 @@
GNUNET_MessageHello *hello;
int xround;
- memset (&api, 0, sizeof (CoreAPIForTransport));
+ memset (&api, 0, sizeof (GNUNET_CoreAPIForTransport));
pid = fork ();
res = GNUNET_init (argc,
argv,
Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/udp.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -512,8 +512,8 @@
* The exported method. Makes the core api available via a global and
* returns the udp transport API.
*/
-TransportAPI *
-inittransport_udp (CoreAPIForTransport * core)
+GNUNET_TransportAPI *
+inittransport_udp (GNUNET_CoreAPIForTransport * core)
{
unsigned long long mtu;
Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/udp6.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -463,8 +463,8 @@
* The exported method. Makes the core api available via a global and
* returns the udp6 transport API.
*/
-TransportAPI *
-inittransport_udp6 (CoreAPIForTransport * core)
+GNUNET_TransportAPI *
+inittransport_udp6 (GNUNET_CoreAPIForTransport * core)
{
unsigned long long mtu;
Modified: GNUnet/src/transports/udp_helper.c
===================================================================
--- GNUnet/src/transports/udp_helper.c 2007-12-07 01:03:44 UTC (rev 5814)
+++ GNUnet/src/transports/udp_helper.c 2007-12-07 01:04:03 UTC (rev 5815)
@@ -45,9 +45,9 @@
/* *********** globals ************* */
-static CoreAPIForTransport *coreAPI;
+static GNUNET_CoreAPIForTransport *coreAPI;
-static TransportAPI udpAPI;
+static GNUNET_TransportAPI udpAPI;
static GNUNET_Stats_ServiceAPI *stats;
@@ -84,7 +84,7 @@
void *sock_ctx, const GNUNET_MessageHeader * msg)
{
unsigned int len;
- P2P_PACKET *mp;
+ GNUNET_TransportPacket *mp;
const UDPMessage *um;
len = ntohs (msg->size);
@@ -102,7 +102,7 @@
"Received %d bytes via UDP\n", len);
#endif
um = (const UDPMessage *) msg;
- mp = GNUNET_malloc (sizeof (P2P_PACKET));
+ mp = GNUNET_malloc (sizeof (GNUNET_TransportPacket));
mp->msg = GNUNET_malloc (len - sizeof (UDPMessage));
memcpy (mp->msg, &um[1], len - sizeof (UDPMessage));
mp->sender = um->sender;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5815 - in GNUnet: . m4 src/applications/advertising src/applications/transport src/include src/server src/transports,
gnunet <=