github
/
nps
mirror of https://github.com/ehang-io/nps
1
0
Fork 0
Code Issues Releases Wiki Activity

项目迁移

pull/1219/head
刘河 2019-02-03 12:40:43 +08:00
parent cbdad1adb0
commit 87f2c8b2ce
14 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/bridge.go
View File

@ -2,7 +2,7 @@ package bridge
import (
"errors"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/utils"
"net"
"sync"
"time"

2
client/client.go
View File

@ -1,7 +1,7 @@
package client
import (
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/utils"
"net"
"sync"
"time"

78
cmd/npc/npc.go
View File

@ -2,80 +2,32 @@ package main
import (
"flag"
"github.com/astaxie/beego"
"github.com/cnlh/easyProxy/server"
"github.com/cnlh/easyProxy/utils"
_ "github.com/cnlh/easyProxy/web/routers"
"os"
"github.com/cnlh/nps/client"
"github.com/cnlh/nps/utils"
_ "github.com/cnlh/nps/utils"
"strings"
)
const VERSION = "v0.0.13"
var (
TcpPort = flag.Int("tcpport", 0, "客户端与服务端通信端口")
httpPort = flag.Int("httpport", 8024, "对外监听的端口")
rpMode = flag.String("mode", "webServer", "启动模式")
tunnelTarget = flag.String("target", "127.0.0.1:80", "远程目标")
VerifyKey = flag.String("vkey", "", "验证密钥")
u = flag.String("u", "", "验证用户名(socks5和web)")
p = flag.String("p", "", "验证密码(socks5和web)")
compress = flag.String("compress", "", "数据压缩方式（snappy）")
crypt = flag.String("crypt", "false", "是否加密(true|false)")
serverAddr = flag.String("server", "", "服务器地址ip:端口")
verifyKey = flag.String("vkey", "", "验证密钥")
logType = flag.String("log", "stdout", "日志输出方式（stdout|file）")
)
func main() {
flag.Parse()
var test bool
if len(os.Args) > 1 && os.Args[1] == "test" {
test = true
}
utils.InitDaemon("server")
if *logType == "stdout" || test {
utils.InitLogFile("server", true)
utils.InitDaemon("client")
if *logType == "stdout" {
utils.InitLogFile("client", true)
} else {
utils.InitLogFile("server", false)
utils.InitLogFile("client", false)
}
task := &utils.Tunnel{
TcpPort: *httpPort,
Mode: *rpMode,
Target: *tunnelTarget,
Config: &utils.Config{
U: *u,
P: *p,
Compress: *compress,
Crypt: utils.GetBoolByStr(*crypt),
},
Flow: &utils.Flow{},
UseClientCnf: false,
stop := make(chan int)
for _, v := range strings.Split(*verifyKey, ",") {
utils.Println("客户端启动，连接：", *serverAddr, " 验证令牌：", v)
go client.NewRPClient(*serverAddr, v).Start()
}
if *VerifyKey != "" {
c := &utils.Client{
Id: 0,
VerifyKey: *VerifyKey,
Addr: "",
Remark: "",
Status: true,
IsConnect: false,
Cnf: &utils.Config{},
Flow: &utils.Flow{},
}
c.Cnf.CompressDecode, c.Cnf.CompressEncode = utils.GetCompressType(c.Cnf.Compress)
server.CsvDb.Clients[0] = c
task.Client = c
}
if *TcpPort == 0 {
p, err := beego.AppConfig.Int("tcpport")
if err == nil && *rpMode == "webServer" {
*TcpPort = p
} else {
*TcpPort = 8284
}
}
utils.Println("服务端启动，监听tcp服务端端口：", *TcpPort)
task.Config.CompressDecode, task.Config.CompressEncode = utils.GetCompressType(task.Config.Compress)
if *rpMode != "webServer" {
server.CsvDb.Tasks[0] = task
}
server.StartNewServer(*TcpPort, task, test)
<-stop
}

78
cmd/nps/nps.go
View File

@ -2,32 +2,80 @@ package main
import (
"flag"
"github.com/cnlh/easyProxy/client"
"github.com/cnlh/easyProxy/utils"
_ "github.com/cnlh/easyProxy/utils"
"strings"
"github.com/astaxie/beego"
"github.com/cnlh/nps/server"
"github.com/cnlh/nps/utils"
_ "github.com/cnlh/nps/web/routers"
"os"
)
const VERSION = "v0.0.13"
var (
serverAddr = flag.String("server", "", "服务器地址ip:端口")
verifyKey = flag.String("vkey", "", "验证密钥")
TcpPort = flag.Int("tcpport", 0, "客户端与服务端通信端口")
httpPort = flag.Int("httpport", 8024, "对外监听的端口")
rpMode = flag.String("mode", "webServer", "启动模式")
tunnelTarget = flag.String("target", "127.0.0.1:80", "远程目标")
VerifyKey = flag.String("vkey", "", "验证密钥")
u = flag.String("u", "", "验证用户名(socks5和web)")
p = flag.String("p", "", "验证密码(socks5和web)")
compress = flag.String("compress", "", "数据压缩方式（snappy）")
crypt = flag.String("crypt", "false", "是否加密(true|false)")
logType = flag.String("log", "stdout", "日志输出方式（stdout|file）")
)
func main() {
flag.Parse()
utils.InitDaemon("client")
if *logType == "stdout" {
utils.InitLogFile("client", true)
var test bool
if len(os.Args) > 1 && os.Args[1] == "test" {
test = true
}
utils.InitDaemon("server")
if *logType == "stdout" || test {
utils.InitLogFile("server", true)
} else {
utils.InitLogFile("client", false)
utils.InitLogFile("server", false)
}
stop := make(chan int)
for _, v := range strings.Split(*verifyKey, ",") {
utils.Println("客户端启动，连接：", *serverAddr, " 验证令牌：", v)
go client.NewRPClient(*serverAddr, v).Start()
task := &utils.Tunnel{
TcpPort: *httpPort,
Mode: *rpMode,
Target: *tunnelTarget,
Config: &utils.Config{
U: *u,
P: *p,
Compress: *compress,
Crypt: utils.GetBoolByStr(*crypt),
},
Flow: &utils.Flow{},
UseClientCnf: false,
}
<-stop
if *VerifyKey != "" {
c := &utils.Client{
Id: 0,
VerifyKey: *VerifyKey,
Addr: "",
Remark: "",
Status: true,
IsConnect: false,
Cnf: &utils.Config{},
Flow: &utils.Flow{},
}
c.Cnf.CompressDecode, c.Cnf.CompressEncode = utils.GetCompressType(c.Cnf.Compress)
server.CsvDb.Clients[0] = c
task.Client = c
}
if *TcpPort == 0 {
p, err := beego.AppConfig.Int("tcpport")
if err == nil && *rpMode == "webServer" {
*TcpPort = p
} else {
*TcpPort = 8284
}
}
utils.Println("服务端启动，监听tcp服务端端口：", *TcpPort)
task.Config.CompressDecode, task.Config.CompressEncode = utils.GetCompressType(task.Config.Compress)
if *rpMode != "webServer" {
server.CsvDb.Tasks[0] = task
}
server.StartNewServer(*TcpPort, task, test)
}

4
server/base.go
View File

@ -2,8 +2,8 @@ package server
import (
"errors"
"github.com/cnlh/easyProxy/bridge"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/bridge"
"github.com/cnlh/nps/utils"
"net"
"net/http"
"sync"

4
server/http.go
View File

@ -4,8 +4,8 @@ import (
"bufio"
"crypto/tls"
"github.com/astaxie/beego"
"github.com/cnlh/easyProxy/bridge"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/bridge"
"github.com/cnlh/nps/utils"
"net"
"net/http"
"net/http/httputil"

4
server/server.go
View File

@ -2,8 +2,8 @@ package server
import (
"errors"
"github.com/cnlh/easyProxy/bridge"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/bridge"
"github.com/cnlh/nps/utils"
"log"
"os"
"reflect"

4
server/socks5.go
View File

@ -3,8 +3,8 @@ package server
import (
"encoding/binary"
"errors"
"github.com/cnlh/easyProxy/bridge"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/bridge"
"github.com/cnlh/nps/utils"
"io"
"net"
"strconv"

4
server/tcp.go
View File

@ -3,8 +3,8 @@ package server
import (
"errors"
"github.com/astaxie/beego"
"github.com/cnlh/easyProxy/bridge"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/bridge"
"github.com/cnlh/nps/utils"
"net"
"strings"
)

4
server/udp.go
View File

@ -1,8 +1,8 @@
package server
import (
"github.com/cnlh/easyProxy/bridge"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/bridge"
"github.com/cnlh/nps/utils"
"net"
"strings"
)

4
web/controllers/base.go
View File

@ -2,8 +2,8 @@ package controllers
import (
"github.com/astaxie/beego"
"github.com/cnlh/easyProxy/server"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/server"
"github.com/cnlh/nps/utils"
"strconv"
"strings"
)

4
web/controllers/client.go
View File

@ -1,8 +1,8 @@
package controllers
import (
"github.com/cnlh/easyProxy/server"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/server"
"github.com/cnlh/nps/utils"
)
type ClientController struct {

4
web/controllers/index.go
View File

@ -1,8 +1,8 @@
package controllers
import (
"github.com/cnlh/easyProxy/server"
"github.com/cnlh/easyProxy/utils"
"github.com/cnlh/nps/server"
"github.com/cnlh/nps/utils"
)
type IndexController struct {

2
web/routers/router.go
View File

@ -2,7 +2,7 @@ package routers
import (
"github.com/astaxie/beego"
"github.com/cnlh/easyProxy/web/controllers"
"github.com/cnlh/nps/web/controllers"
)
func init() {