cmd/tailscaled, net/tstun: add build tags to omit BIRD and TAP

Signed-off-by: Andrew Dunham <andrew@du.nham.ca>
Change-Id: I7a39f4eeeb583b73ecffaf4c5f086a38e3a53e2e
pull/6217/head
Andrew Dunham 2 years ago
parent 036334e913
commit c2d7940ec0

@ -54,7 +54,7 @@ while [ "$#" -gt 1 ]; do
--extra-small) --extra-small)
shift shift
ldflags="$ldflags -w -s" ldflags="$ldflags -w -s"
tags="${tags:+$tags,}ts_omit_aws" tags="${tags:+$tags,}ts_omit_aws,ts_omit_bird,ts_omit_tap"
;; ;;
--box) --box)
shift shift

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//go:build go1.19 && (linux || darwin || freebsd || openbsd) //go:build go1.19 && (linux || darwin || freebsd || openbsd) && !ts_omit_bird
package main package main

@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//go:build !ts_omit_tap
package tstun package tstun
import ( import (

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//go:build !linux //go:build !linux || ts_omit_tap
package tstun package tstun

@ -31,6 +31,9 @@ func New(logf logger.Logf, tunName string) (tun.Device, string, error) {
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
return nil, "", errors.New("tap only works on Linux") return nil, "", errors.New("tap only works on Linux")
} }
if createTAP == nil { // if the ts_omit_tap tag is used
return nil, "", errors.New("tap is not supported in this build")
}
f := strings.Split(tunName, ":") f := strings.Split(tunName, ":")
var tapName, bridgeName string var tapName, bridgeName string
switch len(f) { switch len(f) {

Loading…
Cancel
Save