root/telebit
1
0
Fork 0
mirror of https://github.com/therootcompany/telebit.git synced 2025-11-03 23:02:51 +00:00
Code Issues Projects Releases Wiki Activity

fixed bug with peeking I introduced during the cleanup

Browse Source
This commit is contained in:
tigerbot 2017-03-23 17:57:43 -06:00
parent c7b6a4a000
commit 0a7ef4c601
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main.go
View File

@ -35,10 +35,6 @@ var (
serverName string serverName string
) )
func init() {
}
//Main -- main entry point //Main -- main entry point
func main() { func main() {
flag.Parse() flag.Parse()
@ -56,10 +52,10 @@ func main() {
wssHostName = viper.Get("rvpn.wssdomain").(string) wssHostName = viper.Get("rvpn.wssdomain").(string)
adminHostName = viper.Get("rvpn.admindomain").(string) adminHostName = viper.Get("rvpn.admindomain").(string)
argGenericBinding = viper.GetInt("rvpn.genericlistener") argGenericBinding = viper.GetInt("rvpn.genericlistener")
deadtime := viper.Get("rvpn.deadtime") deadtime := viper.Get("rvpn.deadtime").(map[string]interface{})
idle = deadtime.(map[string]interface{})["idle"].(int) idle = deadtime["idle"].(int)
dwell = deadtime.(map[string]interface{})["dwell"].(int) dwell = deadtime["dwell"].(int)
cancelcheck = deadtime.(map[string]interface{})["cancelcheck"].(int) cancelcheck = deadtime["cancelcheck"].(int)
lbDefaultMethod = viper.Get("rvpn.loadbalancing.defaultmethod").(string) lbDefaultMethod = viper.Get("rvpn.loadbalancing.defaultmethod").(string)
serverName = viper.Get("rvpn.serverName").(string) serverName = viper.Get("rvpn.serverName").(string)

6
rvpn/genericlistener/conn_wedge.go
View File

@ -56,5 +56,11 @@ func (w *WedgeConn) Buffered() int {
// - get all the chars available // - get all the chars available
// - pass then back // - pass then back
func (w *WedgeConn) PeekAll() ([]byte, error) { func (w *WedgeConn) PeekAll() ([]byte, error) {
// We first peek with 1 so that if there is no buffered data the reader will
// fill the buffer before we read how much data is buffered.
if _, err := w.Peek(1); err != nil {
return nil, err
}
return w.Peek(w.Buffered()) return w.Peek(w.Buffered())
} }