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

Merge branch 'dnsseed' of github.com:cjdelisle/cjdns into dnsseed

Browse Source
This commit is contained in:
Caleb James DeLisle
2024-09-19 10:30:16 +00:00
parent 7e29c7c56f 6ab3c4e476
commit 669544d3ee
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/cjdroute2.c
View File

@@ -523,7 +523,6 @@ static Err_DEFUN checkRunningInstance(struct Allocator* allocator,
EventBase_beginLoop(base);
Assert_true(ctx->res);
Allocator_free(alloc);
if (ctx->res->err != AdminClient_Error_TIMEOUT) {
Err_raise(allocator, "Startup failed: cjdroute is already running. [%d]", ctx->res->err);
}

2
interface/ETHInterface_darwin.c
View File

@@ -263,7 +263,7 @@ static Err_DEFUN macaddr(const char* ifname, uint8_t addrOut[6], struct Allocato
}
Err_DEFUN ETHInterface_new(
struct ETHInterface* out,
struct ETHInterface** out,
EventBase_t* eventBase,
const char* bindDevice,
struct Allocator* alloc,