From d6efb7eb94b67df4653388c0ea0f43eeaaff37a5 Mon Sep 17 00:00:00 2001
From: Bernd Storath <999999bst@gmail.com>
Date: Tue, 3 Sep 2024 15:54:23 +0200
Subject: [PATCH] fix some errors

---
 src/server/utils/WireGuard.ts         | 5 ++---
 src/services/database/migrations/1.ts | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/server/utils/WireGuard.ts b/src/server/utils/WireGuard.ts
index c1733c8a..59402682 100644
--- a/src/server/utils/WireGuard.ts
+++ b/src/server/utils/WireGuard.ts
@@ -175,13 +175,12 @@ Endpoint = ${system.wgHost}:${system.wgConfigPort}`;
     });
     const preSharedKey = await exec('wg genpsk');
 
-    // TODO: cidr
     // Calculate next IP
     const cidr = ip.cidrSubnet(system.userConfig.addressRange);
     let address;
     for (
-      let i = ip.toLong(cidr.firstAddress);
-      i <= ip.toLong(cidr.lastAddress);
+      let i = ip.toLong(cidr.firstAddress) + 1;
+      i <= ip.toLong(cidr.lastAddress) - 1;
       i++
     ) {
       const currentIp = ip.fromLong(i);
diff --git a/src/services/database/migrations/1.ts b/src/services/database/migrations/1.ts
index 05b30f42..7f4f5aef 100644
--- a/src/services/database/migrations/1.ts
+++ b/src/services/database/migrations/1.ts
@@ -2,7 +2,7 @@ import type { Low } from 'lowdb';
 import type { Database } from '../repositories/database';
 import packageJson from '@@/package.json';
 import { ChartType } from '../repositories/system';
-import { cidrSubnet } from 'ip';
+import ip from 'ip';
 
 export async function run1(db: Low<Database>) {
   const privateKey = await exec('wg genkey');
@@ -10,7 +10,7 @@ export async function run1(db: Low<Database>) {
     log: 'echo ***hidden*** | wg pubkey',
   });
   const addressRange = '10.8.0.0/24';
-  const cidr = cidrSubnet(addressRange);
+  const cidr = ip.cidrSubnet(addressRange);
   const database: Database = {
     migrations: [],
     system: {
@@ -30,7 +30,7 @@ export async function run1(db: Low<Database>) {
         defaultDns: ['1.1.1.1'],
         allowedIps: ['0.0.0.0/0', '::/0'],
       },
-      wgDevice: 'wg0',
+      wgDevice: 'eth0',
       // TODO: wgHost has to be configured when onboarding
       wgHost: '',
       wgPort: 51820,