From 09d296df2a0daf0c6d45d0408037d204ff6dfe11 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Wed, 29 Apr 2020 23:52:44 -0600 Subject: [PATCH] minor fs denesting --- {rvpn/client => client}/client.go | 0 {rvpn/client => client}/setup.go | 0 {rvpn/client => client}/ws_handler.go | 4 ++-- cmd/telebit/telebit.go | 2 +- cmd/telebitd/telebitd.go | 2 +- debug.sh | 2 +- {rvpn/envelope => envelope}/envelope.go | 0 {rvpn/envelope => envelope}/setup.go | 0 {rvpn/packer => packer}/packer.go | 0 {rvpn/packer => packer}/packer_data.go | 0 {rvpn/packer => packer}/packer_header.go | 0 {rvpn/packer => packer}/setup.go | 0 {rvpn/server => server}/api_collect_connections.go | 0 {rvpn/server => server}/api_collect_domains.go | 0 {rvpn/server => server}/api_collect_server.go | 0 {rvpn/server => server}/api_collect_server_domains.go | 0 {rvpn/server => server}/api_collect_servers.go | 0 {rvpn/server => server}/api_collect_status.go | 0 {rvpn/server => server}/api_collect_status_dead_time.go | 0 {rvpn/server => server}/api_collect_status_traffic.go | 0 {rvpn/server => server}/api_interface.go | 2 +- {rvpn/server => server}/conn_tracking.go | 0 {rvpn/server => server}/conn_wedge.go | 0 {rvpn/server => server}/connection.go | 2 +- {rvpn/server => server}/connection_registration.go | 0 {rvpn/server => server}/connection_table.go | 0 {rvpn/server => server}/domain_loadbalance.go | 0 {rvpn/server => server}/domain_mapping.go | 0 {rvpn/server => server}/domain_track.go | 0 {rvpn/server => server}/listener_generic.go | 4 ++-- {rvpn/server => server}/manager.go | 0 {rvpn/server => server}/one_conn.go | 0 {rvpn/server => server}/send_track.go | 0 {rvpn/server => server}/setup.go | 0 {rvpn/server => server}/status.go | 0 {rvpn/server => server}/status_dead_time.go | 0 {rvpn/server => server}/status_req_type.go | 0 {rvpn/server => server}/status_traffic_connections.go | 0 {rvpn/server => server}/status_traffic_stats.go | 0 {rvpn/sni => sni}/tls_get_hostname.go | 0 40 files changed, 9 insertions(+), 9 deletions(-) rename {rvpn/client => client}/client.go (100%) rename {rvpn/client => client}/setup.go (100%) rename {rvpn/client => client}/ws_handler.go (98%) rename {rvpn/envelope => envelope}/envelope.go (100%) rename {rvpn/envelope => envelope}/setup.go (100%) rename {rvpn/packer => packer}/packer.go (100%) rename {rvpn/packer => packer}/packer_data.go (100%) rename {rvpn/packer => packer}/packer_header.go (100%) rename {rvpn/packer => packer}/setup.go (100%) rename {rvpn/server => server}/api_collect_connections.go (100%) rename {rvpn/server => server}/api_collect_domains.go (100%) rename {rvpn/server => server}/api_collect_server.go (100%) rename {rvpn/server => server}/api_collect_server_domains.go (100%) rename {rvpn/server => server}/api_collect_servers.go (100%) rename {rvpn/server => server}/api_collect_status.go (100%) rename {rvpn/server => server}/api_collect_status_dead_time.go (100%) rename {rvpn/server => server}/api_collect_status_traffic.go (100%) rename {rvpn/server => server}/api_interface.go (99%) rename {rvpn/server => server}/conn_tracking.go (100%) rename {rvpn/server => server}/conn_wedge.go (100%) rename {rvpn/server => server}/connection.go (99%) rename {rvpn/server => server}/connection_registration.go (100%) rename {rvpn/server => server}/connection_table.go (100%) rename {rvpn/server => server}/domain_loadbalance.go (100%) rename {rvpn/server => server}/domain_mapping.go (100%) rename {rvpn/server => server}/domain_track.go (100%) rename {rvpn/server => server}/listener_generic.go (99%) rename {rvpn/server => server}/manager.go (100%) rename {rvpn/server => server}/one_conn.go (100%) rename {rvpn/server => server}/send_track.go (100%) rename {rvpn/server => server}/setup.go (100%) rename {rvpn/server => server}/status.go (100%) rename {rvpn/server => server}/status_dead_time.go (100%) rename {rvpn/server => server}/status_req_type.go (100%) rename {rvpn/server => server}/status_traffic_connections.go (100%) rename {rvpn/server => server}/status_traffic_stats.go (100%) rename {rvpn/sni => sni}/tls_get_hostname.go (100%) diff --git a/rvpn/client/client.go b/client/client.go similarity index 100% rename from rvpn/client/client.go rename to client/client.go diff --git a/rvpn/client/setup.go b/client/setup.go similarity index 100% rename from rvpn/client/setup.go rename to client/setup.go diff --git a/rvpn/client/ws_handler.go b/client/ws_handler.go similarity index 98% rename from rvpn/client/ws_handler.go rename to client/ws_handler.go index 5adf9ee..09f47cf 100644 --- a/rvpn/client/ws_handler.go +++ b/client/ws_handler.go @@ -12,8 +12,8 @@ import ( "github.com/gorilla/websocket" - "git.coolaj86.com/coolaj86/go-telebitd/rvpn/packer" - "git.coolaj86.com/coolaj86/go-telebitd/rvpn/sni" + "git.coolaj86.com/coolaj86/go-telebitd/packer" + "git.coolaj86.com/coolaj86/go-telebitd/sni" ) var hostRegexp = regexp.MustCompile(`(?im)(?:^|[\r\n])Host: *([^\r\n]+)[\r\n]`) diff --git a/cmd/telebit/telebit.go b/cmd/telebit/telebit.go index f026fc2..4a8470c 100644 --- a/cmd/telebit/telebit.go +++ b/cmd/telebit/telebit.go @@ -11,7 +11,7 @@ import ( flag "github.com/spf13/pflag" "github.com/spf13/viper" - "git.coolaj86.com/coolaj86/go-telebitd/rvpn/client" + "git.coolaj86.com/coolaj86/go-telebitd/client" ) var httpRegexp = regexp.MustCompile(`(?i)^http`) diff --git a/cmd/telebitd/telebitd.go b/cmd/telebitd/telebitd.go index 4a920b5..a513360 100644 --- a/cmd/telebitd/telebitd.go +++ b/cmd/telebitd/telebitd.go @@ -15,7 +15,7 @@ import ( lumberjack "gopkg.in/natefinch/lumberjack.v2" telebit "git.coolaj86.com/coolaj86/go-telebitd" - "git.coolaj86.com/coolaj86/go-telebitd/rvpn/server" + "git.coolaj86.com/coolaj86/go-telebitd/server" ) var ( diff --git a/debug.sh b/debug.sh index dc77c4a..658256d 100755 --- a/debug.sh +++ b/debug.sh @@ -1,5 +1,5 @@ #!/bin/bash godebug build -instrument \ - git.coolaj86.com/coolaj86/go-telebitd/rvpn/connection,git.coolaj86.com/coolaj86/go-telebitd/rvpn/connection \ + git.coolaj86.com/coolaj86/go-telebitd/connection,git.coolaj86.com/coolaj86/go-telebitd/connection \ -o debug . diff --git a/rvpn/envelope/envelope.go b/envelope/envelope.go similarity index 100% rename from rvpn/envelope/envelope.go rename to envelope/envelope.go diff --git a/rvpn/envelope/setup.go b/envelope/setup.go similarity index 100% rename from rvpn/envelope/setup.go rename to envelope/setup.go diff --git a/rvpn/packer/packer.go b/packer/packer.go similarity index 100% rename from rvpn/packer/packer.go rename to packer/packer.go diff --git a/rvpn/packer/packer_data.go b/packer/packer_data.go similarity index 100% rename from rvpn/packer/packer_data.go rename to packer/packer_data.go diff --git a/rvpn/packer/packer_header.go b/packer/packer_header.go similarity index 100% rename from rvpn/packer/packer_header.go rename to packer/packer_header.go diff --git a/rvpn/packer/setup.go b/packer/setup.go similarity index 100% rename from rvpn/packer/setup.go rename to packer/setup.go diff --git a/rvpn/server/api_collect_connections.go b/server/api_collect_connections.go similarity index 100% rename from rvpn/server/api_collect_connections.go rename to server/api_collect_connections.go diff --git a/rvpn/server/api_collect_domains.go b/server/api_collect_domains.go similarity index 100% rename from rvpn/server/api_collect_domains.go rename to server/api_collect_domains.go diff --git a/rvpn/server/api_collect_server.go b/server/api_collect_server.go similarity index 100% rename from rvpn/server/api_collect_server.go rename to server/api_collect_server.go diff --git a/rvpn/server/api_collect_server_domains.go b/server/api_collect_server_domains.go similarity index 100% rename from rvpn/server/api_collect_server_domains.go rename to server/api_collect_server_domains.go diff --git a/rvpn/server/api_collect_servers.go b/server/api_collect_servers.go similarity index 100% rename from rvpn/server/api_collect_servers.go rename to server/api_collect_servers.go diff --git a/rvpn/server/api_collect_status.go b/server/api_collect_status.go similarity index 100% rename from rvpn/server/api_collect_status.go rename to server/api_collect_status.go diff --git a/rvpn/server/api_collect_status_dead_time.go b/server/api_collect_status_dead_time.go similarity index 100% rename from rvpn/server/api_collect_status_dead_time.go rename to server/api_collect_status_dead_time.go diff --git a/rvpn/server/api_collect_status_traffic.go b/server/api_collect_status_traffic.go similarity index 100% rename from rvpn/server/api_collect_status_traffic.go rename to server/api_collect_status_traffic.go diff --git a/rvpn/server/api_interface.go b/server/api_interface.go similarity index 99% rename from rvpn/server/api_interface.go rename to server/api_interface.go index 5b69f0a..df5f907 100644 --- a/rvpn/server/api_interface.go +++ b/server/api_interface.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" telebit "git.coolaj86.com/coolaj86/go-telebitd" - "git.coolaj86.com/coolaj86/go-telebitd/rvpn/envelope" + "git.coolaj86.com/coolaj86/go-telebitd/envelope" ) const ( diff --git a/rvpn/server/conn_tracking.go b/server/conn_tracking.go similarity index 100% rename from rvpn/server/conn_tracking.go rename to server/conn_tracking.go diff --git a/rvpn/server/conn_wedge.go b/server/conn_wedge.go similarity index 100% rename from rvpn/server/conn_wedge.go rename to server/conn_wedge.go diff --git a/rvpn/server/connection.go b/server/connection.go similarity index 99% rename from rvpn/server/connection.go rename to server/connection.go index 778edb4..612ca4a 100755 --- a/rvpn/server/connection.go +++ b/server/connection.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/websocket" - "git.coolaj86.com/coolaj86/go-telebitd/rvpn/packer" + "git.coolaj86.com/coolaj86/go-telebitd/packer" ) // Connection track websocket and faciliates in and out data diff --git a/rvpn/server/connection_registration.go b/server/connection_registration.go similarity index 100% rename from rvpn/server/connection_registration.go rename to server/connection_registration.go diff --git a/rvpn/server/connection_table.go b/server/connection_table.go similarity index 100% rename from rvpn/server/connection_table.go rename to server/connection_table.go diff --git a/rvpn/server/domain_loadbalance.go b/server/domain_loadbalance.go similarity index 100% rename from rvpn/server/domain_loadbalance.go rename to server/domain_loadbalance.go diff --git a/rvpn/server/domain_mapping.go b/server/domain_mapping.go similarity index 100% rename from rvpn/server/domain_mapping.go rename to server/domain_mapping.go diff --git a/rvpn/server/domain_track.go b/server/domain_track.go similarity index 100% rename from rvpn/server/domain_track.go rename to server/domain_track.go diff --git a/rvpn/server/listener_generic.go b/server/listener_generic.go similarity index 99% rename from rvpn/server/listener_generic.go rename to server/listener_generic.go index 2986f94..38e5f83 100644 --- a/rvpn/server/listener_generic.go +++ b/server/listener_generic.go @@ -18,8 +18,8 @@ import ( "github.com/gorilla/websocket" telebit "git.coolaj86.com/coolaj86/go-telebitd" - "git.coolaj86.com/coolaj86/go-telebitd/rvpn/packer" - "git.coolaj86.com/coolaj86/go-telebitd/rvpn/sni" + "git.coolaj86.com/coolaj86/go-telebitd/packer" + "git.coolaj86.com/coolaj86/go-telebitd/sni" ) type contextKey string diff --git a/rvpn/server/manager.go b/server/manager.go similarity index 100% rename from rvpn/server/manager.go rename to server/manager.go diff --git a/rvpn/server/one_conn.go b/server/one_conn.go similarity index 100% rename from rvpn/server/one_conn.go rename to server/one_conn.go diff --git a/rvpn/server/send_track.go b/server/send_track.go similarity index 100% rename from rvpn/server/send_track.go rename to server/send_track.go diff --git a/rvpn/server/setup.go b/server/setup.go similarity index 100% rename from rvpn/server/setup.go rename to server/setup.go diff --git a/rvpn/server/status.go b/server/status.go similarity index 100% rename from rvpn/server/status.go rename to server/status.go diff --git a/rvpn/server/status_dead_time.go b/server/status_dead_time.go similarity index 100% rename from rvpn/server/status_dead_time.go rename to server/status_dead_time.go diff --git a/rvpn/server/status_req_type.go b/server/status_req_type.go similarity index 100% rename from rvpn/server/status_req_type.go rename to server/status_req_type.go diff --git a/rvpn/server/status_traffic_connections.go b/server/status_traffic_connections.go similarity index 100% rename from rvpn/server/status_traffic_connections.go rename to server/status_traffic_connections.go diff --git a/rvpn/server/status_traffic_stats.go b/server/status_traffic_stats.go similarity index 100% rename from rvpn/server/status_traffic_stats.go rename to server/status_traffic_stats.go diff --git a/rvpn/sni/tls_get_hostname.go b/sni/tls_get_hostname.go similarity index 100% rename from rvpn/sni/tls_get_hostname.go rename to sni/tls_get_hostname.go