github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-09-01 02:46:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

public key bug and multiuser enhancement and server ip support and config file of client optimization

Browse Source
This commit is contained in:
刘河
2019-03-26 23:34:55 +08:00
parent 00a4a33c5f
commit 42a73fa392
22 changed files with 155 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/connection/connection.go
View File

@@ -50,7 +50,7 @@ func GetHttpListener() (net.Listener, error) {
return pMux.GetHttpListener(), nil
}
logs.Info("start http listener, port is", httpPort)
return getTcpListener("", httpPort)
return getTcpListener(beego.AppConfig.String("http_proxy_ip"), httpPort)
}
func GetHttpsListener() (net.Listener, error) {
@@ -59,7 +59,7 @@ func GetHttpsListener() (net.Listener, error) {
return pMux.GetHttpsListener(), nil
}
logs.Info("start https listener, port is", httpsPort)
return getTcpListener("", httpsPort)
return getTcpListener(beego.AppConfig.String("http_proxy_ip"), httpsPort)
}
func GetWebManagerListener() (net.Listener, error) {

2
server/proxy/socks5.go
View File

@@ -251,7 +251,7 @@ func (s *Sock5ModeServer) Auth(c net.Conn) error {
//start
func (s *Sock5ModeServer) Start() error {
return conn.NewTcpListenerAndProcess(":"+strconv.Itoa(s.task.Port), func(c net.Conn) {
return conn.NewTcpListenerAndProcess(s.task.ServerIp+":"+strconv.Itoa(s.task.Port), func(c net.Conn) {
if err := s.CheckFlowAndConnNum(s.task.Client); err != nil {
logs.Warn("client id %d, task id %d, error %s, when socks5 connection", s.task.Client.Id, s.task.Id, err.Error())
c.Close()

2
server/proxy/tcp.go
View File

@@ -32,7 +32,7 @@ func NewTunnelModeServer(process process, bridge *bridge.Bridge, task *file.Tunn
//开始
func (s *TunnelModeServer) Start() error {
return conn.NewTcpListenerAndProcess(":"+strconv.Itoa(s.task.Port), func(c net.Conn) {
return conn.NewTcpListenerAndProcess(s.task.ServerIp+":"+strconv.Itoa(s.task.Port), func(c net.Conn) {
if err := s.CheckFlowAndConnNum(s.task.Client); err != nil {
logs.Warn("client id %d, task id %d,error %s, when tcp connection", s.task.Client.Id, s.task.Id, err.Error())
c.Close()

5
server/proxy/udp.go
View File

@@ -26,7 +26,10 @@ func NewUdpModeServer(bridge *bridge.Bridge, task *file.Tunnel) *UdpModeServer {
//开始
func (s *UdpModeServer) Start() error {
var err error
s.listener, err = net.ListenUDP("udp", &net.UDPAddr{net.ParseIP("0.0.0.0"), s.task.Port, ""})
if s.task.ServerIp == "" {
s.task.ServerIp = "0.0.0.0"
}
s.listener, err = net.ListenUDP("udp", &net.UDPAddr{net.ParseIP(s.task.ServerIp), s.task.Port, ""})
if err != nil {
return err
}

4
server/server.go
View File

@@ -255,8 +255,8 @@ func GetTunnel(start, length int, typeVal string, clientId int, search string) (
}
//获取客户端列表
func GetClientList(start, length int, search string) (list []*file.Client, cnt int) {
list, cnt = file.GetCsvDb().GetClientList(start, length, search)
func GetClientList(start, length int, search string, clientId int) (list []*file.Client, cnt int) {
list, cnt = file.GetCsvDb().GetClientList(start, length, search, clientId)
dealClientData()
return
}