Merge protocol #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

draganm wants to merge 4 commits into main from merge-protocol

.github/workflows/nightly-release.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,11 +21,16 @@ jobs: @@
           - name: "Setup nix env"
             uses: JRMurr/direnv-nix-action@v4.1.0
-          - name: Use Latest userwireguard and protocol
+          - name: Check if the current protobuf go files are up to date
+            working-directory: protocol
+            run: |
+              make
+              git diff --exit-code
+          - name: Use Latest userwireguard
             run: |
               go mod edit -dropreplace github.com/urnetwork/userwireguard@v0.0.0
-              go mod edit -dropreplace github.com/urnetwork/protocol@v0.0.0
-              go mod edit -require github.com/urnetwork/userwireguard@latest -require github.com/urnetwork/protocol@latest
+              go mod edit -require github.com/urnetwork/userwireguard@latest
               go mod tidy
           - name: Install semver-release
@@ Expand Down @@

.github/workflows/run-tests.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,11 +24,16 @@ jobs: @@
           - name: "Setup env"
             uses: JRMurr/direnv-nix-action@v4.1.0
-          - name: Use Latest userwireguard and protocol
+          - name: Check if the current protobuf go files are up to date
+            working-directory: protocol
+            run: |
+              make
+              git diff --exit-code
+          - name: Use Latest userwireguard
             run: |
               go mod edit -dropreplace github.com/urnetwork/userwireguard@v0.0.0
-              go mod edit -dropreplace github.com/urnetwork/protocol@v0.0.0
-              go mod edit -require github.com/urnetwork/userwireguard@latest -require github.com/urnetwork/protocol@latest
+              go mod edit -require github.com/urnetwork/userwireguard@latest
               go mod tidy
           - name: Run Tests
@@ Expand Down @@

connect.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"github.com/oklog/ulid/v2"
-    	"github.com/urnetwork/protocol"
+    	"github.com/urnetwork/connect/protocol"
     )
     const MaxMultihopLength = 8
@@ Expand Down @@

connectctl/main.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ import ( @@
     	"github.com/docopt/docopt-go"
     	"github.com/urnetwork/connect"
-    	"github.com/urnetwork/protocol"
+    	"github.com/urnetwork/connect/protocol"
     )
     const ConnectCtlVersion = "0.0.1"
@@ Expand Down @@

extenderctl/main.gox

-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ import ( @@
     	"github.com/urnetwork/connect"
     	// "github.com/urnetwork/connect"
-    	// "github.com/urnetwork/protocol"
+    	// "github.com/urnetwork/connect/protocol"
     )
     // run [secret] [allowed host] [port]
@@ Expand Down @@

frame.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"google.golang.org/protobuf/proto"
-    	"github.com/urnetwork/protocol"
+    	"github.com/urnetwork/connect/protocol"
     )
     func ToFrame(message proto.Message) (*protocol.Frame, error) {
@@ Expand Down @@

go.mod

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ require ( @@
     	github.com/mattn/go-shellwords v1.0.12
     	github.com/oklog/ulid/v2 v2.1.0
     	github.com/quic-go/quic-go v0.46.0
-    	github.com/urnetwork/protocol v0.0.0
     	github.com/urnetwork/userwireguard v0.0.0
     	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
     	golang.org/x/term v0.20.0
@@ Expand Down Expand Up / @@ -62,6 +61,4 @@ require ( @@
     	gopkg.in/yaml.v3 v3.0.1 // indirect
     )
-    replace github.com/urnetwork/protocol v0.0.0 => ../protocol
     replace github.com/urnetwork/userwireguard v0.0.0 => ../userwireguard

go.sum

-Original file line number
+Diff line change
@@ Expand Up @@
     github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
     github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
     github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-    github.com/urnetwork/protocol v0.1.0 h1:XgBEVJ+8K24jVJH37CwkBi/szzh54PWBQaODElto5KQ=
-    github.com/urnetwork/protocol v0.1.0/go.mod h1:+JJm4mqeK95mTRMAGMeddzdUpPEnZmp2U8RYPjXb/JQ=
+    github.com/urnetwork/connect/protocol v0.1.0 h1:XgBEVJ+8K24jVJH37CwkBi/szzh54PWBQaODElto5KQ=
+    github.com/urnetwork/connect/protocol v0.1.0/go.mod h1:+JJm4mqeK95mTRMAGMeddzdUpPEnZmp2U8RYPjXb/JQ=
     github.com/urnetwork/userwireguard v0.0.1 h1:6tG7Oas3Ca1UPjenVmcuYmX87uRIyzc/3hz640wFwsM=
     github.com/urnetwork/userwireguard v0.0.1/go.mod h1:4o4/Mpn+ipHHx998wXkRt4yRXZh1bMMl2Ybivh71gLo=
     go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
@@ Expand Down @@

ip.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ import ( @@
     	"github.com/golang/glog"
-    	"github.com/urnetwork/protocol"
+    	"github.com/urnetwork/connect/protocol"
     )
     // implements user-space NAT (UNAT) and packet inspection
@@ Expand Down @@

ip_remote_multi_client.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ import ( @@
     	"github.com/golang/glog"
-    	"github.com/urnetwork/protocol"
+    	"github.com/urnetwork/connect/protocol"
     )
     // multi client is a sender approach to mitigate bad destinations
@@ Expand Down @@

ip_remote_multi_client_test.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ import ( @@
     	"github.com/go-playground/assert/v2"
-    	"github.com/urnetwork/protocol"
+    	"github.com/urnetwork/connect/protocol"
     )
     func TestMultiClientUdp4(t *testing.T) {
@@ Expand Down @@

ip_test.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ import ( @@
     	"github.com/go-playground/assert/v2"
-    	"github.com/urnetwork/protocol"
+    	"github.com/urnetwork/connect/protocol"
     )
     func TestClientUdp4(t *testing.T) {
@@ Expand Down @@

net_extender.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ import ( @@
     	// "src.agwa.name/tlshacks"
-    	"github.com/urnetwork/protocol"
+    	"github.com/urnetwork/connect/protocol"
     )
     // an extender uses an independent url that is hard-coded to forward to the platform
@@ Expand Down @@

net_extender_server.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ import ( @@
     	// "src.agwa.name/tlshacks"
-    	"github.com/urnetwork/protocol"
+    	"github.com/urnetwork/connect/protocol"
     )
     // server listens for a tls connect and replies with a self-signed cert
@@ Expand Down @@

protocol/MOVED.md

This file was deleted.

protocol/Makefile

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,6 @@

		all:
		protoc -I=. --go_out=. --go_opt=paths=source_relative *.proto

Provide feedback