From e49144a83062cf7905538444390478db1f092b51 Mon Sep 17 00:00:00 2001 From: shaxxx Date: Tue, 1 Aug 2023 12:00:51 +0200 Subject: [PATCH 1/2] Fix auto IP tracking --- src/sn_utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sn_utils.c b/src/sn_utils.c index 40d67468b..bae0d47dd 100644 --- a/src/sn_utils.c +++ b/src/sn_utils.c @@ -1107,6 +1107,9 @@ static int update_edge (n2n_sn_t *sss, /* Known */ if(auth_edge(&(scan->auth), &(reg->auth), answer_auth, comm) == 0) { if(!sock_equal(sender_sock, &(scan->sock))) { + scan->dev_addr.net_addr = reg->dev_addr.net_addr; + scan->dev_addr.net_bitlen = reg->dev_addr.net_bitlen; + memcpy((char*)scan->dev_desc, reg->dev_desc, N2N_DESC_SIZE); memcpy(&(scan->sock), sender_sock, sizeof(n2n_sock_t)); scan->socket_fd = socket_fd; scan->last_cookie = reg->cookie; From 1c7f4f3b2ff4aa8646f065bab1a8b01cf54edd34 Mon Sep 17 00:00:00 2001 From: Hamish Coleman Date: Thu, 31 Aug 2023 18:31:18 +0100 Subject: [PATCH 2/2] Test only against current runner OS versions --- .github/workflows/tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d082e3bf8..e81928981 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,7 @@ jobs: matrix: os: - ubuntu-20.04 - - ubuntu-18.04 + - ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -113,8 +113,8 @@ jobs: fail-fast: true matrix: os: - - macos-10.15 - macos-11 + - macos-12 steps: - uses: actions/checkout@v2 @@ -185,7 +185,6 @@ jobs: fail-fast: true matrix: os: - - windows-2016 - windows-2019 - windows-2022