pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-02 08:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clients' of https://github.com/fosrl/pangolin_dg into clients

Browse Source
This commit is contained in:
miloschwartz
2025-02-21 18:51:43 -05:00
parent fcf6abd36e b9080a1ec1
commit 1a63669805
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/routers/client/createClient.ts
View File

@@ -18,7 +18,7 @@ import HttpCode from "@server/types/HttpCode";
import createHttpError from "http-errors";
import logger from "@server/logger";
import { eq, and } from "drizzle-orm";
import { addPeer } from "../gerbil/peers";
import { addPeer } from "../newt/peers";
import { fromError } from "zod-validation-error";
import { newts } from "@server/db/schema";
import moment from "moment";

11
server/routers/client/pickClientDefaults.ts
View File

@@ -101,16 +101,13 @@ export async function pickClientDefaults(
subnets.push(
address.replace(
/\/\d+$/,
`/${config.getRawConfig().wg_site.site_block_size}`
`/${config.getRawConfig().newt.site_block_size}`
)
);
logger.debug(`Subnets: ${subnets}`);
logger.debug(`Address: ${address}`);
logger.debug(`Block size: ${config.getRawConfig().wg_site.block_size}`);
logger.debug(`Site block size: ${config.getRawConfig().wg_site.site_block_size}`);
const newSubnet = findNextAvailableCidr(
subnets,
config.getRawConfig().wg_site.site_block_size,
config.getRawConfig().newt.site_block_size,
address
);
if (!newSubnet) {
@@ -133,7 +130,7 @@ export async function pickClientDefaults(
name: site.name,
listenPort: listenPort,
endpoint: endpoint,
subnet: newSubnet,
subnet: `${newSubnet.split("/")[0]}/${config.getRawConfig().newt.block_size}`, // we want the block size of the whole subnet
olmId: olmId,
olmSecret: secret
},