myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

More unused parameters removed in protocol functions

Browse source
This commit is contained in:
Juan Font Alonso 2022-09-04 11:41:31 +02:00
parent e0857f0226
commit 4527801d48
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
protocol_common.go
View file

@ -215,7 +215,7 @@ func (h *Headscale) handleRegisterCommon(
// If machine is not expired, and is register, we have a already accepted this machine, // If machine is not expired, and is register, we have a already accepted this machine,
// let it proceed with a valid registration // let it proceed with a valid registration
if !machine.isExpired() { if !machine.isExpired() {
h.handleMachineValidRegistrationCommon(writer, req, *machine, machineKey) h.handleMachineValidRegistrationCommon(writer, *machine, machineKey)
return return
} }
@ -226,7 +226,6 @@ func (h *Headscale) handleRegisterCommon(
!machine.isExpired() { !machine.isExpired() {
h.handleMachineRefreshKeyCommon( h.handleMachineRefreshKeyCommon(
writer, writer,
req,
registerRequest, registerRequest,
*machine, *machine,
machineKey, machineKey,
@ -236,7 +235,7 @@ func (h *Headscale) handleRegisterCommon(
} }
// The machine has expired // The machine has expired
h.handleMachineExpiredCommon(writer, req, registerRequest, *machine, machineKey) h.handleMachineExpiredCommon(writer, registerRequest, *machine, machineKey)
machine.Expiry = &time.Time{} machine.Expiry = &time.Time{}
h.registrationCache.Set( h.registrationCache.Set(
@ -567,7 +566,6 @@ func (h *Headscale) handleMachineLogOutCommon(
func (h *Headscale) handleMachineValidRegistrationCommon( func (h *Headscale) handleMachineValidRegistrationCommon(
writer http.ResponseWriter, writer http.ResponseWriter,
req *http.Request,
machine Machine, machine Machine,
machineKey key.MachinePublic, machineKey key.MachinePublic,
) { ) {
@ -621,7 +619,6 @@ func (h *Headscale) handleMachineValidRegistrationCommon(
func (h *Headscale) handleMachineRefreshKeyCommon( func (h *Headscale) handleMachineRefreshKeyCommon(
writer http.ResponseWriter, writer http.ResponseWriter,
req *http.Request,
registerRequest tailcfg.RegisterRequest, registerRequest tailcfg.RegisterRequest,
machine Machine, machine Machine,
machineKey key.MachinePublic, machineKey key.MachinePublic,
@ -681,7 +678,6 @@ func (h *Headscale) handleMachineRefreshKeyCommon(
func (h *Headscale) handleMachineExpiredCommon( func (h *Headscale) handleMachineExpiredCommon(
writer http.ResponseWriter, writer http.ResponseWriter,
req *http.Request,
registerRequest tailcfg.RegisterRequest, registerRequest tailcfg.RegisterRequest,
machine Machine, machine Machine,
machineKey key.MachinePublic, machineKey key.MachinePublic,