From 425117270754c412f967e9c2da92ed2b5f4d8f3a Mon Sep 17 00:00:00 2001 From: dr7ana Date: Fri, 15 Dec 2023 12:45:45 -0800 Subject: [PATCH] libquic/oxenc vbumps --- external/oxen-encoding | 2 +- external/oxen-libquic | 2 +- llarp/router/router.cpp | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/external/oxen-encoding b/external/oxen-encoding index f6172d58d..24fbdb794 160000 --- a/external/oxen-encoding +++ b/external/oxen-encoding @@ -1 +1 @@ -Subproject commit f6172d58d3358473a4c98d96270058a32e166d5f +Subproject commit 24fbdb794ef26bf5324d1b56d48d1da8de8a140c diff --git a/external/oxen-libquic b/external/oxen-libquic index 89d85ffea..78b46d4f4 160000 --- a/external/oxen-libquic +++ b/external/oxen-libquic @@ -1 +1 @@ -Subproject commit 89d85ffeabbc773a1ea20d05b7f9c2a13c5e8370 +Subproject commit 78b46d4f4df45747b70918386672228ead2c7ed3 diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp index 061ff5efc..a7a17c79f 100644 --- a/llarp/router/router.cpp +++ b/llarp/router/router.cpp @@ -866,8 +866,12 @@ namespace llarp { log::critical(logcat, "Regenerating and gossiping RC..."); +<<<<<<< Updated upstream router_contact.resign(); save_rc(); +======= + auto view = router_contact.view(); +>>>>>>> Stashed changes _link_manager->gossip_rc( router_contact.router_id(),