Refactor HTTP control server code

internal/server/openvpn.go

@@ -5,32 +5,32 @@ import (
 	"net/http"
 )
 
-func (s *server) handleGetPortForwarded(w http.ResponseWriter) {
-	port := s.openvpnLooper.GetPortForwarded()
+func (h *handler) getPortForwarded(w http.ResponseWriter) {
+	port := h.openvpnLooper.GetPortForwarded()
 	data, err := json.Marshal(struct {
 		Port uint16 `json:"port"`
 	}{port})
 	if err != nil {
-		s.logger.Warn(err)
+		h.logger.Warn(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 	if _, err := w.Write(data); err != nil {
-		s.logger.Warn(err)
+		h.logger.Warn(err)
 		w.WriteHeader(http.StatusInternalServerError)
 	}
 }
 
-func (s *server) handleGetOpenvpnSettings(w http.ResponseWriter) {
-	settings := s.openvpnLooper.GetSettings()
+func (h *handler) getOpenvpnSettings(w http.ResponseWriter) {
+	settings := h.openvpnLooper.GetSettings()
 	data, err := json.Marshal(settings)
 	if err != nil {
-		s.logger.Warn(err)
+		h.logger.Warn(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 	if _, err := w.Write(data); err != nil {
-		s.logger.Warn(err)
+		h.logger.Warn(err)
 		w.WriteHeader(http.StatusInternalServerError)
 	}
 }