bgptool 0.2.2 (fix #53)

.github/workflows/build.yml

@@ -14,21 +14,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      BGPTOOLS_VERSION: 0.0.3
-      GO111MODULE: on
+      BGPTOOLS_VERSION: 0.2.2
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
       - uses: cargo-bins/cargo-binstall@main
-      - uses: actions/setup-go@v2
-        with:
-          go-version: 1.16
-      - run: sudo apt-get install -y lftp bgpdump tree jq axel
+      - run: sudo apt-get install -y tree jq axel
       - uses: actions/cache@v3
         with:
           key: ${{ runner.os }}-build-dependencies
           path: |
-            ~/go/bin
             ~/.cargo/bin
       - run: ./dependency.sh
       - uses: nick-fields/retry@v3

common.sh

@@ -23,19 +23,13 @@ prepare_data_v4(){
 	rm -f rib.gz
 	bgpkit-broker latest -c rrc00 --json | jq -c '.[] | select( .data_type | contains("rib")) | .url' | head -n 1 | xargs axel -q -o rib.gz
 	stat rib.gz
-	log_info "runing bgpdump v4 ..."
-	bgpdump -m -O rib.txt rib.gz
-	stat rib.txt
-	log_info "finish bgpdump v4"
+	log_info "rib.gz ready for bgptools"
 }
 prepare_data_v6(){
-	rm -f rib6.gz
+	rm -f rib6.bz2
 	bgpkit-broker latest -c route-views6 --json | jq -c '.[] | select( .data_type | contains("rib")) | .url' | head -n 1 | xargs axel -q -o rib6.bz2
 	stat rib6.bz2
-	log_info "runing bgpdump v6 ..."
-	bgpdump -m -O rib6.txt rib6.bz2
-	stat rib6.txt
-	log_info "finish bgpdump v6"
+	log_info "rib6.bz2 ready for bgptools"
 }
 prepare_data(){
 	curl -sSL https://bgp.potaroo.net/cidr/autnums.html | awk '-F[<>]' '{print $3,$5}' | grep '^AS' > asnames.txt &

dependency.sh

@@ -2,9 +2,6 @@
 
 set -e
 
-cidr-merger --version || \
-    go install github.com/zhanhb/cidr-merger@v1.1.2
-
 bgptools --version | grep -F $BGPTOOLS_VERSION || \
     cargo install --version $BGPTOOLS_VERSION bgptools
 
@@ -14,7 +11,6 @@ bgpkit-parser --version || \
 bgpkit-broker --version || \
     cargo binstall --secure --no-confirm bgpkit-broker@0.7.0
 
-cidr-merger --version
 bgptools --version
 bgpkit-parser --version
 bgpkit-broker --version

generate.sh

@@ -9,8 +9,8 @@ for file in operator/*.conf; do
 	operator=${operator##*/}
 	log_info "generating IP list of $operator ..."
 	get_asn $file
-	get_asn $file | xargs bgptools -b rib.txt  | cidr-merger -s | grep -Fv : | cat > result/${operator}.txt  &
-	get_asn $file | xargs bgptools -b rib6.txt | grep -v '^::/0$' | cidr-merger -s | grep -F  : | cat > result/${operator}6.txt &
+	get_asn $file | xargs bgptools --mrt-file rib.gz   | grep -Fv : | cat > result/${operator}.txt  &
+	get_asn $file | xargs bgptools --mrt-file rib6.bz2 | grep -v '^::/0$' | grep -F  : | cat > result/${operator}6.txt &
 done
 
 wait_exit