GitHub-Mirror/cjdns
0
0
Fork 0
mirror of https://github.com/cjdelisle/cjdns synced 2025-10-06 00:32:50 +02:00
Code Issues Releases Wiki Activity

Unified errors: BencMessageWriter_write

Browse Source
This commit is contained in:
Caleb James DeLisle
2024-09-18 09:10:55 +00:00
parent 16fe9a3c76
commit b695aa831a
10 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/Admin.c
View File

@@ -132,7 +132,7 @@ static Err_DEFUN sendBenc(Dict* message,
int fd)
{
Message_reset(admin->tempSendMsg);
Err(BencMessageWriter_write1(message, admin->tempSendMsg));
Err(BencMessageWriter_write(message, admin->tempSendMsg));
Message_t* msg = Message_new(0, Message_getLength(admin->tempSendMsg) + 32, alloc);
Err(Message_epush(msg, Message_bytes(admin->tempSendMsg), Message_getLength(admin->tempSendMsg)));
Message_setAssociatedFd(msg, fd);

2
admin/angel/Core.c
View File

@@ -525,7 +525,7 @@ int Core_main(int argc, char** argv)
));
// This always times out because the angel doesn't respond.
Message_t* clientResponse = Message_new(0, 512, tempAlloc);
Er_assert(BencMessageWriter_write(&response, clientResponse));
Err_assert(BencMessageWriter_write(&response, clientResponse));
Err_assert(AddrIface_pushAddr(clientResponse, addr));
Iface_CALL(ss->iface->send, clientResponse, ss->iface);

9
benc/serialization/standard/BencMessageWriter.c
View File

@@ -85,7 +85,7 @@ static Err_DEFUN writeGeneric(Object* obj, Message_t* msg)
return NULL;
}
Err_DEFUN BencMessageWriter_write1(Dict* toWrite, Message_t* msg)
Err_DEFUN BencMessageWriter_write(Dict* toWrite, Message_t* msg)
{
Err(writeDict(toWrite, msg));
@@ -104,9 +104,4 @@ Err_DEFUN BencMessageWriter_write1(Dict* toWrite, Message_t* msg)
Err(Message_epop8(&d, msg));
Err(Message_epush8(msg, 'd'));
return NULL;
}
Er_DEFUN(void BencMessageWriter_write(Dict* toWrite, Message_t* msg))
{
return Er_fromErr(BencMessageWriter_write1(toWrite, msg));
}
}

4
benc/serialization/standard/BencMessageWriter.h
View File

@@ -21,8 +21,6 @@
#include "util/Linker.h"
Linker_require("benc/serialization/standard/BencMessageWriter.c")
Err_DEFUN BencMessageWriter_write1(Dict* toWrite, Message_t* msg);
Er_DEFUN(void BencMessageWriter_write(Dict* toWrite, Message_t* msg));
Err_DEFUN BencMessageWriter_write(Dict* toWrite, Message_t* msg);
#endif

4
client/AdminClient.c
View File

@@ -91,7 +91,7 @@ static int calculateAuth(Dict* message,
// serialize the message with the password hash
Message_t* msg = Message_new(0, AdminClient_MAX_MESSAGE_SIZE, alloc);
Er_assert(BencMessageWriter_write(message, msg));
Err_assert(BencMessageWriter_write(message, msg));
// calculate the hash of the message with the password hash
crypto_hash_sha256(hash, Message_bytes(msg), Message_getLength(msg));
@@ -200,7 +200,7 @@ static struct Request* sendRaw(Dict* messageDict,
struct Allocator* child = Allocator_child(req->alloc);
Message_t* msg = Message_new(0, AdminClient_MAX_MESSAGE_SIZE + 256, child);
Er_assert(BencMessageWriter_write(messageDict, msg));
Err_assert(BencMessageWriter_write(messageDict, msg));
req->timeoutAlloc = Allocator_child(req->alloc);
req->timeout = Timeout_setTimeout(timeout,

2
client/cjdroute2.c
View File

@@ -802,7 +802,7 @@ int cjdroute2_main(int argc, char** argv)
}
Message_t* toCoreMsg = Message_new(0, 1024, allocator);
Er_assert(BencMessageWriter_write(preConf, toCoreMsg));
Err_assert(BencMessageWriter_write(preConf, toCoreMsg));
Iface_CALL(corePipe->send, toCoreMsg, corePipe);
Log_debug(logger, "Sent [%d] bytes to core", Message_getLength(toCoreMsg));

2
dht/SerializationModule.c
View File

@@ -84,7 +84,7 @@ static int handleOutgoing(struct DHTMessage* message,
Dict_putStringC(message->asDict, "txid", newTxid, message->allocator);
}
Er_assert(BencMessageWriter_write(message->asDict, message->binMessage));
Err_assert(BencMessageWriter_write(message->asDict, message->binMessage));
Assert_true(!((uintptr_t)Message_bytes(message->binMessage) % 4) || !"alignment fault");

2
subnode/MsgCore.c
View File

@@ -152,7 +152,7 @@ static void sendMsg(struct MsgCore_pvt* mcp,
}
Message_t* msg = Message_new(0, 2048, alloc);
Er_assert(BencMessageWriter_write(msgDict, msg));
Err_assert(BencMessageWriter_write(msgDict, msg));
//Log_debug(mcp->log, "Sending msg [%s]", Escape_getEscaped(msg->bytes, Message_getLength(msg), alloc));

2
tunnel/IpTunnel.c
View File

@@ -213,7 +213,7 @@ static void sendControlMessage(Dict* dict,
struct IpTunnel_pvt* context)
{
Message_t* msg = Message_new(0, 1024, requestAlloc);
Er_assert(BencMessageWriter_write(dict, msg));
Err_assert(BencMessageWriter_write(dict, msg));
int length = Message_getLength(msg);

2
tunnel/test/IpTunnel_test.c
View File

@@ -214,7 +214,7 @@ static String* getExpectedResponse(struct Sockaddr* sa4, int prefix4, int alloc4
Dict_putDict(output, String_new("addresses", alloc), addresses, alloc);
Dict_putString(output, String_new("txid", alloc), String_new("abcd", alloc), alloc);
Message_t* msg = Message_new(0, 512, alloc);
Er_assert(BencMessageWriter_write(output, msg));
Err_assert(BencMessageWriter_write(output, msg));
String* outStr = String_newBinary(Message_bytes(msg), Message_getLength(msg), allocator);
Allocator_free(alloc);