Skip to content

Commit cff5ec4

Browse files
committed
p2p: remove pre-addrv2 onions from SerializeV1Array()
1 parent 4192a74 commit cff5ec4

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

src/netaddress.h

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -333,31 +333,22 @@ class CNetAddr
333333
memcpy(arr, IPV4_IN_IPV6_PREFIX.data(), prefix_size);
334334
memcpy(arr + prefix_size, m_addr.data(), m_addr.size());
335335
return;
336-
case NET_ONION:
337-
if (m_addr.size() == ADDR_TORV3_SIZE) {
338-
break;
339-
}
340-
prefix_size = sizeof(TORV2_IN_IPV6_PREFIX);
341-
assert(prefix_size + m_addr.size() == sizeof(arr));
342-
memcpy(arr, TORV2_IN_IPV6_PREFIX.data(), prefix_size);
343-
memcpy(arr + prefix_size, m_addr.data(), m_addr.size());
344-
return;
345336
case NET_INTERNAL:
346337
prefix_size = sizeof(INTERNAL_IN_IPV6_PREFIX);
347338
assert(prefix_size + m_addr.size() == sizeof(arr));
348339
memcpy(arr, INTERNAL_IN_IPV6_PREFIX.data(), prefix_size);
349340
memcpy(arr + prefix_size, m_addr.data(), m_addr.size());
350341
return;
342+
case NET_ONION:
351343
case NET_I2P:
352-
break;
353344
case NET_CJDNS:
354345
break;
355346
case NET_UNROUTABLE:
356347
case NET_MAX:
357348
assert(false);
358349
} // no default case, so the compiler can warn about missing cases
359350

360-
// Serialize TORv3, I2P and CJDNS as all-zeros.
351+
// Serialize ONION, I2P and CJDNS as all-zeros.
361352
memset(arr, 0x0, V1_SERIALIZATION_SIZE);
362353
}
363354

0 commit comments

Comments
 (0)