mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-23 15:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,098 Commits 18 Branches 69 Tags 10 MiB
75729ce779
Commit Graph

1098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mocking
4140bcd11a Enhancement of "redirect" function, adding support for MacOS 
Added the function of "MacOS" FreeBSD firewall traffic forwarding and resolving destination address
example:
"inbounds": [
{
"listen": "127.0.0.1",
"port": 1122,
"protocol": "dokodemo-door",
"tag": "dokodemo",
"settings": {
"network": "tcp",
"followRedirect": true,
"userLevel": 0
},
"streamSettings": {
"sockopt": {
"tproxy": "Redirect"
}
}
}
]

还原#1189 提交
 2022-08-22 10:33:58 -04:00
S-Mocking
59602db02d
Add "tproxy" option (#1189) 
* Add "tproxy" option
Added the function of "MacOS" FreeBSD firewall traffic forwarding and resolving destination address
example:
  "inbounds": [
    {
      "listen": "127.0.0.1",
      "port": 1122,
      "protocol": "dokodemo-door",
      "tag": "dokodemo",
      "settings": {
        "network": "tcp",
        "followRedirect": true,
        "userLevel": 0
      },
      "streamSettings": {
        "sockopt": {
          "tproxy": "pf"
        }
      }
    }
  ]

* Add "tproxy" option
Added the function of "MacOS" FreeBSD firewall traffic forwarding and resolving destination address
example:
  "inbounds": [
    {
      "listen": "127.0.0.1",
      "port": 1122,
      "protocol": "dokodemo-door",
      "tag": "dokodemo",
      "settings": {
        "network": "tcp",
        "followRedirect": true,
        "userLevel": 0
      },
      "streamSettings": {
        "sockopt": {
          "tproxy": "pf"
        }
      }
    }
  ]

* Add "tproxy" option
Added the function of "MacOS" FreeBSD firewall traffic forwarding and resolving destination address
example:
  "inbounds": [
    {
      "listen": "127.0.0.1",
      "port": 1122,
      "protocol": "dokodemo-door",
      "tag": "dokodemo",
      "settings": {
        "network": "tcp",
        "followRedirect": true,
        "userLevel": 0
      },
      "streamSettings": {
        "sockopt": {
          "tproxy": "pf"
        }
      }
    }
  ]

Co-authored-by: Mocking <fanhaiwang0817@gmail.com>
 2022-08-20 09:02:18 -04:00
ksco.he
76638d793c fix(udp): check addr nil (close 1807) 2022-08-12 20:33:33 -04:00
yuhan6665
b67314796f Add shadowsocks 2022 relay config 2022-08-09 10:37:21 -04:00
yuhan6665
340234166b
Add TCPKeepAliveIdle in Sockopt option (#1166) 
* Add TCP keep alive idle setting

* Add TCP keep alive idle setting: auto generated

* Add TCP keep alive support in Linux

* Add TCP keep alive support in MacOS, FreeBSD

* Add TCP keep alive support in Windows

* fix bug introduced in adding tcp keep alive adjustment

* embed macOS const to avoid platform inconsistency

* embed macOS const to avoid platform inconsistency(again)

* add TCP Keep Alive support in config

* use sys/unix instead of syscall

Suggestion from:
https://github.com/v2fly/v2ray-core/pull/1395#issuecomment-974761647

* use sys/unix instead of syscall

Suggestion from:
https://github.com/v2fly/v2ray-core/pull/1395#issuecomment-974761647

* Separate TcpKeepAliveIdle and TcpKeepAliveInterval check logic

* Disable tcp keepAlive when TcpKeepAliveIdle < 0 and  TcpKeepAliveInterval <= 0

Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com>

Co-authored-by: ValdikSS <iam@valdikss.org.ru>
Co-authored-by: Shelikhoo <xiaokangwang@outlook.com>
Co-authored-by: xqzr <34030394+xqzr@users.noreply.github.com>
 2022-07-31 09:55:40 -04:00
dependabot[bot]
50b5ea5a54 Bump google.golang.org/protobuf from 1.28.0 to 1.28.1 
Bumps [google.golang.org/protobuf](https://github.com/protocolbuffers/protobuf-go) from 1.28.0 to 1.28.1.
- [Release notes](https://github.com/protocolbuffers/protobuf-go/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf-go/blob/master/release.bash)
- [Commits](https://github.com/protocolbuffers/protobuf-go/compare/v1.28.0...v1.28.1)

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-28 22:47:35 -04:00
yuhan6665
5e323958b6 Unify dns log 2022-07-24 23:54:58 -04:00
dependabot[bot]
2b46178ff9 Bump github.com/lucas-clemente/quic-go from 0.28.0 to 0.28.1 
Bumps [github.com/lucas-clemente/quic-go](https://github.com/lucas-clemente/quic-go) from 0.28.0 to 0.28.1.
- [Release notes](https://github.com/lucas-clemente/quic-go/releases)
- [Changelog](https://github.com/lucas-clemente/quic-go/blob/master/Changelog.md)
- [Commits](https://github.com/lucas-clemente/quic-go/compare/v0.28.0...v0.28.1)

---
updated-dependencies:
- dependency-name: github.com/lucas-clemente/quic-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-24 23:43:57 -04:00
dependabot[bot]
c835622b37 Bump github.com/refraction-networking/utls from 1.1.0 to 1.1.1 
Bumps [github.com/refraction-networking/utls](https://github.com/refraction-networking/utls) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/refraction-networking/utls/releases)
- [Commits](https://github.com/refraction-networking/utls/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: github.com/refraction-networking/utls
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-20 21:16:05 -04:00
yuhan6665
05483cc729 Update version 1.5.9 2022-07-15 22:05:40 -04:00
yuhan6665
b4e11e1856 Update other dependencies 2022-07-15 22:05:40 -04:00
yuhan6665
f956b142d8 Use protojson for marshal api output 2022-07-15 22:05:40 -04:00
世界
7d52ded2a3
Update dependencies 2022-07-16 09:33:03 +08:00
dependabot[bot]
e459daaaf6 Bump google.golang.org/grpc from 1.47.0 to 1.48.0 
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.47.0 to 1.48.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.47.0...v1.48.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-12 22:16:04 -04:00
yuhan6665
00230a74d5
Fix new Quic lib: KeepAlivePeriod (#1139) 
* Bump github.com/lucas-clemente/quic-go from 0.27.2 to 0.28.0

Bumps [github.com/lucas-clemente/quic-go](https://github.com/lucas-clemente/quic-go) from 0.27.2 to 0.28.0.
- [Release notes](https://github.com/lucas-clemente/quic-go/releases)
- [Changelog](https://github.com/lucas-clemente/quic-go/blob/master/Changelog.md)
- [Commits](https://github.com/lucas-clemente/quic-go/compare/v0.27.2...v0.28.0)

---
updated-dependencies:
- dependency-name: github.com/lucas-clemente/quic-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix new Quic lib: KeepAlivePeriod

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-07-10 21:38:39 -04:00
yuhan6665
9480bc0379 Fix ss2022 user stat for single user 2022-07-02 11:27:26 -04:00
dependabot[bot]
0eed604ba3 Bump github.com/stretchr/testify from 1.7.5 to 1.8.0 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.5 to 1.8.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.7.5...v1.8.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-30 10:10:09 -04:00
世界
52930a16b2
Fix check ss bad udp request #1122 2022-06-28 07:50:18 +08:00
dependabot[bot]
0f2a6f2088 Bump github.com/stretchr/testify from 1.7.4 to 1.7.5 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.7.4...v1.7.5)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-23 21:17:15 -04:00
dependabot[bot]
9f365b7b45 Bump github.com/miekg/dns from 1.1.49 to 1.1.50 
Bumps [github.com/miekg/dns](https://github.com/miekg/dns) from 1.1.49 to 1.1.50.
- [Release notes](https://github.com/miekg/dns/releases)
- [Changelog](https://github.com/miekg/dns/blob/master/Makefile.release)
- [Commits](https://github.com/miekg/dns/compare/v1.1.49...v1.1.50)

---
updated-dependencies:
- dependency-name: github.com/miekg/dns
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-22 10:20:41 -04:00
dependabot[bot]
a809596829 Bump github.com/stretchr/testify from 1.7.2 to 1.7.4 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.2 to 1.7.4.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.7.2...v1.7.4)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-20 21:33:13 -04:00
yuhan6665
7d946562eb Update version 1.5.8 2022-06-19 19:14:53 -04:00
Shelikhoo
d4f18b1342 Fix DoS attack vulnerability in VMess Option Processing 2022-06-19 19:13:37 -04:00
世界
ba4ce4c24f
Add shadowsocks 2022 relay service 2022-06-19 22:17:23 +08:00
Stash Networks
a1c3aed9d3 Add Stash to the iOS & macOS Client 2022-06-11 08:01:30 -04:00
世界
ec8904066a
Update dependencies 2022-06-10 15:53:05 +08:00
世界
def30a0882
Fix shadowsocks-2022 udp on 32-bit devices 2022-06-07 21:09:35 +08:00
世界
bd0cf955c7
Update shadowsocks-2022 multi-server usage 2022-06-07 11:17:08 +08:00
dependabot[bot]
e91f033c01 Bump github.com/marten-seemann/qtls-go1-18 from 0.1.1 to 0.1.2 
Bumps [github.com/marten-seemann/qtls-go1-18](https://github.com/marten-seemann/qtls-go1-18) from 0.1.1 to 0.1.2.
- [Release notes](https://github.com/marten-seemann/qtls-go1-18/releases)
- [Commits](https://github.com/marten-seemann/qtls-go1-18/compare/v0.1.1...v0.1.2)

---
updated-dependencies:
- dependency-name: github.com/marten-seemann/qtls-go1-18
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-06 10:21:59 -04:00
dependabot[bot]
f1b70b4155 Bump github.com/marten-seemann/qtls-go1-17 from 0.1.1 to 0.1.2 
Bumps [github.com/marten-seemann/qtls-go1-17](https://github.com/marten-seemann/qtls-go1-17) from 0.1.1 to 0.1.2.
- [Release notes](https://github.com/marten-seemann/qtls-go1-17/releases)
- [Commits](https://github.com/marten-seemann/qtls-go1-17/compare/v0.1.1...v0.1.2)

---
updated-dependencies:
- dependency-name: github.com/marten-seemann/qtls-go1-17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-06 10:10:29 -04:00
yuhan6665
cc67e83a8f Update version 1.5.7 2022-06-05 07:46:18 -04:00
世界
ea9246ec7f
Update dependencies 2022-06-05 09:35:52 +08:00
世界
0c9bd21b59
Fix disable invalidptr check 2022-06-05 09:35:32 +08:00
世界
34aab75484
Fix shadowsocks-2022 multi-user udp 2022-06-04 12:29:43 +08:00
世界
c3505632fd
Add udp over tcp support for shadowsocks-2022 2022-06-01 11:49:02 +08:00
世界
6f93ef7736
Remove useless error log 2022-06-01 11:11:53 +08:00
世界
c4a307e84d
Refactor to stdlib error unwrap method 2022-06-01 11:03:06 +08:00
世界
f1d753f069
Fix build in legacy golang version 2022-05-31 15:55:38 +08:00
世界
91ce752405
Fix close pipe 2022-05-31 11:44:32 +08:00
yuhan6665
f0b58d9ee0 Update version 1.5.6 2022-05-28 12:07:11 -04:00
yuhan6665
d56f38d38e Break shadowsocks2022 test into Tcp and Udp 
- make test smaller
- pickPort is more reliable for only Tcp or Udp
 2022-05-28 12:05:54 -04:00
yuhan6665
7b72e19e16 Update dependencies 2022-05-28 11:47:41 -04:00
世界
4e5752f93e
Add more shadowsocks tests 2022-05-28 13:35:03 +08:00
世界
36906d018d
Update shadowsocks 2022 library 2022-05-28 13:34:58 +08:00
世界
79f3057687
Migrate shadowsocks-2022 to protocol library 2022-05-26 07:35:17 +08:00
dependabot[bot]
c375b144f8 Bump github.com/lucas-clemente/quic-go from 0.27.0 to 0.27.1 
Bumps [github.com/lucas-clemente/quic-go](https://github.com/lucas-clemente/quic-go) from 0.27.0 to 0.27.1.
- [Release notes](https://github.com/lucas-clemente/quic-go/releases)
- [Changelog](https://github.com/lucas-clemente/quic-go/blob/master/Changelog.md)
- [Commits](https://github.com/lucas-clemente/quic-go/compare/v0.27.0...v0.27.1)

---
updated-dependencies:
- dependency-name: github.com/lucas-clemente/quic-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-24 22:23:24 -04:00
世界
1edce576ca
Fix missing user in shadowsocks-2022 inbound 2022-05-25 08:49:52 +08:00
世界
cf7e675c45
Add shadowsocks 2022 multi-user inbound 2022-05-24 07:37:14 +08:00
世界
b6391cbbe1
Fix shadowsocks config 2022-05-24 07:01:47 +08:00
世界
398375d76f
Reformat code (quic sniffers) 2022-05-24 06:57:16 +08:00