Skip to content

Commit

Permalink
[vnet] run os config on windows (#51900)
Browse files Browse the repository at this point in the history
  • Loading branch information
nklaassen authored Feb 6, 2025
1 parent f361831 commit 6980909
Showing 1 changed file with 38 additions and 21 deletions.
59 changes: 38 additions & 21 deletions lib/vnet/admin_process_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ package vnet

import (
"context"
"errors"
"time"

"github.com/gravitational/trace"
"github.com/jonboulle/clockwork"
"golang.org/x/sync/errgroup"
"golang.zx2c4.com/wireguard/tun"
)

Expand Down Expand Up @@ -68,29 +70,44 @@ func runWindowsAdminProcess(ctx context.Context, cfg *windowsAdminProcessConfig)
return trace.Wrap(err, "creating network stack")
}

ctx, cancel := context.WithCancel(ctx)
defer cancel()
errCh := make(chan error)
go func() {
errCh <- trace.Wrap(networkStack.run(ctx), "running network stack")
}()
loop:
for {
select {
case <-time.After(time.Second):
if err := clt.Ping(ctx); err != nil {
log.InfoContext(ctx, "Failed to ping client application, it may have exited, shutting down", "error", err)
break loop
osConfigProvider, err := newRemoteOSConfigProvider(
clt,
tunName,
networkStackConfig.ipv6Prefix.String(),
networkStackConfig.dnsIPv6.String(),
)
if err != nil {
return trace.Wrap(err, "creating OS config provider")
}
osConfigurator := newOSConfigurator(osConfigProvider)

g, ctx := errgroup.WithContext(ctx)
g.Go(func() error {
if err := networkStack.run(ctx); err != nil {
return trace.Wrap(err, "running network stack")
}
return errors.New("network stack terminated")
})
g.Go(func() error {
if err := osConfigurator.runOSConfigurationLoop(ctx); err != nil {
return trace.Wrap(err, "running OS configuration loop")
}
return errors.New("OS configuration loop terminated")
})
g.Go(func() error {
tick := time.Tick(time.Second)
for {
select {
case <-tick:
if err := clt.Ping(ctx); err != nil {
return trace.Wrap(err, "failed to ping client application, it may have exited, shutting down")
}
case <-ctx.Done():
return ctx.Err()
}
case <-ctx.Done():
log.InfoContext(ctx, "Context canceled, shutting down", "error", err)
break loop
}
}
// Cancel the context and wait for networkStack.run to terminate.
cancel()
err = <-errCh
return trace.Wrap(err, "running VNet network stack")
})
return trace.Wrap(g.Wait(), "running VNet admin process")
}

func newWindowsNetworkStackConfig(tun tunDevice, clt *clientApplicationServiceClient) (*networkStackConfig, error) {
Expand Down

0 comments on commit 6980909

Please sign in to comment.