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

SwitchPinger: Include reverse path and snode in ping reply

Browse Source
This commit is contained in:
Caleb James DeLisle
2024-10-01 13:54:52 +02:00
parent cd2a5a4f97
commit 7161e7c741
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/SwitchPinger_admin.c
View File

@@ -15,8 +15,10 @@
#include "admin/Admin.h"
#include "benc/String.h"
#include "benc/Dict.h"
#include "dht/Address.h"
#include "net/SwitchPinger.h"
#include "net/SwitchPinger_admin.h"
#include "util/Bits.h"
#include "util/Endian.h"
#include "util/AddrTools.h"
#include "crypto/Key.h"
@@ -50,7 +52,7 @@ static void adminPingOnResponse(struct SwitchPinger_Response* resp, void* vping)
uint8_t path[20] = {0};
AddrTools_printPath(path, resp->label);
String* pathStr = String_new(path, pingAlloc);
Dict_putStringC(rd, "rpath", pathStr, pingAlloc);
Dict_putStringC(rd, "responsePath", pathStr, pingAlloc);
}
Dict_putIntC(rd, "version", resp->version, pingAlloc);
@@ -65,6 +67,17 @@ static void adminPingOnResponse(struct SwitchPinger_Response* resp, void* vping)
Dict_putStringC(rd, "key", Key_stringify(resp->key, pingAlloc), pingAlloc);
}
if (!Bits_isZero(&resp->snode, sizeof resp->snode)) {
Dict_putStringC(rd, "snode", Address_toString(&resp->snode, pingAlloc), pingAlloc);
}
if (resp->rpath) {
uint8_t path[20] = {0};
AddrTools_printPath(path, resp->rpath);
String* pathStr = String_new(path, pingAlloc);
Dict_putStringC(rd, "rpath", pathStr, pingAlloc);
}
if (!Bits_isZero(&resp->lladdr, sizeof resp->lladdr)) {
struct Sockaddr_storage ss;
if (resp->lladdr.addr.udp4.type == Control_LlAddr_Udp4_TYPE) {