Use new network classes from tailscale_tun
This commit is contained in:
parent
1e5b9bcea1
commit
8a3da023d1
@ -34,7 +34,7 @@
|
|||||||
<script src="./xterm/xterm.js"></script>
|
<script src="./xterm/xterm.js"></script>
|
||||||
<script src="./xterm/xterm-addon-fit.js"></script>
|
<script src="./xterm/xterm-addon-fit.js"></script>
|
||||||
<script>
|
<script>
|
||||||
window.networkInterface = { bind: null, connect: null, listen: null, ready: false };
|
window.networkInterface = { ready: false };
|
||||||
</script>
|
</script>
|
||||||
<script type="module" src="network.js"></script>
|
<script type="module" src="network.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
@ -51,16 +51,15 @@ const netmapUpdateCb = (map) => {
|
|||||||
const ip = map.self.addresses[0];
|
const ip = map.self.addresses[0];
|
||||||
statusElem.innerHTML = "IP: "+ip;
|
statusElem.innerHTML = "IP: "+ip;
|
||||||
};
|
};
|
||||||
const { listen, connect, bind, up } = await autoConf({
|
const { tcpSocket, udpSocket, up } = await autoConf({
|
||||||
loginUrlCb,
|
loginUrlCb,
|
||||||
stateUpdateCb,
|
stateUpdateCb,
|
||||||
netmapUpdateCb,
|
netmapUpdateCb,
|
||||||
authKey,
|
authKey,
|
||||||
controlUrl,
|
controlUrl,
|
||||||
});
|
});
|
||||||
window.networkInterface.bind = bind;
|
window.networkInterface.tcpSocket = tcpSocket;
|
||||||
window.networkInterface.connect = connect;
|
window.networkInterface.udpSocket = udpSocket;
|
||||||
window.networkInterface.listen = listen;
|
|
||||||
window.networkInterface.ready = true;
|
window.networkInterface.ready = true;
|
||||||
loginElem.style.cursor = "pointer";
|
loginElem.style.cursor = "pointer";
|
||||||
statusElem.style.color = "white";
|
statusElem.style.color = "white";
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
<script src="./xterm/xterm.js"></script>
|
<script src="./xterm/xterm.js"></script>
|
||||||
<script src="./xterm/xterm-addon-fit.js"></script>
|
<script src="./xterm/xterm-addon-fit.js"></script>
|
||||||
<script>
|
<script>
|
||||||
window.networkInterface = { bind: null, connect: null, listen: null, ready: false };
|
window.networkInterface = { ready: false };
|
||||||
</script>
|
</script>
|
||||||
<script type="module" src="network.js"></script>
|
<script type="module" src="network.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
1373
tun/ipstack.js
1373
tun/ipstack.js
File diff suppressed because one or more lines are too long
BIN
tun/ipstack.wasm
BIN
tun/ipstack.wasm
Binary file not shown.
Binary file not shown.
@ -83,9 +83,8 @@ export async function init() {
|
|||||||
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
connect: IpStack.connect,
|
tcpSocket: IpStack.TCPSocket.create,
|
||||||
listen: IpStack.listen,
|
udpSocket: IpStack.UDPSocket.create,
|
||||||
bind: IpStack.bind,
|
|
||||||
parseIP: IpStack.parseIP,
|
parseIP: IpStack.parseIP,
|
||||||
resolve: IpStack.resolve,
|
resolve: IpStack.resolve,
|
||||||
up: async (conf) => {
|
up: async (conf) => {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import {State, init} from "./tailscale_tun.js";
|
import {State, init} from "./tailscale_tun.js";
|
||||||
|
|
||||||
export async function autoConf({loginUrlCb, stateUpdateCb, netmapUpdateCb, controlUrl, authKey}) {
|
export async function autoConf({loginUrlCb, stateUpdateCb, netmapUpdateCb, controlUrl, authKey}) {
|
||||||
const { listen, connect, bind, parseIP, resolve, up, down, login, logout, listeners } = await init();
|
const { tcpSocket, udpSocket, parseIP, resolve, up, down, login, logout, listeners } = await init();
|
||||||
|
|
||||||
const settings = {
|
const settings = {
|
||||||
controlUrl: controlUrl,
|
controlUrl: controlUrl,
|
||||||
@ -65,9 +65,8 @@ export async function autoConf({loginUrlCb, stateUpdateCb, netmapUpdateCb, contr
|
|||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
bind,
|
tcpSocket,
|
||||||
connect,
|
udpSocket,
|
||||||
listen,
|
|
||||||
parseIP,
|
parseIP,
|
||||||
resolve,
|
resolve,
|
||||||
up: async () => {
|
up: async () => {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user