Merge pull request #239 from Dstack-TEE/fix-rev-net

gw: Fix reserved ip allocation

Author: kvinwang

gateway/src/main_service.rs

@@ -269,19 +269,29 @@ fn start_sync_task(proxy: Proxy) {
 }
 
 impl ProxyState {
+    fn valid_ip(&self, ip: Ipv4Addr) -> bool {
+        if self.config.wg.ip.broadcast() == ip {
+            return false;
+        }
+        if self.config.wg.ip.addr() == ip {
+            return false;
+        }
+        if self
+            .config
+            .wg
+            .reserved_net
+            .iter()
+            .any(|net| net.contains(&ip))
+        {
+            return false;
+        }
+        true
+    }
     fn alloc_ip(&mut self) -> Option<Ipv4Addr> {
         for ip in self.config.wg.client_ip_range.hosts() {
-            if self.config.wg.ip.broadcast() == ip {
+            if !self.valid_ip(ip) {
                 continue;
             }
-            if self.config.wg.ip.addr() == ip {
-                continue;
-            }
-            for net in &self.config.wg.reserved_net {
-                if net.contains(&ip) {
-                    continue;
-                }
-            }
             if self.state.allocated_addresses.contains(&ip) {
                 continue;
             }
@@ -305,7 +315,12 @@ impl ProxyState {
                 info!("public key changed for instance {id}, new key: {public_key}");
                 existing.public_key = public_key.to_string();
             }
-            return Some(existing.clone());
+            let existing = existing.clone();
+            if self.valid_ip(existing.ip) {
+                return Some(existing);
+            }
+            info!("ip {} is invalid, removing", existing.ip);
+            self.state.allocated_addresses.remove(&existing.ip);
         }
         let ip = self.alloc_ip()?;
         let host_info = InstanceInfo {