XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-27 15:45:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

web/frpc: support more info (#3334)

Browse Source
This commit is contained in:
fatedier
2023-02-26 02:54:53 +08:00
committed by GitHub
parent 871511ba52
commit 8c6303c1e5
20 changed files with 277 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/process.go
View File

@@ -38,7 +38,7 @@ func (f *Framework) RunProcesses(serverTemplates []string, clientTemplates []str
err = p.Start()
ExpectNoError(err)
}
time.Sleep(time.Second)
time.Sleep(2 * time.Second)
currentClientProcesses := make([]*process.Process, 0, len(clientTemplates))
for i := range clientTemplates {

8
test/e2e/pkg/port/port.go
View File

@@ -10,8 +10,8 @@ import (
)
type Allocator struct {
reserved sets.Int
used sets.Int
reserved sets.Set[int]
used sets.Set[int]
mu sync.Mutex
}
@@ -20,8 +20,8 @@ type Allocator struct {
// Reserved ports: 13, 17
func NewAllocator(from int, to int, mod int, index int) *Allocator {
pa := &Allocator{
reserved: sets.NewInt(),
used: sets.NewInt(),
reserved: sets.New[int](),
used: sets.New[int](),
}
for i := from; i <= to; i++ {

40
test/e2e/pkg/sdk/client/client.go
View File

@@ -39,43 +39,15 @@ func (c *Client) GetProxyStatus(name string) (*client.ProxyStatusResp, error) {
if err != nil {
return nil, err
}
allStatus := &client.StatusResp{}
allStatus := make(client.StatusResp)
if err = json.Unmarshal([]byte(content), &allStatus); err != nil {
return nil, fmt.Errorf("unmarshal http response error: %s", strings.TrimSpace(content))
}
for _, s := range allStatus.TCP {
if s.Name == name {
return &s, nil
}
}
for _, s := range allStatus.UDP {
if s.Name == name {
return &s, nil
}
}
for _, s := range allStatus.HTTP {
if s.Name == name {
return &s, nil
}
}
for _, s := range allStatus.HTTPS {
if s.Name == name {
return &s, nil
}
}
for _, s := range allStatus.STCP {
if s.Name == name {
return &s, nil
}
}
for _, s := range allStatus.XTCP {
if s.Name == name {
return &s, nil
}
}
for _, s := range allStatus.SUDP {
if s.Name == name {
return &s, nil
for _, pss := range allStatus {
for _, ps := range pss {
if ps.Name == name {
return &ps, nil
}
}
}
return nil, fmt.Errorf("no proxy status found")