Skip to content

Commit 7d7a6bd

Browse files
marshallstonemarshallstone
authored
Marshall/refactor structure (#189)
refactor a majority of conjure logic out of the gotapdance repo.
1 parent 40a75f2 commit 7d7a6bd

File tree

126 files changed

+16234
-1808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+16234
-1808
lines changed

‎Cargo.lock‎

Lines changed: 1114 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ test:
2222

2323
app:
2424
[ -d $(EXE_DIR) ] || mkdir -p $(EXE_DIR)
25-
go build -o ${EXE_DIR}/application ./application
25+
go build -o ${EXE_DIR}/application ./cmd/application
2626

2727
libtd:
2828
cd ./libtapdance/ && make libtapdance.a

‎application/Makefile‎ renamed to ‎cmd/application/Makefile‎

File renamed without changes.

‎application/README.md‎ renamed to ‎cmd/application/README.md‎

File renamed without changes.

‎application/app_config.toml‎ renamed to ‎cmd/application/app_config.toml‎

File renamed without changes.

‎application/conns.go‎ renamed to ‎cmd/application/conns.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"syscall"
1717
"time"
1818

19-
cj "github.com/refraction-networking/conjure/application/lib"
20-
"github.com/refraction-networking/conjure/application/log"
21-
"github.com/refraction-networking/conjure/application/transports"
19+
cj "github.com/refraction-networking/conjure/pkg/station/lib"
20+
"github.com/refraction-networking/conjure/pkg/station/log"
21+
"github.com/refraction-networking/conjure/pkg/transports"
2222
)
2323

2424
// connManagerConfig

‎application/conns_test.go‎ renamed to ‎cmd/application/conns_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ import (
1212
"testing"
1313
"time"
1414

15-
cj "github.com/refraction-networking/conjure/application/lib"
16-
"github.com/refraction-networking/conjure/application/log"
15+
"github.com/refraction-networking/conjure/internal/conjurepath"
16+
cj "github.com/refraction-networking/conjure/pkg/station/lib"
17+
"github.com/refraction-networking/conjure/pkg/station/log"
1718
)
1819

1920
// MockGeoIP is a mock implementation of the geoip.GeoIP interface.
@@ -41,7 +42,7 @@ func (m *MockGeoIP) ASN(ip net.IP) (uint, error) {
4142
}
4243

