[PR #3] [MERGED] Fix some bugs #4090

New issue

Closed

opened 2026-05-05 14:35:29 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:35:29 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/3
Author: @Hurricanezwf
Created: 2/5/2016
Status: ✅ Merged
Merged: 2/18/2016
Merged by: @fatedier

Base: dev ← Head: fix_some_bugs

📝 Commits (5)

f065562 (1)分离出连接服务器的逻辑 (2)新增client断线重连功能
af6fc61 (1)新增client向server发送心跳检测
5d6f37a (1)优化重连和心跳检测
04c26d1 (1)新增心跳检测发送间隔和超时时间的配置
60c9804 format代码

📊 Changes

14 files changed (+226 additions, -104 deletions)

View changed files

📝 .gitignore (+3 -0)
📝 cmd/frpc/config.go (+11 -6)
📝 cmd/frpc/control.go (+93 -36)
📝 cmd/frpc/main.go (+1 -1)
📝 cmd/frps/config.go (+6 -6)
📝 cmd/frps/control.go (+50 -9)
📝 cmd/frps/main.go (+1 -1)
📝 conf/frpc.ini (+3 -1)
📝 conf/frps.ini (+3 -1)
📝 pkg/models/client.go (+8 -8)
📝 pkg/models/msg.go (+6 -7)
📝 pkg/models/server.go (+28 -17)
📝 pkg/utils/conn/conn.go (+12 -10)
📝 pkg/utils/log/log.go (+1 -1)

📄 Description

(1) Add heatbeat test
(2) Add handle method when disconnection occured either at client or server

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/fatedier/frp/pull/3 **Author:** [@Hurricanezwf](https://github.com/Hurricanezwf) **Created:** 2/5/2016 **Status:** ✅ Merged **Merged:** 2/18/2016 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `dev` ← **Head:** `fix_some_bugs` --- ### 📝 Commits (5) - [`f065562`](https://github.com/fatedier/frp/commit/f065562ec3e570dda5f560840653ae761a962f67) (1)分离出连接服务器的逻辑 (2)新增client断线重连功能 - [`af6fc61`](https://github.com/fatedier/frp/commit/af6fc61537eaa8012c0091a0eb18353de9604c2c) (1)新增client向server发送心跳检测 - [`5d6f37a`](https://github.com/fatedier/frp/commit/5d6f37aa82b8e0a5e3cbcb78b6febcb8a44299e0) (1)优化重连和心跳检测 - [`04c26d1`](https://github.com/fatedier/frp/commit/04c26d1c31c6994d8c77c3982b9f2b38a5776abe) (1)新增心跳检测发送间隔和超时时间的配置 - [`60c9804`](https://github.com/fatedier/frp/commit/60c9804776ffb7455b80d2110733805c93636a3c) format代码 ### 📊 Changes **14 files changed** (+226 additions, -104 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+3 -0) 📝 `cmd/frpc/config.go` (+11 -6) 📝 `cmd/frpc/control.go` (+93 -36) 📝 `cmd/frpc/main.go` (+1 -1) 📝 `cmd/frps/config.go` (+6 -6) 📝 `cmd/frps/control.go` (+50 -9) 📝 `cmd/frps/main.go` (+1 -1) 📝 `conf/frpc.ini` (+3 -1) 📝 `conf/frps.ini` (+3 -1) 📝 `pkg/models/client.go` (+8 -8) 📝 `pkg/models/msg.go` (+6 -7) 📝 `pkg/models/server.go` (+28 -17) 📝 `pkg/utils/conn/conn.go` (+12 -10) 📝 `pkg/utils/log/log.go` (+1 -1) </details> ### 📄 Description (1) Add heatbeat test (2) Add handle method when disconnection occured either at client or server --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>