chore(port-forward): support multiple port forwarded
This commit is contained in:
@@ -22,7 +22,7 @@ type DNSLoop interface {
|
||||
}
|
||||
|
||||
type PortForwardedGetter interface {
|
||||
GetPortForwarded() (portForwarded uint16)
|
||||
GetPortsForwarded() (ports []uint16)
|
||||
}
|
||||
|
||||
type PublicIPLoop interface {
|
||||
|
||||
@@ -123,12 +123,21 @@ func (h *openvpnHandler) getSettings(w http.ResponseWriter) {
|
||||
}
|
||||
|
||||
func (h *openvpnHandler) getPortForwarded(w http.ResponseWriter) {
|
||||
port := h.pf.GetPortForwarded()
|
||||
ports := h.pf.GetPortsForwarded()
|
||||
encoder := json.NewEncoder(w)
|
||||
data := portWrapper{Port: port}
|
||||
if err := encoder.Encode(data); err != nil {
|
||||
var data any
|
||||
switch len(ports) {
|
||||
case 0:
|
||||
data = portWrapper{Port: 0} // TODO v4 change to portsWrapper
|
||||
case 1:
|
||||
data = portWrapper{Port: ports[0]} // TODO v4 change to portsWrapper
|
||||
default:
|
||||
data = portsWrapper{Ports: ports}
|
||||
}
|
||||
|
||||
err := encoder.Encode(data)
|
||||
if err != nil {
|
||||
h.warner.Warn(err.Error())
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,10 +25,14 @@ func (sw *statusWrapper) getStatus() (status models.LoopStatus, err error) {
|
||||
}
|
||||
}
|
||||
|
||||
type portWrapper struct {
|
||||
type portWrapper struct { // TODO v4 remove
|
||||
Port uint16 `json:"port"`
|
||||
}
|
||||
|
||||
type portsWrapper struct {
|
||||
Ports []uint16 `json:"ports"`
|
||||
}
|
||||
|
||||
type outcomeWrapper struct {
|
||||
Outcome string `json:"outcome"`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user