Skip to content

Commit

Permalink
优化编译脚本
Browse files Browse the repository at this point in the history
  • Loading branch information
bjdgyc committed Feb 1, 2024
1 parent 02bc75b commit 936c44e
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
github: [ 'bjdgyc' ] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
Expand All @@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: ['https://github.com/bjdgyc/anylink/blob/main/doc/README.md'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
custom: [ 'https://github.com/bjdgyc/anylink/blob/main/doc/README.md' ] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
7 changes: 4 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ name: "CodeQL"

on:
workflow_dispatch:

schedule:
- cron: '32 5 * * 1'
# push:
# branches: [ "main", "dev" ]
# pull_request:
# branches: [ "main", "dev" ]
# schedule:
# - cron: '32 12 * * 5'



jobs:
analyze:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Go
on:
workflow_dispatch:

# push:
# branches: [ "main", "dev" ]
# pull_request:
# branches: [ "main", "dev" ]
push:
branches: [ "main", "dev" ]
pull_request:
branches: [ "main", "dev" ]

jobs:

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
tags:
- "v0.*"
- "v1.*"

jobs:
Build:
Expand Down Expand Up @@ -46,7 +47,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
logout: true

- name: pre bash
- name: Pre bash
shell: bash
run: |
appVer=`cat version`
Expand All @@ -65,8 +66,8 @@ jobs:
uses: docker/build-push-action@v5
with:
push: true
#cache-from: type=gha,scope=anylink
#cache-to: type=gha,mode=max,scope=anylink
cache-from: type=gha,scope=anylink
cache-to: type=gha,mode=max,scope=anylink
context: .
file: ./docker/Dockerfile
platforms: linux/amd64,linux/arm64,linux/arm/v7
Expand Down
6 changes: 6 additions & 0 deletions doc/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ mobile_dpd = 15
>
> 如经常出现 timeout 的错误信息,应根据当前防火墙的设置,适当减小dpd数值
### 关于审计日志 audit_interval 参数

> 默认值 `audit_interval = 600` 表示相同日志600秒内只记录一次,不同日志首次出现立即记录
>
> 去重key的格式: 16字节源IP地址 + 16字节目的IP地址 + 2字节目的端口 + 1字节协议类型 + 16字节域名MD5
### 反向代理问题

> anylink 仅支持四层反向代理,不支持七层反向代理
Expand Down
1 change: 1 addition & 0 deletions server/handler/payload_access_audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ func logAudit(userName string, pl *sessdata.Payload) {
ipSrc := waterutil.IPv4Source(pl.Data)
ipDst := waterutil.IPv4Destination(pl.Data)
b := getByte51()
// key格式 16字节源IP地址 + 16字节目的IP地址 + 2字节目的端口 + 1字节协议类型 + 16字节域名MD5
key := *b
copy(key[:16], ipSrc)
copy(key[16:32], ipDst)
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.3-test
0.10.4

0 comments on commit 936c44e

Please sign in to comment.