|
@@ -311,7 +311,8 @@ func adoptedWireChanged(c, snapIb *model.Inbound, adoptedSettings string) bool {
|
|
|
c.ExpiryTime != snapIb.ExpiryTime ||
|
|
c.ExpiryTime != snapIb.ExpiryTime ||
|
|
|
c.StreamSettings != snapIb.StreamSettings ||
|
|
c.StreamSettings != snapIb.StreamSettings ||
|
|
|
c.Sniffing != snapIb.Sniffing ||
|
|
c.Sniffing != snapIb.Sniffing ||
|
|
|
- c.TrafficReset != snapIb.TrafficReset
|
|
|
|
|
|
|
+ c.TrafficReset != snapIb.TrafficReset ||
|
|
|
|
|
+ c.TrafficResetDay != normalizeTrafficResetDay(snapIb.TrafficResetDay)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// adoptedWireInbound is the central inbound as it reads after adopting the
|
|
// adoptedWireInbound is the central inbound as it reads after adopting the
|
|
@@ -330,6 +331,7 @@ func adoptedWireInbound(c, snapIb *model.Inbound, adoptedSettings string) *model
|
|
|
a.StreamSettings = snapIb.StreamSettings
|
|
a.StreamSettings = snapIb.StreamSettings
|
|
|
a.Sniffing = snapIb.Sniffing
|
|
a.Sniffing = snapIb.Sniffing
|
|
|
a.TrafficReset = snapIb.TrafficReset
|
|
a.TrafficReset = snapIb.TrafficReset
|
|
|
|
|
+ a.TrafficResetDay = normalizeTrafficResetDay(snapIb.TrafficResetDay)
|
|
|
return &a
|
|
return &a
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -561,6 +563,7 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
|
|
|
StreamSettings: snapIb.StreamSettings,
|
|
StreamSettings: snapIb.StreamSettings,
|
|
|
Sniffing: snapIb.Sniffing,
|
|
Sniffing: snapIb.Sniffing,
|
|
|
TrafficReset: snapIb.TrafficReset,
|
|
TrafficReset: snapIb.TrafficReset,
|
|
|
|
|
+ TrafficResetDay: normalizeTrafficResetDay(snapIb.TrafficResetDay),
|
|
|
LastTrafficResetTime: snapIb.LastTrafficResetTime,
|
|
LastTrafficResetTime: snapIb.LastTrafficResetTime,
|
|
|
Enable: snapIb.Enable,
|
|
Enable: snapIb.Enable,
|
|
|
Remark: snapIb.Remark,
|
|
Remark: snapIb.Remark,
|
|
@@ -616,6 +619,7 @@ func (s *InboundService) setRemoteTrafficLocked(nodeID int, snap *runtime.Traffi
|
|
|
updates["stream_settings"] = snapIb.StreamSettings
|
|
updates["stream_settings"] = snapIb.StreamSettings
|
|
|
updates["sniffing"] = snapIb.Sniffing
|
|
updates["sniffing"] = snapIb.Sniffing
|
|
|
updates["traffic_reset"] = snapIb.TrafficReset
|
|
updates["traffic_reset"] = snapIb.TrafficReset
|
|
|
|
|
+ updates["traffic_reset_day"] = normalizeTrafficResetDay(snapIb.TrafficResetDay)
|
|
|
updates["last_traffic_reset_time"] = snapIb.LastTrafficResetTime
|
|
updates["last_traffic_reset_time"] = snapIb.LastTrafficResetTime
|
|
|
if adoptedWireChanged(c, snapIb, adoptedSettings) {
|
|
if adoptedWireChanged(c, snapIb, adoptedSettings) {
|
|
|
adoptedInbounds = append(adoptedInbounds, adoptedWireInbound(c, snapIb, adoptedSettings))
|
|
adoptedInbounds = append(adoptedInbounds, adoptedWireInbound(c, snapIb, adoptedSettings))
|