From 049ad0802b4fae15954cfdc160f764aefbea2d9e Mon Sep 17 00:00:00 2001 From: EKCKABATOP54 Date: Wed, 25 Sep 2024 12:18:25 +0200 Subject: [PATCH 1/4] print yggdrasil address --- routerinfo.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/routerinfo.cpp b/routerinfo.cpp index a56a273..1991c0a 100644 --- a/routerinfo.cpp +++ b/routerinfo.cpp @@ -6,7 +6,7 @@ static void usage(const char * argv) { - std::cout << "usage: " << argv << " [-6|-f|-p] routerinfo.dat" << std::endl; + std::cout << "usage: " << argv << " [-6|-f|-p|-y] routerinfo.dat" << std::endl; } template @@ -51,7 +51,8 @@ int main(int argc, char * argv[]) bool ipv6 = false; bool firewall = false; bool port = false; - while((opt = getopt(argc, argv, "6fp")) != -1) { + bool yggdrasil = false; + while((opt = getopt(argc, argv, "6fpy")) != -1) { switch(opt) { case '6': ipv6 = true; @@ -62,6 +63,9 @@ int main(int argc, char * argv[]) case 'p': port = true; break; + case 'y': + yggdrasil = true; + break; default: usage(argv[0]); return 1; @@ -89,7 +93,13 @@ int main(int argc, char * argv[]) a = ri.GetSSU2V6Address(); if(a) addrs.push_back(a); - } + } + + if(yggdrasil){ + a = ri.GetYggdrasilAddress(); + if(a) + addrs.push_back(a); + } if(firewall) std::cout << "# "; From be61895bdc48a4167d2fa887892886607a7fedd6 Mon Sep 17 00:00:00 2001 From: hcyp <161704246+hcyp@users.noreply.github.com> Date: Fri, 29 Nov 2024 20:43:48 +0000 Subject: [PATCH 2/4] update building instructions --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e5921ee..8fcaa27 100755 --- a/README.md +++ b/README.md @@ -26,7 +26,12 @@ Notice: git submodules are used so make sure to clone this repository recursivel ### Building - make +```sh +git submodule init && git submodule update +git submodule update --init +git pull --recurse-submodules +make +``` ## Tools included From 33fce4b087d92ee90653460bbe7a07cdc0c7b121 Mon Sep 17 00:00:00 2001 From: orignal Date: Tue, 25 Feb 2025 15:47:26 -0500 Subject: [PATCH 3/4] updated to 2.56.0 --- famtool.cpp | 2 +- i2pd | 2 +- keygen.cpp | 2 +- offlinekeys.cpp | 2 +- regaddr.cpp | 2 +- regaddr_3ld.cpp | 2 +- regaddralias.cpp | 2 +- routerinfo.cpp | 2 +- vain.cpp | 6 +++--- verifyhost.cpp | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/famtool.cpp b/famtool.cpp index c8b5911..0a40689 100644 --- a/famtool.cpp +++ b/famtool.cpp @@ -197,7 +197,7 @@ int main(int argc, char * argv[]) return 0; } - InitCrypto(false, true, false); + InitCrypto(false); if(!fam.size()) { // no family name diff --git a/i2pd b/i2pd index 9668ea9..dcd15cc 160000 --- a/i2pd +++ b/i2pd @@ -1 +1 @@ -Subproject commit 9668ea9338fe8524781d6966f576227775129769 +Subproject commit dcd15cc2449d6320de6351054e61ef2ee7ebee40 diff --git a/keygen.cpp b/keygen.cpp index 30df4a0..a9f72cf 100644 --- a/keygen.cpp +++ b/keygen.cpp @@ -12,7 +12,7 @@ int main (int argc, char * argv[]) std::cout << "Usage: keygen filename " << std::endl; return -1; } - i2p::crypto::InitCrypto (false, true, false); + i2p::crypto::InitCrypto (false); i2p::data::SigningKeyType type = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519; if (argc > 2) { std::string str(argv[2]); diff --git a/offlinekeys.cpp b/offlinekeys.cpp index 8a4a8c5..c290465 100644 --- a/offlinekeys.cpp +++ b/offlinekeys.cpp @@ -14,7 +14,7 @@ int main (int argc, char * argv[]) std::cout << "Usage: offlinekeys " << std::endl; return -1; } - i2p::crypto::InitCrypto (false, true, false); + i2p::crypto::InitCrypto (false); std::string fname(argv[2]); i2p::data::PrivateKeys keys; diff --git a/regaddr.cpp b/regaddr.cpp index bd560c0..6dbf1fd 100644 --- a/regaddr.cpp +++ b/regaddr.cpp @@ -12,7 +12,7 @@ int main (int argc, char * argv[]) return -1; } - i2p::crypto::InitCrypto (false, true, false); + i2p::crypto::InitCrypto (false); i2p::data::PrivateKeys keys; std::ifstream s(argv[1], std::ifstream::binary); diff --git a/regaddr_3ld.cpp b/regaddr_3ld.cpp index 561bbae..4c94b09 100644 --- a/regaddr_3ld.cpp +++ b/regaddr_3ld.cpp @@ -18,7 +18,7 @@ int main (int argc, char * argv[]) if (argc < 3) { help(); return -1;} std::string arg = argv[1]; - i2p::crypto::InitCrypto (false, true, false); + i2p::crypto::InitCrypto (false); i2p::data::PrivateKeys keys; if (arg == "step1") { diff --git a/regaddralias.cpp b/regaddralias.cpp index 96eafaa..cc56bc0 100644 --- a/regaddralias.cpp +++ b/regaddralias.cpp @@ -12,7 +12,7 @@ int main (int argc, char * argv[]) return -1; } - i2p::crypto::InitCrypto (false, true, false); + i2p::crypto::InitCrypto (false); i2p::data::PrivateKeys oldkeys, newkeys; { diff --git a/routerinfo.cpp b/routerinfo.cpp index 1991c0a..5391e39 100644 --- a/routerinfo.cpp +++ b/routerinfo.cpp @@ -46,7 +46,7 @@ int main(int argc, char * argv[]) usage(argv[0]); return 1; } - i2p::crypto::InitCrypto(false, true, false); + i2p::crypto::InitCrypto(false); int opt; bool ipv6 = false; bool firewall = false; diff --git a/vain.cpp b/vain.cpp index ddee306..91227b9 100755 --- a/vain.cpp +++ b/vain.cpp @@ -294,9 +294,9 @@ int main (int argc, char * argv[]) } // https://github.com/PurpleI2P/i2pd/blob/ae5239de435e1dcdff342961af9b506f60a494d4/libi2pd/Crypto.h#L310 //// init and terminate -// void InitCrypto (bool precomputation, bool aesni, bool avx, bool force); -// By default false to all. But on much proccessors some things will be enabled. SO, TODO - i2p::crypto::InitCrypto (PRECOMPUTATION_CRYPTO, AESNI_CRYPTO, FORCE_CRYPTO); +// void InitCrypto (bool precomputation); +// By default false + i2p::crypto::InitCrypto (PRECOMPUTATION_CRYPTO); options.signature = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519; /////////////// //For while diff --git a/verifyhost.cpp b/verifyhost.cpp index 482d7f8..52c4cff 100644 --- a/verifyhost.cpp +++ b/verifyhost.cpp @@ -12,7 +12,7 @@ int main (int argc, char * argv[]) return -1; } - i2p::crypto::InitCrypto (false, true, false); + i2p::crypto::InitCrypto (false); i2p::data::IdentityEx Identity, OldIdentity; From 3e89876fa86edcc29fb7e45bb6d99b813d538d84 Mon Sep 17 00:00:00 2001 From: CrawlerBleak <176775426+CrawlerBleak@users.noreply.github.com> Date: Wed, 23 Jul 2025 23:05:44 -0700 Subject: [PATCH 4/4] .gitignore: ignore one built binary --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5754812..38d6a5d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ *.o # built binaries +autoconf keygen keyinfo famtool