4344
func TestConnHandleNewTCPConn(t *testing.T) {
44-
testSubnetPath := os.Getenv("GOPATH") + "/src/github.com/refraction-networking/conjure/application/lib/test/phantom_subnets.toml"
45+
testSubnetPath := conjurepath.Root + "/pkg/station/lib/test/phantom_subnets.toml"
4546
os.Setenv("PHANTOM_SUBNET_LOCATION", testSubnetPath)
4647

4748
rm := cj.NewRegistrationManager(&cj.RegConfig{})
@@ -128,7 +129,7 @@ func TestConnHandleConcurrent(t *testing.T) {
128129
// We don't actually care about what gets written
129130
logger := log.New(ioutil.Discard, "[TEST CONN STATS] ", golog.Ldate|golog.Lmicroseconds)
130131

131-
testSubnetPath := os.Getenv("GOPATH") + "/src/github.com/refraction-networking/conjure/application/lib/test/phantom_subnets.toml"
132+
testSubnetPath := conjurepath.Root + "/pkg/station/lib/test/phantom_subnets.toml"
132133
os.Setenv("PHANTOM_SUBNET_LOCATION", testSubnetPath)
133134

134135
rm := cj.NewRegistrationManager(&cj.RegConfig{})

‎application/main.go‎ renamed to ‎cmd/application/main.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"syscall"
1111
"time"
1212

13-
cj "github.com/refraction-networking/conjure/application/lib"
14-
"github.com/refraction-networking/conjure/application/log"
15-
"github.com/refraction-networking/conjure/application/transports/wrapping/min"
16-
"github.com/refraction-networking/conjure/application/transports/wrapping/obfs4"
17-
"github.com/refraction-networking/conjure/application/transports/wrapping/prefix"
18-
pb "github.com/refraction-networking/gotapdance/protobuf"
13+
cj "github.com/refraction-networking/conjure/pkg/station/lib"
14+
"github.com/refraction-networking/conjure/pkg/station/log"
15+
"github.com/refraction-networking/conjure/pkg/transports/wrapping/min"
16+
"github.com/refraction-networking/conjure/pkg/transports/wrapping/obfs4"
17+
"github.com/refraction-networking/conjure/pkg/transports/wrapping/prefix"
18+
pb "github.com/refraction-networking/conjure/proto"
1919
)
2020

2121
var sharedLogger *log.Logger

‎application/registration_with_transport_test.go‎ renamed to ‎cmd/application/registration_with_transport_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import (
66
"os"
77
"testing"
88

9-
cj "github.com/refraction-networking/conjure/application/lib"
10-
"github.com/refraction-networking/conjure/application/transports/wrapping/min"
11-
"github.com/refraction-networking/conjure/application/transports/wrapping/obfs4"
9+
"github.com/refraction-networking/conjure/internal/conjurepath"
1210
"github.com/refraction-networking/conjure/pkg/core"
11+
cj "github.com/refraction-networking/conjure/pkg/station/lib"
12+
"github.com/refraction-networking/conjure/pkg/transports/wrapping/min"
13+
"github.com/refraction-networking/conjure/pkg/transports/wrapping/obfs4"
1314

14-
pb "github.com/refraction-networking/gotapdance/protobuf"
15+
pb "github.com/refraction-networking/conjure/proto"
1516
"github.com/stretchr/testify/require"
1617
"google.golang.org/protobuf/proto"
1718
)
@@ -37,9 +38,8 @@ func mockReceiveFromDetector() (*pb.ClientToStation, cj.ConjureSharedKeys) {
3738
}
3839

3940
func TestManagerFunctionality(t *testing.T) {
40-
cwd, _ := os.Getwd()
41-
testSubnetPath := cwd + "/lib/test/phantom_subnets.toml"
42-
os.Setenv("PHANTOM_SUBNET_LOCATION", testSubnetPath)
41+
root := conjurepath.Root
42+
os.Setenv("PHANTOM_SUBNET_LOCATION", root+"/pkg/station/lib/test/phantom_subnets.toml")
4343

4444
rm := cj.NewRegistrationManager(&cj.RegConfig{})
4545

‎cmd/registration-server/main.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ import (
1212
"time"
1313

1414
"github.com/BurntSushi/toml"
15-
"github.com/refraction-networking/conjure/application/lib"
16-
"github.com/refraction-networking/conjure/application/transports/wrapping/min"
17-
"github.com/refraction-networking/conjure/application/transports/wrapping/obfs4"
18-
"github.com/refraction-networking/conjure/application/transports/wrapping/prefix"
19-
"github.com/refraction-networking/conjure/pkg/apiregserver"
20-
"github.com/refraction-networking/conjure/pkg/dnsregserver"
15+
2116
"github.com/refraction-networking/conjure/pkg/metrics"
2217
"github.com/refraction-networking/conjure/pkg/regprocessor"
23-
pb "github.com/refraction-networking/gotapdance/protobuf"
18+
"github.com/refraction-networking/conjure/pkg/regserver/apiregserver"
19+
"github.com/refraction-networking/conjure/pkg/regserver/dnsregserver"
20+
"github.com/refraction-networking/conjure/pkg/station/lib"
21+
"github.com/refraction-networking/conjure/pkg/transports/wrapping/min"
22+
"github.com/refraction-networking/conjure/pkg/transports/wrapping/obfs4"
23+
"github.com/refraction-networking/conjure/pkg/transports/wrapping/prefix"
24+
pb "github.com/refraction-networking/conjure/proto"
2425
log "github.com/sirupsen/logrus"
2526
"google.golang.org/protobuf/proto"
2627
)

0 commit comments

Comments
 (0)