minor fs denesting

2020-04-29 23:52:44 -06:00 · 2020-04-29 23:52:44 -06:00 · 09d296df2a
parent cf8defbe3d
commit 09d296df2a
40 changed files with 9 additions and 9 deletions
--- a/rvpn/client/client.go
+++ b/rvpn/client/client.go
--- a/rvpn/client/setup.go
+++ b/rvpn/client/setup.go
--- a/rvpn/client/ws_handler.go
+++ b/rvpn/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]`)
--- 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`)
--- 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 (
--- 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 .
--- a/rvpn/envelope/envelope.go
+++ b/rvpn/envelope/envelope.go
--- a/rvpn/envelope/setup.go
+++ b/rvpn/envelope/setup.go
--- a/rvpn/packer/packer.go
+++ b/rvpn/packer/packer.go
--- a/rvpn/packer/packer_data.go
+++ b/rvpn/packer/packer_data.go
--- a/rvpn/packer/packer_header.go
+++ b/rvpn/packer/packer_header.go
--- a/rvpn/packer/setup.go
+++ b/rvpn/packer/setup.go
--- a/rvpn/server/api_collect_connections.go
+++ b/rvpn/server/api_collect_connections.go
--- a/rvpn/server/api_collect_domains.go
+++ b/rvpn/server/api_collect_domains.go
--- a/rvpn/server/api_collect_server.go
+++ b/rvpn/server/api_collect_server.go
--- a/rvpn/server/api_collect_server_domains.go
+++ b/rvpn/server/api_collect_server_domains.go
--- a/rvpn/server/api_collect_servers.go
+++ b/rvpn/server/api_collect_servers.go
--- a/rvpn/server/api_collect_status.go
+++ b/rvpn/server/api_collect_status.go
--- a/rvpn/server/api_collect_status_dead_time.go
+++ b/rvpn/server/api_collect_status_dead_time.go
--- a/rvpn/server/api_collect_status_traffic.go
+++ b/rvpn/server/api_collect_status_traffic.go
--- a/rvpn/server/api_interface.go
+++ b/rvpn/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 (
--- a/rvpn/server/conn_tracking.go
+++ b/rvpn/server/conn_tracking.go
--- a/rvpn/server/conn_wedge.go
+++ b/rvpn/server/conn_wedge.go
--- a/rvpn/server/connection.go
+++ b/rvpn/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
--- a/rvpn/server/connection_registration.go
+++ b/rvpn/server/connection_registration.go
--- a/rvpn/server/connection_table.go
+++ b/rvpn/server/connection_table.go
--- a/rvpn/server/domain_loadbalance.go
+++ b/rvpn/server/domain_loadbalance.go
--- a/rvpn/server/domain_mapping.go
+++ b/rvpn/server/domain_mapping.go
--- a/rvpn/server/domain_track.go
+++ b/rvpn/server/domain_track.go
--- a/rvpn/server/listener_generic.go
+++ b/rvpn/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
--- a/rvpn/server/manager.go
+++ b/rvpn/server/manager.go
--- a/rvpn/server/one_conn.go
+++ b/rvpn/server/one_conn.go
--- a/rvpn/server/send_track.go
+++ b/rvpn/server/send_track.go
--- a/rvpn/server/setup.go
+++ b/rvpn/server/setup.go
--- a/rvpn/server/status.go
+++ b/rvpn/server/status.go
--- a/rvpn/server/status_dead_time.go
+++ b/rvpn/server/status_dead_time.go
--- a/rvpn/server/status_req_type.go
+++ b/rvpn/server/status_req_type.go
--- a/rvpn/server/status_traffic_connections.go
+++ b/rvpn/server/status_traffic_connections.go
--- a/rvpn/server/status_traffic_stats.go
+++ b/rvpn/server/status_traffic_stats.go
--- a/rvpn/sni/tls_get_hostname.go
+++ b/rvpn/sni/tls_get_hostname.go