global: begin modularization

dongdongxiang · Mar 3, 2019 · 69f0fe6 · 69f0fe6
1 parent d435be3
commit 69f0fe6
Show file tree

Hide file tree

Showing 44 changed files with 118 additions and 109 deletions.
diff --git a/Makefile b/Makefile
@@ -24,10 +24,10 @@ MAKEFLAGS += --no-print-directory
 generate-version-and-build:
 	@export GIT_CEILING_DIRECTORIES="$(realpath $(CURDIR)/..)" && \
 	tag="$$(git describe --dirty 2>/dev/null)" && \
-	ver="$$(printf 'package main\nconst WireGuardGoVersion = "%s"\n' "$$tag")" && \
-	[ "$$(cat version.go 2>/dev/null)" != "$$ver" ] && \
-	echo "$$ver" > version.go && \
-	git update-index --assume-unchanged version.go || true
+	ver="$$(printf 'package device\nconst WireGuardGoVersion = "%s"\n' "$$tag")" && \
+	[ "$$(cat device/version.go 2>/dev/null)" != "$$ver" ] && \
+	echo "$$ver" > device/version.go && \
+	git update-index --assume-unchanged device/version.go || true
 	@$(MAKE) wireguard-go
 
 wireguard-go: $(wildcard *.go) $(wildcard */*.go)

diff --git a/allowedips.go → device/allowedips.go b/allowedips.go → device/allowedips.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"errors"

diff --git a/allowedips_rand_test.go → device/allowedips_rand_test.go b/allowedips_rand_test.go → device/allowedips_rand_test.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"math/rand"

diff --git a/allowedips_test.go → device/allowedips_test.go b/allowedips_test.go → device/allowedips_test.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"math/rand"

diff --git a/bind_test.go → device/bind_test.go b/bind_test.go → device/bind_test.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import "errors"
 

diff --git a/conn.go → device/conn.go b/conn.go → device/conn.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"errors"
@@ -177,4 +177,4 @@ func (device *Device) BindClose() error {
 	err := unsafeCloseBind(device)
 	device.net.Unlock()
 	return err
-}
+}
diff --git a/conn_default.go → device/conn_default.go b/conn_default.go → device/conn_default.go
@@ -5,7 +5,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"net"

diff --git a/conn_linux.go → device/conn_linux.go b/conn_linux.go → device/conn_linux.go
@@ -14,7 +14,7 @@
  * So this code is remains platform dependent.
  */
 
-package main
+package device
 
 import (
 	"errors"

diff --git a/constants.go → device/constants.go b/constants.go → device/constants.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"time"

diff --git a/cookie.go → device/cookie.go b/cookie.go → device/cookie.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"crypto/hmac"

diff --git a/cookie_test.go → device/cookie_test.go b/cookie_test.go → device/cookie_test.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"testing"

diff --git a/device.go → device/device.go b/device.go → device/device.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"golang.zx2c4.com/wireguard/ratelimiter"

diff --git a/device_test.go → device/device_test.go b/device_test.go → device/device_test.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 /* Create two device instances and simulate full WireGuard interaction
  * without network dependencies

diff --git a/endpoint_test.go → device/endpoint_test.go b/endpoint_test.go → device/endpoint_test.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"math/rand"

diff --git a/indextable.go → device/indextable.go b/indextable.go → device/indextable.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"crypto/rand"

diff --git a/ip.go → device/ip.go b/ip.go → device/ip.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"net"

diff --git a/kdf_test.go → device/kdf_test.go b/kdf_test.go → device/kdf_test.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"encoding/hex"

diff --git a/keypair.go → device/keypair.go b/keypair.go → device/keypair.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"crypto/cipher"

diff --git a/logger.go → device/logger.go b/logger.go → device/logger.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"io"

diff --git a/mark_default.go → device/mark_default.go b/mark_default.go → device/mark_default.go
@@ -5,7 +5,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 func (bind *NativeBind) SetMark(mark uint32) error {
 	return nil

diff --git a/mark_unix.go → device/mark_unix.go b/mark_unix.go → device/mark_unix.go
@@ -5,7 +5,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"golang.org/x/sys/unix"

diff --git a/misc.go → device/misc.go b/misc.go → device/misc.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"sync/atomic"

diff --git a/noise-helpers.go → device/noise-helpers.go b/noise-helpers.go → device/noise-helpers.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"crypto/hmac"

diff --git a/noise-protocol.go → device/noise-protocol.go b/noise-protocol.go → device/noise-protocol.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"errors"

diff --git a/noise-types.go → device/noise-types.go b/noise-types.go → device/noise-types.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"crypto/subtle"

diff --git a/noise_test.go → device/noise_test.go b/noise_test.go → device/noise_test.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"bytes"

diff --git a/peer.go → device/peer.go b/peer.go → device/peer.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"encoding/base64"

diff --git a/pools.go → device/pools.go b/pools.go → device/pools.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import "sync"
 

diff --git a/queueconstants.go → device/queueconstants.go b/queueconstants.go → device/queueconstants.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 /* Implementation specific constants */
 

diff --git a/receive.go → device/receive.go b/receive.go → device/receive.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"bytes"

diff --git a/send.go → device/send.go b/send.go → device/send.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"bytes"

diff --git a/timers.go → device/timers.go b/timers.go → device/timers.go
@@ -5,7 +5,7 @@
  * This is based heavily on timers.c from the kernel implementation.
  */
 
-package main
+package device
 
 import (
 	"math/rand"

diff --git a/tun.go → device/tun.go b/tun.go → device/tun.go
@@ -3,7 +3,7 @@
  * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
  */
 
-package main
+package device
 
 import (
 	"golang.zx2c4.com/wireguard/tun"