Merge branch 'admin' of git.daplie.com:Daplie/go-rvpn-server into admin

# Conflicts:
#	rvpn/genericlistener/conn_wedge.go

main.go

@@ -35,10 +35,6 @@ var (
 	serverName               string
 )
 
-func init() {
-
-}
-
 //Main -- main entry point
 func main() {
 	flag.Parse()
@@ -56,10 +52,10 @@ func main() {
 	wssHostName = viper.Get("rvpn.wssdomain").(string)
 	adminHostName = viper.Get("rvpn.admindomain").(string)
 	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)
 	serverName = viper.Get("rvpn.serverName").(string)
 

rvpn/genericlistener/conn_wedge.go

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