Skip to content

feat: add endpoint to get listening ports in agent #4260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 6, 2022
Merged

feat: add endpoint to get listening ports in agent #4260

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ed21d4a
feat: add endpoint to get listening ports in agent
deansheather Sep 29, 2022
d4663fa
fixup! feat: add endpoint to get listening ports in agent
deansheather Sep 29, 2022
3f741c6
fixup! feat: add endpoint to get listening ports in agent
deansheather Sep 29, 2022
4fbc0ff
fixup! feat: add endpoint to get listening ports in agent
deansheather Oct 4, 2022
0f7b8dc
fixup! feat: add endpoint to get listening ports in agent
deansheather Oct 4, 2022
ea2027e
fixup! feat: add endpoint to get listening ports in agent
deansheather Oct 4, 2022
e2973ba
fixup! feat: add endpoint to get listening ports in agent
deansheather Oct 4, 2022
d9635a8
please work tests
deansheather Oct 6, 2022
3962635
Revert "please work tests"
deansheather Oct 6, 2022
4ea68bc
Merge branch 'main' into dean/listening-ports
deansheather Oct 6, 2022
d4b7ce9
fixup! Merge branch 'main' into dean/listening-ports
deansheather Oct 6, 2022
b084277
fixup! Merge branch 'main' into dean/listening-ports
deansheather Oct 6, 2022
0960944
fixup! Merge branch 'main' into dean/listening-ports
deansheather Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! Merge branch 'main' into dean/listening-ports
  • Loading branch information
@deansheather
deansheather committed Oct 6, 2022
commit 0960944e1d69a5de9caa3192d5425dbe42c0262d
8 changes: 8 additions & 0 deletions agent/ports_supported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,20 @@ func (lp *listeningPortsHandler) getListeningPorts() ([]codersdk.ListeningPort,
return nil, xerrors.Errorf("scan listening ports: %w", err)
}

seen := make(map[uint16]struct{}, len(tabs))
ports := []codersdk.ListeningPort{}
for _, tab := range tabs {
if tab.LocalAddr == nil || tab.LocalAddr.Port < uint16(codersdk.MinimumListeningPort) {
continue
}

// Don't include ports that we've already seen. This can happen on
// Windows, and maybe on Linux if you're using a shared listener socket.
if _, ok := seen[tab.LocalAddr.Port]; ok {
continue
}
seen[tab.LocalAddr.Port] = struct{}{}

procName := ""
if tab.Process != nil {
procName = tab.Process.Name
Expand Down