Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/outline-ss-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp"
"golang.org/x/term"

"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
onet "github.com/Jigsaw-Code/outline-ss-server/net"
outline_prometheus "github.com/Jigsaw-Code/outline-ss-server/prometheus"
"github.com/Jigsaw-Code/outline-ss-server/service"
"golang.getoutline.org/tunnel-server/ipinfo"
onet "golang.getoutline.org/tunnel-server/net"
outline_prometheus "golang.getoutline.org/tunnel-server/prometheus"
"golang.getoutline.org/tunnel-server/service"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/outline-ss-server/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"time"

"github.com/Jigsaw-Code/outline-ss-server/service"
"golang.getoutline.org/tunnel-server/service"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/outline-ss-server/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"
"time"

"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
"golang.getoutline.org/tunnel-server/ipinfo"
"github.com/op/go-logging"
"github.com/prometheus/client_golang/prometheus"
promtest "github.com/prometheus/client_golang/prometheus/testutil"
Expand Down
2 changes: 1 addition & 1 deletion cmd/outline-ss-server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"
"time"

"github.com/Jigsaw-Code/outline-ss-server/prometheus"
"golang.getoutline.org/tunnel-server/prometheus"
)

func TestRunOutlineServer(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Jigsaw-Code/outline-ss-server
module golang.getoutline.org/tunnel-server

require (
github.com/Jigsaw-Code/outline-sdk v0.0.18-0.20241106233708-faffebb12629
Expand Down
4 changes: 2 additions & 2 deletions internal/integration_test/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (

"github.com/Jigsaw-Code/outline-sdk/transport"
"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
"github.com/Jigsaw-Code/outline-ss-server/service"
"github.com/Jigsaw-Code/outline-ss-server/service/metrics"
"golang.getoutline.org/tunnel-server/service"
"golang.getoutline.org/tunnel-server/service/metrics"
logging "github.com/op/go-logging"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
6 changes: 3 additions & 3 deletions prometheus/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"sync"
"time"

"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
"github.com/Jigsaw-Code/outline-ss-server/service"
"github.com/Jigsaw-Code/outline-ss-server/service/metrics"
"golang.getoutline.org/tunnel-server/ipinfo"
"golang.getoutline.org/tunnel-server/service"
"golang.getoutline.org/tunnel-server/service/metrics"
"github.com/prometheus/client_golang/prometheus"
)

Expand Down
4 changes: 2 additions & 2 deletions prometheus/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"testing"
"time"

"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
"github.com/Jigsaw-Code/outline-ss-server/service/metrics"
"golang.getoutline.org/tunnel-server/ipinfo"
"golang.getoutline.org/tunnel-server/service/metrics"
"github.com/op/go-logging"
"github.com/prometheus/client_golang/prometheus"
promtest "github.com/prometheus/client_golang/prometheus/testutil"
Expand Down
2 changes: 1 addition & 1 deletion service/shadowsocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/Jigsaw-Code/outline-sdk/transport"

onet "github.com/Jigsaw-Code/outline-ss-server/net"
onet "golang.getoutline.org/tunnel-server/net"
)

// 59 seconds is most common timeout for servers that do not respond to invalid requests
Expand Down
4 changes: 2 additions & 2 deletions service/tcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
"github.com/shadowsocks/go-shadowsocks2/socks"

onet "github.com/Jigsaw-Code/outline-ss-server/net"
"github.com/Jigsaw-Code/outline-ss-server/service/metrics"
onet "golang.getoutline.org/tunnel-server/net"
"golang.getoutline.org/tunnel-server/service/metrics"
)

// TCPConnMetrics is used to report metrics on TCP connections.
Expand Down
2 changes: 1 addition & 1 deletion service/tcp_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/Jigsaw-Code/outline-sdk/transport"

onet "github.com/Jigsaw-Code/outline-ss-server/net"
onet "golang.getoutline.org/tunnel-server/net"
)

// fwmark can be used in conjunction with other Linux networking features like cgroups, network namespaces, and TC (Traffic Control) for sophisticated network management.
Expand Down
2 changes: 1 addition & 1 deletion service/tcp_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/Jigsaw-Code/outline-sdk/transport"

onet "github.com/Jigsaw-Code/outline-ss-server/net"
onet "golang.getoutline.org/tunnel-server/net"
)

// fwmark can be used in conjunction with other Linux networking features like cgroups, network namespaces, and TC (Traffic Control) for sophisticated network management.
Expand Down
2 changes: 1 addition & 1 deletion service/tcp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/shadowsocks/go-shadowsocks2/socks"
"github.com/stretchr/testify/require"

"github.com/Jigsaw-Code/outline-ss-server/service/metrics"
"golang.getoutline.org/tunnel-server/service/metrics"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions service/udp.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
"github.com/shadowsocks/go-shadowsocks2/socks"

"github.com/Jigsaw-Code/outline-ss-server/internal/slicepool"
onet "github.com/Jigsaw-Code/outline-ss-server/net"
"golang.getoutline.org/tunnel-server/internal/slicepool"
onet "golang.getoutline.org/tunnel-server/net"
)

// NATMetrics is used to report NAT related metrics.
Expand Down
2 changes: 1 addition & 1 deletion service/udp_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/Jigsaw-Code/outline-sdk/transport"

onet "github.com/Jigsaw-Code/outline-ss-server/net"
onet "golang.getoutline.org/tunnel-server/net"
)

type udpListener struct {
Expand Down
2 changes: 1 addition & 1 deletion service/udp_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/Jigsaw-Code/outline-sdk/transport"

onet "github.com/Jigsaw-Code/outline-ss-server/net"
onet "golang.getoutline.org/tunnel-server/net"
)

type udpListener struct {
Expand Down
2 changes: 1 addition & 1 deletion service/udp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

onet "github.com/Jigsaw-Code/outline-ss-server/net"
onet "golang.getoutline.org/tunnel-server/net"
)

const timeout = 5 * time.Minute
Expand Down