+ BGPQ path argument

ipcjk · ipcjk · commit a81dd998b0c3 · 2026-01-07T09:27:57.000+01:00
+ Raise version number for pot. release
diff --git a/bgpqworkers/bgpqworkers.go b/bgpqworkers/bgpqworkers.go
@@ -64,10 +64,23 @@ func (b *baseBGPQWorker) runCommand(args []string) (ixtypes.PrefixFilters, error
 	return filters, nil
 }
 
-func NewBGPQ3Worker() *BGPQ3Worker {
+func NewBGPQ3Worker(path string) *BGPQ3Worker {
+	var executable string
+	if path != "" {
+		if _, err := os.Stat(path); err == nil {
+			// check if path is executable on linux or mac
+			executable = path
+		} else {
+			log.Printf("Warning: %s is not a valid executable file, will use default executable", path)
+			executable = findExecutable(getExecutableName("bgpq3"))
+		}
+	} else {
+		executable = findExecutable(getExecutableName("bgpq3"))
+	}
+
 	return &BGPQ3Worker{
 		baseBGPQWorker{config: BGPQConfig{
-			Executable: findExecutable(getExecutableName("bgpq3")),
+			Executable: executable,
 			Version:    3,
 		}},
 	}
@@ -86,20 +99,33 @@ type BGPQ4Worker struct {
 	baseBGPQWorker
 }
 
-func NewBGPQ4Worker() *BGPQ4Worker {
+func NewBGPQ4Worker(path string) *BGPQ4Worker {
+	var executable string
+	if path != "" {
+		if _, err := os.Stat(path); err == nil {
+			// check if path is executable on linux or mac
+			executable = path
+		} else {
+			log.Printf("Warning: %s is not a valid executable file, will use default executable", path)
+			executable = findExecutable(getExecutableName("bgpq4"))
+		}
+	} else {
+		executable = findExecutable(getExecutableName("bgpq4"))
+	}
+
 	return &BGPQ4Worker{
 		baseBGPQWorker{config: BGPQConfig{
-			Executable: findExecutable(getExecutableName("bgpq4")),
+			Executable: executable,
 			Version:    4,
 		}},
 	}
 }
 
-func NewBGPQWorker(version int) BGPQ {
+func NewBGPQWorker(version int, path string) BGPQ {
 	if version == 4 {
-		return NewBGPQ4Worker()
+		return NewBGPQ4Worker(path)
 	}
-	return NewBGPQ3Worker()
+	return NewBGPQ3Worker(path)
 }
 
 // GenPrefixList generates the prefix lists in bgqp4 way
diff --git a/bgpqworkers/bgpqworkers_test.go b/bgpqworkers/bgpqworkers_test.go
@@ -8,7 +8,7 @@ import (
 
 func TestRunBGPQ3Worker(t *testing.T) {
 	testAsMacro := "AS196922"
-	bgpWorker := NewBGPQ3Worker()
+	bgpWorker := NewBGPQ3Worker("")
 
 	prefixFilters, err := bgpWorker.GenPrefixList("as196922p4", testAsMacro, 4, true)
 	if err != nil {
@@ -41,7 +41,7 @@ func TestRunBGPQ3Worker(t *testing.T) {
 
 func TestRunBGPQ3WorkerWithSource(t *testing.T) {
 	testAsMacro := "RIPE::AS16097:AS-HLKOMM"
-	bgpWorker := NewBGPQ3Worker()
+	bgpWorker := NewBGPQ3Worker("")
 
 	prefixFilters, err := bgpWorker.GenPrefixList("as16097p4", testAsMacro, 4, true)
 	if err != nil {
@@ -75,7 +75,7 @@ func TestRunBGPQ3WorkerWithSource(t *testing.T) {
 
 func TestRunBGPQ4Worker(t *testing.T) {
 	testAsMacro := "AS196922"
-	bgpWorker := NewBGPQ4Worker()
+	bgpWorker := NewBGPQ4Worker("")
 
 	prefixFilters, err := bgpWorker.GenPrefixList("as196922p4", testAsMacro, 4, true)
 	if err != nil {
@@ -109,7 +109,7 @@ func TestRunBGPQ4Worker(t *testing.T) {
 
 func TestRunBGPQ4WorkerWithSource(t *testing.T) {
 	testAsMacro := "RIPE::AS16097:AS-HLKOMM"
-	bgpWorker := NewBGPQ4Worker()
+	bgpWorker := NewBGPQ4Worker("")
 
 	prefixFilters, err := bgpWorker.GenPrefixList("as16097p4", testAsMacro, 4, true)
 	if err != nil {
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,9 +1,9 @@
 FROM alpine:latest
 RUN apk update && apk upgrade && apk add unzip ca-certificates openssl
 WORKDIR /ixgen
-RUN wget -O /tmp/ixgen.tar.gz https://github.com/ipcjk/ixgen/releases/download/0.7/release.tar.gz && tar xfz /tmp/ixgen.tar.gz --exclude release/bgpq3.mac --exclude release/ixapiserver.exe --exclude release/ixapiserver.mac --exclude release/ixgen.mac --exclude release/ixgen.exe --strip 1 && rm /tmp/ixgen.tar.gz
+RUN wget -O /tmp/ixgen.tar.gz https://github.com/ipcjk/ixgen/releases/download/0.8a/release.tar.gz && tar xfz /tmp/ixgen.tar.gz --exclude release/bgpq3.mac --exclude release/ixapiserver.exe --exclude release/ixapiserver.mac --exclude release/ixgen.mac --exclude release/ixgen.exe --strip 1 && rm /tmp/ixgen.tar.gz
 RUN mv /ixgen/ixgen.linux /ixgen/ixgen && mv /ixgen/ixapiserver.linux /ixgen/ixapiserver
 # RUN mv /ixgen/release/configuration/peering.ini /ixgen/release/configuration/example.ini
 # E.g. add your peering.ini from your source
-MAINTAINER Joerg Kost <jk@ip-clear.de>
+LABEL maintainer="Joerg Kost <jk@ip-clear.de>"
 #CMD ["/ixgen/release/ixgen.linux"]
diff --git a/docker/Dockerfile.git b/docker/Dockerfile.git
@@ -0,0 +1,24 @@
+FROM alpine:latest
+RUN apk update && apk upgrade
+RUN apk add  --virtual .build-deps --no-cache unzip ca-certificates openssl go git libc-dev
+WORKDIR /build
+RUN git clone https://github.com/ipcjk/ixgen.git .
+RUN go install ./...
+# RUN apk del .build-deps
+FROM alpine:latest
+WORKDIR /ixgen
+RUN apk update && apk upgrade && apk add ca-certificates
+RUN mkdir /ixgen/configuration && mkdir /ixgen/cache
+COPY --from=0 /root/go/bin/ixgen /ixgen/ixgen
+COPY --from=0 /root/go/bin/ixapiserver /ixgen/ixapiserver
+COPY --from=0 /build/configuration/*  /ixgen/configuration/
+COPY --from=0 /build/Readme.md  /ixgen/README
+COPY --from=0 /build/bgpq3.linux  /ixgen/bgpq3.linux
+COPY --from=0 /build/bgpq3.license  /ixgen/bgpq3.license
+COPY --from=0 /build/bgpq4.linux  /ixgen/bgpq4.linux
+COPY --from=0 /build/bgpq4.license  /ixgen/bgpq4.license
+COPY --from=0 /build/templates  /ixgen/templates
+COPY --from=0 /build/LICENSE  /ixgen/LICENSE
+RUN /ixgen/ixgen -buildcache
+LABEL maintainer="Joerg Kost <jk@ip-clear.de>"
+
diff --git a/ixgen.go b/ixgen.go
@@ -33,6 +33,7 @@ var peerGenerator *peergen.Peergen
 var printOrExit, buildCache, version bool
 var prefixFactor float64
 var bgpqVersion int
+var bgpqPath string
 
 /* Api server / uri */
 var cacheDirectory string
@@ -64,6 +65,7 @@ func readArgumentsAndSetup() {
 	flag.StringVar(&apiServiceURL, "api", "https://www.peeringdb.com/api", "use a differnt server as sources instead local/api-service.")
 	flag.StringVar(&peeringDBAPIKey, "apikey", "", "Peering DB API-Key")
 	flag.IntVar(&bgpqVersion, "bgpq", 3, "BGPQ version to use (3 or 4)")
+	flag.StringVar(&bgpqPath, "bgpqpath", "", "path to bgpq binary, default use auto-detection")
 
 	/* profiling support */
 	flag.StringVar(&cpuprofile, "cpuprofile", "", "write cpu profile to `file`")
@@ -72,7 +74,7 @@ func readArgumentsAndSetup() {
 	flag.Parse()
 
 	if version {
-		log.Println("ixgen 0.8 (C) 2025 by Jörg Kost, jk@ip-clear.de")
+		log.Println("ixgen 0.8a (C) 2026 by Jörg Kost, jk@ip-clear.de")
 		os.Exit(0)
 	}
 
@@ -121,7 +123,7 @@ func main() {
 	exchanges = ixworkers.WorkerMergePeerConfiguration(exchanges, apiServiceURL, peeringDBAPIKey, exchangeOnly, myASN, prefixFactor)
 	/* Merge BGPq prefixFilters if we are on Mac or Linux */
 	if runtime.GOOS == "linux" || runtime.GOOS == "darwin" {
-		exchanges = ixworkers.WorkerMergePrefixFilters(exchanges, exchangeOnly, bgpqVersion)
+		exchanges = ixworkers.WorkerMergePrefixFilters(exchanges, exchangeOnly, bgpqVersion, bgpqPath)
 	}
 
 	if !printOrExit {
diff --git a/ixworkers/ixworkers.go b/ixworkers/ixworkers.go
@@ -299,10 +299,10 @@ func WorkerMergePeerConfiguration(exchanges ixtypes.IXs, apiServiceURL string, a
 	return exchanges
 }
 
-func WorkerMergePrefixFilters(exchanges ixtypes.IXs, exchangeOnly string, bgpqVersion int) ixtypes.IXs {
+func WorkerMergePrefixFilters(exchanges ixtypes.IXs, exchangeOnly string, bgpqVersion int, bgpqPath string) ixtypes.IXs {
 	var wg sync.WaitGroup
 
-	bgpWorker := bgpqworkers.NewBGPQWorker(bgpqVersion)
+	bgpWorker := bgpqworkers.NewBGPQWorker(bgpqVersion, bgpqPath)
 
 	wg.Add(len(exchanges))
 	for k := range exchanges {
