[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3191 - in GNUnet/src: applications/advertising application
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3191 - in GNUnet/src: applications/advertising applications/chat applications/datastore applications/dht/module applications/dht/tools applications/fragmentation applications/fs applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/tools applications/gap applications/rpc applications/session applications/sqstore_mysql applications/tbench applications/testbed applications/topology_f2f applications/traffic applications/vpn setup transports util/crypto util/os |
|
Date: |
Sun, 30 Jul 2006 20:27:51 -0700 (PDT) |
Author: grothoff
Date: 2006-07-30 20:27:39 -0700 (Sun, 30 Jul 2006)
New Revision: 3191
Modified:
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/chat/chat.c
GNUnet/src/applications/datastore/filter.c
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/module/datastore_dht_master.c
GNUnet/src/applications/dht/module/datastore_memory_test.c
GNUnet/src/applications/dht/module/dht.c
GNUnet/src/applications/dht/tools/dhttest2.c
GNUnet/src/applications/fragmentation/fragmentationtest.c
GNUnet/src/applications/fs/ecrs/directory.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/ecrs/ecrs.c
GNUnet/src/applications/fs/ecrs/ecrstest.c
GNUnet/src/applications/fs/ecrs/keyspace.c
GNUnet/src/applications/fs/ecrs/meta.c
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/ecrs/namespacetest.c
GNUnet/src/applications/fs/ecrs/search.c
GNUnet/src/applications/fs/ecrs/searchtest.c
GNUnet/src/applications/fs/ecrs/tree.c
GNUnet/src/applications/fs/ecrs/upload.c
GNUnet/src/applications/fs/ecrs/uri.c
GNUnet/src/applications/fs/ecrs_core.c
GNUnet/src/applications/fs/fsui/collection.c
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/downloadtest.c
GNUnet/src/applications/fs/fsui/file_info.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/fsui/fsuitest.c
GNUnet/src/applications/fs/fsui/fsuitest2.c
GNUnet/src/applications/fs/fsui/namespace_info.c
GNUnet/src/applications/fs/fsui/namespace_infotest.c
GNUnet/src/applications/fs/fsui/searchtest.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/lib/fslib.c
GNUnet/src/applications/fs/lib/fslibtest.c
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/applications/fs/module/ondemand.c
GNUnet/src/applications/fs/module/querymanager.c
GNUnet/src/applications/fs/tools/gnunet-download.c
GNUnet/src/applications/gap/gap.c
GNUnet/src/applications/gap/gaptest.c
GNUnet/src/applications/gap/pid_table.c
GNUnet/src/applications/rpc/rpc.c
GNUnet/src/applications/session/sessiontest.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/tbench/gnunet-tbench.c
GNUnet/src/applications/tbench/tbenchtest.c
GNUnet/src/applications/tbench/tbenchtest_udp.c
GNUnet/src/applications/testbed/gnunet-testbed.c
GNUnet/src/applications/testbed/testbed.c
GNUnet/src/applications/topology_f2f/topology.c
GNUnet/src/applications/traffic/traffic.c
GNUnet/src/applications/vpn/vpn.c
GNUnet/src/setup/confdata.c
GNUnet/src/setup/glade_support.c
GNUnet/src/setup/wizard_gtk.c
GNUnet/src/transports/http.c
GNUnet/src/transports/smtp.c
GNUnet/src/util/crypto/symciphertest.c
GNUnet/src/util/os/daemontest.c
Log:
GNUNET_ASSERT -> GE_ASSERT
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/advertising/advertising.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -276,7 +276,7 @@
if (mtu == 0) {
mtu = 2048; /* bound size */
} else {
- GNUNET_ASSERT(mtu > P2P_MESSAGE_OVERHEAD);
+ GE_ASSERT(ectx, mtu > P2P_MESSAGE_OVERHEAD);
mtu -= P2P_MESSAGE_OVERHEAD;
}
buffer = MALLOC(mtu);
@@ -299,7 +299,7 @@
if (mtu > ntohs(ping->size)) {
heloEnd = transport->getAdvertisedhellos(mtu - ntohs(ping->size),
buffer);
- GNUNET_ASSERT(mtu - ntohs(ping->size) >= heloEnd);
+ GE_ASSERT(ectx, mtu - ntohs(ping->size) >= heloEnd);
} else {
heloEnd = -2;
}
Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/applications/chat/chat.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -189,7 +189,7 @@
int initialize_module_chat(CoreAPIForApplication * capi) {
int ok = OK;
- GNUNET_ASSERT(sizeof(P2P_chat_MESSAGE) == sizeof(CS_chat_MESSAGE));
+ GE_ASSERT(ectx, sizeof(P2P_chat_MESSAGE) == sizeof(CS_chat_MESSAGE));
MUTEX_CREATE(&chatMutex);
clientCount = 0;
coreAPI = capi;
Modified: GNUnet/src/applications/datastore/filter.c
===================================================================
--- GNUnet/src/applications/datastore/filter.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/datastore/filter.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -82,7 +82,7 @@
void deleteFilter() {
char * fn;
- GNUNET_ASSERT(filter == NULL);
+ GE_ASSERT(ectx, filter == NULL);
fn = getFilterName();
UNLINK(fn);
FREE(fn);
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/dht/module/cs.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -497,7 +497,7 @@
size = ntohs(req->header.size)
- sizeof(CS_dht_request_put_MESSAGE)
+ sizeof(DataContainer);
- GNUNET_ASSERT(size < MAX_BUFFER_SIZE);
+ GE_ASSERT(ectx, size < MAX_BUFFER_SIZE);
if (size == 0) {
data = NULL;
} else {
@@ -577,7 +577,7 @@
size = ntohs(req->header.size)
- sizeof(CS_dht_request_remove_MESSAGE)
+ sizeof(DataContainer);
- GNUNET_ASSERT(size < 0xFFFF);
+ GE_ASSERT(ectx, size < 0xFFFF);
if (size == 0) {
data = NULL;
} else {
Modified: GNUnet/src/applications/dht/module/datastore_dht_master.c
===================================================================
--- GNUnet/src/applications/dht/module/datastore_dht_master.c 2006-07-31
03:24:57 UTC (rev 3190)
+++ GNUnet/src/applications/dht/module/datastore_dht_master.c 2006-07-31
03:27:39 UTC (rev 3191)
@@ -86,7 +86,7 @@
int i;
DataContainer * data;
- GNUNET_ASSERT(keyCount == 1);
+ GE_ASSERT(ectx, keyCount == 1);
if (ds == NULL)
return SYSERR;
MUTEX_LOCK(&ds->lock);
Modified: GNUnet/src/applications/dht/module/datastore_memory_test.c
===================================================================
--- GNUnet/src/applications/dht/module/datastore_memory_test.c 2006-07-31
03:24:57 UTC (rev 3190)
+++ GNUnet/src/applications/dht/module/datastore_memory_test.c 2006-07-31
03:27:39 UTC (rev 3191)
@@ -149,14 +149,14 @@
static int test(Blockstore * s) {
- GNUNET_ASSERT(0 == store(s, "a", "Hello"));
- GNUNET_ASSERT(0 == store(s, "b", "World"));
- GNUNET_ASSERT(0 == load(s, "a", "Hello"));
- GNUNET_ASSERT(0 == load(s, "b", "World"));
- GNUNET_ASSERT(0 == rem(s, "a", "Hello"));
- GNUNET_ASSERT(0 == rem(s, "b", "World"));
- GNUNET_ASSERT(0 == load(s, "a", NULL));
- GNUNET_ASSERT(0 == load(s, "b", NULL));
+ GE_ASSERT(ectx, 0 == store(s, "a", "Hello"));
+ GE_ASSERT(ectx, 0 == store(s, "b", "World"));
+ GE_ASSERT(ectx, 0 == load(s, "a", "Hello"));
+ GE_ASSERT(ectx, 0 == load(s, "b", "World"));
+ GE_ASSERT(ectx, 0 == rem(s, "a", "Hello"));
+ GE_ASSERT(ectx, 0 == rem(s, "b", "World"));
+ GE_ASSERT(ectx, 0 == load(s, "a", NULL));
+ GE_ASSERT(ectx, 0 == load(s, "b", NULL));
return 0;
}
Modified: GNUnet/src/applications/dht/module/dht.c
===================================================================
--- GNUnet/src/applications/dht/module/dht.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/dht/module/dht.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -973,7 +973,7 @@
_("Could not find peer `%s' in routing table!\n"),
&enc);
}
- GNUNET_ASSERT(bucket != NULL);
+ GE_ASSERT(ectx, bucket != NULL);
if (pos == NULL) {
PeerInfo * oldest = NULL;
@@ -1239,7 +1239,7 @@
PeerInfo * pos;
ENTER();
- GNUNET_ASSERT(! hostIdentityEquals(responder,
+ GE_ASSERT(ectx, ! hostIdentityEquals(responder,
coreAPI->myIdentity));
/* this processes the 'tables' field! */
processOptionalFields(responder,
Modified: GNUnet/src/applications/dht/tools/dhttest2.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest2.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/dht/tools/dhttest2.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -74,7 +74,7 @@
DataContainer * value;
Blockstore * store;
- GNUNET_ASSERT(OK ==
+ GE_ASSERT(ectx, OK ==
enc2hash("BV3AS3KMIIBVIFCGEG907N6NTDTH26B7T6FODUSLSGK"
"5B2Q58IEU1VF5FTR838449CSHVBOAHLDVQAOA33O77F"
"OPDA8F1VIKESLSNBO",
@@ -99,12 +99,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
printf("Re-starting daemons.\n");
/* re-start, this time we're sure up-to-date hellos are available */
@@ -244,12 +244,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
doneUtil();
return ret;
Modified: GNUnet/src/applications/fragmentation/fragmentationtest.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentationtest.c 2006-07-31
03:24:57 UTC (rev 3190)
+++ GNUnet/src/applications/fragmentation/fragmentationtest.c 2006-07-31
03:27:39 UTC (rev 3191)
@@ -57,7 +57,7 @@
const unsigned int len,
int wasEncrypted,
TSession * ts) {
- GNUNET_ASSERT(hostIdentityEquals(sender, &mySender));
+ GE_ASSERT(ectx, hostIdentityEquals(sender, &mySender));
myMsg = resultBuffer;
memcpy(resultBuffer, msg, len);
myMsgLen = len;
@@ -111,10 +111,10 @@
unsigned int len) {
int i;
- GNUNET_ASSERT(myMsg != NULL);
- GNUNET_ASSERT(myMsgLen == len);
+ GE_ASSERT(ectx, myMsg != NULL);
+ GE_ASSERT(ectx, myMsgLen == len);
for (i=0;i<len;i++)
- GNUNET_ASSERT(myMsg[i] == (char) (i+id));
+ GE_ASSERT(ectx, myMsg[i] == (char) (i+id));
myMsgLen = 0;
myMsg = NULL;
}
@@ -127,7 +127,7 @@
pep = makeFragment(0, 16, 32, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
pep = makeFragment(16, 16, 32, 42);
processFragment(&mySender, pep);
checkPacket(42, 32);
@@ -138,11 +138,11 @@
pep = makeFragment(0, 16, 32, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
makeTimeout();
pep = makeFragment(16, 16, 32, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
pep = makeFragment(0, 16, 32, 42);
processFragment(&mySender, pep);
checkPacket(42, 32);
@@ -153,7 +153,7 @@
pep = makeFragment(16, 16, 32, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
pep = makeFragment(0, 16, 32, 42);
processFragment(&mySender, pep);
checkPacket(42, 32);
@@ -166,7 +166,7 @@
for (i=0;i<50;i++) {
pep = makeFragment(i*16, 16, 51*16, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
pep = makeFragment(50*16,16, 51*16, 42);
processFragment(&mySender, pep);
@@ -180,7 +180,7 @@
for (i=0;i<4000;i++) {
pep = makeFragment(i*16, 16, 4001*16, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
pep = makeFragment(4000*16, 16, 4001*16, 42);
processFragment(&mySender, pep);
@@ -194,7 +194,7 @@
for (i=0;i<5;i++) {
pep = makeFragment(i*16, 8, 6*16+8, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
pep = makeFragment(5*16, 24, 6*16+8, 42);
processFragment(&mySender, pep);
@@ -212,12 +212,12 @@
for (i=0;i<50;i++) {
pep = makeFragment(i*16, 8, 51*16+8, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
for (i=0;i<50;i++) {
pep = makeFragment(i*16+8, 8, 51*16+8, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
pep = makeFragment(50*16, 24, 51*16+8, 42);
processFragment(&mySender, pep);
@@ -231,12 +231,12 @@
for (i=0;i<50;i++) {
pep = makeFragment(i*32, 16, 51*32, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
for (i=0;i<50;i++) {
pep = makeFragment(i*32+8, 24, 51*32, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
pep = makeFragment(50*32, 32, 51*32, 42);
processFragment(&mySender, pep);
@@ -250,7 +250,7 @@
for (i=0;i<50;i++) {
pep = makeFragment(0, i*16+16, 51*16, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
pep = makeFragment(50*16,16, 51*16, 42);
processFragment(&mySender, pep);
@@ -264,12 +264,12 @@
for (i=0;i<50;i++) {
pep = makeFragment(0, i*16+16, 51*16+8, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
makeTimeout();
pep = makeFragment(50*16, 24, 51*16+8, 42);
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
for (i=0;i<50;i++) {
pep = makeFragment(0, i*16+16, 51*16+8, 42);
processFragment(&mySender, pep);
@@ -287,7 +287,7 @@
pep = makeFragment(i*16, 16, 51*16, id+5);
mySender.hashPubKey.bits[0] = id;
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
}
for (id=0;id<DEFRAG_BUCKET_COUNT;id++) {
@@ -308,7 +308,7 @@
pep = makeFragment(i*16, 16, 6*16, id+5);
mySender.hashPubKey.bits[0] = id;
processFragment(&mySender, pep);
- GNUNET_ASSERT(myMsg == NULL);
+ GE_ASSERT(ectx, myMsg == NULL);
}
}
for (id=0;id<DEFRAG_BUCKET_COUNT*4;id++) {
Modified: GNUnet/src/applications/fs/ecrs/directory.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directory.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/directory.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -187,7 +187,7 @@
psize = size;
ucs[i] = ECRS_uriToString(fis[i].uri);
- GNUNET_ASSERT(ucs[i] != NULL);
+ GE_ASSERT(ectx, ucs[i] != NULL);
size += strlen(ucs[i]) + 1;
size += sizeof(unsigned int);
size += ECRS_sizeofMetaData(fis[i].meta,
@@ -212,7 +212,7 @@
&(*data)[pos + sizeof(unsigned int)],
size - pos - sizeof(unsigned int),
ECRS_SERIALIZE_FULL);
- GNUNET_ASSERT(ret != SYSERR);
+ GE_ASSERT(ectx, ret != SYSERR);
ret = htonl(ret);
memcpy(&(*data)[pos],
&ret,
@@ -242,7 +242,7 @@
&(*data)[pos + sizeof(unsigned int)],
size - pos - sizeof(unsigned int),
ECRS_SERIALIZE_FULL);
- GNUNET_ASSERT(ret != SYSERR);
+ GE_ASSERT(ectx, ret != SYSERR);
ret = htonl(ret);
memcpy(&(*data)[pos],
&ret,
@@ -250,7 +250,7 @@
pos += ntohl(ret) + sizeof(unsigned int);
}
FREE(ucs);
- GNUNET_ASSERT(pos == size);
+ GE_ASSERT(ectx, pos == size);
return OK;
}
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/download.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -146,7 +146,7 @@
char * fn;
struct stat st;
- GNUNET_ASSERT(filename != NULL);
+ GE_ASSERT(ectx, filename != NULL);
this->treedepth = computeDepth(filesize);
MUTEX_CREATE(&this->lock);
this->handles = MALLOC(sizeof(int) * (this->treedepth+1));
@@ -532,7 +532,7 @@
&enc);
#endif
- GNUNET_ASSERT(node != NULL);
+ GE_ASSERT(ectx, node != NULL);
entry
= MALLOC(sizeof(RequestEntry));
entry->node
@@ -548,7 +548,7 @@
entry->searchHandle
= NULL;
MUTEX_LOCK(&rm->lock);
- GNUNET_ASSERT(rm->requestListSize > 0);
+ GE_ASSERT(ectx, rm->requestListSize > 0);
if (rm->requestListSize == rm->requestListIndex)
GROW(rm->requestList,
rm->requestListSize,
@@ -619,7 +619,7 @@
unsigned long long spos;
unsigned long long epos;
- GNUNET_ASSERT(node->offset < node->ctx->total);
+ GE_ASSERT(ectx, node->offset < node->ctx->total);
if (node->level == 0) {
ret = DBLOCK_SIZE;
if (node->offset + (unsigned long long) ret
@@ -819,7 +819,7 @@
unsigned int levelSize;
unsigned long long baseOffset;
- GNUNET_ASSERT(node->level > 0);
+ GE_ASSERT(ectx, node->level > 0);
childcount = size / sizeof(CHK);
if (size != childcount * sizeof(CHK)) {
GE_BREAK(ectx, 0);
@@ -838,9 +838,9 @@
child->ctx = node->ctx;
child->chk = chks[i];
child->offset = baseOffset + i * levelSize;
- GNUNET_ASSERT(child->offset < node->ctx->total);
+ GE_ASSERT(ectx, child->offset < node->ctx->total);
child->level = node->level - 1;
- GNUNET_ASSERT( (child->level != 0) ||
+ GE_ASSERT(ectx, (child->level != 0) ||
( (child->offset % DBLOCK_SIZE) == 0) );
if (NO == checkPresent(child))
addRequest(node->ctx->rm,
@@ -867,7 +867,7 @@
INITVECTOR iv;
SESSIONKEY skey;
- GNUNET_ASSERT((data!=NULL) && (hashcode != NULL) && (result != NULL));
+ GE_ASSERT(ectx, (data!=NULL) && (hashcode != NULL) && (result != NULL));
/* get key and init value from the hash code */
hashToKey(hashcode,
&skey,
@@ -907,7 +907,7 @@
&enc);
#endif
- GNUNET_ASSERT(equalsHashCode512(query,
+ GE_ASSERT(ectx, equalsHashCode512(query,
&node->chk.query));
size = ntohl(reply->size) - sizeof(Datastore_Value);
if ( (size <= sizeof(DBlock)) ||
@@ -921,7 +921,7 @@
size,
&node->chk.key,
data))
- GNUNET_ASSERT(0);
+ GE_ASSERT(ectx, 0);
hash(data,
size,
&hc);
@@ -1227,7 +1227,7 @@
dpcb(0, 0, cronTime(NULL), 0, NULL, 0, dpcbClosure);
return OK;
}
- GNUNET_ASSERT(filename != NULL);
+ GE_ASSERT(ectx, filename != NULL);
fid = uri->data.chk;
if (! ECRS_isFileUri(uri)) {
GE_BREAK(ectx, 0);
Modified: GNUnet/src/applications/fs/ecrs/ecrs.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrs.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/ecrs.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -38,7 +38,7 @@
hashToKey(hc, &skey, &iv);
tmp = MALLOC(len);
- GNUNET_ASSERT(len ==
+ GE_ASSERT(ectx, len ==
encryptBlock(data,
len,
&skey,
@@ -57,7 +57,7 @@
hashToKey(hc, &skey, &iv);
tmp = MALLOC(len);
- GNUNET_ASSERT(len ==
+ GE_ASSERT(ectx, len ==
decryptBlock(&skey,
data,
len,
Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -143,7 +143,7 @@
"Search found URI `%s'\n",
tmp);
FREE(tmp);
- GNUNET_ASSERT(NULL == *my);
+ GE_ASSERT(ectx, NULL == *my);
*my = ECRS_dupUri(fi->uri);
return SYSERR; /* abort search */
}
@@ -265,10 +265,10 @@
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
+ GE_ASSERT(ectx, daemon > 0);
ok = YES;
startCron();
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
gnunet_util_sleep(5 * cronSECONDS); /* give apps time to start */
sock = getClientSocket();
CHECK(sock != NULL);
@@ -295,8 +295,8 @@
if (sock != NULL)
releaseClientSocket(sock);
stopCron();
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return (ok == YES) ? 0 : 1;
}
Modified: GNUnet/src/applications/fs/ecrs/keyspace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/keyspace.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/keyspace.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -67,7 +67,7 @@
YES,
&query))
return SYSERR;
- GNUNET_ASSERT(type == K_BLOCK);
+ GE_ASSERT(ectx, type == K_BLOCK);
if (size < sizeof(KBlock))
return SYSERR;
@@ -179,7 +179,7 @@
memcpy(&kb[1],
dstURI,
strlen(dstURI)+1);
- GNUNET_ASSERT(mdsize ==
+ GE_ASSERT(ectx, mdsize ==
ECRS_serializeMetaData(md,
&((char*)&kb[1])[strlen(dstURI)+1],
mdsize,
@@ -224,13 +224,13 @@
pk = makeKblockKey(&key);
getPublicKey(pk,
&kb->keyspace);
- GNUNET_ASSERT(OK == sign(pk,
+ GE_ASSERT(ectx, OK == sign(pk,
mdsize + strlen(dstURI) + 1,
&kb[1],
&kb->signature));
#if EXTRA_CHECKS
/* extra check: verify sig */
- GNUNET_ASSERT(OK == getQueryFor(size,
+ GE_ASSERT(ectx, OK == getQueryFor(size,
(DBlock*) kb,
YES,
&hc));
@@ -239,7 +239,7 @@
if (OK != FS_insert(sock, value))
ret = SYSERR;
#if EXTRA_CHECKS
- GNUNET_ASSERT(OK == verifyKBlock(&key, value))
+ GE_ASSERT(ectx, OK == verifyKBlock(&key, value))
#endif
}
ECRS_freeUri(xuri);
Modified: GNUnet/src/applications/fs/ecrs/meta.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/meta.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/meta.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -81,7 +81,7 @@
const char * data) {
int idx;
- GNUNET_ASSERT(data != NULL);
+ GE_ASSERT(ectx, data != NULL);
for (idx=0;idx<md->itemCount;idx++) {
if ( (md->items[idx].type == type) &&
(0 == strcmp(md->items[idx].data,
@@ -481,7 +481,7 @@
else
ic--; /* small steps, we're close */
}
- GNUNET_ASSERT(size <= max);
+ GE_ASSERT(ectx, size <= max);
memcpy(target,
hdr,
size);
@@ -492,7 +492,7 @@
MetaData * mdx;
mdx = ECRS_deserializeMetaData(target,
size);
- GNUNET_ASSERT(NULL != mdx);
+ GE_ASSERT(ectx, NULL != mdx);
ECRS_freeMetaData(mdx);
}
#endif
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -201,7 +201,7 @@
nb->rootEntry = *rootEntry;
- GNUNET_ASSERT(OK == sign(hk,
+ GE_ASSERT(ectx, OK == sign(hk,
mdsize + 3 * sizeof(HashCode512),
&nb->identifier,
&nb->signature));
@@ -241,13 +241,13 @@
pk = makeKblockKey(&hc);
getPublicKey(pk,
&knb->kblock.keyspace);
- GNUNET_ASSERT(size - sizeof(KBlock) - sizeof(unsigned int)
+ GE_ASSERT(ectx, size - sizeof(KBlock) - sizeof(unsigned int)
== sizeof(NBlock) + mdsize);
ECRS_encryptInPlace(&hc,
&knb->nblock,
size - sizeof(KBlock) - sizeof(unsigned int));
- GNUNET_ASSERT(OK == sign(pk,
+ GE_ASSERT(ectx, OK == sign(pk,
sizeof(NBlock) + mdsize,
&knb->nblock,
&knb->kblock.signature));
@@ -478,7 +478,7 @@
- sizeof(PublicKey)
- sizeof(HashCode512));
/* FINALLY: sign & publish SBlock */
- GNUNET_ASSERT(OK == sign(hk,
+ GE_ASSERT(ectx, OK == sign(hk,
size
- sizeof(Signature)
- sizeof(PublicKey)
Modified: GNUnet/src/applications/fs/ecrs/namespacetest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespacetest.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/fs/ecrs/namespacetest.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -110,14 +110,14 @@
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
+ GE_ASSERT(ectx, daemon > 0);
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
gnunet_util_sleep(30 * cronSECONDS);
failureCount += testNamespace();
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return (failureCount == 0) ? 0 : 1;
}
Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/search.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -252,7 +252,7 @@
c);
return OK;
}
- GNUNET_ASSERT(ntohl(sb->updateInterval) != 0);
+ GE_ASSERT(ectx, ntohl(sb->updateInterval) != 0);
pos = ntohl(sb->creationTime);
deltaId(&sb->identifierIncrement,
&sb->nextIdentifier,
Modified: GNUnet/src/applications/fs/ecrs/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/searchtest.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/fs/ecrs/searchtest.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -105,10 +105,10 @@
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
+ GE_ASSERT(ectx, daemon > 0);
ok = YES;
startCron();
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
gnunet_util_sleep(5 * cronSECONDS); /* give apps time to start */
sock = getClientSocket();
CHECK(sock != NULL);
@@ -171,8 +171,8 @@
if (sock != NULL)
releaseClientSocket(sock);
stopCron();
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return (ok == YES) ? 0 : 1;
}
Modified: GNUnet/src/applications/fs/ecrs/tree.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/tree.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/tree.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -31,8 +31,8 @@
unsigned int treeDepth;
unsigned long long fl;
- GNUNET_ASSERT(DBLOCK_SIZE < MAX_BUFFER_SIZE);
- GNUNET_ASSERT(IBLOCK_SIZE < MAX_BUFFER_SIZE);
+ GE_ASSERT(ectx, DBLOCK_SIZE < MAX_BUFFER_SIZE);
+ GE_ASSERT(ectx, IBLOCK_SIZE < MAX_BUFFER_SIZE);
treeDepth = 0;
fl = DBLOCK_SIZE;
while (fl < flen) {
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -61,9 +61,9 @@
#endif
size = ntohl(iblocks[level]->size);
- GNUNET_ASSERT(size > sizeof(Datastore_Value));
+ GE_ASSERT(ectx, size > sizeof(Datastore_Value));
size -= sizeof(Datastore_Value);
- GNUNET_ASSERT(size - sizeof(DBlock) <= IBLOCK_SIZE);
+ GE_ASSERT(ectx, size - sizeof(DBlock) <= IBLOCK_SIZE);
present = (size - sizeof(DBlock)) / sizeof(CHK);
db = (DBlock*) &iblocks[level][1];
if (present == CHK_PER_INODE) {
@@ -118,7 +118,7 @@
chk,
sizeof(CHK));
size += sizeof(CHK) + sizeof(Datastore_Value);
- GNUNET_ASSERT(size < MAX_BUFFER_SIZE);
+ GE_ASSERT(ectx, size < MAX_BUFFER_SIZE);
iblocks[level]->size = htonl(size);
return OK;
@@ -270,7 +270,7 @@
0,
DBLOCK_SIZE);
}
- GNUNET_ASSERT(sizeof(Datastore_Value) + size + sizeof(DBlock) <
MAX_BUFFER_SIZE);
+ GE_ASSERT(ectx, sizeof(Datastore_Value) + size + sizeof(DBlock) <
MAX_BUFFER_SIZE);
dblock->size = htonl(sizeof(Datastore_Value) + size + sizeof(DBlock));
if (size != READ(fd,
&db[1],
@@ -314,7 +314,7 @@
&chk.query,
&value))
goto FAILURE;
- GNUNET_ASSERT(value != NULL);
+ GE_ASSERT(ectx, value != NULL);
*value = *dblock; /* copy options! */
if (SYSERR == FS_insert(sock,
value)) {
@@ -347,7 +347,7 @@
#endif
for (i=0;i<treedepth;i++) {
size = ntohl(iblocks[i]->size) - sizeof(Datastore_Value);
- GNUNET_ASSERT(size < MAX_BUFFER_SIZE);
+ GE_ASSERT(ectx, size < MAX_BUFFER_SIZE);
if (size == sizeof(DBlock)) {
#if DEBUG_UPLOAD
GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
Modified: GNUnet/src/applications/fs/ecrs/uri.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uri.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs/uri.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -201,7 +201,7 @@
size_t slen;
char * dup;
- GNUNET_ASSERT(uri != NULL);
+ GE_ASSERT(ectx, uri != NULL);
slen = strlen(uri);
pos = strlen(ECRS_URI_PREFIX);
@@ -242,7 +242,7 @@
}
}
(*keywords)[--ret] = STRDUP(&dup[pos]);
- GNUNET_ASSERT(ret == 0);
+ GE_ASSERT(ectx, ret == 0);
FREE(dup);
return iret;
}
@@ -262,7 +262,7 @@
size_t slen;
char * up;
- GNUNET_ASSERT(uri != NULL);
+ GE_ASSERT(ectx, uri != NULL);
slen = strlen(uri);
pos = strlen(ECRS_URI_PREFIX);
@@ -313,7 +313,7 @@
size_t slen;
char * dup;
- GNUNET_ASSERT(uri != NULL);
+ GE_ASSERT(ectx, uri != NULL);
slen = strlen(uri);
pos = strlen(ECRS_URI_PREFIX);
@@ -387,7 +387,7 @@
*/
void ECRS_freeUri(struct ECRS_URI * uri) {
int i;
- GNUNET_ASSERT(uri != NULL);
+ GE_ASSERT(ectx, uri != NULL);
if (uri->type == ksk) {
for (i=0;i<uri->data.ksk.keywordCount;i++)
FREE(uri->data.ksk.keywords[i]);
@@ -461,7 +461,7 @@
if (uri->type == ksk) {
for (i=uri->data.ksk.keywordCount-1;i>=0;i--)
- GNUNET_ASSERT(uri->data.ksk.keywords[i] != NULL);
+ GE_ASSERT(ectx, uri->data.ksk.keywords[i] != NULL);
}
#endif
return uri->type == ksk;
@@ -527,7 +527,7 @@
case loc:
return ntohll(uri->data.loc.size);
default:
- GNUNET_ASSERT(0);
+ GE_ASSERT(ectx, 0);
}
return 0; /* unreachable */
}
@@ -574,7 +574,7 @@
time_t now;
unsigned int keywordCount;
- GNUNET_ASSERT(uri->type == ksk);
+ GE_ASSERT(ectx, uri->type == ksk);
time(&now);
#ifdef HAVE_GMTIME_R
gmtime_r(&now, &t);
@@ -590,7 +590,7 @@
ret->data.ksk.keywords = MALLOC(sizeof(char*) * keywordCount * 2);
for (i=0;i<keywordCount;i++) {
key = uri->data.ksk.keywords[i];
- GNUNET_ASSERT(key != NULL);
+ GE_ASSERT(ectx, key != NULL);
ret->data.ksk.keywords[2*i]
= STRDUP(key);
kd = MALLOC(strlen(key) + 13);
@@ -659,7 +659,7 @@
}
}
if (add == 1) {
- GNUNET_ASSERT(md->items[i].data != NULL);
+ GE_ASSERT(ectx, md->items[i].data != NULL);
ret->data.ksk.keywords[i-havePreview]
= STRDUP(md->items[i].data);
}
@@ -704,8 +704,8 @@
int i;
int j;
- GNUNET_ASSERT(uri1 != NULL);
- GNUNET_ASSERT(uri2 != NULL);
+ GE_ASSERT(ectx, uri1 != NULL);
+ GE_ASSERT(ectx, uri2 != NULL);
if (uri1->type != uri2->type)
return NO;
switch(uri1->type) {
Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/ecrs_core.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -53,8 +53,8 @@
Datastore_Value * val;
DBlock * db;
- GNUNET_ASSERT(len >= sizeof(DBlock));
- GNUNET_ASSERT((data!=NULL) && (query != NULL));
+ GE_ASSERT(ectx, len >= sizeof(DBlock));
+ GE_ASSERT(ectx, (data!=NULL) && (query != NULL));
hash(&data[1], len - sizeof(DBlock), &hc);
hashToKey(&hc,
&skey,
@@ -67,8 +67,8 @@
val->expirationTime = htonl(0);
db = (DBlock*) &val[1];
db->type = htonl(D_BLOCK);
- GNUNET_ASSERT(len - sizeof(DBlock) < MAX_BUFFER_SIZE);
- GNUNET_ASSERT(len - sizeof(DBlock)
+ GE_ASSERT(ectx, len - sizeof(DBlock) < MAX_BUFFER_SIZE);
+ GE_ASSERT(ectx, len - sizeof(DBlock)
== encryptBlock(&data[1],
len - sizeof(DBlock),
&skey,
@@ -96,7 +96,7 @@
void fileBlockGetKey(const DBlock * data,
unsigned int len,
HashCode512 * key) {
- GNUNET_ASSERT(len >= sizeof(DBlock));
+ GE_ASSERT(ectx, len >= sizeof(DBlock));
hash(&data[1],
len - sizeof(DBlock),
key);
@@ -117,16 +117,16 @@
SESSIONKEY skey;
INITVECTOR iv;
- GNUNET_ASSERT(len >= sizeof(DBlock));
+ GE_ASSERT(ectx, len >= sizeof(DBlock));
data = (const char*) &db[1];
len -= sizeof(DBlock);
- GNUNET_ASSERT(len < MAX_BUFFER_SIZE);
+ GE_ASSERT(ectx, len < MAX_BUFFER_SIZE);
hash(data, len, &hc);
hashToKey(&hc,
&skey,
&iv);
tmp = MALLOC(len);
- GNUNET_ASSERT(len == encryptBlock(data,
+ GE_ASSERT(ectx, len == encryptBlock(data,
len,
&skey,
&iv,
Modified: GNUnet/src/applications/fs/fsui/collection.c
===================================================================
--- GNUnet/src/applications/fs/fsui/collection.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/fs/fsui/collection.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -115,9 +115,9 @@
struct ECRS_MetaData * dirMeta;
FSUI_stopCollection(ctx); /* cancel old collection */
- GNUNET_ASSERT(name != NULL);
+ GE_ASSERT(ectx, name != NULL);
advertisement = FSUI_parseCharKeywordURI(COLLECTION);
- GNUNET_ASSERT(advertisement != NULL);
+ GE_ASSERT(ectx, advertisement != NULL);
TIME(&now);
prio = getConfigurationInt("FS",
"ADVERTISEMENT-PRIORITY");
@@ -138,7 +138,7 @@
ECRS_freeUri(advertisement);
ECRS_freeUri(rootURI);
dirMeta = ECRS_dupMetaData(meta);
- GNUNET_ASSERT(OK == ECRS_createDirectory(&dirData,
+ GE_ASSERT(ectx, OK == ECRS_createDirectory(&dirData,
&dirLen,
0,
NULL,
@@ -276,7 +276,7 @@
UNLINK(tmpName);
FREE(tmpName);
metaData = NULL;
- GNUNET_ASSERT(OK == ECRS_listDirectory(&cd->name[strlen(cd->name)+1],
+ GE_ASSERT(ectx, OK == ECRS_listDirectory(&cd->name[strlen(cd->name)+1],
dirLen,
&metaData,
NULL,
@@ -350,7 +350,7 @@
dirLen = ntohl(cd->hdr.size) - strlen(cd->name) - sizeof(CollectionData);
cls.count = 0;
cls.fis = NULL;
- GNUNET_ASSERT(OK ==
+ GE_ASSERT(ectx, OK ==
ECRS_listDirectory(&cd->name[strlen(cd->name)+1],
dirLen,
&metaData,
@@ -361,7 +361,7 @@
NO,
&cls);
dirData = NULL;
- GNUNET_ASSERT(OK ==
+ GE_ASSERT(ectx, OK ==
ECRS_createDirectory(&dirData,
&dirLen,
cls.count,
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/fsui/download.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -76,7 +76,7 @@
EXTRACTOR_FILENAME);
if (filename == NULL) {
char * tmp = ECRS_uriToString(fi->uri);
- GNUNET_ASSERT(strlen(tmp) >= strlen(ECRS_URI_PREFIX) +
strlen(ECRS_FILE_INFIX));
+ GE_ASSERT(ectx, strlen(tmp) >= strlen(ECRS_URI_PREFIX) +
strlen(ECRS_FILE_INFIX));
filename = STRDUP(&tmp[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)]);
FREE(tmp);
}
@@ -205,8 +205,8 @@
"Download thread for `%s' started...\n",
dl->filename);
#endif
- GNUNET_ASSERT(dl->ctx != NULL);
- GNUNET_ASSERT(dl->filename != NULL);
+ GE_ASSERT(ectx, dl->ctx != NULL);
+ GE_ASSERT(ectx, dl->filename != NULL);
ret = ECRS_downloadFile(dl->uri,
dl->filename,
dl->anonymityLevel,
@@ -307,7 +307,7 @@
dl->ctx->ecb(dl->ctx->ecbClosure,
&event);
} else {
- GNUNET_ASSERT(dl != &dl->ctx->activeDownloads);
+ GE_ASSERT(ectx, dl != &dl->ctx->activeDownloads);
while ( (dl != NULL) &&
(dl->ctx != NULL) &&
(dl != &dl->ctx->activeDownloads) ) {
@@ -357,7 +357,7 @@
FSUI_DownloadList * root;
unsigned long long totalBytes;
- GNUNET_ASSERT(ctx != NULL);
+ GE_ASSERT(ectx, ctx != NULL);
if (! (ECRS_isFileUri(uri) ||
ECRS_isLocationUri(uri)) ) {
GE_BREAK(ectx, 0); /* wrong type of URI! */
@@ -401,8 +401,8 @@
const char * filename) {
int ret;
- GNUNET_ASSERT(filename != NULL);
- GNUNET_ASSERT(ctx != NULL);
+ GE_ASSERT(ectx, filename != NULL);
+ GE_ASSERT(ectx, ctx != NULL);
MUTEX_LOCK(&ctx->lock);
ret = startDownload(ctx,
anonymityLevel,
@@ -515,7 +515,7 @@
FSUI_DownloadList * dpos;
int i;
- GNUNET_ASSERT(list->state != FSUI_DOWNLOAD_ACTIVE);
+ GE_ASSERT(ectx, list->state != FSUI_DOWNLOAD_ACTIVE);
/* first, find our predecessor and
unlink us from the tree! */
@@ -528,7 +528,7 @@
while ( (dpos != NULL) &&
(dpos->next != list) )
dpos = dpos->next;
- GNUNET_ASSERT(dpos != NULL);
+ GE_ASSERT(ectx, dpos != NULL);
dpos->next = list->next;
}
}
@@ -562,7 +562,7 @@
GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSUI_stopDownload called.\n");
- GNUNET_ASSERT(filename != NULL);
+ GE_ASSERT(ectx, filename != NULL);
MUTEX_LOCK(&ctx->lock);
dl = ctx->activeDownloads.child;
prev = NULL;
@@ -705,8 +705,8 @@
const char * dirname) {
int ret;
- GNUNET_ASSERT(dirname != NULL);
- GNUNET_ASSERT(ctx != NULL);
+ GE_ASSERT(ectx, dirname != NULL);
+ GE_ASSERT(ectx, ctx != NULL);
MUTEX_LOCK(&ctx->lock);
ret = startDownload(ctx,
anonymityLevel,
Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -187,13 +187,13 @@
return -1;
#if 1
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
+ GE_ASSERT(ectx, daemon > 0);
#else
daemon = -1;
#endif
ok = YES;
startCron();
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(2 * cronMINUTES));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(2 * cronMINUTES));
gnunet_util_sleep(5 * cronSECONDS); /* give apps time to start */
/* ACTUAL TEST CODE */
@@ -312,8 +312,8 @@
ECRS_freeUri(upURI);
stopCron();
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return (ok == YES) ? 0 : 1;
}
Modified: GNUnet/src/applications/fs/fsui/file_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/file_info.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/fsui/file_info.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -115,7 +115,7 @@
size = ECRS_sizeofMetaData(fi->meta,
ECRS_SERIALIZE_FULL);
data = MALLOC(size);
- GNUNET_ASSERT(size == ECRS_serializeMetaData(fi->meta,
+ GE_ASSERT(ectx, size == ECRS_serializeMetaData(fi->meta,
data,
size,
ECRS_SERIALIZE_FULL));
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -84,7 +84,7 @@
int i;
int ok;
- GNUNET_ASSERT(ctx != NULL);
+ GE_ASSERT(ectx, ctx != NULL);
if (1 != READ(fd, &zaro, sizeof(char))) {
GE_BREAK(ectx, 0);
return NULL;
@@ -754,7 +754,7 @@
unsigned int big;
tmp = ECRS_uriToString(spos->uri);
- GNUNET_ASSERT(tmp != NULL);
+ GE_ASSERT(ectx, tmp != NULL);
big = htonl(strlen(tmp));
WRITE(fd,
&big,
Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -123,10 +123,10 @@
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
+ GE_ASSERT(ectx, daemon > 0);
ok = YES;
startCron();
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(2 * cronMINUTES));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(2 * cronMINUTES));
gnunet_util_sleep(5 * cronSECONDS); /* give apps time to start */
/* ACTUAL TEST CODE */
@@ -194,8 +194,8 @@
FREE(filename);
stopCron();
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return (ok == YES) ? 0 : 1;
}
Modified: GNUnet/src/applications/fs/fsui/fsuitest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest2.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/fsui/fsuitest2.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -63,10 +63,10 @@
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
+ GE_ASSERT(ectx, daemon > 0);
ok = YES;
startCron();
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
gnunet_util_sleep(5 * cronSECONDS); /* give apps time to start */
/* ACTUAL TEST CODE */
@@ -87,8 +87,8 @@
FSUI_stop(ctx);
stopCron();
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return (ok == YES) ? 0 : 1;
}
Modified: GNUnet/src/applications/fs/fsui/namespace_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/namespace_info.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/fs/fsui/namespace_info.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -64,7 +64,7 @@
tag = size + sizeof(int);
buf = MALLOC(tag);
((int *) buf)[0] = htonl(ranking); /* ranking */
- GNUNET_ASSERT(size == ECRS_serializeMetaData(meta,
+ GE_ASSERT(ectx, size == ECRS_serializeMetaData(meta,
&buf[sizeof(int)],
size,
ECRS_SERIALIZE_FULL));
@@ -470,7 +470,7 @@
memcpy(&buf[1],
uri,
strlen(uri)+1);
- GNUNET_ASSERT(metaSize ==
+ GE_ASSERT(ectx, metaSize ==
ECRS_serializeMetaData(fi->meta,
&((char*)&buf[1])[strlen(uri)+1],
metaSize,
Modified: GNUnet/src/applications/fs/fsui/namespace_infotest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/namespace_infotest.c 2006-07-31
03:24:57 UTC (rev 3190)
+++ GNUnet/src/applications/fs/fsui/namespace_infotest.c 2006-07-31
03:27:39 UTC (rev 3191)
@@ -73,10 +73,10 @@
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
+ GE_ASSERT(ectx, daemon > 0);
ok = YES;
startCron();
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(2 * cronMINUTES));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(2 * cronMINUTES));
ECRS_deleteNamespace("test");
gnunet_util_sleep(5 * cronSECONDS); /* give apps time to start */
@@ -139,8 +139,8 @@
ECRS_freeMetaData(meta);
ECRS_deleteNamespace("test");
stopCron();
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return (ok == YES) ? 0 : 1;
}
Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/fs/fsui/searchtest.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -123,10 +123,10 @@
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
+ GE_ASSERT(ectx, daemon > 0);
ok = YES;
startCron();
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
gnunet_util_sleep(5 * cronSECONDS); /* give apps time to start */
/* ACTUAL TEST CODE */
@@ -204,8 +204,8 @@
FREE(fn);
stopCron();
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return (ok == YES) ? 0 : 1;
}
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/fsui/upload.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -129,7 +129,7 @@
int handle;
char * mdn;
- GNUNET_ASSERT(utc->filename != NULL);
+ GE_ASSERT(ectx, utc->filename != NULL);
ret = SYSERR;
if (*meta == NULL)
@@ -184,7 +184,7 @@
NULL,
uri);
if (ret == OK) {
- GNUNET_ASSERT(NULL != *uri);
+ GE_ASSERT(ectx, NULL != *uri);
event.type = FSUI_upload_complete;
event.data.UploadComplete.total = utc->main_total;
event.data.UploadComplete.completed = utc->main_completed;
@@ -249,7 +249,7 @@
NULL,
&uri);
if (ret == OK) {
- GNUNET_ASSERT(uri != NULL);
+ GE_ASSERT(ectx, uri != NULL);
event.type = FSUI_upload_complete;
event.data.UploadComplete.total = utc->main_total;
event.data.UploadComplete.completed = utc->main_completed;
@@ -369,7 +369,7 @@
char * inboundFN;
int sendEvent = YES;
- GNUNET_ASSERT(utc->main_filename != NULL);
+ GE_ASSERT(ectx, utc->main_filename != NULL);
inboundFN
= ECRS_getFromMetaData(utc->meta,
EXTRACTOR_FILENAME);
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/lib/fslib.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -160,7 +160,7 @@
void FS_SEARCH_destroyContext(struct FS_SEARCH_CONTEXT * ctx) {
void * unused;
- GNUNET_ASSERT(ctx->handleCount == 0);
+ GE_ASSERT(ectx, ctx->handleCount == 0);
ctx->abort = YES;
closeSocketTemporarily(ctx->sock);
PTHREAD_JOIN(&ctx->thread,
Modified: GNUnet/src/applications/fs/lib/fslibtest.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslibtest.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/lib/fslibtest.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -143,7 +143,7 @@
fileBlockGetQuery((DBlock*) &blk[1],
ntohl(blk->size) - sizeof(Datastore_Value),
&ekey);
- GNUNET_ASSERT(OK ==
+ GE_ASSERT(ectx, OK ==
fileBlockEncode((DBlock*) &blk[1],
ntohl(blk->size) - sizeof(Datastore_Value),
&ekey,
@@ -231,11 +231,11 @@
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
+ GE_ASSERT(ectx, daemon > 0);
ok = YES;
startCron();
MUTEX_CREATE(&lock);
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(60 * cronSECONDS));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(60 * cronSECONDS));
gnunet_util_sleep(5 * cronSECONDS); /* give apps time to start */
sock = getClientSocket();
CHECK(sock != NULL);
@@ -357,8 +357,8 @@
releaseClientSocket(sock);
MUTEX_DESTROY(&lock);
stopCron();
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return (ok == YES) ? 0 : 1;
}
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/fs/module/fs.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -1164,13 +1164,13 @@
static Blockstore dsGap;
static Blockstore dsDht;
- GNUNET_ASSERT(sizeof(CHK) == 128);
- GNUNET_ASSERT(sizeof(DBlock) == 4);
- GNUNET_ASSERT(sizeof(IBlock) == 132);
- GNUNET_ASSERT(sizeof(KBlock) == 524);
- GNUNET_ASSERT(sizeof(SBlock) == 724);
- GNUNET_ASSERT(sizeof(NBlock) == 716);
- GNUNET_ASSERT(sizeof(KNBlock) == 1244);
+ GE_ASSERT(ectx, sizeof(CHK) == 128);
+ GE_ASSERT(ectx, sizeof(DBlock) == 4);
+ GE_ASSERT(ectx, sizeof(IBlock) == 132);
+ GE_ASSERT(ectx, sizeof(KBlock) == 524);
+ GE_ASSERT(ectx, sizeof(SBlock) == 724);
+ GE_ASSERT(ectx, sizeof(NBlock) == 716);
+ GE_ASSERT(ectx, sizeof(KNBlock) == 1244);
migration = testConfigurationString("FS",
"ACTIVEMIGRATION",
@@ -1242,23 +1242,23 @@
CS_PROTO_gap_GET_AVG_PRIORITY,
CS_PROTO_gap_INIT_INDEX);
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_QUERY_START,
+ GE_ASSERT(ectx, SYSERR !=
capi->registerClientHandler(CS_PROTO_gap_QUERY_START,
&csHandleRequestQueryStart));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_QUERY_STOP,
+ GE_ASSERT(ectx, SYSERR !=
capi->registerClientHandler(CS_PROTO_gap_QUERY_STOP,
&csHandleRequestQueryStop));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_INSERT,
+ GE_ASSERT(ectx, SYSERR != capi->registerClientHandler(CS_PROTO_gap_INSERT,
&csHandleCS_fs_request_insert_MESSAGE));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_INDEX,
+ GE_ASSERT(ectx, SYSERR != capi->registerClientHandler(CS_PROTO_gap_INDEX,
&csHandleCS_fs_request_index_MESSAGE));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_INIT_INDEX,
+ GE_ASSERT(ectx, SYSERR !=
capi->registerClientHandler(CS_PROTO_gap_INIT_INDEX,
&csHandleCS_fs_request_init_index_MESSAGE));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_DELETE,
+ GE_ASSERT(ectx, SYSERR != capi->registerClientHandler(CS_PROTO_gap_DELETE,
&csHandleCS_fs_request_delete_MESSAGE));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_UNINDEX,
+ GE_ASSERT(ectx, SYSERR != capi->registerClientHandler(CS_PROTO_gap_UNINDEX,
&csHandleCS_fs_request_unindex_MESSAGE));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_gap_TESTINDEX,
+ GE_ASSERT(ectx, SYSERR != capi->registerClientHandler(CS_PROTO_gap_TESTINDEX,
&csHandleCS_fs_request_test_index_MESSAGEed));
- GNUNET_ASSERT(SYSERR !=
capi->registerClientHandler(CS_PROTO_gap_GET_AVG_PRIORITY,
+ GE_ASSERT(ectx, SYSERR !=
capi->registerClientHandler(CS_PROTO_gap_GET_AVG_PRIORITY,
&csHandleRequestGetAvgPriority));
initMigration(capi,
datastore,
@@ -1284,23 +1284,23 @@
"Leaving DHT complete.");
}
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_QUERY_START,
+ GE_ASSERT(ectx, SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_QUERY_START,
&csHandleRequestQueryStart));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_QUERY_STOP,
+ GE_ASSERT(ectx, SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_QUERY_STOP,
&csHandleRequestQueryStop));
- GNUNET_ASSERT(SYSERR != coreAPI->unregisterClientHandler(CS_PROTO_gap_INSERT,
+ GE_ASSERT(ectx, SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_INSERT,
&csHandleCS_fs_request_insert_MESSAGE));
- GNUNET_ASSERT(SYSERR != coreAPI->unregisterClientHandler(CS_PROTO_gap_INDEX,
+ GE_ASSERT(ectx, SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_INDEX,
&csHandleCS_fs_request_index_MESSAGE));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_INIT_INDEX,
+ GE_ASSERT(ectx, SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_INIT_INDEX,
&csHandleCS_fs_request_init_index_MESSAGE));
- GNUNET_ASSERT(SYSERR != coreAPI->unregisterClientHandler(CS_PROTO_gap_DELETE,
+ GE_ASSERT(ectx, SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_DELETE,
&csHandleCS_fs_request_delete_MESSAGE));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_UNINDEX,
+ GE_ASSERT(ectx, SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_UNINDEX,
&csHandleCS_fs_request_unindex_MESSAGE));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_TESTINDEX,
+ GE_ASSERT(ectx, SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_TESTINDEX,
&csHandleCS_fs_request_test_index_MESSAGEed));
- GNUNET_ASSERT(SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_GET_AVG_PRIORITY,
+ GE_ASSERT(ectx, SYSERR !=
coreAPI->unregisterClientHandler(CS_PROTO_gap_GET_AVG_PRIORITY,
&csHandleRequestGetAvgPriority));
doneQueryManager();
while (lg_jobs != NULL) {
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/fs/module/ondemand.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -648,7 +648,7 @@
if (NULL == tmp) {
tmp = getConfigurationString("GNUNETD",
"GNUNETD_HOME");
- GNUNET_ASSERT(NULL != tmp);
+ GE_ASSERT(ectx, NULL != tmp);
tmp = REALLOC(tmp,
strlen(tmp) +
strlen("/data/shared/") + 1);
Modified: GNUnet/src/applications/fs/module/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/module/querymanager.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/fs/module/querymanager.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -54,7 +54,7 @@
static CoreAPIForApplication * coreAPI;
static void removeEntry(unsigned int off) {
- GNUNET_ASSERT(off < trackerCount);
+ GE_ASSERT(ectx, off < trackerCount);
FREE(trackers[off]);
trackers[off] = trackers[--trackerCount];
trackers[trackerCount] = NULL;
@@ -84,7 +84,7 @@
const ClientHandle client) {
int i;
- GNUNET_ASSERT(client != NULL);
+ GE_ASSERT(ectx, client != NULL);
MUTEX_LOCK(&queryManagerLock);
for (i=trackerCount-1;i>=0;i--)
if ( (trackers[i]->client == client) &&
@@ -142,7 +142,7 @@
EncName enc;
#endif
- GNUNET_ASSERT(ntohl(value->size) > sizeof(Datastore_Value));
+ GE_ASSERT(ectx, ntohl(value->size) > sizeof(Datastore_Value));
matchCount = 0;
#if DEBUG_QUERYMANAGER
IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -244,7 +244,7 @@
filename = getConfigurationString("GNUNET-DOWNLOAD",
"FILENAME");
if (filename == NULL) {
- GNUNET_ASSERT(strlen(fstring) >
+ GE_ASSERT(ectx, strlen(fstring) >
strlen(ECRS_URI_PREFIX) +
strlen(ECRS_FILE_INFIX));
filename = expandFileName(&fstring[strlen(ECRS_URI_PREFIX)+
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/applications/gap/gap.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -659,7 +659,7 @@
pos += qr->rankings[j];
if (pos > sel) {
setBit(qr, j);
- GNUNET_ASSERT(rankingSum >= qr->rankings[j]);
+ GE_ASSERT(ectx, rankingSum >= qr->rankings[j]);
rankingSum -= qr->rankings[j];
qr->rankings[j] = 0;
break;
@@ -715,7 +715,7 @@
= (((unsigned int*)query)[0] ^
((unsigned int*)query)[1] / (1 + random_qsel))
% indirectionTableSize;
- GNUNET_ASSERT(res < indirectionTableSize);
+ GE_ASSERT(ectx, res < indirectionTableSize);
#if DO_HISTOGRAM
histogram[res % 65536]++;
if (++hist_total % 10000 == 0) {
@@ -898,7 +898,7 @@
&enc,
ite);
#endif
- GNUNET_ASSERT(sender != 0); /* do NOT add to RT for local clients! */
+ GE_ASSERT(ectx, sender != 0); /* do NOT add to RT for local clients! */
cronTime(&now);
if ( (stats != NULL) &&
(ite->ttl == 0) )
@@ -941,7 +941,7 @@
ite->priority = priority;
}
} else { /* GROW mode */
- GNUNET_ASSERT(equalsHashCode512(query,
+ GE_ASSERT(ectx, equalsHashCode512(query,
&ite->primaryKey));
for (i=0;i<ite->hostsWaiting;i++)
if (sender == ite->destination[i])
@@ -1407,7 +1407,7 @@
return SYSERR;
senderID = intern_pid(sender);
- GNUNET_ASSERT( (senderID != 0) || (sender == NULL) );
+ GE_ASSERT(ectx, (senderID != 0) || (sender == NULL) );
ite = &ROUTING_indTable_[computeRoutingIndex(&query->queries[0])];
MUTEX_LOCK(&lookup_exclusion);
i = -1;
@@ -1894,7 +1894,7 @@
size - sizeof(P2P_gap_reply_MESSAGE));
#if EXTRA_CHECKS
/* verify content integrity */
- GNUNET_ASSERT(SYSERR != bs->put(bs->closure,
+ GE_ASSERT(ectx, SYSERR != bs->put(bs->closure,
primaryKey,
data,
0));
@@ -2068,8 +2068,8 @@
static GAP_ServiceAPI api;
unsigned int i;
- GNUNET_ASSERT(sizeof(P2P_gap_reply_MESSAGE) == 68);
- GNUNET_ASSERT(sizeof(P2P_gap_query_MESSAGE) == 144);
+ GE_ASSERT(ectx, sizeof(P2P_gap_reply_MESSAGE) == 68);
+ GE_ASSERT(ectx, sizeof(P2P_gap_query_MESSAGE) == 144);
coreAPI = capi;
stats = capi->requestService("stats");
@@ -2103,9 +2103,9 @@
hardUpLimit = getConfigurationInt("LOAD", "HARDUPLIMIT");
identity = coreAPI->requestService("identity");
- GNUNET_ASSERT(identity != NULL);
+ GE_ASSERT(ectx, identity != NULL);
topology = coreAPI->requestService("topology");
- GNUNET_ASSERT(topology != NULL);
+ GE_ASSERT(ectx, topology != NULL);
traffic = coreAPI->requestService("traffic");
if (traffic == NULL) {
GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
Modified: GNUnet/src/applications/gap/gaptest.c
===================================================================
--- GNUnet/src/applications/gap/gaptest.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/gap/gaptest.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -151,7 +151,7 @@
"Search found URI `%s'\n",
tmp);
FREE(tmp);
- GNUNET_ASSERT(NULL == *my);
+ GE_ASSERT(ectx, NULL == *my);
*my = ECRS_dupUri(fi->uri);
return SYSERR; /* abort search */
}
@@ -259,7 +259,7 @@
int left;
struct ECRS_URI * uri;
- GNUNET_ASSERT(OK ==
+ GE_ASSERT(ectx, OK ==
enc2hash("BV3AS3KMIIBVIFCGEG907N6NTDTH26B7T6FODUSLSGK"
"5B2Q58IEU1VF5FTR838449CSHVBOAHLDVQAOA33O77F"
"OPDA8F1VIKESLSNBO",
@@ -286,12 +286,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
/* re-start, this time we're sure up-to-date hellos are available */
@@ -354,12 +354,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
doneUtil();
return ret;
Modified: GNUnet/src/applications/gap/pid_table.c
===================================================================
--- GNUnet/src/applications/gap/pid_table.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/gap/pid_table.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -82,7 +82,7 @@
}
if (ret == 0)
ret = 1;
- GNUNET_ASSERT(ret < size);
+ GE_ASSERT(ectx, ret < size);
table[ret].id = pid->hashPubKey;
table[ret].rc = 1;
if (stats != NULL) {
@@ -102,8 +102,8 @@
MUTEX_LOCK(&lock);
for (i=count-1;i>=0;i--) {
id = ids[i];
- GNUNET_ASSERT(id < size);
- GNUNET_ASSERT(table[id].rc > 0);
+ GE_ASSERT(ectx, id < size);
+ GE_ASSERT(ectx, table[id].rc > 0);
table[id].rc--;
if ( (table[id].rc == 0) &&
(stats != NULL) )
@@ -118,8 +118,8 @@
if (id == 0)
return;
MUTEX_LOCK(&lock);
- GNUNET_ASSERT(id < size);
- GNUNET_ASSERT(table[id].rc > 0);
+ GE_ASSERT(ectx, id < size);
+ GE_ASSERT(ectx, table[id].rc > 0);
table[id].rc += delta;
if (stats != NULL) {
stats->change(stat_pid_rc, delta);
@@ -137,8 +137,8 @@
return;
}
MUTEX_LOCK(&lock);
- GNUNET_ASSERT(id < size);
- GNUNET_ASSERT(table[id].rc > 0);
+ GE_ASSERT(ectx, id < size);
+ GE_ASSERT(ectx, table[id].rc > 0);
pid->hashPubKey = table[id].id;
MUTEX_UNLOCK(&lock);
}
Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/applications/rpc/rpc.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -118,8 +118,8 @@
RPC_Function callback) {
RegisteredRPC * rrpc;
- GNUNET_ASSERT(name != NULL);
- GNUNET_ASSERT(callback != NULL);
+ GE_ASSERT(ectx, name != NULL);
+ GE_ASSERT(ectx, callback != NULL);
MUTEX_LOCK (rpcLock);
rrpc = vectorGetFirst(list_of_callbacks);
while (rrpc != NULL) {
@@ -158,8 +158,8 @@
ASYNC_RPC_Function callback) {
RegisteredRPC * rrpc;
- GNUNET_ASSERT(name != NULL);
- GNUNET_ASSERT(callback != NULL);
+ GE_ASSERT(ectx, name != NULL);
+ GE_ASSERT(ectx, callback != NULL);
MUTEX_LOCK (rpcLock);
rrpc = vectorGetFirst(list_of_callbacks);
while (rrpc != NULL) {
@@ -200,7 +200,7 @@
RPC_Function callback) {
RegisteredRPC * rrpc;
- GNUNET_ASSERT(name != NULL);
+ GE_ASSERT(ectx, name != NULL);
MUTEX_LOCK(rpcLock);
rrpc = vectorGetFirst(list_of_callbacks);
while (rrpc != NULL) {
@@ -247,7 +247,7 @@
ASYNC_RPC_Function callback) {
RegisteredRPC * rrpc;
- GNUNET_ASSERT(name != NULL);
+ GE_ASSERT(ectx, name != NULL);
MUTEX_LOCK(rpcLock);
rrpc = vectorGetFirst(list_of_callbacks);
while (rrpc != NULL) {
@@ -627,7 +627,7 @@
cron_t now;
cronTime(&now);
- GNUNET_ASSERT( (cronTime(NULL) + 1 * cronMINUTES > call->expirationTime) ||
+ GE_ASSERT(ectx, (cronTime(NULL) + 1 * cronMINUTES > call->expirationTime) ||
(call->expirationTime - cronTime(NULL) < 1 * cronHOURS) );
MUTEX_LOCK(rpcLock);
if (now > call->expirationTime) {
@@ -693,7 +693,7 @@
ntohl(call->msg->importance),
maxdelay);
}
- GNUNET_ASSERT( (cronTime(NULL) + 1 * cronMINUTES > call->expirationTime) ||
+ GE_ASSERT(ectx, (cronTime(NULL) + 1 * cronMINUTES > call->expirationTime)
||
(call->expirationTime - cronTime(NULL) < 1 * cronHOURS) );
addCronJob((CronJob) &retryRPCJob,
call->repetitionFrequency,
@@ -837,7 +837,7 @@
results);
vectorInsertLast(incomingCalls, calls);
- GNUNET_ASSERT( (cronTime(NULL) + 1 * cronMINUTES > calls->expirationTime) ||
+ GE_ASSERT(ectx, (cronTime(NULL) + 1 * cronMINUTES > calls->expirationTime)
||
(calls->expirationTime - cronTime(NULL) < 1 * cronHOURS) );
/* for right now: schedule cron job to send reply! */
addCronJob((CronJob)&retryRPCJob,
@@ -1208,7 +1208,7 @@
call->finishedCallback = (RPCFinishedCallback) &RPC_execute_callback;
call->rpcCallbackArgs = &cls;
vectorInsertLast(outgoingCalls, call);
- GNUNET_ASSERT( (cronTime(NULL) + 1 * cronMINUTES > call->expirationTime) ||
+ GE_ASSERT(ectx, (cronTime(NULL) + 1 * cronMINUTES > call->expirationTime) ||
(call->expirationTime - cronTime(NULL) < 1 * cronHOURS) );
addCronJob((CronJob) &retryRPCJob,
0,
@@ -1291,7 +1291,7 @@
(RPCFinishedCallback) &RPC_async_callback;
ret->call->rpcCallbackArgs = ret;
vectorInsertLast(outgoingCalls, ret->call);
- GNUNET_ASSERT( (cronTime(NULL) + 1 * cronMINUTES >
ret->call->expirationTime) ||
+ GE_ASSERT(ectx, (cronTime(NULL) + 1 * cronMINUTES >
ret->call->expirationTime) ||
(ret->call->expirationTime - cronTime(NULL) < 1 * cronHOURS) );
addCronJob((CronJob) &retryRPCJob,
0,
Modified: GNUnet/src/applications/session/sessiontest.c
===================================================================
--- GNUnet/src/applications/session/sessiontest.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/session/sessiontest.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -65,7 +65,7 @@
GNUNET_TCP_SOCKET * sock;
int left;
- GNUNET_ASSERT(OK ==
+ GE_ASSERT(ectx, OK ==
enc2hash("BV3AS3KMIIBVIFCGEG907N6NTDTH26B7T6FODUSLSGK"
"5B2Q58IEU1VF5FTR838449CSHVBOAHLDVQAOA33O77F"
"OPDA8F1VIKESLSNBO",
@@ -89,12 +89,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
/* re-start, this time we're sure up-to-date hellos are available */
@@ -143,12 +143,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
doneUtil();
return ret;
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -718,7 +718,7 @@
dbh->sbind[0].buffer = (char*) query;
dbh->sbind[1].buffer = (char*) &type;
dbh->sbind[0].length = &hashSize;
- GNUNET_ASSERT(mysql_stmt_param_count(stmt) <= 2);
+ GE_ASSERT(ectx, mysql_stmt_param_count(stmt) <= 2);
sql_res = mysql_stmt_result_metadata(stmt);
if (! sql_res) {
GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
@@ -978,7 +978,7 @@
stmt = dbh->deleteh;
dbh->dbind[0].buffer = (char*) key;
dbh->dbind[0].length = &twenty;
- GNUNET_ASSERT(mysql_stmt_param_count(stmt) <= 1);
+ GE_ASSERT(ectx, mysql_stmt_param_count(stmt) <= 1);
} else {
stmt = dbh->deleteg;
type = ntohl(value->type);
@@ -996,7 +996,7 @@
dbh->dbind[5].buffer = (char*) &expiration;
dbh->dbind[6].buffer = (char*) &value[1];
dbh->dbind[6].length = &datasize;
- GNUNET_ASSERT(mysql_stmt_param_count(stmt) <= 7);
+ GE_ASSERT(ectx, mysql_stmt_param_count(stmt) <= 7);
}
if (mysql_stmt_bind_param(stmt,
dbh->dbind)) {
@@ -1046,7 +1046,7 @@
dbh->ubind[1].length = &twenty;
dbh->ubind[2].buffer = (char*) &value[1];
dbh->ubind[2].length = &contentSize;
- GNUNET_ASSERT(mysql_stmt_param_count(dbh->update) <= 3);
+ GE_ASSERT(ectx, mysql_stmt_param_count(dbh->update) <= 3);
if (mysql_stmt_bind_param(dbh->update,
dbh->ubind)) {
GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
@@ -1110,7 +1110,7 @@
GE_BREAK(ectx, 0);
return 0; /* shouldn't get here */
}
- GNUNET_ASSERT( (dbh->avgLength_ID < rows) &&
+ GE_ASSERT(ectx, (dbh->avgLength_ID < rows) &&
(dbh->avgLength_ID >= 0) );
if (sql_row[dbh->avgLength_ID] != NULL)
avgRowLen = atoll(sql_row[dbh->avgLength_ID]);
@@ -1119,7 +1119,7 @@
mysql_free_result(sql_res);
}
- GNUNET_ASSERT(avgRowLen >= 0);
+ GE_ASSERT(ectx, avgRowLen >= 0);
/* find number of entries (rows) */
mysql_query(dbh->dbf,
"SELECT COUNT(*) FROM gn070");
@@ -1130,7 +1130,7 @@
if ((sql_row=mysql_fetch_row(sql_res))) {
int cols = mysql_num_fields(sql_res);
- GNUNET_ASSERT(cols > 0);
+ GE_ASSERT(ectx, cols > 0);
if (sql_row[0] != NULL)
rowsInTable = atoll(sql_row[0]);
else
@@ -1269,7 +1269,7 @@
break;
}
}
- GNUNET_ASSERT(dbh->avgLength_ID != -1);
+ GE_ASSERT(ectx, dbh->avgLength_ID != -1);
mysql_free_result(sql_res);
if (found == NO) {
GE_BREAK(ectx, 0);
Modified: GNUnet/src/applications/tbench/gnunet-tbench.c
===================================================================
--- GNUnet/src/applications/tbench/gnunet-tbench.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/tbench/gnunet-tbench.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -236,7 +236,7 @@
buffer = NULL;
if (OK == readFromSocket(sock,
(CS_MESSAGE_HEADER**)&buffer)) {
- GNUNET_ASSERT(ntohs(buffer->header.size) ==
+ GE_ASSERT(ectx, ntohs(buffer->header.size) ==
sizeof(CS_tbench_reply_MESSAGE));
if ((float)buffer->mean_loss <= 0){
GE_BREAK(ectx, 0);
Modified: GNUnet/src/applications/tbench/tbenchtest.c
===================================================================
--- GNUnet/src/applications/tbench/tbenchtest.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/tbench/tbenchtest.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -146,7 +146,7 @@
GNUNET_TCP_SOCKET * sock;
int i;
- GNUNET_ASSERT(OK ==
+ GE_ASSERT(ectx, OK ==
enc2hash("BV3AS3KMIIBVIFCGEG907N6NTDTH26B7T6FODUSLSGK"
"5B2Q58IEU1VF5FTR838449CSHVBOAHLDVQAOA33O77F"
"OPDA8F1VIKESLSNBO",
@@ -170,12 +170,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
/* re-start, this time we're sure up-to-date hellos are available */
@@ -224,12 +224,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
doneUtil();
return ret;
Modified: GNUnet/src/applications/tbench/tbenchtest_udp.c
===================================================================
--- GNUnet/src/applications/tbench/tbenchtest_udp.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/tbench/tbenchtest_udp.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -146,7 +146,7 @@
GNUNET_TCP_SOCKET * sock;
int i;
- GNUNET_ASSERT(OK ==
+ GE_ASSERT(ectx, OK ==
enc2hash("BV3AS3KMIIBVIFCGEG907N6NTDTH26B7T6FODUSLSGK"
"5B2Q58IEU1VF5FTR838449CSHVBOAHLDVQAOA33O77F"
"OPDA8F1VIKESLSNBO",
@@ -171,12 +171,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
#endif
@@ -227,12 +227,12 @@
if (daemon1 != -1) {
if (! termProcess(daemon1))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon1));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon1));
}
if (daemon2 != -1) {
if (! termProcess(daemon2))
DIE_STRERROR("kill");
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon2));
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon2));
}
doneUtil();
return ret;
Modified: GNUnet/src/applications/testbed/gnunet-testbed.c
===================================================================
--- GNUnet/src/applications/testbed/gnunet-testbed.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/testbed/gnunet-testbed.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -252,7 +252,7 @@
configFile = getConfigurationString("FILES",
"gnunet.conf");
- GNUNET_ASSERT(configFile != NULL);
+ GE_ASSERT(ectx, configFile != NULL);
argv[0] = SHELL;
aliases = FOPEN(TB_ALIASES, "w+");
fprintf(aliases,
@@ -406,7 +406,7 @@
continue;
}
/* access control! */
- GNUNET_ASSERT(sizeof(struct in_addr) == sizeof(IPaddr));
+ GE_ASSERT(ectx, sizeof(struct in_addr) == sizeof(IPaddr));
memcpy(&ipaddr,
&clientAddr.sin_addr,
sizeof(struct in_addr));
Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/testbed/testbed.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -1337,8 +1337,8 @@
for (i=0;i<TESTBED_MAX_MSG;i++)
if ( (handlers[i].msgId != i) &&
(handlers[i].handler != &tb_undefined) )
- GNUNET_ASSERT(0);
- GNUNET_ASSERT(handlers[TESTBED_MAX_MSG].handler == NULL);
+ GE_ASSERT(ectx, 0);
+ GE_ASSERT(ectx, handlers[TESTBED_MAX_MSG].handler == NULL);
identity = capi->requestService("identity");
if (identity == NULL)
return SYSERR;
@@ -1348,8 +1348,8 @@
"TESTBED registering handler %d!\n",
CS_PROTO_testbed_REQUEST);
coreAPI = capi;
- GNUNET_ASSERT(SYSERR !=
capi->registerClientExitHandler(&testbedClientExitHandler));
- GNUNET_ASSERT(SYSERR != capi->registerClientHandler(CS_PROTO_testbed_REQUEST,
+ GE_ASSERT(ectx, SYSERR !=
capi->registerClientExitHandler(&testbedClientExitHandler));
+ GE_ASSERT(ectx, SYSERR !=
capi->registerClientHandler(CS_PROTO_testbed_REQUEST,
(CSHandler)&csHandleTestbedRequest));
httpRegister("startup");
setConfigurationString("ABOUT",
Modified: GNUnet/src/applications/topology_f2f/topology.c
===================================================================
--- GNUnet/src/applications/topology_f2f/topology.c 2006-07-31 03:24:57 UTC
(rev 3190)
+++ GNUnet/src/applications/topology_f2f/topology.c 2006-07-31 03:27:39 UTC
(rev 3191)
@@ -451,7 +451,7 @@
int initialize_module_topology_f2f(CoreAPIForApplication * capi) {
myCapi = capi;
myTopology = capi->requestService("topology");
- GNUNET_ASSERT(myTopology != NULL);
+ GE_ASSERT(ectx, myTopology != NULL);
return OK;
}
Modified: GNUnet/src/applications/traffic/traffic.c
===================================================================
--- GNUnet/src/applications/traffic/traffic.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/applications/traffic/traffic.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -546,7 +546,7 @@
}
#endif
- GNUNET_ASSERT(counters == NULL);
+ GE_ASSERT(ectx, counters == NULL);
MUTEX_CREATE(&lock);
#if KEEP_RECEIVE_STATS || KEEP_TRANSMITTED_STATS
stats = capi->requestService("stats");
@@ -590,7 +590,7 @@
* Initialize the traffic module.
*/
int initialize_module_traffic(CoreAPIForApplication * capi) {
- GNUNET_ASSERT(myCoreAPI == NULL);
+ GE_ASSERT(ectx, myCoreAPI == NULL);
myCoreAPI = capi;
myApi = capi->requestService("traffic");
if (myApi == NULL) {
@@ -610,8 +610,8 @@
* Shutdown the traffic module.
*/
void done_module_traffic() {
- GNUNET_ASSERT(myCoreAPI != NULL);
- GNUNET_ASSERT(SYSERR !=
myCoreAPI->unregisterClientHandler(CS_PROTO_traffic_QUERY,
+ GE_ASSERT(ectx, myCoreAPI != NULL);
+ GE_ASSERT(ectx, SYSERR !=
myCoreAPI->unregisterClientHandler(CS_PROTO_traffic_QUERY,
&trafficQueryHandler));
myCoreAPI->releaseService(myApi);
myApi = NULL;
Modified: GNUnet/src/applications/vpn/vpn.c
===================================================================
--- GNUnet/src/applications/vpn/vpn.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/applications/vpn/vpn.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -1338,7 +1338,7 @@
identity = coreAPI->requestService("identity");
- GNUNET_ASSERT(identity != NULL);
+ GE_ASSERT(ectx, identity != NULL);
init_router(); /* reqire identity */
init_realised(); /* reqire identity */
Modified: GNUnet/src/setup/confdata.c
===================================================================
--- GNUnet/src/setup/confdata.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/setup/confdata.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -52,7 +52,7 @@
struct expr *e;
int i = 0;
- GNUNET_ASSERT(name != NULL);
+ GE_ASSERT(ectx, name != NULL);
FREENONNULL(setConfigurationString("FILES",
"gnunet.conf",
name));
Modified: GNUnet/src/setup/glade_support.c
===================================================================
--- GNUnet/src/setup/glade_support.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/setup/glade_support.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -37,7 +37,7 @@
}
void destroyMainXML() {
- GNUNET_ASSERT(mainXML_ != NULL);
+ GE_ASSERT(ectx, mainXML_ != NULL);
g_object_unref(mainXML_);
mainXML_ = NULL;
}
@@ -66,7 +66,7 @@
GladeXML * xml = user_data;
void * method;
- GNUNET_ASSERT(xml != NULL);
+ GE_ASSERT(ectx, xml != NULL);
method = trybindDynamicMethod(library,
"",
handler_name);
Modified: GNUnet/src/setup/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/wizard_gtk.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/setup/wizard_gtk.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -65,8 +65,8 @@
* Also unrefs the current glade XML context.
*/
static void destroyCurrentWindow() {
- GNUNET_ASSERT(mainXML != NULL);
- GNUNET_ASSERT(curwnd != NULL);
+ GE_ASSERT(ectx, mainXML != NULL);
+ GE_ASSERT(ectx, curwnd != NULL);
quit = 0;
gtk_widget_destroy(curwnd);
curwnd = NULL;
@@ -151,7 +151,7 @@
destroyCurrentWindow();
curwnd = get_xml("assi_step2");
cls.cmbNIC = lookup_widget("cmbNIC");
- GNUNET_ASSERT(cls.cmbNIC != NULL);
+ GE_ASSERT(ectx, cls.cmbNIC != NULL);
cls.nic_item_count = 0;
model = gtk_list_store_new(1, G_TYPE_STRING);
gtk_combo_box_set_model(GTK_COMBO_BOX(cls.cmbNIC),
@@ -613,7 +613,7 @@
sym = sym_lookup("USER", "GNUNETD", 0);
ret = gtk_editable_get_chars(editable, 0, -1);
- GNUNET_ASSERT(ret != NULL);
+ GE_ASSERT(ectx, ret != NULL);
sym_set_string_value(sym, ret);
FREENONNULL(user_name);
if (strlen(ret) != 0)
@@ -631,7 +631,7 @@
FREENONNULL(group_name);
ret = gtk_editable_get_chars(editable, 0, -1);
- GNUNET_ASSERT(ret != NULL);
+ GE_ASSERT(ectx, ret != NULL);
sym_set_string_value(sym, ret);
if (strlen(ret) != 0)
group_name = STRDUP(ret);
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/transports/http.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -547,7 +547,7 @@
return SYSERR; /* error! */
}
} else {
- GNUNET_ASSERT(httpSession->rsize > httpSession->rpos);
+ GE_ASSERT(ectx, httpSession->rsize > httpSession->rpos);
/* data read mode */
ret = READ(httpSession->sock,
&httpSession->rbuff[httpSession->rpos],
@@ -616,7 +616,7 @@
httpSession->rsize,
0);
httpSession->rpos = 0;
- GNUNET_ASSERT(httpSession->wsize == 0);
+ GE_ASSERT(ectx, httpSession->wsize == 0);
GROW(httpSession->wbuff,
httpSession->wsize,
256);
@@ -638,7 +638,7 @@
mp = MALLOC(sizeof(P2P_PACKET));
mp->sender = httpSession->sender;
mp->tsession = tsession;
- GNUNET_ASSERT(httpSession->rbuff != NULL);
+ GE_ASSERT(ectx, httpSession->rbuff != NULL);
mp->msg = httpSession->rbuff;
mp->size = httpSession->rsize;
httpSession->rbuff = NULL;
@@ -807,7 +807,7 @@
user should be able to specify who is allowed to connect,
otherwise we just close and reject the communication! */
IPaddr ipaddr;
- GNUNET_ASSERT(sizeof(struct in_addr) == sizeof(IPaddr));
+ GE_ASSERT(ectx, sizeof(struct in_addr) == sizeof(IPaddr));
memcpy(&ipaddr,
&clientAddr.sin_addr,
sizeof(struct in_addr));
@@ -887,7 +887,7 @@
i--;
continue;
}
- GNUNET_ASSERT(ret <= httpSession->wpos);
+ GE_ASSERT(ectx, ret <= httpSession->wpos);
if (ret == httpSession->wpos) {
FREENONNULL(httpSession->wbuff);
httpSession->wbuff = NULL;
@@ -1162,7 +1162,7 @@
soaddr.sin_addr = theProxy.sin_addr;
soaddr.sin_port = theProxy.sin_port;
} else {
- GNUNET_ASSERT(sizeof(struct in_addr) == sizeof(IPaddr));
+ GE_ASSERT(ectx, sizeof(struct in_addr) == sizeof(IPaddr));
memcpy(&soaddr.sin_addr,
&haddr->ip,
sizeof(IPaddr));
Modified: GNUnet/src/transports/smtp.c
===================================================================
--- GNUnet/src/transports/smtp.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/transports/smtp.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -419,7 +419,7 @@
"PIPE",
_("You must specify the name of a "
"pipe for the SMTP transport in section `%s' under
`%s'.\n"));
- GNUNET_ASSERT(pipename != NULL);
+ GE_ASSERT(ectx, pipename != NULL);
UNLINK(pipename);
if (0 != mkfifo(pipename,
S_IWUSR|S_IRUSR))
@@ -616,7 +616,7 @@
= htons(P2P_hello_MESSAGE_size(msg));
FREE(email);
if (verifyHelo(msg) == SYSERR)
- GNUNET_ASSERT(0);
+ GE_ASSERT(ectx, 0);
return msg;
}
Modified: GNUnet/src/util/crypto/symciphertest.c
===================================================================
--- GNUnet/src/util/crypto/symciphertest.c 2006-07-31 03:24:57 UTC (rev
3190)
+++ GNUnet/src/util/crypto/symciphertest.c 2006-07-31 03:27:39 UTC (rev
3191)
@@ -112,7 +112,7 @@
int main(int argc, char * argv[]) {
int failureCount = 0;
- GNUNET_ASSERT(strlen(INITVALUE) > sizeof(INITVECTOR));
+ GE_ASSERT(ectx, strlen(INITVALUE) > sizeof(INITVECTOR));
initLockingGcrypt();
failureCount += testSymcipher();
failureCount += verifyCrypto();
Modified: GNUnet/src/util/os/daemontest.c
===================================================================
--- GNUnet/src/util/os/daemontest.c 2006-07-31 03:24:57 UTC (rev 3190)
+++ GNUnet/src/util/os/daemontest.c 2006-07-31 03:27:39 UTC (rev 3191)
@@ -50,10 +50,10 @@
&parseCommandLine))
return -1;
daemon = startGNUnetDaemon(NO);
- GNUNET_ASSERT(daemon > 0);
- GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
- GNUNET_ASSERT(OK == stopGNUnetDaemon());
- GNUNET_ASSERT(OK == waitForGNUnetDaemonTermination(daemon));
+ GE_ASSERT(ectx, daemon > 0);
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
+ GE_ASSERT(ectx, OK == stopGNUnetDaemon());
+ GE_ASSERT(ectx, OK == waitForGNUnetDaemonTermination(daemon));
doneUtil();
return 0;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3191 - in GNUnet/src: applications/advertising applications/chat applications/datastore applications/dht/module applications/dht/tools applications/fragmentation applications/fs applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/tools applications/gap applications/rpc applications/session applications/sqstore_mysql applications/tbench applications/testbed applications/topology_f2f applications/traffic applications/vpn setup transports util/crypto util/os,
grothoff <=