start dailymotion support, improve vendor support
This commit is contained in:
20
openvpn.go
20
openvpn.go
@@ -41,12 +41,15 @@ func (v *OpenVpnSrv) Unlock() {
|
||||
|
||||
func NewOpenVpnSrv(conn net.Conn, mgt *OpenVpnMgt) *OpenVpnSrv {
|
||||
return &OpenVpnSrv{
|
||||
buf: bufio.NewReadWriter(bufio.NewReader(conn), bufio.NewWriter(conn)),
|
||||
chanHold: make(chan bool),
|
||||
chanPass: make(chan OpenVpnPassword),
|
||||
ret: make(chan []string),
|
||||
mgt: mgt,
|
||||
hold: false,
|
||||
buf: bufio.NewReadWriter(bufio.NewReader(conn), bufio.NewWriter(conn)),
|
||||
chanHold: make(chan bool),
|
||||
chanPass: make(chan OpenVpnPassword),
|
||||
ret: make(chan []string),
|
||||
mgt: mgt,
|
||||
hold: false,
|
||||
Status: "Starting",
|
||||
Identifier: "Unknown",
|
||||
Provider: "Unknown",
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,6 +101,9 @@ func (v *OpenVpnSrv) GetPid() error {
|
||||
if err == nil {
|
||||
v.mgt.SetPid(v, pid)
|
||||
v.mgt.Debug("Found PID", pid)
|
||||
if v.Identifier == "Unknown" {
|
||||
v.Identifier = fmt.Sprintf("Unknown-%d", pid)
|
||||
}
|
||||
}
|
||||
return err
|
||||
}
|
||||
@@ -143,9 +149,9 @@ func (v *OpenVpnSrv) GetLine() (string, error) {
|
||||
}
|
||||
|
||||
func (v *OpenVpnSrv) ValidRemote(server, port, proto string) {
|
||||
v.Status = "Connected"
|
||||
if v.Remote != "" {
|
||||
v.sendCommand([]string{fmt.Sprintf("remote MOD %s %s %s", v.Remote, port, proto)})
|
||||
v.Status = "Connected"
|
||||
return
|
||||
}
|
||||
v.Remote = server
|
||||
|
||||
Reference in New Issue
Block a user