openlan: route to vpn subnet

Signed-off-by: zhihui.ding <danieldin186@gmail.com>

pkg/switch/openlan.go

@@ -179,7 +179,7 @@ func (w *OpenLANWorker) allowedSubnet() {
 	for _, rt := range cfg.Routes {
 		if vCfg != nil {
 			w.toForward("", br.Name, vCfg.Subnet, rt.Prefix, "To VPN")
-			w.toMasq(vCfg.Subnet, rt.Prefix, "To VPN")
+			w.toMasq(rt.Prefix, vCfg.Subnet, "To VPN")
 		}
 
 		w.toForward(br.Name, "", subnet, rt.Prefix, "To route")

pkg/switch/switch.go

@@ -414,6 +414,8 @@ func (v *Switch) Stop() {
 	defer v.lock.Unlock()
 
 	v.out.Info("Switch.Stop")
+	v.fire.Stop()
+
 	if v.l2tp != nil {
 		v.l2tp.Stop()
 	}
@@ -436,7 +438,6 @@ func (v *Switch) Stop() {
 		}
 		v.leftClient(p.Client)
 	}
-	v.fire.Stop()
 	v.server.Close()
 }