diff --git a/cmd/indra/relay.go b/cmd/indra/relay.go index 13378c1b..24bc046a 100644 --- a/cmd/indra/relay.go +++ b/cmd/indra/relay.go @@ -10,7 +10,7 @@ import ( "git-indra.lan/indra-labs/indra/pkg/interrupt" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" "git-indra.lan/indra-labs/indra/pkg/relay" - "git-indra.lan/indra-labs/indra/pkg/transport" + "git-indra.lan/indra-labs/indra/pkg/relay/transport" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/balance.go b/pkg/relay/balance.go index b18e5fcf..4c51a042 100644 --- a/pkg/relay/balance.go +++ b/pkg/relay/balance.go @@ -5,10 +5,10 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/key/signer" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/balance" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/messages/getbalance" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/balance" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/codec.go b/pkg/relay/codec.go index 03b30218..7d62b1eb 100644 --- a/pkg/relay/codec.go +++ b/pkg/relay/codec.go @@ -1,7 +1,7 @@ package relay import ( - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/codec_test.go b/pkg/relay/codec_test.go index 546c025e..4d41752c 100644 --- a/pkg/relay/codec_test.go +++ b/pkg/relay/codec_test.go @@ -12,15 +12,15 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/confirm" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/messages/delay" - "git-indra.lan/indra-labs/indra/pkg/messages/exit" - "git-indra.lan/indra-labs/indra/pkg/messages/forward" - "git-indra.lan/indra-labs/indra/pkg/messages/response" - "git-indra.lan/indra-labs/indra/pkg/messages/reverse" - "git-indra.lan/indra-labs/indra/pkg/messages/session" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/delay" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/exit" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/forward" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/response" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/session" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" "git-indra.lan/indra-labs/indra/pkg/util/tests" ) diff --git a/pkg/relay/engine.go b/pkg/relay/engine.go index e5163a57..a54e17aa 100644 --- a/pkg/relay/engine.go +++ b/pkg/relay/engine.go @@ -10,7 +10,7 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/signer" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/types" ) var ( diff --git a/pkg/relay/engine_test.go b/pkg/relay/engine_test.go index 2d950fe3..18c7bef5 100644 --- a/pkg/relay/engine_test.go +++ b/pkg/relay/engine_test.go @@ -12,9 +12,9 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/prv" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/intro" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/transport" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/intro" + "git-indra.lan/indra-labs/indra/pkg/relay/transport" "git-indra.lan/indra-labs/indra/pkg/util/slice" "git-indra.lan/indra-labs/indra/pkg/util/tests" ) diff --git a/pkg/relay/exit.go b/pkg/relay/exit.go index 36ead94a..845faa75 100644 --- a/pkg/relay/exit.go +++ b/pkg/relay/exit.go @@ -8,10 +8,10 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/signer" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/messages/exit" - "git-indra.lan/indra-labs/indra/pkg/messages/response" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/exit" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/response" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/handlemessage.go b/pkg/relay/handlemessage.go index 95b49602..2c76c9d7 100644 --- a/pkg/relay/handlemessage.go +++ b/pkg/relay/handlemessage.go @@ -2,21 +2,21 @@ package relay import ( "reflect" - - "git-indra.lan/indra-labs/indra/pkg/messages/balance" - "git-indra.lan/indra-labs/indra/pkg/messages/confirm" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/messages/delay" - "git-indra.lan/indra-labs/indra/pkg/messages/exit" - "git-indra.lan/indra-labs/indra/pkg/messages/forward" - "git-indra.lan/indra-labs/indra/pkg/messages/getbalance" - "git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice" - "git-indra.lan/indra-labs/indra/pkg/messages/intro" - "git-indra.lan/indra-labs/indra/pkg/messages/introquery" - "git-indra.lan/indra-labs/indra/pkg/messages/response" - "git-indra.lan/indra-labs/indra/pkg/messages/reverse" - "git-indra.lan/indra-labs/indra/pkg/messages/session" - "git-indra.lan/indra-labs/indra/pkg/types" + + "git-indra.lan/indra-labs/indra/pkg/relay/messages/balance" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/delay" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/exit" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/forward" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/intro" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/introquery" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/response" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/session" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/handler.go b/pkg/relay/handler.go index 1160a5bc..f1b08fdc 100644 --- a/pkg/relay/handler.go +++ b/pkg/relay/handler.go @@ -1,7 +1,7 @@ package relay import ( - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/types" ) func (eng *Engine) handler() (out bool) { diff --git a/pkg/relay/handlers.go b/pkg/relay/handlers.go index fceca69e..ec0d3347 100644 --- a/pkg/relay/handlers.go +++ b/pkg/relay/handlers.go @@ -4,15 +4,15 @@ import ( "time" "git-indra.lan/indra-labs/indra/pkg/crypto/ciph" - "git-indra.lan/indra-labs/indra/pkg/messages/confirm" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/messages/delay" - "git-indra.lan/indra-labs/indra/pkg/messages/forward" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" - "git-indra.lan/indra-labs/indra/pkg/messages/response" - "git-indra.lan/indra-labs/indra/pkg/messages/reverse" - "git-indra.lan/indra-labs/indra/pkg/messages/session" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/delay" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/forward" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/response" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/session" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/hiddenservice.go b/pkg/relay/hiddenservice.go index 11faa0cf..3a9deae9 100644 --- a/pkg/relay/hiddenservice.go +++ b/pkg/relay/hiddenservice.go @@ -5,9 +5,9 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/key/signer" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice" - "git-indra.lan/indra-labs/indra/pkg/messages/intro" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/intro" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/introductions.go b/pkg/relay/introductions.go index a6507477..67c926a8 100644 --- a/pkg/relay/introductions.go +++ b/pkg/relay/introductions.go @@ -9,10 +9,10 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/key/signer" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/messages/intro" - "git-indra.lan/indra-labs/indra/pkg/messages/introquery" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/intro" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/introquery" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/cryptorand" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/messages/balance/balance.go b/pkg/relay/messages/balance/balance.go similarity index 89% rename from pkg/messages/balance/balance.go rename to pkg/relay/messages/balance/balance.go index 3fea14eb..4bd0d075 100644 --- a/pkg/messages/balance/balance.go +++ b/pkg/relay/messages/balance/balance.go @@ -5,11 +5,11 @@ import ( "git-indra.lan/indra-labs/indra" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/confirm/confirmation.go b/pkg/relay/messages/confirm/confirmation.go similarity index 91% rename from pkg/messages/confirm/confirmation.go rename to pkg/relay/messages/confirm/confirmation.go index d27f8b09..00c81767 100644 --- a/pkg/messages/confirm/confirmation.go +++ b/pkg/relay/messages/confirm/confirmation.go @@ -3,11 +3,11 @@ package confirm import ( "git-indra.lan/indra-labs/indra" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/crypt/crypt.go b/pkg/relay/messages/crypt/crypt.go similarity index 93% rename from pkg/messages/crypt/crypt.go rename to pkg/relay/messages/crypt/crypt.go index d6b43afd..9f96bc3c 100644 --- a/pkg/messages/crypt/crypt.go +++ b/pkg/relay/messages/crypt/crypt.go @@ -9,12 +9,12 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/prv" "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" - "git-indra.lan/indra-labs/indra/pkg/messages/reverse" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/delay/delay.go b/pkg/relay/messages/delay/delay.go similarity index 86% rename from pkg/messages/delay/delay.go rename to pkg/relay/messages/delay/delay.go index 890944e5..8f9a2d5d 100644 --- a/pkg/messages/delay/delay.go +++ b/pkg/relay/messages/delay/delay.go @@ -4,11 +4,11 @@ import ( "time" "git-indra.lan/indra-labs/indra" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/dxresponse/dxresponse.go b/pkg/relay/messages/dxresponse/dxresponse.go similarity index 91% rename from pkg/messages/dxresponse/dxresponse.go rename to pkg/relay/messages/dxresponse/dxresponse.go index 2f5033e5..2d5f6fb5 100644 --- a/pkg/messages/dxresponse/dxresponse.go +++ b/pkg/relay/messages/dxresponse/dxresponse.go @@ -3,11 +3,11 @@ package dxresponse import ( "git-indra.lan/indra-labs/indra" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/exit/exit.go b/pkg/relay/messages/exit/exit.go similarity index 93% rename from pkg/messages/exit/exit.go rename to pkg/relay/messages/exit/exit.go index 85fd67b2..f34a556b 100644 --- a/pkg/messages/exit/exit.go +++ b/pkg/relay/messages/exit/exit.go @@ -4,11 +4,11 @@ import ( "git-indra.lan/indra-labs/indra" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/forward/forward.go b/pkg/relay/messages/forward/forward.go similarity index 88% rename from pkg/messages/forward/forward.go rename to pkg/relay/messages/forward/forward.go index ced33dd9..852db1bc 100644 --- a/pkg/messages/forward/forward.go +++ b/pkg/relay/messages/forward/forward.go @@ -5,11 +5,11 @@ import ( "net/netip" "git-indra.lan/indra-labs/indra" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/getbalance/getbalance.go b/pkg/relay/messages/getbalance/getbalance.go similarity index 91% rename from pkg/messages/getbalance/getbalance.go rename to pkg/relay/messages/getbalance/getbalance.go index 0d49da08..40c4bb19 100644 --- a/pkg/messages/getbalance/getbalance.go +++ b/pkg/relay/messages/getbalance/getbalance.go @@ -4,11 +4,11 @@ import ( "git-indra.lan/indra-labs/indra" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/hiddenservice/hiddenservice.go b/pkg/relay/messages/hiddenservice/hiddenservice.go similarity index 90% rename from pkg/messages/hiddenservice/hiddenservice.go rename to pkg/relay/messages/hiddenservice/hiddenservice.go index 07c147a9..14e1737c 100644 --- a/pkg/messages/hiddenservice/hiddenservice.go +++ b/pkg/relay/messages/hiddenservice/hiddenservice.go @@ -4,12 +4,12 @@ import ( "git-indra.lan/indra-labs/indra" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/intro" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/intro" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/intro/intro-message.go b/pkg/relay/messages/intro/intro-message.go similarity index 91% rename from pkg/messages/intro/intro-message.go rename to pkg/relay/messages/intro/intro-message.go index fba0e0b6..d7159dd8 100644 --- a/pkg/messages/intro/intro-message.go +++ b/pkg/relay/messages/intro/intro-message.go @@ -9,11 +9,11 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/key/sig" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) var ( diff --git a/pkg/messages/intro/intro-message_test.go b/pkg/relay/messages/intro/intro-message_test.go similarity index 100% rename from pkg/messages/intro/intro-message_test.go rename to pkg/relay/messages/intro/intro-message_test.go diff --git a/pkg/messages/introquery/introquery.go b/pkg/relay/messages/introquery/introquery.go similarity index 92% rename from pkg/messages/introquery/introquery.go rename to pkg/relay/messages/introquery/introquery.go index 9846edbb..432f586a 100644 --- a/pkg/messages/introquery/introquery.go +++ b/pkg/relay/messages/introquery/introquery.go @@ -5,11 +5,11 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/magicbytes/magic.go b/pkg/relay/messages/magicbytes/magic.go similarity index 100% rename from pkg/messages/magicbytes/magic.go rename to pkg/relay/messages/magicbytes/magic.go diff --git a/pkg/messages/noop/noop.go b/pkg/relay/messages/noop/noop.go similarity index 88% rename from pkg/messages/noop/noop.go rename to pkg/relay/messages/noop/noop.go index dff9cefb..f49947da 100644 --- a/pkg/messages/noop/noop.go +++ b/pkg/relay/messages/noop/noop.go @@ -1,7 +1,7 @@ package noop import ( - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/messages/response/response.go b/pkg/relay/messages/response/response.go similarity index 88% rename from pkg/messages/response/response.go rename to pkg/relay/messages/response/response.go index 88d4848a..0b6d944a 100644 --- a/pkg/messages/response/response.go +++ b/pkg/relay/messages/response/response.go @@ -3,11 +3,11 @@ package response import ( "git-indra.lan/indra-labs/indra" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/reverse/reverse.go b/pkg/relay/messages/reverse/reverse.go similarity index 91% rename from pkg/messages/reverse/reverse.go rename to pkg/relay/messages/reverse/reverse.go index a8f6eec6..c9d23c71 100644 --- a/pkg/messages/reverse/reverse.go +++ b/pkg/relay/messages/reverse/reverse.go @@ -4,11 +4,11 @@ import ( "net/netip" "git-indra.lan/indra-labs/indra" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/splice" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" + "git-indra.lan/indra-labs/indra/pkg/util/splice" ) const ( diff --git a/pkg/messages/session/session.go b/pkg/relay/messages/session/session.go similarity index 94% rename from pkg/messages/session/session.go rename to pkg/relay/messages/session/session.go index 8a3e8660..212d1f49 100644 --- a/pkg/messages/session/session.go +++ b/pkg/relay/messages/session/session.go @@ -5,10 +5,10 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/prv" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" - "git-indra.lan/indra-labs/indra/pkg/messages/noop" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/noop" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/node.go b/pkg/relay/node.go index a8c24e2e..ad813998 100644 --- a/pkg/relay/node.go +++ b/pkg/relay/node.go @@ -8,8 +8,8 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/prv" "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/ring" - "git-indra.lan/indra-labs/indra/pkg/types" + ring2 "git-indra.lan/indra-labs/indra/pkg/relay/ring" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) @@ -21,12 +21,12 @@ type Node struct { IdentityPub *pub.Key IdentityBytes pub.Bytes IdentityPrv *prv.Key - RelayRate int // Base relay price/Mb. - Services Services // Services offered by this peer. - HiddenServices Referrers // Hidden services known by peer. - Load *ring.BufferLoad // Relay load. - Latency *ring.BufferLatency // Latency to peer. - Failure *ring.BufferFailure // Times of tx failure. + RelayRate int // Base relay price/Mb. + Services Services // Services offered by this peer. + HiddenServices Referrers // Hidden services known by peer. + Load *ring2.BufferLoad // Relay load. + Latency *ring2.BufferLatency // Latency to peer. + Failure *ring2.BufferFailure // Times of tx failure. PaymentChan types.Transport } @@ -60,9 +60,9 @@ func NewNode(addr *netip.AddrPort, idPub *pub.Key, idPrv *prv.Key, if !local { // These ring buffers are needed to evaluate these metrics for remote // peers only. - n.Load = ring.NewBufferLoad(DefaultSampleBufferSize) - n.Latency = ring.NewBufferLatency(DefaultSampleBufferSize) - n.Failure = ring.NewBufferFailure(DefaultSampleBufferSize) + n.Load = ring2.NewBufferLoad(DefaultSampleBufferSize) + n.Latency = ring2.NewBufferLatency(DefaultSampleBufferSize) + n.Failure = ring2.NewBufferFailure(DefaultSampleBufferSize) } return } diff --git a/pkg/packet/packet.go b/pkg/relay/packet/packet.go similarity index 100% rename from pkg/packet/packet.go rename to pkg/relay/packet/packet.go diff --git a/pkg/packet/packet_test.go b/pkg/relay/packet/packet_test.go similarity index 100% rename from pkg/packet/packet_test.go rename to pkg/relay/packet/packet_test.go diff --git a/pkg/packet/segcalc.go b/pkg/relay/packet/segcalc.go similarity index 100% rename from pkg/packet/segcalc.go rename to pkg/relay/packet/segcalc.go diff --git a/pkg/packet/segcalc_test.go b/pkg/relay/packet/segcalc_test.go similarity index 100% rename from pkg/packet/segcalc_test.go rename to pkg/relay/packet/segcalc_test.go diff --git a/pkg/packet/segment.go b/pkg/relay/packet/segment.go similarity index 99% rename from pkg/packet/segment.go rename to pkg/relay/packet/segment.go index e4490b67..b0075177 100644 --- a/pkg/packet/segment.go +++ b/pkg/relay/packet/segment.go @@ -4,10 +4,11 @@ import ( "errors" "fmt" "sort" - + + "github.com/templexxx/reedsolomon" + "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" "git-indra.lan/indra-labs/indra/pkg/util/slice" - "github.com/templexxx/reedsolomon" ) const ErrEmptyBytes = "cannot encode empty bytes" @@ -85,7 +86,7 @@ func Join(packets Packets) (msg []byte, e error) { // if they match. if sha256.Single(ps.Data) == sha256.Single(packets[prevSeq].Data) { - + discard = append(discard, int(ps.Seq)) // No need to go on, we will discard this one. continue diff --git a/pkg/packet/segment_test.go b/pkg/relay/packet/segment_test.go similarity index 100% rename from pkg/packet/segment_test.go rename to pkg/relay/packet/segment_test.go diff --git a/pkg/relay/payments.go b/pkg/relay/payments.go index ed4ed6df..ce173794 100644 --- a/pkg/relay/payments.go +++ b/pkg/relay/payments.go @@ -5,7 +5,7 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/session" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/session" ) type Payment struct { diff --git a/pkg/relay/peel.go b/pkg/relay/peel.go index f15f64ee..bd29dc0f 100644 --- a/pkg/relay/peel.go +++ b/pkg/relay/peel.go @@ -2,25 +2,25 @@ package relay import ( "fmt" - + "github.com/davecgh/go-spew/spew" - - "git-indra.lan/indra-labs/indra/pkg/messages/balance" - "git-indra.lan/indra-labs/indra/pkg/messages/confirm" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/messages/delay" - "git-indra.lan/indra-labs/indra/pkg/messages/dxresponse" - "git-indra.lan/indra-labs/indra/pkg/messages/exit" - "git-indra.lan/indra-labs/indra/pkg/messages/forward" - "git-indra.lan/indra-labs/indra/pkg/messages/getbalance" - "git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice" - "git-indra.lan/indra-labs/indra/pkg/messages/intro" - "git-indra.lan/indra-labs/indra/pkg/messages/introquery" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" - "git-indra.lan/indra-labs/indra/pkg/messages/response" - "git-indra.lan/indra-labs/indra/pkg/messages/reverse" - "git-indra.lan/indra-labs/indra/pkg/messages/session" - "git-indra.lan/indra-labs/indra/pkg/types" + + "git-indra.lan/indra-labs/indra/pkg/relay/messages/balance" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/delay" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/dxresponse" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/exit" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/forward" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/intro" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/introquery" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/response" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/session" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/ring/failure.go b/pkg/relay/ring/failure.go similarity index 100% rename from pkg/ring/failure.go rename to pkg/relay/ring/failure.go diff --git a/pkg/ring/latency.go b/pkg/relay/ring/latency.go similarity index 100% rename from pkg/ring/latency.go rename to pkg/relay/ring/latency.go diff --git a/pkg/ring/load.go b/pkg/relay/ring/load.go similarity index 100% rename from pkg/ring/load.go rename to pkg/relay/ring/load.go diff --git a/pkg/relay/send.go b/pkg/relay/send.go index 4b99b054..82f009fe 100644 --- a/pkg/relay/send.go +++ b/pkg/relay/send.go @@ -5,14 +5,14 @@ import ( "runtime" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/balance" - "git-indra.lan/indra-labs/indra/pkg/messages/confirm" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/messages/exit" - "git-indra.lan/indra-labs/indra/pkg/messages/forward" - "git-indra.lan/indra-labs/indra/pkg/messages/getbalance" - "git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice" - "git-indra.lan/indra-labs/indra/pkg/messages/reverse" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/balance" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/exit" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/forward" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/services.go b/pkg/relay/services.go index 98152e3e..bfa4c12d 100644 --- a/pkg/relay/services.go +++ b/pkg/relay/services.go @@ -1,6 +1,8 @@ package relay -import "git-indra.lan/indra-labs/indra/pkg/types" +import ( + "git-indra.lan/indra-labs/indra/pkg/relay/types" +) type Service struct { Port uint16 diff --git a/pkg/relay/session.go b/pkg/relay/session.go index 3982034b..0e0a282d 100644 --- a/pkg/relay/session.go +++ b/pkg/relay/session.go @@ -11,8 +11,8 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/signer" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/session" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/session" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/cryptorand" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/skins.go b/pkg/relay/skins.go index a71cbfa5..3fdf3d40 100644 --- a/pkg/relay/skins.go +++ b/pkg/relay/skins.go @@ -9,21 +9,21 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/prv" "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/messages/balance" - "git-indra.lan/indra-labs/indra/pkg/messages/confirm" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/messages/delay" - "git-indra.lan/indra-labs/indra/pkg/messages/exit" - "git-indra.lan/indra-labs/indra/pkg/messages/forward" - "git-indra.lan/indra-labs/indra/pkg/messages/getbalance" - "git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice" - "git-indra.lan/indra-labs/indra/pkg/messages/intro" - "git-indra.lan/indra-labs/indra/pkg/messages/introquery" - "git-indra.lan/indra-labs/indra/pkg/messages/noop" - "git-indra.lan/indra-labs/indra/pkg/messages/response" - "git-indra.lan/indra-labs/indra/pkg/messages/reverse" - "git-indra.lan/indra-labs/indra/pkg/messages/session" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/balance" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/delay" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/exit" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/forward" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/intro" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/introquery" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/noop" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/response" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/session" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/transport/sim.go b/pkg/relay/transport/sim.go similarity index 100% rename from pkg/transport/sim.go rename to pkg/relay/transport/sim.go diff --git a/pkg/transport/sim_test.go b/pkg/relay/transport/sim_test.go similarity index 100% rename from pkg/transport/sim_test.go rename to pkg/relay/transport/sim_test.go diff --git a/pkg/transport/transport.go b/pkg/relay/transport/transport.go similarity index 100% rename from pkg/transport/transport.go rename to pkg/relay/transport/transport.go diff --git a/pkg/transport/transport_test.go b/pkg/relay/transport/transport_test.go similarity index 100% rename from pkg/transport/transport_test.go rename to pkg/relay/transport/transport_test.go diff --git a/pkg/types/types.go b/pkg/relay/types/types.go similarity index 100% rename from pkg/types/types.go rename to pkg/relay/types/types.go diff --git a/pkg/relay/util.go b/pkg/relay/util.go index 175a1aff..4957ab96 100644 --- a/pkg/relay/util.go +++ b/pkg/relay/util.go @@ -10,8 +10,8 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/crypt" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) diff --git a/pkg/relay/utils_test.go b/pkg/relay/utils_test.go index bf1cddeb..2d49e2cd 100644 --- a/pkg/relay/utils_test.go +++ b/pkg/relay/utils_test.go @@ -4,8 +4,8 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/prv" "git-indra.lan/indra-labs/indra/pkg/crypto/key/pub" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" - "git-indra.lan/indra-labs/indra/pkg/transport" - "git-indra.lan/indra-labs/indra/pkg/types" + "git-indra.lan/indra-labs/indra/pkg/relay/transport" + "git-indra.lan/indra-labs/indra/pkg/relay/types" "git-indra.lan/indra-labs/indra/pkg/util/slice" ) @@ -75,7 +75,8 @@ func CreateNMockCircuits(nCirc int, nReturns int) (cl []*Engine, e error) { return createNMockCircuits(false, nCirc, nReturns) } -func CreateNMockCircuitsWithSessions(nCirc int, nReturns int) (cl []*Engine, e error) { - return createNMockCircuits(true, nCirc, nReturns) +func CreateNMockCircuitsWithSessions(nCirc int, nReturns int) (cl []*Engine, + e error) { + return createNMockCircuits(true, nCirc, nReturns) } diff --git a/pkg/splice/splice.go b/pkg/util/splice/splice.go similarity index 98% rename from pkg/splice/splice.go rename to pkg/util/splice/splice.go index fc815da4..bc7ef413 100644 --- a/pkg/splice/splice.go +++ b/pkg/util/splice/splice.go @@ -14,8 +14,8 @@ import ( "git-indra.lan/indra-labs/indra/pkg/crypto/key/sig" "git-indra.lan/indra-labs/indra/pkg/crypto/nonce" "git-indra.lan/indra-labs/indra/pkg/crypto/sha256" - "git-indra.lan/indra-labs/indra/pkg/messages/magicbytes" log2 "git-indra.lan/indra-labs/indra/pkg/proc/log" + "git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes" "git-indra.lan/indra-labs/indra/pkg/util/slice" )