[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3189 - in GNUnet/src: applications/advertising application
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3189 - in GNUnet/src: applications/advertising applications/datastore applications/dht/module applications/dht/tools applications/fs applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/tools applications/gap applications/rpc applications/sqstore_mysql applications/sqstore_sqlite applications/tbench applications/topology_f2f applications/tracekit applications/traffic transports util/crypto |
|
Date: |
Sun, 30 Jul 2006 20:22:01 -0700 (PDT) |
Author: grothoff
Date: 2006-07-30 20:21:49 -0700 (Sun, 30 Jul 2006)
New Revision: 3189
Modified:
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/datastore/datastore.c
GNUnet/src/applications/datastore/prefetch.c
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/module/dht.c
GNUnet/src/applications/dht/tools/dhttest2.c
GNUnet/src/applications/fs/ecrs/directory.c
GNUnet/src/applications/fs/ecrs/download.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/search.c
GNUnet/src/applications/fs/ecrs/searchtest.c
GNUnet/src/applications/fs/ecrs/unindex.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/helper.c
GNUnet/src/applications/fs/fsui/namespace_info.c
GNUnet/src/applications/fs/fsui/namespace_infotest.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/searchtest.c
GNUnet/src/applications/fs/fsui/unindex.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/tools/gnunet-download.c
GNUnet/src/applications/fs/tools/gnunet-insert.c
GNUnet/src/applications/fs/tools/gnunet-search.c
GNUnet/src/applications/fs/tools/gnunet-unindex.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/sqstore_mysql/mysql.c
GNUnet/src/applications/sqstore_mysql/mysqltest.c
GNUnet/src/applications/sqstore_sqlite/sqlite.c
GNUnet/src/applications/tbench/gnunet-tbench.c
GNUnet/src/applications/tbench/tbench.c
GNUnet/src/applications/topology_f2f/topology.c
GNUnet/src/applications/tracekit/gnunet-tracekit.c
GNUnet/src/applications/tracekit/tracekit.c
GNUnet/src/applications/traffic/clientapi.c
GNUnet/src/applications/traffic/traffic.c
GNUnet/src/transports/http.c
GNUnet/src/transports/smtp.c
GNUnet/src/util/crypto/kblockkey_test.c
GNUnet/src/util/crypto/weakkeytest.c
Log:
BREAK -> GE_BREAK
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/advertising/advertising.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -710,19 +710,19 @@
coreAPI = capi;
identity = capi->requestService("identity");
if (identity == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
transport = capi->requestService("transport");
if (transport == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
capi->releaseService(identity);
identity = NULL;
return SYSERR;
}
pingpong = capi->requestService("pingpong");
if (pingpong == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
capi->releaseService(identity);
identity = NULL;
capi->releaseService(transport);
@@ -731,7 +731,7 @@
}
topology = capi->requestService("topology");
if (topology == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
capi->releaseService(identity);
identity = NULL;
capi->releaseService(transport);
Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/datastore/datastore.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -336,7 +336,7 @@
= ((unsigned long long)lquota) * 1024L * 1024L; /* MB to bytes */
sq = capi->requestService("sqstore");
if (sq == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
lquota = htonl(lquota);
Modified: GNUnet/src/applications/datastore/prefetch.c
===================================================================
--- GNUnet/src/applications/datastore/prefetch.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/datastore/prefetch.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -96,7 +96,7 @@
rCBPos = (rCBPos + 1) % RCB_SIZE;
load++;
if (load > RCB_SIZE) {
- BREAK();
+ GE_BREAK(ectx, 0);
MUTEX_UNLOCK(&lock);
return SYSERR;
}
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/dht/module/cs.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -172,7 +172,7 @@
int ret;
if (keyCount < 1) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
@@ -360,7 +360,7 @@
int ret;
if (ntohs(message->size) != sizeof(CS_dht_request_join_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
req = (CS_dht_request_join_MESSAGE*) message;
@@ -409,7 +409,7 @@
DHT_CLIENT_TableHandlers * ptr;
if (ntohs(message->size) != sizeof(CS_dht_request_leave_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
req = (CS_dht_request_leave_MESSAGE*) message;
@@ -490,7 +490,7 @@
unsigned int size;
if (ntohs(message->size) < sizeof(CS_dht_request_put_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
req = (CS_dht_request_put_MESSAGE*) message;
@@ -616,7 +616,7 @@
struct CSRemoveClosure * cpc;
if (ntohs(message->size) < sizeof(CS_dht_request_remove_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
cpc = MALLOC(sizeof(struct CSRemoveClosure));
@@ -754,7 +754,7 @@
struct CSGetClosure * cpc;
if (ntohs(message->size) != sizeof(CS_dht_request_get_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
@@ -783,7 +783,7 @@
int i;
if (ntohs(message->size) != sizeof(CS_dht_reply_ack_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
req =(CS_dht_reply_ack_MESSAGE*) message;
@@ -823,13 +823,13 @@
int i;
if (ntohs(message->size) < sizeof(CS_dht_reply_results_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
req = (CS_dht_reply_results_MESSAGE*) message;
dataLength = ntohs(message->size) - sizeof(CS_dht_reply_results_MESSAGE);
if (dataLength != ntohl(req->data.size)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
LOG(LOG_EVERYTHING,
Modified: GNUnet/src/applications/dht/module/dht.c
===================================================================
--- GNUnet/src/applications/dht/module/dht.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/dht/module/dht.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -1308,7 +1308,7 @@
ENTER();
if (hostIdentityEquals(identity,
coreAPI->myIdentity)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return; /* refuse to self-ping!... */
}
MUTEX_LOCK(lock);
@@ -1542,7 +1542,7 @@
if ( (equalsHashCode512(&rec->table,
&masterTableId)) &&
((ntohl(val->size) - sizeof(DataContainer)) % sizeof(PeerIdentity) !=
0) )
- BREAK(); /* assertion failed: entry in master table malformed! */
+ GE_BREAK(ectx, 0); /* assertion failed: entry in master table malformed! */
ret = OK;
if (rec->resultCallback != NULL)
ret = rec->resultCallback(key,
@@ -1652,7 +1652,7 @@
(HashCode512*) hosts,
&coreAPI->myIdentity->hashPubKey);
if (count == 0) {
- BREAK();
+ GE_BREAK(ectx, 0);
/* Assertion failed: I participate in a table but findLocalNodes
returned 0! */
MUTEX_UNLOCK(lock);
FREE(ret->keys);
@@ -2114,7 +2114,7 @@
fnc->async_handle = NULL;
if (equalsHashCode512(table,
&masterTableId)) {
- BREAK();
+ GE_BREAK(ectx, 0);
/* findKNodes_start called for masterTable. That should not happen! */
} else {
#if DEBUG_DHT
@@ -2318,7 +2318,7 @@
EncName enc2;
if (value == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
@@ -2384,7 +2384,7 @@
(HashCode512*) hosts,
&coreAPI->myIdentity->hashPubKey);
if (count == 0) {
- BREAK();
+ GE_BREAK(ectx, 0);
/* Assertion failed: I participate in a table but findLocalNodes
returned 0! */
MUTEX_UNLOCK(lock);
return NULL;
@@ -2654,7 +2654,7 @@
(HashCode512*) hosts,
&coreAPI->myIdentity->hashPubKey);
if (count == 0) {
- BREAK();
+ GE_BREAK(ectx, 0);
/* Assertion failed: I participate in a table but findLocalNodes
returned 0! */
MUTEX_UNLOCK(lock);
return NULL;
Modified: GNUnet/src/applications/dht/tools/dhttest2.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest2.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/dht/tools/dhttest2.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -54,8 +54,8 @@
}
-#define CHECK(a) do { if (!(a)) { ret = 1; BREAK(); goto FAILURE; } } while(0)
-#define CHECK2(a) do { if (!(a)) { ret = 1; BREAK(); goto FAILURE2; } }
while(0)
+#define CHECK(a) do { if (!(a)) { ret = 1; GE_BREAK(ectx, 0); goto FAILURE; }
} while(0)
+#define CHECK2(a) do { if (!(a)) { ret = 1; GE_BREAK(ectx, 0); goto FAILURE2;
} } while(0)
/**
* Testcase to test gap routing (2 peers only).
Modified: GNUnet/src/applications/fs/ecrs/directory.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directory.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/directory.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -104,7 +104,7 @@
return SYSERR; /* malformed! */
if (ECRS_isKeywordUri(fi.uri)) {
ECRS_freeUri(fi.uri);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR; /* illegal in directory! */
}
@@ -174,7 +174,7 @@
for (i=0;i<count;i++) {
if (ECRS_isKeywordUri(fis[i].uri)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR; /* illegal in directory! */
}
}
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/download.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -586,7 +586,7 @@
}
}
MUTEX_UNLOCK(&rm->lock);
- BREAK(); /* uh uh - at least a memory leak... */
+ GE_BREAK(ectx, 0); /* uh uh - at least a memory leak... */
}
@@ -697,7 +697,7 @@
if (rm->requestList[i]->node == node)
pos = i;
if (pos == -1) {
- /* BREAK(); */ /* should never happen */
+ /* GE_BREAK(ectx, 0); */ /* should never happen */
return;
}
entry = rm->requestList[pos];
@@ -822,7 +822,7 @@
GNUNET_ASSERT(node->level > 0);
childcount = size / sizeof(CHK);
if (size != childcount * sizeof(CHK)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return;
}
if (node->level == 1) {
@@ -912,7 +912,7 @@
size = ntohl(reply->size) - sizeof(Datastore_Value);
if ( (size <= sizeof(DBlock)) ||
(size - sizeof(DBlock) != getNodeSize(node)) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR; /* invalid size! */
}
size -= sizeof(DBlock);
@@ -930,7 +930,7 @@
delRequest(node->ctx->rm,
node);
FREE(data);
- BREAK();
+ GE_BREAK(ectx, 0);
LOG(LOG_ERROR,
_("Decrypted content does not match key. "
"This is either a bug or a maliciously inserted "
@@ -1031,7 +1031,7 @@
= entry->node->ctx->TTL_DECREMENT;
if (entry->lastTimeout + TTL_DECREMENT > now)
- BREAK();
+ GE_BREAK(ectx, 0);
if (entry->lasttime == 0) {
timeout = now + rm->initialTTL;
} else {
@@ -1230,7 +1230,7 @@
GNUNET_ASSERT(filename != NULL);
fid = uri->data.chk;
if (! ECRS_isFileUri(uri)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -29,7 +29,7 @@
#include "gnunet_ecrs_lib.h"
#include "tree.h"
-#define CHECK(a) if (!(a)) { ok = NO; BREAK(); goto FAILURE; }
+#define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
static int parseCommandLine(int argc,
char * argv[]) {
Modified: GNUnet/src/applications/fs/ecrs/keyspace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/keyspace.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/keyspace.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -83,7 +83,7 @@
(((const char*)kb)[j] != '\0') )
j++;
if (j == size) {
- BREAK(); /* kblock malformed */
+ GE_BREAK(ectx, 0); /* kblock malformed */
return SYSERR;
}
dstURI = (const char*) &kb[1];
@@ -91,12 +91,12 @@
fi.meta = ECRS_deserializeMetaData(&((const char*)kb)[j],
size - j);
if (fi.meta == NULL) {
- BREAK(); /* kblock malformed */
+ GE_BREAK(ectx, 0); /* kblock malformed */
return SYSERR;
}
fi.uri = ECRS_stringToUri(dstURI);
if (fi.uri == NULL) {
- BREAK(); /* kblock malformed */
+ GE_BREAK(ectx, 0); /* kblock malformed */
ECRS_freeMetaData(fi.meta);
return SYSERR;
}
@@ -143,7 +143,7 @@
struct ECRS_URI * xuri;
if (! ECRS_isKeywordUri(uri)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
@@ -166,7 +166,7 @@
mdsize,
ECRS_SERIALIZE_PART);
if (mdsize == -1) {
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(dstURI);
return SYSERR;
}
Modified: GNUnet/src/applications/fs/ecrs/meta.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/meta.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/meta.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -577,7 +577,7 @@
if (compressed) {
dataSize = ntohl(hdr->size) - sizeof(MetaDataHeader);
if (dataSize > 2 * 1042 * 1024) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL; /* only 2 MB allowed [to make sure we don't blow
our memory limit because of a mal-formed
message... ]*/
@@ -586,25 +586,25 @@
size - sizeof(MetaDataHeader),
dataSize);
if (data == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
} else {
data = (char*) &hdr[1];
dataSize = size - sizeof(MetaDataHeader);
if (size != ntohl(hdr->size)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
}
if ( (sizeof(unsigned int) * ic + ic) > dataSize) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto FAILURE;
}
if ( (ic > 0)
&& (data[dataSize-1] != '\0') ) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto FAILURE;
}
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -124,7 +124,7 @@
if ( (advertisementURI != NULL) &&
(! ECRS_isKeywordUri(advertisementURI)) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
fileName = getPseudonymFileName(name);
@@ -164,7 +164,7 @@
mdsize,
ECRS_SERIALIZE_PART);
if (mdsize == -1) {
- BREAK();
+ GE_BREAK(ectx, 0);
ECRS_deleteNamespace(name);
freePrivateKey(hk);
return NULL;
@@ -421,7 +421,7 @@
mdsize,
ECRS_SERIALIZE_PART);
if (mdsize == -1) {
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(dstURI);
return NULL;
}
@@ -548,7 +548,7 @@
_("Format of file `%s' is invalid.\n"),
fileName);
FREE(fileName);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
FREE(fileName);
Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/search.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -216,7 +216,7 @@
_("LOC URI not allowed for search.\n"));
break;
default:
- BREAK();
+ GE_BREAK(ectx, 0);
/* unknown URI type */
break;
}
@@ -288,7 +288,7 @@
fi.meta = ECRS_deserializeMetaData((const char*)&nb[1],
size - sizeof(NBlock));
if (fi.meta == NULL) {
- BREAK(); /* nblock malformed */
+ GE_BREAK(ectx, 0); /* nblock malformed */
return SYSERR;
}
fi.uri = &uri;
@@ -375,7 +375,7 @@
(((const char*)kb)[j] != '\0') )
j++;
if (j == size) {
- BREAK(); /* kblock malformed */
+ GE_BREAK(ectx, 0); /* kblock malformed */
FREE(kb);
return SYSERR;
}
@@ -384,13 +384,13 @@
fi.meta = ECRS_deserializeMetaData(&((const char*)kb)[j],
size - j);
if (fi.meta == NULL) {
- BREAK(); /* kblock malformed */
+ GE_BREAK(ectx, 0); /* kblock malformed */
FREE(kb);
return SYSERR;
}
fi.uri = ECRS_stringToUri(dstURI);
if (fi.uri == NULL) {
- BREAK(); /* kblock malformed */
+ GE_BREAK(ectx, 0); /* kblock malformed */
ECRS_freeMetaData(fi.meta);
FREE(kb);
return SYSERR;
@@ -461,7 +461,7 @@
(((char*) &sb[1])[j] != '\0') )
j++;
if (j == size) {
- BREAK(); /* sblock malformed */
+ GE_BREAK(ectx, 0); /* sblock malformed */
FREE(sb);
return SYSERR;
}
@@ -470,13 +470,13 @@
fi.meta = ECRS_deserializeMetaData(&dstURI[j],
size - j);
if (fi.meta == NULL) {
- BREAK(); /* kblock malformed */
+ GE_BREAK(ectx, 0); /* kblock malformed */
FREE(sb);
return SYSERR;
}
fi.uri = ECRS_stringToUri(dstURI);
if (fi.uri == NULL) {
- BREAK(); /* sblock malformed */
+ GE_BREAK(ectx, 0); /* sblock malformed */
ECRS_freeMetaData(fi.meta);
FREE(sb);
return SYSERR;
@@ -505,7 +505,7 @@
return ret; /* have latest version */
}
if (ps->keyCount != 2) {
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(sb);
return SYSERR;
}
@@ -519,7 +519,7 @@
return ret;
}
default:
- BREAK();
+ GE_BREAK(ectx, 0);
break;
} /* end switch */
} /* for all matches */
Modified: GNUnet/src/applications/fs/ecrs/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/searchtest.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/ecrs/searchtest.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -29,7 +29,7 @@
#include "gnunet_ecrs_lib.h"
#include "tree.h"
-#define CHECK(a) if (!(a)) { ok = NO; BREAK(); goto FAILURE; }
+#define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
static int parseCommandLine(int argc,
char * argv[]) {
Modified: GNUnet/src/applications/fs/ecrs/unindex.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/unindex.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/unindex.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -77,7 +77,7 @@
&ichk,
level+1,
iblocks)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
fileBlockEncode(db,
@@ -88,7 +88,7 @@
if (SYSERR == FS_delete(sock,
value)) {
FREE(value);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
#else
@@ -195,11 +195,11 @@
cronTime(&start);
if (isDirectory(filename)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
if (0 == assertIsFile(filename)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
if (OK != getFileSize(filename,
@@ -214,7 +214,7 @@
if (SYSERR == getFileHash(filename,
&fileId)) {
releaseClientSocket(sock);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
cronTime(&now);
@@ -293,7 +293,7 @@
&chk,
0, /* dblocks are on level 0 */
iblocks)) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto FAILURE;
}
if (! wasIndexed) {
@@ -307,7 +307,7 @@
if (OK != FS_delete(sock,
value)) {
FREE(value);
- BREAK();
+ GE_BREAK(ectx, 0);
goto FAILURE;
}
#else
@@ -341,7 +341,7 @@
&chk,
i+1,
iblocks)) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto FAILURE;
}
fileBlockEncode(db,
@@ -352,7 +352,7 @@
if (OK != FS_delete(sock,
value)) {
FREE(value);
- BREAK();
+ GE_BREAK(ectx, 0);
goto FAILURE;
}
#else
@@ -371,11 +371,11 @@
if (OK != FS_unindex(sock,
DBLOCK_SIZE,
&fileId)) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto FAILURE;
}
} else {
- BREAK();
+ GE_BREAK(ectx, 0);
goto FAILURE;
}
}
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -93,7 +93,7 @@
&ichk.query,
&value);
if (value == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
value->prio = htonl(prio);
@@ -170,7 +170,7 @@
cronTime(&start);
memset(&chk, 0, sizeof(CHK));
if (isDirectory(filename)) {
- BREAK();
+ GE_BREAK(ectx, 0);
/* Should not happen */
LOG(LOG_ERROR, "Cannot upload file `%s', it seems to be a directory!",
filename);
return SYSERR;
@@ -388,7 +388,7 @@
&chk.query,
&value);
if (value == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto FAILURE;
}
value->prio = htonl(priority);
Modified: GNUnet/src/applications/fs/ecrs/uri.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uri.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs/uri.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -164,7 +164,7 @@
*/
char * ECRS_uriToString(const struct ECRS_URI * uri) {
if (uri == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
switch (uri->type) {
@@ -179,7 +179,7 @@
case loc:
return "FIXME";
default:
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
}
@@ -430,7 +430,7 @@
int ECRS_getNamespaceId(const struct ECRS_URI * uri,
HashCode512 * id) {
if (! ECRS_isNamespaceUri(uri)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
*id = uri->data.sks.namespace;
@@ -445,7 +445,7 @@
int ECRS_getSKSContentHash(const struct ECRS_URI * uri,
HashCode512 * id) {
if (! ECRS_isNamespaceUri(uri)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
*id = uri->data.sks.identifier;
Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/ecrs_core.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -83,7 +83,7 @@
return OK;
} else {
FREE(val);
- BREAK();
+ GE_BREAK(ectx, 0);
*value = NULL;
return SYSERR;
}
@@ -138,7 +138,7 @@
unsigned int getTypeOfBlock(unsigned int size,
const DBlock * data) {
if (size <= 4) {
- BREAK();
+ GE_BREAK(ectx, 0);
return ANY_BLOCK; /* signal error */
}
return ntohl(*((const unsigned int*)data));
@@ -161,7 +161,7 @@
type = getTypeOfBlock(size, data);
if (type == ANY_BLOCK) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
switch (type) {
@@ -174,7 +174,7 @@
case S_BLOCK: {
const SBlock * sb;
if (size < sizeof(SBlock)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
sb = (const SBlock*) data;
@@ -186,7 +186,7 @@
- sizeof(unsigned int),
&sb->signature,
&sb->subspace)) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
*query = sb->identifier;
@@ -195,7 +195,7 @@
case K_BLOCK: {
const KBlock * kb;
if (size < sizeof(KBlock)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
kb = (const KBlock*) data;
@@ -204,7 +204,7 @@
size - sizeof(KBlock),
&kb->signature,
&kb->keyspace)) ) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
hash(&kb->keyspace,
@@ -215,7 +215,7 @@
case N_BLOCK: {
const NBlock * nb;
if (size < sizeof(NBlock)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
nb = (const NBlock*) data;
@@ -227,7 +227,7 @@
- sizeof(unsigned int),
&nb->signature,
&nb->subspace)) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
*query = nb->namespace; /* XOR with all zeros makes no difference... */
@@ -236,7 +236,7 @@
case KN_BLOCK: {
const KNBlock * kb;
if (size < sizeof(KNBlock)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
kb = (const KNBlock*) data;
@@ -247,7 +247,7 @@
- sizeof(unsigned int),
&kb->kblock.signature,
&kb->kblock.keyspace)) ) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
hash(&kb->kblock.keyspace,
@@ -256,11 +256,11 @@
return OK;
}
case ONDEMAND_BLOCK: {
- BREAK(); /* should never be used here! */
+ GE_BREAK(ectx, 0); /* should never be used here! */
return SYSERR;
}
default: {
- BREAK(); /* unknown block type */
+ GE_BREAK(ectx, 0); /* unknown block type */
return SYSERR;
}
} /* end switch */
@@ -289,15 +289,15 @@
HashCode512 hc;
if (type != getTypeOfBlock(size, data)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR; /* type mismatch */
}
if (OK != getQueryFor(size, data, YES, &hc)) {
- BREAK(); /* malformed data */
+ GE_BREAK(ectx, 0); /* malformed data */
return SYSERR;
}
if (! equalsHashCode512(&hc, &keys[0])) {
- BREAK(); /* mismatch between primary queries,
+ GE_BREAK(ectx, 0); /* mismatch between primary queries,
we should not even see those here. */
return SYSERR;
}
@@ -330,13 +330,13 @@
case K_BLOCK:
case KN_BLOCK:
if (keyCount != 1)
- BREAK(); /* keyCount should be 1 */
+ GE_BREAK(ectx, 0); /* keyCount should be 1 */
return OK; /* if query matches, everything matches! */
case ANY_BLOCK:
- BREAK(); /* block type should be known */
+ GE_BREAK(ectx, 0); /* block type should be known */
return SYSERR;
default:
- BREAK(); /* unknown block type */
+ GE_BREAK(ectx, 0); /* unknown block type */
return SYSERR;
}
}
Modified: GNUnet/src/applications/fs/fsui/collection.c
===================================================================
--- GNUnet/src/applications/fs/fsui/collection.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/fsui/collection.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -343,7 +343,7 @@
if (ctx->collectionData == NULL)
return;
if ((ECRS_isKeywordUri(fi->uri))) {
- BREAK();
+ GE_BREAK(ectx, 0);
return;
}
cd = (CollectionData*) ctx->collectionData;
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/fsui/download.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -227,7 +227,7 @@
dl->state = FSUI_DOWNLOAD_ERROR;
else if ( (dl->state != FSUI_DOWNLOAD_ABORTED) &&
(dl->state != FSUI_DOWNLOAD_SUSPENDING) )
- BREAK();
+ GE_BREAK(ectx, 0);
totalBytes = 0;
}
root = dl;
@@ -301,7 +301,7 @@
event.type = FSUI_download_error;
event.data.DownloadError.message = _("Unexpected download state.");
printf("State: %u\n", dl->state);
- BREAK();
+ GE_BREAK(ectx, 0);
}
event.data.DownloadError.pos = dl;
dl->ctx->ecb(dl->ctx->ecbClosure,
@@ -360,7 +360,7 @@
GNUNET_ASSERT(ctx != NULL);
if (! (ECRS_isFileUri(uri) ||
ECRS_isLocationUri(uri)) ) {
- BREAK(); /* wrong type of URI! */
+ GE_BREAK(ectx, 0); /* wrong type of URI! */
return SYSERR;
}
dl = MALLOC(sizeof(FSUI_DownloadList));
Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -34,7 +34,7 @@
#define DEBUG_VERBOSE NO
-#define CHECK(a) if (!(a)) { ok = NO; BREAK(); goto FAILURE; }
+#define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
static volatile int suspendRestart = 0;
Modified: GNUnet/src/applications/fs/fsui/file_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/file_info.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/fsui/file_info.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -231,25 +231,25 @@
spos++;
spos++; /* skip '\0' */
if((spos + sizeof(int) >= ret) || (spos + sizeof(int) < spos)) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto FORMATERROR;
}
fi.uri = ECRS_stringToUri(&result[pos]);
if(fi.uri == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto FORMATERROR;
}
memcpy(&msize, &result[spos], sizeof(int));
msize = ntohl(msize);
spos += sizeof(int);
if((spos + msize > ret) || (spos + msize < spos)) {
- BREAK();
+ GE_BREAK(ectx, 0);
ECRS_freeUri(fi.uri);
goto FORMATERROR;
}
fi.meta = ECRS_deserializeMetaData(&result[spos], msize);
if(fi.meta == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
ECRS_freeUri(fi.uri);
goto FORMATERROR;
}
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -86,7 +86,7 @@
GNUNET_ASSERT(ctx != NULL);
if (1 != READ(fd, &zaro, sizeof(char))) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
if (zaro == '\0')
@@ -125,12 +125,12 @@
}
READINT(big);
if (big > 1024 * 1024) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto ERR;
}
ret->filename = MALLOC(big+1);
if (big != READ(fd, ret->filename, big)) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto ERR;
}
ret->filename[big] = '\0';
@@ -156,7 +156,7 @@
ok = NO;
}
if (NO == ok) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto ERR;
}
ret->parent = parent;
@@ -278,7 +278,7 @@
fi->uri = NULL;
READINT(size);
if (size > 1024 * 1024) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
buf = MALLOC(size);
@@ -286,14 +286,14 @@
buf,
size)) {
FREE(buf);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
fi->meta = ECRS_deserializeMetaData(buf,
size);
if (fi->meta == NULL) {
FREE(buf);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
FREE(buf);
@@ -303,12 +303,12 @@
if (fi->uri == NULL) {
ECRS_freeMetaData(fi->meta);
fi->meta = NULL;
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
return OK;
ERR:
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
@@ -408,13 +408,13 @@
/* ****** check magic ******* */
if (8 != READ(fd, magic, 8)) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
if (0 != memcmp(magic,
"FSUI00\n\0",
8)) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
/* ******* deserialize state **** */
@@ -422,11 +422,11 @@
/* deserialize collection data */
if (sizeof(unsigned int) !=
READ(fd, &big, sizeof(unsigned int))) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
if (ntohl(big) > 16 * 1024 * 1024) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
if (big == 0) {
@@ -440,7 +440,7 @@
ntohl(big) - sizeof(unsigned int))) {
FREE(ret->collectionData);
ret->collectionData = NULL;
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
}
@@ -451,13 +451,13 @@
if (sizeof(unsigned int) !=
READ(fd, &big, sizeof(unsigned int))) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
if (ntohl(big) == 0)
break;
if (ntohl(big) > 1024 * 1024) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
buf
@@ -468,7 +468,7 @@
buf,
ntohl(big))) {
FREE(buf);
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
list
@@ -478,13 +478,13 @@
FREE(buf);
if (list->uri == NULL) {
FREE(list);
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
if (! ECRS_isKeywordUri(list->uri)) {
ECRS_freeUri(list->uri);
FREE(list);
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
list->numberOfURIKeys
@@ -493,7 +493,7 @@
READ(fd, &big, sizeof(unsigned int))) {
ECRS_freeUri(list->uri);
FREE(list);
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
list->anonymityLevel
@@ -502,7 +502,7 @@
READ(fd, &big, sizeof(unsigned int))) {
ECRS_freeUri(list->uri);
FREE(list);
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
list->sizeResultsReceived
@@ -511,7 +511,7 @@
READ(fd, &big, sizeof(unsigned int))) {
ECRS_freeUri(list->uri);
FREE(list);
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
list->sizeUnmatchedResultsReceived
@@ -520,7 +520,7 @@
(list->sizeUnmatchedResultsReceived > 1024*1024) ) {
ECRS_freeUri(list->uri);
FREE(list);
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARN;
}
if (list->sizeResultsReceived > 0)
@@ -549,7 +549,7 @@
READ(fd,
&big,
sizeof(unsigned int))) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARNL;
}
rp->matchingKeyCount
@@ -557,7 +557,7 @@
if ( (rp->matchingKeyCount > 1024) ||
(rp->matchingKeyCount >
list->numberOfURIKeys) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARNL;
}
@@ -574,7 +574,7 @@
rp->matchingKeys,
sizeof(HashCode512) *
rp->matchingKeyCount)) {
- BREAK();
+ GE_BREAK(ectx, 0);
goto WARNL;
}
}
Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -28,7 +28,7 @@
#include "gnunet_util.h"
#include "gnunet_fsui_lib.h"
-#define CHECK(a) if (!(a)) { ok = NO; BREAK(); goto FAILURE; }
+#define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
static int parseCommandLine(int argc,
char * argv[]) {
Modified: GNUnet/src/applications/fs/fsui/fsuitest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest2.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/fsui/fsuitest2.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -28,7 +28,7 @@
#include "gnunet_util.h"
#include "gnunet_fsui_lib.h"
-#define CHECK(a) if (!(a)) { ok = NO; BREAK(); goto FAILURE; }
+#define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
static int parseCommandLine(int argc,
char * argv[]) {
Modified: GNUnet/src/applications/fs/fsui/helper.c
===================================================================
--- GNUnet/src/applications/fs/fsui/helper.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/fsui/helper.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -47,7 +47,7 @@
char * searchString;
if (input == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
searchString = STRDUP(input);
Modified: GNUnet/src/applications/fs/fsui/namespace_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/namespace_info.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/fsui/namespace_info.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -112,7 +112,7 @@
}
if (len > 16 * 1024 * 1024) {
/* too big, must be invalid! remove! */
- BREAK();
+ GE_BREAK(ectx, 0);
UNLINK(fn);
FREE(fn);
return SYSERR;
@@ -132,7 +132,7 @@
size);
if ((*meta) == NULL) {
/* invalid data! remove! */
- BREAK();
+ GE_BREAK(ectx, 0);
UNLINK(fn);
FREE(buf);
FREE(fn);
@@ -413,7 +413,7 @@
size -= pos;
if (size == 0) {
FREE(buf);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
if (fi != NULL) {
@@ -421,7 +421,7 @@
size);
if (fi->meta == NULL) {
FREE(buf);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
fi->uri = ECRS_stringToUri(uri);
@@ -429,7 +429,7 @@
ECRS_freeMetaData(fi->meta);
fi->meta = NULL;
FREE(buf);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
}
@@ -699,7 +699,7 @@
if (OK != enc2hash(fil,
&lastId)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return OK;
}
fi.uri = NULL;
@@ -710,7 +710,7 @@
&fi,
&pubFreq,
&lastTime)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return OK;
}
cls->cnt++;
@@ -792,7 +792,7 @@
HashCode512 id;
if (! ECRS_isNamespaceUri(uri)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return;
}
ECRS_getNamespaceId(uri,
Modified: GNUnet/src/applications/fs/fsui/namespace_infotest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/namespace_infotest.c 2006-07-31
03:20:45 UTC (rev 3188)
+++ GNUnet/src/applications/fs/fsui/namespace_infotest.c 2006-07-31
03:21:49 UTC (rev 3189)
@@ -29,7 +29,7 @@
#include "gnunet_ecrs_lib.h"
#include "gnunet_fsui_lib.h"
-#define CHECK(a) if (!(a)) { ok = NO; BREAK(); goto FAILURE; }
+#define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
static int parseCommandLine(int argc,
char * argv[]) {
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/fsui/search.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -66,7 +66,7 @@
if (OK != ECRS_getNamespaceId(fi->uri,
&ns)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return;
}
name = ECRS_getNamespaceName(&ns);
@@ -125,7 +125,7 @@
}
if (pos->numberOfURIKeys > 1) {
if (key == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
#if DEBUG_SEARCH
LOG(LOG_DEBUG,
"Received search result without key to decrypt.\n");
@@ -243,7 +243,7 @@
pos->uri)) {
LOG(LOG_ERROR,
_("This search is already pending!\n"));
- BREAK();
+ GE_BREAK(ectx, 0);
MUTEX_UNLOCK(&ctx->lock);
return SYSERR;
}
Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/fsui/searchtest.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -28,7 +28,7 @@
#include "gnunet_util.h"
#include "gnunet_fsui_lib.h"
-#define CHECK(a) if (!(a)) { ok = NO; BREAK(); goto FAILURE; }
+#define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
static int parseCommandLine(int argc,
char * argv[]) {
Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/fsui/unindex.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -75,7 +75,7 @@
event.type = FSUI_unindex_complete;
if (OK != getFileSize(utc->filename,
&event.data.UnindexComplete.total)) {
- BREAK();
+ GE_BREAK(ectx, 0);
event.data.UnindexComplete.total = 0;
}
event.data.UnindexComplete.filename = utc->filename;
@@ -110,7 +110,7 @@
UnindexThreadClosure * utc;
if (YES == isDirectory(filename)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
utc = MALLOC(sizeof(UnindexThreadClosure));
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/lib/fslib.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -76,7 +76,7 @@
matching callback, call on value */
if ( (ntohs(hdr->size) < sizeof(CS_fs_reply_content_MESSAGE)) ||
(ntohs(hdr->type) != CS_PROTO_gap_RESULT) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(hdr);
continue;
}
@@ -86,7 +86,7 @@
(DBlock*)&rep[1],
NO, /* gnunetd will have checked already */
&query)) {
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(hdr);
continue;
}
@@ -311,7 +311,7 @@
unsigned int size;
if (ntohl(block->size) <= sizeof(Datastore_Value)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
size = ntohl(block->size) - sizeof(Datastore_Value);
@@ -448,13 +448,13 @@
if (OK != writeToSocket(sock,
&rd->header)) {
FREE(rd);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
FREE(rd);
if (OK != readTCPResult(sock,
&ret)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
return ret;
Modified: GNUnet/src/applications/fs/lib/fslibtest.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslibtest.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/lib/fslibtest.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -29,7 +29,7 @@
#include "gnunet_protocols.h"
#include "ecrs_core.h"
-#define CHECK(a) if (!(a)) { ok = NO; BREAK(); goto FAILURE; }
+#define CHECK(a) if (!(a)) { ok = NO; GE_BREAK(ectx, 0); goto FAILURE; }
static int parseCommandLine(int argc,
char * argv[]) {
@@ -158,7 +158,7 @@
SEMAPHORE_UP(cls->sem);
ret = SYSERR;
} else {
- BREAK();
+ GE_BREAK(ectx, 0);
printf("Received unexpected result.\n");
ret = OK;
}
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/fs/module/fs.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -110,7 +110,7 @@
cron_t now;
if (ntohl(value->size) < sizeof(GapWrapper)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
gw = (GapWrapper*) value;
@@ -164,7 +164,7 @@
dv = gapWrapperToDatastoreValue(value, prio);
if (dv == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
gw = (GapWrapper*) value;
@@ -174,7 +174,7 @@
YES,
&hc)) ||
(! equalsHashCode512(&hc, query)) ) {
- BREAK(); /* value failed verification! */
+ GE_BREAK(ectx, 0); /* value failed verification! */
return SYSERR;
}
if (YES != isDatumApplicable(ntohl(dv->type),
@@ -182,7 +182,7 @@
(DBlock*) &dv[1],
0,
query)) {
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(dv);
return SYSERR;
}
@@ -247,7 +247,7 @@
#endif
if (ntohs(req->size) < sizeof(CS_fs_request_search_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
rs = (CS_fs_request_search_MESSAGE*) req;
@@ -286,7 +286,7 @@
#endif
if (ntohs(req->size) < sizeof(CS_fs_request_insert_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
ri = (const CS_fs_request_insert_MESSAGE*) req;
@@ -301,7 +301,7 @@
(const DBlock*)&ri[1],
YES,
&query)) {
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(datum);
return SYSERR;
}
@@ -378,7 +378,7 @@
int fnLen;
if (ntohs(req->size) < sizeof(CS_fs_request_init_index_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
@@ -417,7 +417,7 @@
const CS_fs_request_index_MESSAGE * ri;
if (ntohs(req->size) < sizeof(CS_fs_request_index_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
ri = (const CS_fs_request_index_MESSAGE*) req;
@@ -488,7 +488,7 @@
#endif
if (ntohs(req->size) < sizeof(CS_fs_request_delete_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
rd = (const CS_fs_request_delete_MESSAGE*) req;
@@ -507,7 +507,7 @@
NO,
&query)) {
FREE(value);
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
#if DEBUG_FS
@@ -548,7 +548,7 @@
CS_fs_request_unindex_MESSAGE * ru;
if (ntohs(req->size) != sizeof(CS_fs_request_unindex_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
ru = (CS_fs_request_unindex_MESSAGE*) req;
@@ -573,7 +573,7 @@
RequestTestindex * ru;
if (ntohs(req->size) != sizeof(RequestTestindex)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
ru = (RequestTestindex*) req;
@@ -787,7 +787,7 @@
static int gapDel(void * closure,
const HashCode512 * key,
const DataContainer * value) {
- BREAK(); /* gap does not use 'del'! */
+ GE_BREAK(ectx, 0); /* gap does not use 'del'! */
return SYSERR;
}
@@ -801,7 +801,7 @@
static int gapIterate(void * closure,
DataProcessor processor,
void * cls) {
- BREAK(); /* gap does not use 'iterate' */
+ GE_BREAK(ectx, 0); /* gap does not use 'iterate' */
return SYSERR;
}
@@ -935,7 +935,7 @@
size = ntohl(content->size);
if (size < sizeof(GapWrapper)) {
- BREAK();
+ GE_BREAK(ectx, 0);
memset(id, 0, sizeof(HashCode512));
return SYSERR;
}
@@ -957,7 +957,7 @@
size = ntohl(content->size);
if (size < sizeof(GapWrapper)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NO;
}
gw = (const GapWrapper*) content;
@@ -1082,7 +1082,7 @@
int done;
if (ntohs(req->size) < sizeof(CS_fs_request_search_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
rs = (const CS_fs_request_search_MESSAGE*) req;
@@ -1187,13 +1187,13 @@
}
datastore = capi->requestService("datastore");
if (datastore == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
traffic = capi->requestService("traffic");
gap = capi->requestService("gap");
if (gap == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
capi->releaseService(datastore);
return SYSERR;
}
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/module/ondemand.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -170,7 +170,7 @@
if (size <= sizeof(DBlock)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
@@ -237,7 +237,7 @@
size,
&key,
&dsvalue)) {
- BREAK();
+ GE_BREAK(ectx, 0);
} else {
FREE(dsvalue);
}
@@ -334,7 +334,7 @@
DBlock * db;
if (ntohl(dbv->size) != sizeof(OnDemandBlock)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
odb = (OnDemandBlock*) dbv;
@@ -379,7 +379,7 @@
(errno == ENAMETOOLONG) &&
(len < 4 * 1024 * 1024) )
if (len * 2 < len) {
- BREAK();
+ GE_BREAK(ectx, 0);
GROW(ofn, len, 0);
FREE(fn);
return SYSERR;
Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -202,7 +202,7 @@
}
break;
default:
- BREAK();
+ GE_BREAK(ectx, 0);
break;
}
}
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -191,7 +191,7 @@
SEMAPHORE_UP(exitSignal); /* always exit main? */
break;
default:
- BREAK();
+ GE_BREAK(ectx, 0);
break;
}
}
Modified: GNUnet/src/applications/fs/tools/gnunet-search.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-search.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/tools/gnunet-search.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -248,7 +248,7 @@
suri = getConfigurationString("GNUNET-SEARCH",
"URI");
if (suri == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
uri = ECRS_stringToUri(suri);
Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -75,7 +75,7 @@
SEMAPHORE_UP(exitSignal); /* always exit main? */
break;
default:
- BREAK();
+ GE_BREAK(ectx, 0);
break;
}
}
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2006-07-31 03:20:45 UTC (rev 3188)
+++ GNUnet/src/applications/gap/gap.c 2006-07-31 03:21:49 UTC (rev 3189)
@@ -806,7 +806,7 @@
}
size = sizeof(P2P_gap_reply_MESSAGE) + ntohl(data->size) -
sizeof(DataContainer);
if (size >= MAX_BUFFER_SIZE) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
ite->successful_local_lookup_in_delay_loop = YES;
@@ -1565,7 +1565,7 @@
(host != NULL) ? (const char*)&enc : "myself");
#endif
if (ntohs(msg->header.size) < sizeof(P2P_gap_reply_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR; /* invalid! */
}
@@ -1616,7 +1616,7 @@
LOG(LOG_ERROR,
_("GAP received invalid content from `%s'\n"),
(host != NULL) ? (const char*)&enc : _("myself"));
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(value);
return SYSERR; /* invalid */
}
@@ -1736,7 +1736,7 @@
UniqueReplyIdentifier uid,
ReplyHashFunction rh) {
if (bs != NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
bs = datastore;
@@ -1773,7 +1773,7 @@
size = sizeof(P2P_gap_query_MESSAGE) + (keyCount-1) * sizeof(HashCode512);
if (size >= MAX_BUFFER_SIZE) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR; /* too many keys! */
}
@@ -1919,7 +1919,7 @@
#endif
if (bs == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return 0;
}
@@ -1946,7 +1946,7 @@
(ntohs(msg->size) < sizeof(P2P_gap_query_MESSAGE)) ||
(ntohs(msg->size) != sizeof(P2P_gap_query_MESSAGE) +
(queries-1) * sizeof(HashCode512)) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR; /* malformed query */
}
@@ -1959,7 +1959,7 @@
(or B directly back to A; also should not happen)
in this case, A must just drop; however, this
should not happen (peers should check). */
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(qmsg);
return OK;
}
Modified: GNUnet/src/applications/gap/gaptest.c
===================================================================
--- GNUnet/src/applications/gap/gaptest.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/gap/gaptest.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -245,7 +245,7 @@
return ret;
}
-#define CHECK(a) if (!(a)) { ret = 1; BREAK(); goto FAILURE; }
+#define CHECK(a) if (!(a)) { ret = 1; GE_BREAK(ectx, 0); goto FAILURE; }
/**
* Testcase to test gap routing (2 peers only).
Modified: GNUnet/src/applications/gap/pid_table.c
===================================================================
--- GNUnet/src/applications/gap/pid_table.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/gap/pid_table.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -133,7 +133,7 @@
PeerIdentity * pid) {
if (id == 0) {
memset(pid, 0, sizeof(PeerIdentity));
- BREAK();
+ GE_BREAK(ectx, 0);
return;
}
MUTEX_LOCK(&lock);
Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c 2006-07-31 03:20:45 UTC (rev 3188)
+++ GNUnet/src/applications/rpc/rpc.c 2006-07-31 03:21:49 UTC (rev 3189)
@@ -1509,14 +1509,14 @@
"RPC testcase starting\n");
rpcAPI = capi->requestService("rpc");
if (rpcAPI == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
ret = OK;
if (OK != rpcAPI->RPC_register("testFunction",
&testCallback)) {
- BREAK();
+ GE_BREAK(ectx, 0);
ret = SYSERR;
}
@@ -1542,7 +1542,7 @@
0,
5 * cronSECONDS);
if (code != RPC_ERROR_OK) {
- BREAK();
+ GE_BREAK(ectx, 0);
ret = SYSERR;
}
RPC_paramFree(args);
@@ -1552,7 +1552,7 @@
(void**)&reply)) ||
(strncmp("Hello RPC World",
reply, dl) != 0) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
ret = SYSERR;
}
RPC_paramFree(rets);
@@ -1563,11 +1563,11 @@
if (OK != rpcAPI->RPC_unregister("testFunction",
&testCallback)) {
- BREAK();
+ GE_BREAK(ectx, 0);
ret = SYSERR;
}
if (OK != capi->releaseService(rpcAPI)) {
- BREAK();
+ GE_BREAK(ectx, 0);
ret = SYSERR;
}
LOG(LOG_DEBUG,
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -230,7 +230,7 @@
if (0 != mysql_query(dbhI->dbf, scratch))
LOG_MYSQL(LOG_ERROR, "mysql_query", dbhI);
} else {
- BREAK(); /* should really never happen */
+ GE_BREAK(ectx, 0); /* should really never happen */
}
return NULL;
@@ -341,7 +341,7 @@
(dbhI->selectsc == NULL) ||
(dbhI->deleteh == NULL) ||
(dbhI->deleteg == NULL) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
if (dbhI->insert != NULL)
mysql_stmt_close(dbhI->insert);
if (dbhI->update != NULL)
@@ -730,7 +730,7 @@
return SYSERR;
}
if (7 != mysql_num_fields(sql_res)) {
- BREAK();
+ GE_BREAK(ectx, 0);
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
return SYSERR;
}
@@ -883,7 +883,7 @@
#endif
if ( (ntohl(value->size) < sizeof(Datastore_Value)) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
MUTEX_LOCK(&dbh->DATABASE_Lock_);
@@ -1107,7 +1107,7 @@
_("Query `%s' had no results.\n"),
"SHOW TABLE STATUS LIKE 'gn070'");
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
- BREAK();
+ GE_BREAK(ectx, 0);
return 0; /* shouldn't get here */
}
GNUNET_ASSERT( (dbh->avgLength_ID < rows) &&
@@ -1246,7 +1246,7 @@
num_fields=mysql_num_fields(sql_res);
if(num_fields<=0) {
- BREAK();
+ GE_BREAK(ectx, 0);
iclose(dbh);
FREE(dbh);
FREE(cnffile);
@@ -1254,7 +1254,7 @@
}
sql_fields=mysql_fetch_fields(sql_res);
if(sql_fields==NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
iclose(dbh);
FREE(dbh);
FREE(cnffile);
@@ -1272,7 +1272,7 @@
GNUNET_ASSERT(dbh->avgLength_ID != -1);
mysql_free_result(sql_res);
if (found == NO) {
- BREAK();
+ GE_BREAK(ectx, 0);
/* avg_row_length not found in SHOW TABLE STATUS */
iclose(dbh);
FREE(dbh);
@@ -1280,7 +1280,7 @@
return NULL;
}
} else {
- BREAK();
+ GE_BREAK(ectx, 0);
iclose(dbh);
FREE(dbh);
FREE(cnffile);
Modified: GNUnet/src/applications/sqstore_mysql/mysqltest.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -252,7 +252,7 @@
initCore();
api = requestService("sqstore");
if (api == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
doneCore();
doneUtil();
return 1;
@@ -266,7 +266,7 @@
ok = test(api);
releaseService(api);
} else {
- BREAK();
+ GE_BREAK(ectx, 0);
}
}
doneCore();
Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -783,7 +783,7 @@
#endif
if ( (ntohl(value->size) < sizeof(Datastore_Value)) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
Modified: GNUnet/src/applications/tbench/gnunet-tbench.c
===================================================================
--- GNUnet/src/applications/tbench/gnunet-tbench.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/tbench/gnunet-tbench.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -239,7 +239,7 @@
GNUNET_ASSERT(ntohs(buffer->header.size) ==
sizeof(CS_tbench_reply_MESSAGE));
if ((float)buffer->mean_loss <= 0){
- BREAK();
+ GE_BREAK(ectx, 0);
messagesPercentLoss = 0.0;
} else {
messagesPercentLoss = (buffer->mean_loss/((float)htons(msg.msgCnt)));
Modified: GNUnet/src/applications/tbench/tbench.c
===================================================================
--- GNUnet/src/applications/tbench/tbench.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/tbench/tbench.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -133,14 +133,14 @@
const P2P_tbench_MESSAGE * msg;
if ( ntohs(message->size) < sizeof(P2P_tbench_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
msg = (const P2P_tbench_MESSAGE*) message;
if (crc32N(&msg[1],
ntohs(message->size) - sizeof(P2P_tbench_MESSAGE))
!= ntohl(msg->crc)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
@@ -172,14 +172,14 @@
const P2P_tbench_MESSAGE * pmsg;
if (ntohs(message->size) < sizeof(P2P_tbench_MESSAGE)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
pmsg = (const P2P_tbench_MESSAGE*) message;
if (crc32N(&pmsg[1],
ntohs(message->size) - sizeof(P2P_tbench_MESSAGE))
!= ntohl(pmsg->crc)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
#if DEBUG_TBENCH
Modified: GNUnet/src/applications/topology_f2f/topology.c
===================================================================
--- GNUnet/src/applications/topology_f2f/topology.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/topology_f2f/topology.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -184,11 +184,11 @@
&indexMatch);
if (hostIdentityEquals(coreAPI->myIdentity,
&indexMatch.match)) {
- BREAK(); /* should not happen, at least not often... */
+ GE_BREAK(ectx, 0); /* should not happen, at least not often... */
return;
}
if (coreAPI->computeIndex(&indexMatch.match) != index) {
- BREAK(); /* should REALLY not happen */
+ GE_BREAK(ectx, 0); /* should REALLY not happen */
return;
}
hash2enc(&indexMatch.match.hashPubKey,
@@ -239,7 +239,7 @@
return;
cronTime(&now);
if (SYSERR == coreAPI->getLastActivityOf(peer, &act)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return; /* this should not happen... */
}
@@ -385,19 +385,19 @@
coreAPI = capi;
identity = capi->requestService("identity");
if (identity == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return NULL;
}
transport = capi->requestService("transport");
if (transport == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
capi->releaseService(identity);
identity = NULL;
return NULL;
}
pingpong = capi->requestService("pingpong");
if (pingpong == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
capi->releaseService(identity);
identity = NULL;
capi->releaseService(transport);
Modified: GNUnet/src/applications/tracekit/gnunet-tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/gnunet-tracekit.c 2006-07-31 03:20:45 UTC
(rev 3188)
+++ GNUnet/src/applications/tracekit/gnunet-tracekit.c 2006-07-31 03:21:49 UTC
(rev 3189)
@@ -190,7 +190,7 @@
count = ntohs(buffer->header.size) - sizeof(CS_tracekit_reply_MESSAGE);
if (count < 0) {
- BREAK();
+ GE_BREAK(ectx, 0);
break; /* faulty reply */
}
hash2enc(&buffer->responderId.hashPubKey,
@@ -213,7 +213,7 @@
if (ntohs(buffer->header.size) !=
sizeof(CS_tracekit_reply_MESSAGE) +
count * sizeof(PeerIdentity)) {
- BREAK();
+ GE_BREAK(ectx, 0);
break;
}
if (count == 0) {
Modified: GNUnet/src/applications/tracekit/tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/tracekit/tracekit.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -88,7 +88,7 @@
LOG(LOG_DEBUG,
"TRACEKIT: I am initiator, sending to client.\n");
if (idx >= clientCount) {
- BREAK();
+ GE_BREAK(ectx, 0);
continue; /* discard */
}
if (clients[idx] == NULL) {
Modified: GNUnet/src/applications/traffic/clientapi.c
===================================================================
--- GNUnet/src/applications/traffic/clientapi.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/traffic/clientapi.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -78,7 +78,7 @@
CS_PROTO_traffic_INFO) ||
(ntohs(info->header.size) !=
sizeof(CS_traffic_info_MESSAGE) +
ntohl(info->count)*sizeof(TRAFFIC_COUNTER)) ) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
Modified: GNUnet/src/applications/traffic/traffic.c
===================================================================
--- GNUnet/src/applications/traffic/traffic.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/applications/traffic/traffic.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -594,7 +594,7 @@
myCoreAPI = capi;
myApi = capi->requestService("traffic");
if (myApi == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
myCoreAPI = NULL;
return SYSERR;
}
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2006-07-31 03:20:45 UTC (rev 3188)
+++ GNUnet/src/transports/http.c 2006-07-31 03:21:49 UTC (rev 3189)
@@ -411,7 +411,7 @@
HTTPSession * httpSession;
if (tsession == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
httpSession = (HTTPSession*) tsession->internal;
@@ -480,7 +480,7 @@
len);
#endif
if (len >= MAX_BUFFER_SIZE) {
- BREAK(); /* FIMXE: inline method and do proper
+ GE_BREAK(ectx, 0); /* FIMXE: inline method and do proper
error handling! */
httpSession->httpRPos = 0;
} else {
@@ -775,7 +775,7 @@
destroySession(i);
}
} else {
- BREAK();
+ GE_BREAK(ectx, 0);
destroySession(i);
}
if (sock > max)
@@ -955,7 +955,7 @@
return SYSERR;
}
if (ssize == 0) {
- BREAK(); /* size 0 not allowed */
+ GE_BREAK(ectx, 0); /* size 0 not allowed */
return SYSERR;
}
MUTEX_LOCK(&httplock);
@@ -1248,7 +1248,7 @@
if (http_shutdown == YES)
return SYSERR;
if (size == 0) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
@@ -1280,7 +1280,7 @@
unsigned short port;
if (serverSignal != NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
serverSignal = SEMAPHORE_NEW(0);
Modified: GNUnet/src/transports/smtp.c
===================================================================
--- GNUnet/src/transports/smtp.c 2006-07-31 03:20:45 UTC (rev 3188)
+++ GNUnet/src/transports/smtp.c 2006-07-31 03:21:49 UTC (rev 3189)
@@ -482,7 +482,7 @@
READLINE(&line[strlen(line)-1], LINESIZE - strlen(line));
size = base64_decode(line, strlen(line)-1, &out);
if (size < sizeof(SMTPMessage)) {
- BREAK();
+ GE_BREAK(ectx, 0);
FREE(out);
goto END;
}
@@ -544,7 +544,7 @@
if ((ntohs(helo->header.size)!=
sizeof(P2P_hello_MESSAGE)+ntohs(helo->senderAddressSize)) ||
(maddr->senderAddress[ntohs(helo->senderAddressSize)-1-FILTER_STRING_SIZE]!='\0'))
{
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR; /* obviously invalid */
} else {
#if DEBUG_SMTP
@@ -680,11 +680,11 @@
if (smtp_shutdown == YES)
return SYSERR;
if (size == 0) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
if (size > smtpAPI.mtu) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
helo = (P2P_hello_MESSAGE*)tsession->internal;
@@ -796,7 +796,7 @@
char * email;
if (serverSignal != NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
serverSignal = SEMAPHORE_NEW(0);
Modified: GNUnet/src/util/crypto/kblockkey_test.c
===================================================================
--- GNUnet/src/util/crypto/kblockkey_test.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/util/crypto/kblockkey_test.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -47,7 +47,7 @@
hash(word, strlen(word), &in);
hostkey = makeKblockKey(&in);
if (hostkey == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
return SYSERR;
}
getPublicKey(hostkey, &pkey);
@@ -60,7 +60,7 @@
fprintf(stderr, ".");
hostkey = makeKblockKey(&in);
if (hostkey == NULL) {
- BREAK();
+ GE_BREAK(ectx, 0);
fprintf(stderr, " ERROR\n");
return SYSERR;
}
@@ -68,7 +68,7 @@
freePrivateKey(hostkey);
if (0 != memcmp(&pkey, &pkey1,
sizeof(PublicKey))) {
- BREAK();
+ GE_BREAK(ectx, 0);
fprintf(stderr, " ERROR\n");
return SYSERR;
}
Modified: GNUnet/src/util/crypto/weakkeytest.c
===================================================================
--- GNUnet/src/util/crypto/weakkeytest.c 2006-07-31 03:20:45 UTC (rev
3188)
+++ GNUnet/src/util/crypto/weakkeytest.c 2006-07-31 03:21:49 UTC (rev
3189)
@@ -96,7 +96,7 @@
result);
if (size == -1) {
- BREAK();
+ GE_BREAK(ectx, 0);
return 1;
}
@@ -107,12 +107,12 @@
res);
if ((strlen(WEAK_KEY_TESTSTRING)+1) != size) {
- BREAK();
+ GE_BREAK(ectx, 0);
return 1;
}
if (0 != strcmp(res,
WEAK_KEY_TESTSTRING)) {
- BREAK();
+ GE_BREAK(ectx, 0);
return 1;
} else
return 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3189 - in GNUnet/src: applications/advertising applications/datastore applications/dht/module applications/dht/tools applications/fs applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/tools applications/gap applications/rpc applications/sqstore_mysql applications/sqstore_sqlite applications/tbench applications/topology_f2f applications/tracekit applications/traffic transports util/crypto,
grothoff <=