Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coyove/goflyway
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.11b
Choose a base ref
...
head repository: coyove/goflyway
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
5 contributors
Loading
Showing with 3,409 additions and 54,541 deletions.
  1. +15 −3 .gitignore
  2. BIN .misc/logo.png
  3. +0 −10 Dockerfile
  4. +0 −50 Makefile
  5. +0 −38,820 chinalist.txt
  6. +171 −0 client.go
  7. +478 −123 cmd/goflyway/main.go
  8. +62 −0 cmd/mitm-relay/index.py
  9. +0 −4 debug.bat
  10. +0 −11 docker.Makefile
  11. +23 −0 fd/fd.go
  12. +17 −0 fd/fd_go19.go
  13. +17 −0 fd/fd_non_go19.go
  14. +38 −0 fd/fd_unix.go
  15. +14 −0 fd/fd_windows.go
  16. +0 −8 goflyway.conf
  17. +68 −0 io.go
  18. +0 −226 pkg/bitsop/bitsop.go
  19. +0 −62 pkg/bitsop/bitsop_test.go
  20. +0 −214 pkg/config/conf.go
  21. +0 −125 pkg/config/conf_test.go
  22. +0 −9 pkg/counter/counter_darwin.go
  23. +0 −16 pkg/counter/counter_linux.go
  24. +0 −24 pkg/counter/counter_windows.go
  25. +0 −207 pkg/logg/logg.go
  26. +0 −7,762 pkg/lookup/chinaip.go
  27. +0 −213 pkg/lookup/lookup.go
  28. +0 −7 pkg/lookup/privateip.go
  29. +0 −166 pkg/lru/lru.go
  30. +0 −240 pkg/shoco/shoco.go
  31. +0 −170 pkg/shoco/shoco_table.go
  32. +0 −51 pkg/shoco/shoco_test.go
  33. +0 −1,551 pkg/tlds/tlds.go
  34. +0 −402 proxy/cipher.go
  35. +0 −487 proxy/client.go
  36. +0 −154 proxy/multiplexer.go
  37. +0 −298 proxy/server.go
  38. +0 −440 proxy/udp.go
  39. +0 −343 proxy/util.go
  40. +0 −150 proxy/util_test.go
  41. +0 −219 proxy/web.go
  42. +26 −64 readme.md
  43. +93 −0 server.go
  44. +0 −6 shared/build.bat
  45. +0 −28 shared/goflywin/goflywin.sln
  46. +0 −6 shared/goflywin/src/App.config
  47. +0 −22 shared/goflywin/src/Program.cs
  48. +0 −36 shared/goflywin/src/Properties/AssemblyInfo.cs
  49. +0 −63 shared/goflywin/src/Properties/Resources.Designer.cs
  50. +0 −117 shared/goflywin/src/Properties/Resources.resx
  51. +0 −26 shared/goflywin/src/Properties/Settings.Designer.cs
  52. +0 −7 shared/goflywin/src/Properties/Settings.settings
  53. +0 −73 shared/goflywin/src/Resource1.Designer.cs
  54. +0 −124 shared/goflywin/src/Resource1.resx
  55. BIN shared/goflywin/src/Resources/logo_ZS6_icon.ico
  56. +0 −116 shared/goflywin/src/Server.cs
  57. +0 −500 shared/goflywin/src/formMain.Designer.cs
  58. +0 −289 shared/goflywin/src/formMain.cs
  59. +0 −120 shared/goflywin/src/formMain.resx
  60. +0 −120 shared/goflywin/src/goflywin.csproj
  61. +0 −39 shared/main.c
  62. +0 −133 shared/main.go
  63. +0 −75 shared/main.h
  64. +139 −0 ssvpn_interop.go
  65. +13 −0 ssvpn_windows.go
  66. +267 −0 toh/client_conn.go
  67. +152 −0 toh/conn_test.go
  68. +99 −0 toh/dnshelper/dns.go
  69. +8 −0 toh/dnshelper/dns_test.go
  70. +109 −0 toh/frame.go
  71. +67 −0 toh/frame_test.go
  72. +142 −0 toh/listendial.go
  73. +110 −0 toh/option.go
  74. +130 −0 toh/orch.go
  75. +154 −0 toh/proxy_test.go
  76. +220 −0 toh/read_conn.go
  77. +281 −0 toh/server_conn.go
  78. +66 −0 toh/util.go
  79. +264 −0 toh/websocket.go
  80. +42 −11 proxy/tokenbucket.go → util.go
  81. +1 −1 pkg/logg/wsaerrno.go → v/errno.go
  82. +123 −0 v/vprint.go
18 changes: 15 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
top-1m.csv
goflyway.exe
goflyway.dll
debug
launch.json
*.exe
*.dll
*.a
*.csv.*
.vscode
build/
.DS_Store
ca.pem
key.pem
gfw.conf

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
@@ -308,4 +316,8 @@ __pycache__/
*.xsd.cs

# OpenCover UI analysis results
OpenCover/
OpenCover/
heap.txt
*.keystore
cmd/goflyway/lib
shadowsocks*
Binary file added .misc/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions Dockerfile
View file

This file was deleted.

50 changes: 0 additions & 50 deletions Makefile
View file

This file was deleted.

Loading