Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ jobs:
run: |
go run github.com/google/go-licenses check \
--allowed_licenses=Apache-2.0,Apache-3,BSD-2-Clause,BSD-2-Clause,BSD-3-Clause,BSD-4-Clause,CC0-1.0,ISC,MIT \
--ignore github.com/Jigsaw-Code/outline-ss-server \
--ignore github.com/OutlineFoundation/outline-ss-server \
./...
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Outline ss-server

[![Build Status](https://github.com/Jigsaw-Code/outline-ss-server/actions/workflows/go.yml/badge.svg)](https://github.com/Jigsaw-Code/outline-ss-server/actions/workflows/go.yml?query=branch%3Amaster)
[![Build Status](https://github.com/OutlineFoundation/outline-ss-server/actions/workflows/go.yml/badge.svg)](https://github.com/OutlineFoundation/outline-ss-server/actions/workflows/go.yml?query=branch%3Amaster)

[![Go Report Card](https://goreportcard.com/badge/github.com/Jigsaw-Code/outline-ss-server)](https://goreportcard.com/report/github.com/Jigsaw-Code/outline-ss-server)
[![Go Reference](https://pkg.go.dev/badge/github.com/Jigsaw-Code/outline-ss-server.svg)](https://pkg.go.dev/github.com/Jigsaw-Code/outline-ss-server)
[![Go Report Card](https://goreportcard.com/badge/github.com/OutlineFoundation/outline-ss-server)](https://goreportcard.com/report/github.com/OutlineFoundation/outline-ss-server)
[![Go Reference](https://pkg.go.dev/badge/github.com/OutlineFoundation/outline-ss-server.svg)](https://pkg.go.dev/github.com/OutlineFoundation/outline-ss-server)

[![Mattermost](https://badgen.net/badge/Mattermost/Outline%20Community/blue)](https://community.internetfreedomfestival.org/community/channels/outline-community)
[![Reddit](https://badgen.net/badge/Reddit/r%2Foutlinevpn/orange)](https://www.reddit.com/r/outlinevpn/)
Expand Down Expand Up @@ -149,14 +149,14 @@ go run github.com/go-task/task/v3/cmd/task test

You can benchmark the cipher finding code with
```
go test -cpuprofile cpu.prof -memprofile mem.prof -bench . -benchmem -run=^$ github.com/Jigsaw-Code/outline-ss-server/shadowsocks
go test -cpuprofile cpu.prof -memprofile mem.prof -bench . -benchmem -run=^$ github.com/OutlineFoundation/outline-ss-server/shadowsocks
```

You can inspect the CPU or memory profiles with `go tool pprof cpu.prof` or `go tool pprof mem.prof`, and then enter `web` on the prompt.

## Release

We use [GoReleaser](https://goreleaser.com/) to build and upload binaries to our [GitHub releases](https://github.com/Jigsaw-Code/outline-ss-server/releases).
We use [GoReleaser](https://goreleaser.com/) to build and upload binaries to our [GitHub releases](https://github.com/OutlineFoundation/outline-ss-server/releases).

Summary:
- Test the build locally:
Expand All @@ -177,7 +177,7 @@ Summary:
```bash
go run github.com/go-task/task/v3/cmd/task release
```
- Go to https://github.com/Jigsaw-Code/outline-ss-server/releases, review and publish the release.
- Go to https://github.com/OutlineFoundation/outline-ss-server/releases, review and publish the release.

- Delete the Github token you created for the release on the [Personal Access Tokens page](https://github.com/settings/tokens).

Expand Down
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"
"github.com/OutlineFoundation/outline-ss-server/ipinfo"
onet "github.com/OutlineFoundation/outline-ss-server/net"
outline_prometheus "github.com/OutlineFoundation/outline-ss-server/prometheus"
"github.com/OutlineFoundation/outline-ss-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"
"github.com/OutlineFoundation/outline-ss-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"
"github.com/OutlineFoundation/outline-ss-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"
"github.com/OutlineFoundation/outline-ss-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 github.com/OutlineFoundation/outline-ss-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"
"github.com/OutlineFoundation/outline-ss-server/service"
"github.com/OutlineFoundation/outline-ss-server/service/metrics"
logging "github.com/op/go-logging"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion outlinecaddy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ From this directory, build and run a custom Caddy binary with this Go module plu
xcaddy build \
--with github.com/iamd3vil/caddy_yaml_adapter \
--with github.com/mholt/caddy-l4 \
--with github.com/Jigsaw-Code/outline-ss-server/outlinecaddy
--with github.com/OutlineFoundation/outline-ss-server/outlinecaddy
./caddy run --config examples/simple.yaml --adapter yaml --watch
```

Expand Down
2 changes: 1 addition & 1 deletion outlinecaddy/cmd/caddy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package main
import (
caddycmd "github.com/caddyserver/caddy/v2/cmd"

_ "github.com/Jigsaw-Code/outline-ss-server/outlinecaddy"
_ "github.com/OutlineFoundation/outline-ss-server/outlinecaddy"
_ "github.com/caddyserver/caddy/v2/modules/standard"
_ "github.com/iamd3vil/caddy_yaml_adapter"
_ "github.com/mholt/caddy-l4"
Expand Down
2 changes: 1 addition & 1 deletion outlinecaddy/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Jigsaw-Code/outline-ss-server/outlinecaddy
module github.com/OutlineFoundation/outline-ss-server/outlinecaddy

go 1.23

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"
"github.com/OutlineFoundation/outline-ss-server/ipinfo"
"github.com/OutlineFoundation/outline-ss-server/service"
"github.com/OutlineFoundation/outline-ss-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"
"github.com/OutlineFoundation/outline-ss-server/ipinfo"
"github.com/OutlineFoundation/outline-ss-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 "github.com/OutlineFoundation/outline-ss-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 "github.com/OutlineFoundation/outline-ss-server/net"
"github.com/OutlineFoundation/outline-ss-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 "github.com/OutlineFoundation/outline-ss-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 "github.com/OutlineFoundation/outline-ss-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"
"github.com/OutlineFoundation/outline-ss-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"
"github.com/OutlineFoundation/outline-ss-server/internal/slicepool"
onet "github.com/OutlineFoundation/outline-ss-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 "github.com/OutlineFoundation/outline-ss-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 "github.com/OutlineFoundation/outline-ss-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 "github.com/OutlineFoundation/outline-ss-server/net"
)

const timeout = 5 * time.Minute
Expand Down
Loading