Skip to content

Commit

Permalink
Merge branch 'master' into 4722-dhcp-http-panic
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeneOne1 committed Sep 13, 2022
2 parents 39b344f + b74b92f commit 8a8db48
Show file tree
Hide file tree
Showing 49 changed files with 7 additions and 56 deletions.
1 change: 0 additions & 1 deletion internal/aghnet/arpdb_bsd.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build darwin || freebsd
// +build darwin freebsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/arpdb_bsd_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build darwin || freebsd
// +build darwin freebsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/arpdb_linux.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/arpdb_linux_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/arpdb_openbsd.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build openbsd
// +build openbsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/arpdb_openbsd_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build openbsd
// +build openbsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/arpdb_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/arpdb_windows_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghnet

Expand Down
3 changes: 1 addition & 2 deletions internal/aghnet/dhcp_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
//go:build darwin || freebsd || linux || openbsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/dhcp_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/hostscontainer_linux.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/hostscontainer_others.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !(windows || linux)
// +build !windows,!linux

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/hostscontainer_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/interfaces_linux.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package aghnet

Expand Down
3 changes: 1 addition & 2 deletions internal/aghnet/interfaces_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd || solaris
// +build aix darwin dragonfly freebsd netbsd openbsd solaris
//go:build darwin || freebsd || openbsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/interfaces_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/ipset_linux.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/ipset_linux_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/ipset_others.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !linux
// +build !linux

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/net_bsd.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build darwin || freebsd || openbsd
// +build darwin freebsd openbsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/net_darwin.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build darwin
// +build darwin

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/net_freebsd.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build freebsd
// +build freebsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/net_freebsd_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build freebsd
// +build freebsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/net_linux.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/net_linux_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/net_openbsd.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build openbsd
// +build openbsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/net_openbsd_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build openbsd
// +build openbsd

package aghnet

Expand Down
3 changes: 1 addition & 2 deletions internal/aghnet/net_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build openbsd || freebsd || linux || darwin
// +build openbsd freebsd linux darwin
//go:build darwin || freebsd || linux || openbsd

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/net_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/systemresolvers_others.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !windows
// +build !windows

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/systemresolvers_others_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !windows
// +build !windows

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/systemresolvers_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghnet/systemresolvers_windows_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghnet

Expand Down
1 change: 0 additions & 1 deletion internal/aghos/endian_big.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build mips || mips64
// +build mips mips64

// This file is an adapted version of github.com/josharian/native.

Expand Down
1 change: 0 additions & 1 deletion internal/aghos/endian_little.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build amd64 || 386 || arm || arm64 || mipsle || mips64le || ppc64le
// +build amd64 386 arm arm64 mipsle mips64le ppc64le

// This file is an adapted version of github.com/josharian/native.

Expand Down
3 changes: 1 addition & 2 deletions internal/aghos/os_bsd.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build darwin || netbsd || openbsd
// +build darwin netbsd openbsd
//go:build darwin || openbsd

package aghos

Expand Down
1 change: 0 additions & 1 deletion internal/aghos/os_freebsd.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build freebsd
// +build freebsd

package aghos

Expand Down
1 change: 0 additions & 1 deletion internal/aghos/os_linux.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package aghos

Expand Down
1 change: 0 additions & 1 deletion internal/aghos/os_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build darwin || freebsd || linux || openbsd
// +build darwin freebsd linux openbsd

package aghos

Expand Down
1 change: 0 additions & 1 deletion internal/aghos/os_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghos

Expand Down
3 changes: 1 addition & 2 deletions internal/aghos/syslog_others.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !(windows || plan9)
// +build !windows,!plan9
//go:build !windows

package aghos

Expand Down
3 changes: 1 addition & 2 deletions internal/aghos/syslog_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows || plan9
// +build windows plan9
//go:build windows

package aghos

Expand Down
3 changes: 1 addition & 2 deletions internal/aghos/user_unix.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build darwin || freebsd || linux || netbsd || openbsd
// +build darwin freebsd linux netbsd openbsd
//go:build darwin || freebsd || linux || openbsd

package aghos

Expand Down
1 change: 0 additions & 1 deletion internal/aghos/user_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build windows
// +build windows

package aghos

Expand Down
1 change: 0 additions & 1 deletion internal/home/service_linux.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build linux
// +build linux

package home

Expand Down
1 change: 0 additions & 1 deletion internal/home/service_openbsd.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build openbsd
// +build openbsd

package home

Expand Down
1 change: 0 additions & 1 deletion internal/home/service_others.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !(openbsd || linux)
// +build !openbsd,!linux

package home

Expand Down
1 change: 0 additions & 1 deletion internal/version/norace.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build !race
// +build !race

package version

Expand Down
1 change: 0 additions & 1 deletion internal/version/race.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build race
// +build race

package version

Expand Down

0 comments on commit 8a8db48

Please sign in to comment.