Release 1.9

* Fix issue bgp#83 - fix regression bug which ignored -S CLI option (#1)

* Fix issue #83 - fix regression bug which ignored -S CLI option, introduced by commit 08b81f7d19
---------

Co-authored-by: James Bensley <jwbensley@gmail.com>

* Fix off-by-one error

* Swap strlcpy for strdup

---------

Co-authored-by: James Bensley <jwbensley@gmail.com>

.github/images/alpine.Dockerfile

@@ -0,0 +1,17 @@
+ARG image=alpine:latest
+FROM $image
+
+# Install dependencies
+RUN apk upgrade
+RUN apk add autoconf automake file gcc gzip libtool make musl-dev
+
+# Add source code
+ADD . /src
+WORKDIR /src
+
+# Run steps
+RUN ./bootstrap
+RUN ./configure
+RUN make
+RUN make check
+RUN make distcheck

.github/images/alpine:3.17.Dockerfile

@@ -0,0 +1 @@
+alpine.Dockerfile

.github/images/alpine:edge.Dockerfile

@@ -0,0 +1 @@
+alpine.Dockerfile

.github/images/centos.Dockerfile

@@ -1,10 +1,9 @@
-ARG image=centos:8
-FROM $image
+ARG image=centos/centos:latest
+FROM quay.io/$image
 
 # Install dependencies
 RUN yum update -y
-RUN yum groupinstall -y 'Development Tools'
-RUN yum install -y autoconf automake findutils libtool
+RUN yum install -y autoconf automake gcc libtool make diffutils file gzip
 
 # Add source code
 ADD . /src
@@ -16,4 +15,3 @@ RUN ./configure
 RUN make
 RUN make check
 RUN make distcheck
-

.github/images/centos/centos:7.Dockerfile

@@ -0,0 +1 @@
+../centos.Dockerfile

.github/images/centos/centos:stream8.Dockerfile

@@ -0,0 +1 @@
+../centos.Dockerfile

.github/images/centos/centos:stream9.Dockerfile

@@ -0,0 +1 @@
+../centos.Dockerfile

.github/images/centos:7.Dockerfile

@@ -1 +0,0 @@
-centos.Dockerfile

.github/images/centos:8.Dockerfile

@@ -1 +0,0 @@
-centos.Dockerfile

.github/images/fedora/fedora:36.Dockerfile

@@ -0,0 +1 @@
+../centos.Dockerfile

.github/images/fedora/fedora:37.Dockerfile

@@ -0,0 +1 @@
+../centos.Dockerfile

.github/images/fedora/fedora:38.Dockerfile

@@ -0,0 +1 @@
+../centos.Dockerfile

.github/images/fedora:30.Dockerfile

@@ -1 +0,0 @@
-centos.Dockerfile

.github/images/fedora:31.Dockerfile

@@ -1 +0,0 @@
-centos.Dockerfile

.github/images/rockylinux/rockylinux:8.Dockerfile

@@ -0,0 +1 @@
+../centos.Dockerfile

.github/images/rockylinux/rockylinux:9.Dockerfile

@@ -0,0 +1 @@
+../centos.Dockerfile

.github/images/ubuntu:focal.Dockerfile

@@ -0,0 +1 @@
+debian.Dockerfile

.github/images/ubuntu:jammy.Dockerfile

@@ -0,0 +1 @@
+debian.Dockerfile

.github/workflows/build.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: bootstrap
       run: ./bootstrap
     - name: configure

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,38 @@
+name: CodeQL analysis
+
+on:
+  push:
+  pull_request:
+  schedule:
+    # build the main branch every Tuesday morning
+    - cron: '15 6 * * 2'
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp' ]
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+    - name: Build Application using script
+      run: |
+        ./bootstrap
+        ./configure
+        make
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/matrixbuild.yml

@@ -9,15 +9,23 @@ jobs:
       fail-fast: false
       matrix:
         dockerenv:
+          - debian:bookworm
+          - debian:bullseye
           - debian:buster
-          - debian:stretch
+          - ubuntu:jammy
+          - ubuntu:focal
           - ubuntu:bionic
-          - ubuntu:xenial
-          - centos:8
-          - centos:7
-          - fedora:31
-          - fedora:30
+          - fedora/fedora:38
+          - fedora/fedora:37
+          - fedora/fedora:36
+          - centos/centos:stream9
+          - centos/centos:stream8
+          - centos/centos:7
+          - rockylinux/rockylinux:9
+          - rockylinux/rockylinux:8
+          - alpine:edge
+          - alpine:3.17
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Run build on ${{matrix.dockerenv}}
       run: docker build . --file .github/images/${{matrix.dockerenv}}.Dockerfile --build-arg image=${{matrix.dockerenv}}

CHANGES

@@ -1,3 +1,31 @@
+1.9 (2023-03-05)
+    - Bugfix for -S problem (bgpq4#83) by James Bensley
+
+1.8 (2023-01-20)
+    - Downgrade 'key not found' to DEBUG level to reduce noise
+    - Re-introduce -p for private ASN support option
+
+1.7 (2022-11-03)
+    - Support SOURCE:: syntax (contributed by James Bensley)
+
+1.6 (2022-09-07)
+    - Fix a bug in address prefix range parsing
+
+1.5 (2022-07-25)
+    - Add support for the new Junos as-path-origins feature
+
+1.4 (2021-08-20)
+    - Fix BIRD aspath output
+
+1.3 (2021-08-20)
+    - Change versioning from X.Y.Z to Y.Z
+    - The repository file hierachy has been reorganized (compat/ include/)
+    - Man page has been extended
+    - Large portions of code have been reformatted to adhere to OpenBSD's source
+      file style guide to improve readability.
+    - Refactor: replace two-dimensional array for ASN storage with Red-Black tree
+    - Reduced memory usage
+
 0.0.9 (2021-08-18)
     - Fix various memory errors
 

IDEAS

@@ -0,0 +1,29 @@
+Ben Maddison taught me another aggregation trick:
+
+	route-set:      AS37271:RS-EXAMPLE
+	mp-members:     192.0.2.0/27
+	mp-members:     192.0.2.32/27
+	mp-members:     192.0.2.64/27
+	mp-members:     192.0.2.96/27
+	mp-members:     192.0.2.128/26
+	mp-members:     192.0.2.128/27
+	mp-members:     192.0.2.160/27
+	mp-members:     192.0.2.192/27
+	mp-members:     192.0.2.224/27
+	descr:          Example route-set
+	mnt-by:         MAINT-AS37271
+	changed:        benm@workonline.africa 20210819
+	source:         RADB
+
+BGPQ4 produces the following:
+
+	$ bgpq4 -A AS37271:RS-EXAMPLE
+	no ip prefix-list NN
+	ip prefix-list NN permit 192.0.2.0/25 ge 27 le 27
+	ip prefix-list NN permit 192.0.2.128/26 le 27
+	ip prefix-list NN permit 192.0.2.192/26 ge 27 le 27
+
+But the following aggregation also is valid, and shorter:
+
+	ip prefix-list NN permit 192.0.2.0/24 ge 27 le 27
+	ip prefix-list NN permit 192.0.2.128/26

README.md

@@ -1,5 +1,3 @@
-BGPQ4(8) - System Manager's Manual
-
 # NAME
 
 **bgpq4** - bgp filtering automation tool
@@ -13,8 +11,9 @@ BGPQ4(8) - System Manager's Manual
 \[**-f** *asn* |
 **-F** *fmt* |
 **-G** *asn*
+**-H** *asn*
 **-t**]
-\[**-46ABbDdJjNnsXU**]
+\[**-46ABbDdJjNnpsXU**]
 \[**-a** *asn*]
 \[**-r** *len*]
 \[**-R** *len*]
@@ -28,10 +27,10 @@ BGPQ4(8) - System Manager's Manual
 
 The
 **bgpq4**
-utility used to generate configurations (prefix-lists, extended
-access-lists, policy-statement terms and as-path lists) based on RADB data.
+utility is used to generate configurations (prefix-lists, extended
+access-lists, policy-statement terms and as-path lists) based on IRR data.
 
-The options are as follows:
+It's options are as follows:
 
 **-4**
 
@@ -84,6 +83,10 @@ The options are as follows:
 
 > generate output as-path access-list.
 
+**-H** *number*
+
+> generate output as-list for JunOS 21.3R1+ `as-path-origin` filter (JunOS only)
+
 **-h** *host\[:port]*
 
 > host running IRRD database (default: rr.ntt.net).
@@ -98,7 +101,11 @@ The options are as follows:
 
 **-K**
 
-> generate config for Mikrotik (default: Cisco).
+> generate config for Mikrotik ROSv6 (default: Cisco).
+
+**-K7**
+
+> generate config for Mikrotik ROSv7 (default: Cisco).
 
 **-l** *name*
 
@@ -127,11 +134,8 @@ The options are as follows:
 
 **-p**
 
-> accept routes registered for private ASNs (default: disabled)
-
-**-P**
-
-> generate prefix-list (default, backward compatibility).
+> emit prefixes where the origin ASN is in the private ASN range
+> (disabled by default).
 
 **-r** *len*
 
@@ -147,7 +151,7 @@ The options are as follows:
 
 **-S** *sources*
 
-> use specified sources only (recommended: RADB,RIPE,APNIC).
+> use specified sources only (recommended: RPKI,AFRINIC,ARIN,APNIC,LACNIC,RIPE).
 
 **-t**
 
@@ -159,12 +163,16 @@ The options are as follows:
 
 **-W** *len*
 
-> generate as-path strings of no more than len items (use 0 for inifinity).
+> generate as-path strings of no more than len items (use 0 for infinity).
 
 **-U**
 
 > generate config for Huawei devices (Cisco IOS by default)
 
+**-u**
+
+> generate output in Huawei XPL format.
+
 **-X**
 
 > generate config for Cisco IOS XR devices (plain IOS by default).
@@ -222,7 +230,7 @@ more compact:
 	ip prefix-list eltel permit 89.112.64.0/19
 	ip prefix-list eltel permit 217.170.64.0/19 ge 20 le 20
 
-\- you see, prefixes 89.112.0.0/19 and 89.112.32.0/19 now aggregated
+Prefixes 89.112.0.0/19 and 89.112.32.0/19 now aggregated
 into single entry 89.112.0.0/18 ge 19 le 19.
 
 Well, for Juniper we can generate even more interesting policy-options,
@@ -333,6 +341,91 @@ be in one line (sometimes it makes sense):
 	$ bgpq4 -6F "%n/%l; " as-eltel
 	2001:1b00::/32; 2620:4f:8000::/48; 2a04:bac0::/29; 2a05:3a80::/48;
 
+# NOTES ON SOURCES
+
+By default *bgpq4* trusts data from all databases mirrored into NTT's IRR service.
+Unfortunately, not all these databases are equal in how much can we trust their
+data.
+RIR maintained databases (AFRINIC, ARIN, APNIC, LACNIC and RIPE)
+shall be trusted more than the others because they have the knowledge about
+which address space is allocated to each ASN, other databases lack this
+knowledge and can (and actually do) contain some stale data: nobody but RIRs
+care to remove outdated route-objects when address space is revoked from one
+ASN and allocated to another. In order to keep their filters both compact and
+current, *bgpq4 users* are encouraged to use one of two method to limit
+database sources to only ones they trust.
+
+One option is to use the '-S' flag. This limits all queries to a specific data
+source. For example, the following command tells IIRd to only use data from
+the RIPE RIR DB to build the prefix list for the AS-SET:
+
+	$./bgpq4 -S RIPE AS-VOSTRON
+	no ip prefix-list NN
+	ip prefix-list NN permit 89.21.224.0/19
+	ip prefix-list NN permit 134.0.64.0/21
+
+Be aware though, than an AS-SET may contain members from other data sources.
+In this case IRRd won't respond to the bgpq4 query will all the prefixes in the
+AS-SET tree. Make sure to use the '-S' flag with all the data sources required
+for the AS-SET being expanded:
+
+	$./bgpq4 -S RIPE,ARIN AS-VOSTRON
+	no ip prefix-list NN
+	ip prefix-list NN permit 89.21.224.0/19
+	ip prefix-list NN permit 134.0.64.0/21
+	ip prefix-list NN permit 208.86.232.0/24
+	ip prefix-list NN permit 208.86.233.0/24
+	ip prefix-list NN permit 208.86.234.0/24
+	ip prefix-list NN permit 208.86.235.0/24
+
+The other option is to specify a source for an AS-SET or Route Set using the
+"::" notation. When bgpq4 detects this, it will look for "::" in the specified
+AS-SET or RS on the CLI, and in all members of the AS-SET/RS, and for each
+member with a data source specified in "::" format, it will set the IRRd data
+source to the given value, query the AS-SET/RS, then reset the data sources back
+ to the default list for the next object in the tree.
+
+	$./bgpq4 RIPE::AS-VOSTRON
+	no ip prefix-list NN
+	ip prefix-list NN permit 89.21.224.0/19
+	ip prefix-list NN permit 134.0.64.0/21
+	ip prefix-list NN permit 208.86.232.0/22
+	ip prefix-list NN permit 208.86.232.0/24
+	ip prefix-list NN permit 208.86.233.0/24
+	ip prefix-list NN permit 208.86.234.0/24
+	ip prefix-list NN permit 208.86.235.0/24
+
+In comparison to the '-S' flag, this method return all the prefixes under the
+AS-SET, but the root of the tree "AS-VOSTRON" was queries from RIPE only. None
+of the member objects used the "::" notation so they were queries from the
+default source list (which is all sources).
+
+
+General recommendations:
+
+Use minimal set of RIR databases (only those in which you and your
+customers have registered route-objects).
+
+Avoid using ARIN-NONAUTH and RIPE-NONAUTH as trusted sources: these records
+were created in database but for address space allocated to different RIR,
+so the NONAUTH databases have no chance to confirm validity of this route
+object.
+
+	$ bgpq4 -S RIPE,RADB as-space
+	no ip prefix-list NN
+	ip prefix-list NN permit 195.190.32.0/19
+	
+	$ bgpq4 -S RADB,RIPE as-space
+	no ip prefix-list NN
+	ip prefix-list NN permit 45.4.4.0/22
+	ip prefix-list NN permit 45.4.132.0/22
+	ip prefix-list NN permit 45.6.128.0/22
+	ip prefix-list NN permit 45.65.184.0/22
+	[...]
+
+When known, use the "::" notation to speicy the authortative data source for
+an AS-SET or RS instead of the -S flag.
+
 # PERFORMANCE
 
 To improve \`bgpq4\` performance when expanding extra-large AS-SETs you
@@ -383,7 +476,7 @@ In order to create a distribution archive, run:
 When everything is OK,
 **bgpq4**
 generates access-list to standard output and exits with status == 0.
-In case of errors they are printed to stderr and program exits with
+In case of errors they are printed to stderr and the program exits with
 non-zero status.
 
 # AUTHORS
@@ -406,5 +499,3 @@ Users and interested parties can subscribe to the BGPQ4 mailing list bgpq4@tcp0.
 # PROJECT MAINTAINER
 
 Job Snijders <job@sobornost.net>
-
-OpenBSD 7.0 - December 23, 2020

VERSION

@@ -1 +1 @@
-1.2
+1.9

bgpq4.8

@@ -37,9 +37,10 @@
 .Fl f Ar asn |
 .Fl F Ar fmt |
 .Fl G Ar asn
+.Fl H Ar asn
 .Fl t
 .Oc
-.Op Fl 46ABbDdJjNnsXU
+.Op Fl 46ABbDdJjNnpsXU
 .Op Fl a Ar asn
 .Op Fl r Ar len
 .Op Fl R Ar len
@@ -52,7 +53,7 @@
 The
 .Nm
 utility used to generate configurations (prefix-lists, extended
-access-lists, policy-statement terms and as-path lists) based on RADB data.
+access-lists, policy-statement terms and as-path lists) based on IRR data.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -83,6 +84,10 @@ generate input as-path access-list.
 generate output in user-defined format.
 .It Fl G Ar number
 generate output as-path access-list.
+.It Fl H Ar number
+generate output as-list for
+.Em as-path-origin
+filter (JunOS 21.3R1+)
 .It Fl h Ar host[:port]
 host running IRRD database (default: rr.ntt.net).
 .It Fl J
@@ -90,7 +95,9 @@ generate config for Juniper (default: Cisco).
 .It Fl j
 generate output in JSON format (default: Cisco).
 .It Fl K
-generate config for Mikrotik (default: Cisco).
+generate config for Mikrotik ROSv6 (default: Cisco).
+.It Fl K7
+generate config for Mikrotik ROSv7 (default: Cisco).
 .It Fl l Ar name
 name of generated entry.
 .It Fl L Ar limit
@@ -105,9 +112,7 @@ generate config for Nokia SR OS MD-CLI (Cisco IOS by default)
 .It Fl N
 generate config for Nokia SR OS classic CLI (Cisco IOS by default).
 .It Fl p
-accept routes registered for private ASNs (default: disabled)
-.It Fl P
-generate prefix-list (default, backward compatibility).
+emit prefixes where the origin ASN is in the private ASN range (disabled by default).
 .It Fl r Ar len
 allow more specific routes starting with specified masklen too.
 .It Fl R Ar len
@@ -115,15 +120,17 @@ allow more specific routes up to specified masklen too.
 .It Fl s
 generate sequence numbers in IOS-style prefix-lists.
 .It Fl S Ar sources
-use specified sources only (recommended: RADB,RIPE,APNIC).
+use specified sources only (recommended: RPKI,AFRINIC,APNIC,ARIN,LACNIC,RIPE).
 .It Fl t
 generate as-sets for OpenBGPd, BIRD and JSON formats.
 .It Fl T
 disable pipelining (not recommended).
-.It Fl W Ar len
-generate as-path strings of no more than len items (use 0 for inifinity).
 .It Fl U
 generate config for Huawei devices (Cisco IOS by default)
+.It Fl u
+generate config for Huawei devices in XPL format (Cisco IOS by default)
+.It Fl W Ar len
+generate as-path strings of no more than len items (use 0 for infinity).
 .It Fl X
 generate config for Cisco IOS XR devices (plain IOS by default).
 .It Fl z
@@ -178,7 +185,8 @@ ip prefix-list eltel permit 89.112.64.0/19
 ip prefix-list eltel permit 217.170.64.0/19 ge 20 le 20
 .Ed
 .fi
-- you see, prefixes 89.112.0.0/19 and 89.112.32.0/19 now aggregated
+.Pp
+Prefixes 89.112.0.0/19 and 89.112.32.0/19 now aggregated
 into single entry 89.112.0.0/18 ge 19 le 19.
 .Pp
 Well, for Juniper we can generate even more interesting policy-options,
@@ -274,15 +282,54 @@ new line
 tabulation
 .El
 .Pp
-Please note that no new lines inserted automatically after each sentence,
-you have to add them into format string manually, elsewhere output will
-be in one line (sometimes it makes sense):
+Please note that no new lines are inserted automatically after each sentence.
+You have to add them into format string manually, otherwise the output will
+be in one single line (sometimes it makes sense):
 .nf
 .Bd -literal
 $ bgpq4 -6F "%n/%l; " as-eltel
 2001:1b00::/32; 2620:4f:8000::/48; 2a04:bac0::/29; 2a05:3a80::/48;
 .Ed
 .fi
+.Sh NOTES ON SOURCES
+By default
+.Em bgpq4
+trusts data from all the databases mirrored into NTT's IRR service.
+Unfortunately, not all these databases are equal in how much we can
+trust their data.
+RIR maintained databases (AFRINIC, ARIN, APNIC, LACNIC and RIPE)
+shall be trusted more than the others because they have the
+knowledge about who the rightful holders of resources are, while
+other databases lack this knowledge and can (and, actually do) contain 
+stale data: no one but the RIRs care to remove outdated route-objects
+when address space is de-allocated or transferred.
+In order to keep their filters both compact and actual,
+.Em bgpq4 users
+are encouraged to use '-S' flag to limit database sources to only
+the ones they trust.
+.Pp
+General recommendations:
+.Pp
+Use a minimal set of RIR databases (only those in which you and your
+customers have registered route-objects).
+.Pp
+Avoid using ARIN-NONAUTH and RIPE-NONAUTH as trusted sources: these records
+were created in the database, but for address space allocated to different RIRs,
+so the NONAUTH databases have no chance to confirm validity of the route
+objects they contain.
+.Bd -literal
+$ bgpq4 -S RIPE,RADB as-space
+no ip prefix-list NN
+ip prefix-list NN permit 195.190.32.0/19
+
+$ bgpq4 -S RADB,RIPE as-space
+no ip prefix-list NN
+ip prefix-list NN permit 45.4.4.0/22
+ip prefix-list NN permit 45.4.132.0/22
+ip prefix-list NN permit 45.6.128.0/22
+ip prefix-list NN permit 45.65.184.0/22
+[...]
+.Ed
 .Sh PERFORMANCE
 To improve `bgpq4` performance when expanding extra-large AS-SETs you
 shall tune OS settings to enlarge TCP send buffer.

bootstrap

@@ -5,7 +5,7 @@
 
 bsd_environment() {
 	# Based on https://github.com/rvm/rvm/blob/59fe3b39f0fb5ae01ed5b9aa187201080815ac16/scripts/functions/build_config_system#L123
-	if [[  -z "${AUTOCONF_VERSION:-}" ]]
+	if [ -z "${AUTOCONF_VERSION}" ]
 	then
 		export AUTOCONF_VERSION
 		AUTOCONF_VERSION="$(
@@ -17,7 +17,7 @@ bsd_environment() {
 		echo "Using autoconf version: $AUTOCONF_VERSION"
 	fi
 
-	if [[  -z "${AUTOMAKE_VERSION:-}" ]]
+	if [ -z "${AUTOMAKE_VERSION}" ]
 	then
 		export AUTOMAKE_VERSION
 		# FreeBSD might have automake-wrapper

extern.h

@@ -29,19 +29,24 @@
 
 #include "sx_prefix.h"
 
-struct sx_slentry {
-	STAILQ_ENTRY(sx_slentry) entries;
-	char*  text;
+struct slentry {
+	STAILQ_ENTRY(slentry)	 entry;
+	char			*text;
 };
 
-struct sx_slentry* sx_slentry_new(char* text);
+struct slentry		*sx_slentry_new(char *text);
 
 struct sx_tentry {
-	RB_ENTRY(sx_tentry) entries;
-	char* text;
+	RB_ENTRY(sx_tentry)	 entry;
+	char			*text;
 };
 
-struct sx_tentry* sx_tentry_new(char* text);
+struct sx_tentry	*sx_tentry_new(char *text);
+
+struct asn_entry {
+	RB_ENTRY(asn_entry)	entry;
+	uint32_t		asn;
+};
 
 typedef enum {
 	V_CISCO = 0,
@@ -53,7 +58,9 @@ typedef enum {
 	V_FORMAT,
 	V_NOKIA,
 	V_HUAWEI,
-	V_MIKROTIK,
+	V_HUAWEI_XPL,
+	V_MIKROTIK6,
+	V_MIKROTIK7,
 	V_NOKIA_MD,
 	V_ARISTA
 } bgpq_vendor_t;
@@ -62,6 +69,7 @@ typedef enum {
 	T_NONE = 0,
 	T_ASPATH,
 	T_OASPATH,
+	T_ASLIST,
 	T_ASSET,
 	T_PREFIXLIST,	
 	T_EACL,
@@ -70,44 +78,49 @@ typedef enum {
 
 struct bgpq_expander;
 
-struct bgpq_request {
-	STAILQ_ENTRY(bgpq_request) next;
-	char		*request;
-	int 	 	 size, offset;
-	void		*udata;
-	unsigned int	 depth;
-	int	 	 (*callback)(char *, struct bgpq_expander *,
-			    struct bgpq_request *);
+struct request {
+	STAILQ_ENTRY(request)	 next;
+	char			*request;
+	int 	 	 	 size, offset;
+	void			*udata;
+	unsigned int	 	 depth;
+	int	 	 	 (*callback)(char *, struct bgpq_expander *,
+				    struct request *);
 };
 
 struct bgpq_expander {
-	struct sx_radix_tree	*tree;
-	STAILQ_HEAD(sx_slentries, sx_slentry) macroses, rsets;
-	RB_HEAD(tentree, sx_tentry) already, stoplist;
-	int			 family;
-	char			*sources;
-	uint32_t		 asnumber;
-	int			 aswidth;
-	char			*name;
-	bgpq_vendor_t		 vendor;
-	bgpq_gen_t		 generation;
-	int			 identify;
-	int			 sequence;
-	unsigned int		 maxdepth;
-	unsigned int		 cdepth;
-	int			 validate_asns;
-	unsigned char 		*asn32s[65536];
-	struct bgpq_prequest	*firstpipe, *lastpipe;
-	int 			 piped;
-	char			*match;
-	char			*server;
-	char			*port;
-	char			*format;
-	unsigned int		 maxlen;
-	STAILQ_HEAD(bgpq_requests, bgpq_request) wq, rq;
-	int			 fd;
+	struct sx_radix_tree	 	*tree;
+	int			 	 family;
+	char				*sources;
+	char				*defaultsources;
+	unsigned int			 usesource;
+	uint32_t		 	 asnumber;
+	int			 	 aswidth;
+	char				*name;
+	bgpq_vendor_t		 	 vendor;
+	bgpq_gen_t		 	 generation;
+	int			 	 identify;
+	int			 	 sequence;
+	unsigned int		 	 maxdepth;
+	unsigned int		 	 cdepth;
+	int			 	 validate_asns;
+	struct bgpq_prequest		*firstpipe, *lastpipe;
+	int 			 	 piped;
+	char				*match;
+	char				*server;
+	char				*port;
+	char				*format;
+	unsigned int		 	 maxlen;
+	int			 	 fd;
+	RB_HEAD(asn_tree, asn_entry)	 asnlist;
+	STAILQ_HEAD(requests, request)	 wq, rq;
+	STAILQ_HEAD(slentries, slentry)	 macroses, rsets;
+	RB_HEAD(tentree, sx_tentry)	 already, stoplist;
 };
 
+int asn_cmp(struct asn_entry *, struct asn_entry *);
+RB_PROTOTYPE(asn_tree, asn_entry, entry, asn_cmp);
+
 int bgpq_expander_init(struct bgpq_expander *b, int af);
 int bgpq_expander_add_asset(struct bgpq_expander *b, char *set);
 int bgpq_expander_add_rset(struct bgpq_expander *b, char *set);
@@ -116,14 +129,19 @@ int bgpq_expander_add_prefix(struct bgpq_expander *b, char *prefix);
 int bgpq_expander_add_prefix_range(struct bgpq_expander *b, char *prefix);
 int bgpq_expander_add_stop(struct bgpq_expander *b, char *object);
 
+char* bgpq_get_asset(char *object);
+char* bgpq_get_rset(char *object);
+char* bgpq_get_source(char *object);
+
 int bgpq_expand(struct bgpq_expander *b);
 
-int bgpq4_print_prefixlist(FILE *f, struct bgpq_expander *b);
-int bgpq4_print_eacl(FILE *f, struct bgpq_expander *b);
-int bgpq4_print_aspath(FILE *f, struct bgpq_expander *b);
-int bgpq4_print_asset(FILE *f, struct bgpq_expander *b);
-int bgpq4_print_oaspath(FILE *f, struct bgpq_expander *b);
-int bgpq4_print_route_filter_list(FILE *f, struct bgpq_expander *b);
+void bgpq4_print_prefixlist(FILE *f, struct bgpq_expander *b);
+void bgpq4_print_eacl(FILE *f, struct bgpq_expander *b);
+void bgpq4_print_aspath(FILE *f, struct bgpq_expander *b);
+void bgpq4_print_asset(FILE *f, struct bgpq_expander *b);
+void bgpq4_print_oaspath(FILE *f, struct bgpq_expander *b);
+void bgpq4_print_aslist(FILE *f, struct bgpq_expander *b);
+void bgpq4_print_route_filter_list(FILE *f, struct bgpq_expander *b);
 
 void sx_radix_node_freeall(struct sx_radix_node *n);
 void sx_radix_tree_freeall(struct sx_radix_tree *t);
@@ -134,5 +152,5 @@ void expander_freeall(struct bgpq_expander *expander);
 int sx_maxsockbuf(int s, int dir);
 
 #ifndef HAVE_STRLCPY
-size_t strlcpy(char* dst, const char* src, size_t size);
+size_t strlcpy(char *dst, const char *src, size_t size);
 #endif

main.c

@@ -31,8 +31,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include <ctype.h>
 #include <stdio.h>
@@ -52,16 +50,18 @@ extern int expand_special_asn;
 static int
 usage(int ecode)
 {
-	printf("\nUsage: bgpq4 [-h host[:port]] [-S sources] [-E|G <num>"
-	    "|f <num>|t] [-46ABbdJjKNnwXz] [-R len] <OBJECTS> ... "
+	printf("\nUsage: bgpq4 [-h host[:port]] [-S sources] [-E|G|H <num>"
+	    "|f <num>|t] [-46ABbdJjKNnpwXz] [-R len] <OBJECTS> ... "
 	    "[EXCEPT <OBJECTS> ...]\n");
 	printf("\nVendor targets:\n");
 	printf(" no option : Cisco IOS Classic (default)\n");
 	printf(" -X        : Cisco IOS XR\n");
 	printf(" -U        : Huawei\n");
+	printf(" -u        : Huawei XPL\n");
 	printf(" -j        : JSON\n");
 	printf(" -J        : Juniper Junos\n");
-	printf(" -K        : MikroTik RouterOS\n");
+	printf(" -K        : MikroTik RouterOSv6\n");
+	printf(" -K7       : MikroTik RouterOSv7\n");
 	printf(" -b        : NIC.CZ BIRD\n");
 	printf(" -N        : Nokia SR OS (Classic CLI)\n");
 	printf(" -n        : Nokia SR OS (MD-CLI)\n");
@@ -88,6 +88,7 @@ usage(int ecode)
 	    "(OpenBGPD)\n");
 	printf(" -f number : generate input as-path access-list\n");
 	printf(" -G number : generate output as-path access-list\n");
+	printf(" -H number : generate origin as-lists (JunOS only)\n");
 	printf(" -M match  : extra match conditions for JunOS route-filters\n");
 	printf(" -l name   : use specified name for generated access/prefix/.."
 		" list\n");
@@ -97,7 +98,7 @@ usage(int ecode)
 	printf(" -t        : generate as-sets for OpenBGPD (OpenBGPD 6.4+), BIRD "
 		"and JSON formats\n");
 	printf(" -z        : generate route-filter-list (Junos only)\n");
-	printf(" -W len    : specify max-entries on as-path line (use 0 for "
+	printf(" -W len    : specify max-entries on as-path/as-list line (use 0 for "
 		"infinity)\n");
 
 	printf("\nUtility operations:\n");
@@ -124,8 +125,8 @@ version(void)
 static void
 exclusive(void)
 {
-	fprintf(stderr,"-E, -f <asnum>, -G <asnum>, and -t are mutually "
-	    "exclusive\n");
+	fprintf(stderr,"-E, -F, -K , -f <asnum>, -G <asnum>, and -t are mutually"
+	    " exclusive\n");
 	exit(1);
 }
 
@@ -133,9 +134,9 @@ static void
 vendor_exclusive(void)
 {
 	fprintf(stderr, "-b (BIRD), -B (OpenBGPD), -F (formatted), -J (Junos),"
-	    " -j (JSON), -N (Nokia SR OS Classic), -n (Nokia SR OS MD-CLI),"
-	    " -U (Huawei), -e (Arista) and -X (IOS XR) options are mutually"
-	    " exclusive\n");
+	    " -j (JSON), -K[7] (Microtik ROS), -N (Nokia SR OS Classic),"
+	    " -n (Nokia SR OS MD-CLI), -U (Huawei), -u (Huawei XPL),"
+	    "-e (Arista) and -X (IOS XR) options are mutually exclusive\n");
 	exit(1);
 }
 
@@ -190,161 +191,165 @@ main(int argc, char* argv[])
 		exit(1);
 	}
 #endif
-	
+
 	bgpq_expander_init(&expander, af);
 
 	if (getenv("IRRD_SOURCES"))
 		expander.sources=getenv("IRRD_SOURCES");
 
 	while ((c = getopt(argc, argv,
-	    "346a:AbBdDEeF:S:jJKf:l:L:m:M:NnW:pr:R:G:tTh:UwXsvz"))
-	    !=EOF) {
+	    "467a:AbBdDEeF:S:jJKf:l:L:m:M:NnpW:r:R:G:H:tTh:UuwXsvz")) != EOF) {
 	switch (c) {
-        case '3':
-            /*
-             * No-op, left for backwards compatibility with bgpq3
-             */
-            break;
-		case '4':
-			/* do nothing, expander already configured for IPv4 */
-			if (expander.family == AF_INET6) {
-				sx_report(SX_FATAL, "-4 and -6 are mutually "
-				    "exclusive\n");
-				exit(1);
+	case '4':
+		/* do nothing, expander already configured for IPv4 */
+		if (expander.family == AF_INET6) {
+			sx_report(SX_FATAL, "-4 and -6 are mutually "
+			    "exclusive\n");
+			exit(1);
+		}
+		selectedipv4 = 1;
+		break;
+	case '6':
+		if (selectedipv4) {
+			sx_report(SX_FATAL, "-4 and -6 are mutually "
+			    "exclusive\n");
+			exit(1);
+		}
+		af = AF_INET6;
+		expander.family = AF_INET6;
+		expander.tree->family = AF_INET6;
+		break;
+	case '7':
+		if (expander.vendor != V_MIKROTIK6) {
+			sx_report(SX_FATAL, "'7' can only be used after -K\n");
+			exit(1);
+		}
+		expander.vendor = V_MIKROTIK7;
+		break;
+	case 'a':
+		parseasnumber(&expander, optarg);
+		break;
+	case 'A':
+		if (aggregate)
+			debug_aggregation++;
+		aggregate = 1;
+		break;
+	case 'b':
+		if (expander.vendor)
+			vendor_exclusive();
+		expander.vendor = V_BIRD;
+		break;
+	case 'B':
+		if (expander.vendor)
+			vendor_exclusive();
+		expander.vendor = V_OPENBGPD;
+		break;
+	case 'd':
+		debug_expander++;
+		break;
+	case 'E':
+		if (expander.generation)
+			exclusive();
+		expander.generation = T_EACL;
+		break;
+	case 'e':
+		if (expander.vendor)
+			vendor_exclusive();
+		expander.vendor = V_ARISTA;
+		expander.sequence = 1;
+		break;
+	case 'F':
+		if (expander.vendor)
+			exclusive();
+		expander.vendor = V_FORMAT;
+		expander.format = optarg;
+		break;
+	case 'f':
+		if (expander.generation)
+			exclusive();
+		expander.generation = T_ASPATH;
+		parseasnumber(&expander, optarg);
+		break;
+	case 'G':
+		if (expander.generation)
+			exclusive();
+		expander.generation = T_OASPATH;
+		parseasnumber(&expander, optarg);
+		break;
+	case 'H':
+		if (expander.generation)
+			exclusive();
+		expander.generation = T_ASLIST;
+		parseasnumber(&expander, optarg);
+		break;
+	case 'h':
+		{
+			char *d = strchr(optarg, ':');
+			expander.server = optarg;
+			if (d) {
+				*d = 0;
+				expander.port = d + 1;
 			}
-			selectedipv4=1;
-			break;
-		case '6':
-			if (selectedipv4) {
-				sx_report(SX_FATAL, "-4 and -6 are mutually "
-				    "exclusive\n");
-				exit(1);
-			}
-			af = AF_INET6;
-			expander.family = AF_INET6;
-			expander.tree->family = AF_INET6;
-			break;
-		case 'a':
-			parseasnumber(&expander, optarg);
-			break;
-		case 'A':
-			if (aggregate)
-				debug_aggregation++;
-			aggregate = 1;
-			break;
-		case 'b':
-			if (expander.vendor)
-				vendor_exclusive();
-			expander.vendor = V_BIRD;
-			break;
-		case 'B':
-			if (expander.vendor)
-				vendor_exclusive();
-			expander.vendor = V_OPENBGPD;
-			break;
-		case 'd':
-			debug_expander++;
-			break;
-		case 'E':
-			if (expander.generation)
-				exclusive();
-			expander.generation = T_EACL;
-			break;
-		case 'e':
-			if (expander.vendor)
-				vendor_exclusive();
-			expander.vendor = V_ARISTA;
-			expander.sequence = 1;
-			break;
-		case 'F':
-			if (expander.vendor)
-				exclusive();
-			expander.vendor = V_FORMAT;
-			expander.format = optarg;
-			break;
-		case 'f':
-			if (expander.generation)
-				exclusive();
-			expander.generation = T_ASPATH;
-			parseasnumber(&expander, optarg);
-			break;
-		case 'G':
-			if (expander.generation)
-				exclusive();
-			expander.generation = T_OASPATH;
-			parseasnumber(&expander, optarg);
-			break;
-		case 'h':
-			{
-				char* d = strchr(optarg, ':');
-				expander.server = optarg;
-				if (d) {
-					*d = 0;
-					expander.port = d + 1;
-				}
-			}
-			break;
-		case 'J':
-			if (expander.vendor)
-				vendor_exclusive();
-			expander.vendor = V_JUNIPER;
-			break;
-		case 'j':
-			if (expander.vendor)
-				vendor_exclusive();
-			expander.vendor = V_JSON;
-			break;
-		case 'K':
-			if (expander.vendor)
-				vendor_exclusive();
-			expander.vendor = V_MIKROTIK;
-			break;
-		case 'p':
-			expand_special_asn = 1;
-			break;
-		case 'r':
-			refineLow = strtoul(optarg, NULL, 10);
-			if (!refineLow) {
-				sx_report(SX_FATAL, "Invalid refineLow value:"
-				    " %s\n", optarg);
-				exit(1);
-			}
-			break;
-		case 'R':
-			refine = strtoul(optarg, NULL, 10);
-			if (!refine) {
-				sx_report(SX_FATAL,"Invalid refine length:"
-				    " %s\n", optarg);
-				exit(1);
-			}
-			break;
-		case 'l':
-			expander.name = optarg;
-			break;
-		case 'L':
-			expander.maxdepth = strtol(optarg, NULL, 10);
-			if (expander.maxdepth < 1) {
-				sx_report(SX_FATAL, "Invalid maximum recursion"
-				    " (-L): %s\n", optarg);
-				exit(1);
-			}
-			break;
-		case 'm':
-			maxlen=strtoul(optarg, NULL, 10);
-			if (!maxlen) {
-				sx_report(SX_FATAL, "Invalid maxlen (-m): %s\n",
-				    optarg);
-				exit(1);
-			}
-			break;
-		case 'M':
-			{
-			char *mc, *md;
+		}
+		break;
+	case 'J':
+		if (expander.vendor)
+			vendor_exclusive();
+		expander.vendor = V_JUNIPER;
+		break;
+	case 'j':
+		if (expander.vendor)
+			vendor_exclusive();
+		expander.vendor = V_JSON;
+		break;
+	case 'K':
+		if (expander.vendor)
+			vendor_exclusive();
+		expander.vendor = V_MIKROTIK6;
+		break;
+	case 'r':
+		refineLow = strtoul(optarg, NULL, 10);
+		if (!refineLow) {
+			sx_report(SX_FATAL, "Invalid refineLow value:"
+			    " %s\n", optarg);
+			exit(1);
+		}
+		break;
+	case 'R':
+		refine = strtoul(optarg, NULL, 10);
+		if (!refine) {
+			sx_report(SX_FATAL,"Invalid refine length:"
+			    " %s\n", optarg);
+			exit(1);
+		}
+		break;
+	case 'l':
+		expander.name = optarg;
+		break;
+	case 'L':
+		expander.maxdepth = strtol(optarg, NULL, 10);
+		if (expander.maxdepth < 1) {
+			sx_report(SX_FATAL, "Invalid maximum recursion"
+			    " (-L): %s\n", optarg);
+			exit(1);
+		}
+		break;
+	case 'm':
+		maxlen=strtoul(optarg, NULL, 10);
+		if (!maxlen) {
+			sx_report(SX_FATAL, "Invalid maxlen (-m): %s\n",
+			    optarg);
+			exit(1);
+		}
+		break;
+	case 'M':
+		{
+			char	*mc, *md;
 			expander.match = strdup(optarg);
 			mc = md = expander.match;
 			while (*mc) {
 				if (*mc == '\\') {
-					if (*(mc+1) == '\n') {
+					if (*(mc + 1) == '\n') {
 						*md = '\n';
 						md++;
 						mc += 2;
@@ -377,64 +382,71 @@ main(int argc, char* argv[])
 				}
 			}
 			*md = 0;
-			}
-			break;
-		case 'N':
-			if (expander.vendor)
-				vendor_exclusive();
-			expander.vendor = V_NOKIA;
-			break;
-		case 'n':
-			if (expander.vendor)
-				vendor_exclusive();
-			expander.vendor = V_NOKIA_MD;
-			break;
-		case 't':
-			if (expander.generation)
-				exclusive();
-			expander.generation = T_ASSET;
-			break;
-		case 'T':
-			pipelining = 0;
-			break;
-		case 's':
-			expander.sequence = 1;
-			break;
-		case 'S':
-			expander.sources = optarg;
-			break;
-		case 'U':
-			if (expander.vendor)
-				exclusive();
-			expander.vendor = V_HUAWEI;
-			break;
-		case 'W':
-			expander.aswidth = atoi(optarg);
-			if (expander.aswidth < 0) {
-				sx_report(SX_FATAL,"Invalid as-width: %s\n",
-				    optarg);
-				exit(1);
-			}
-			widthSet = 1;
-			break;
-		case 'w':
-			expander.validate_asns = 1;
-			break;
-		case 'X':
-			if (expander.vendor)
-				vendor_exclusive();
-			expander.vendor = V_CISCO_XR;
-			break;
-		case 'v':
-			version();
-			break;
-		case 'z':
-			if (expander.generation)
-				exclusive();
-			expander.generation = T_ROUTE_FILTER_LIST;
-			break;
-		default:
-			usage(1);
+		}
+		break;
+	case 'N':
+		if (expander.vendor)
+			vendor_exclusive();
+		expander.vendor = V_NOKIA;
+		break;
+	case 'n':
+		if (expander.vendor)
+			vendor_exclusive();
+		expander.vendor = V_NOKIA_MD;
+		break;
+	case 'p':
+		expand_special_asn = 1;
+		break;
+	case 't':
+		if (expander.generation)
+			exclusive();
+		expander.generation = T_ASSET;
+		break;
+	case 'T':
+		pipelining = 0;
+		break;
+	case 's':
+		expander.sequence = 1;
+		break;
+	case 'S':
+		expander.sources = optarg;
+		break;
+	case 'U':
+		if (expander.vendor)
+			exclusive();
+		expander.vendor = V_HUAWEI;
+		break;
+	case 'u':
+		if (expander.vendor)
+			exclusive();
+		expander.vendor = V_HUAWEI_XPL;
+		break;
+	case 'W':
+		expander.aswidth = atoi(optarg);
+		if (expander.aswidth < 0) {
+			sx_report(SX_FATAL,"Invalid as-width: %s\n", optarg);
+			exit(1);
+		}
+		widthSet = 1;
+		break;
+	case 'w':
+		expander.validate_asns = 1;
+		break;
+	case 'X':
+		if (expander.vendor)
+			vendor_exclusive();
+		expander.vendor = V_CISCO_XR;
+		break;
+	case 'v':
+		version();
+		break;
+	case 'z':
+		if (expander.generation)
+			exclusive();
+		expander.generation = T_ROUTE_FILTER_LIST;
+		break;
+	default:
+		usage(1);
 	}
 	}
 
@@ -447,16 +459,21 @@ main(int argc, char* argv[])
 			switch (vendor) {
 			case V_ARISTA:
 			case V_CISCO:
-			case V_MIKROTIK:
+			case V_MIKROTIK6:
+			case V_MIKROTIK7:
 				expander.aswidth = 4;
+				break;
 			case V_CISCO_XR:
 				expander.aswidth = 6;
+				break;
 			case V_JUNIPER:
 			case V_NOKIA:
 			case V_NOKIA_MD:
 				expander.aswidth = 8;
+				break;
 			case V_BIRD:
 				expander.aswidth = 10;
+				break;
 			}
 		} else if (expander.generation == T_OASPATH) {
 			int vendor = expander.vendor;
@@ -464,12 +481,22 @@ main(int argc, char* argv[])
 			case V_ARISTA:
 			case V_CISCO:
 				expander.aswidth = 5;
+				break;
 			case V_CISCO_XR:
 				expander.aswidth = 7;
+				break;
 			case V_JUNIPER:
 			case V_NOKIA:
 			case V_NOKIA_MD:
 				expander.aswidth = 8;
+				break;
+			}
+		} else if (expander.generation == T_ASLIST) {
+			int vendor = expander.vendor;
+			switch (vendor) {
+			case V_JUNIPER:
+				expander.aswidth = 8;
+				break;
 			}
 		}
 	}
@@ -656,14 +683,18 @@ main(int argc, char* argv[])
 		    "only with Juniper route-filters\n");
 	}
 
-	if ((expander.generation == T_ASPATH || expander.generation == T_OASPATH)
+	if ((expander.generation == T_ASPATH
+	    || expander.generation == T_OASPATH
+	    || expander.generation == T_ASLIST)
 	    && af != AF_INET && !expander.validate_asns) {
-		sx_report(SX_FATAL, "Sorry, -6 makes no sense with as-path (-f/-G) "
+		sx_report(SX_FATAL, "Sorry, -6 makes no sense with as-path (-f/-G) or as-list (-H) "
 		    "generation\n");
 	}
 
-	if (expander.validate_asns && expander.generation != T_ASPATH
-	    && expander.generation != T_OASPATH) {
+	if (expander.validate_asns
+	    && expander.generation != T_ASPATH
+	    && expander.generation != T_OASPATH
+	    && expander.generation != T_ASLIST) {
 		sx_report(SX_FATAL, "Sorry, -w makes sense only for as-path "
 		    "(-f/-G) generation\n");
 	}
@@ -672,17 +703,23 @@ main(int argc, char* argv[])
 		usage(1);
 
 	while (argv[0]) {
+		char *obj = argv[0];
+		char *delim = strstr(argv[0], "::");
+		if (delim) {
+			expander.usesource = 1;
+			obj = delim + 2;
+		}
 		if (!strcmp(argv[0], "EXCEPT")) {
 			exceptmode = 1;
 		} else if (exceptmode) {
 			bgpq_expander_add_stop(&expander, argv[0]);
-		} else if (!strncasecmp(argv[0], "AS-", 3)) {
+		} else if (!strncasecmp(obj, "AS-", 3)) {
 			bgpq_expander_add_asset(&expander, argv[0]);
-		} else if (!strncasecmp(argv[0], "RS-", 3)) {
+		} else if (!strncasecmp(obj, "RS-", 3)) {
 			bgpq_expander_add_rset(&expander, argv[0]);
-		} else if (!strncasecmp(argv[0], "AS", 2)) {
+		} else if (!strncasecmp(obj, "AS", 2)) {
 			char *ec;
-			if ((ec = strchr(argv[0], ':'))) {
+			if ((ec = strchr(obj, ':'))) {
 				if (!strncasecmp(ec + 1, "AS-", 3)) {
 					bgpq_expander_add_asset(&expander, argv[0]);
 				} else if (!strncasecmp(ec + 1, "RS-", 3)) {
@@ -726,22 +763,25 @@ main(int argc, char* argv[])
 
 	switch (expander.generation) {
 		case T_NONE:
-			sx_report(SX_FATAL,"Unreachable point... call snar\n");
+			sx_report(SX_FATAL,"Unreachable point");
 			exit(1);
 		case T_ASPATH:
-			bgpq4_print_aspath(stdout,&expander);
+			bgpq4_print_aspath(stdout, &expander);
 			break;
 		case T_OASPATH:
-			bgpq4_print_oaspath(stdout,&expander);
+			bgpq4_print_oaspath(stdout, &expander);
+			break;
+		case T_ASLIST:
+			bgpq4_print_aslist(stdout, &expander);
 			break;
 		case T_ASSET:
-			bgpq4_print_asset(stdout,&expander);
+			bgpq4_print_asset(stdout, &expander);
 			break;
 		case T_PREFIXLIST:
-			bgpq4_print_prefixlist(stdout,&expander);
+			bgpq4_print_prefixlist(stdout, &expander);
 			break;
 		case T_EACL:
-			bgpq4_print_eacl(stdout,&expander);
+			bgpq4_print_eacl(stdout, &expander);
 			break;
 		case T_ROUTE_FILTER_LIST:
 			bgpq4_print_route_filter_list(stdout, &expander);

sx_maxsockbuf.c

@@ -39,19 +39,15 @@
 #include "extern.h"
 #include "sx_report.h"
 
-#ifndef SX_MAXSOCKBUF_MAX
-#define SX_MAXSOCKBUF_MAX (2 * 1024 * 1024)
-#endif
-
 int
 sx_maxsockbuf(int s, int dir)
-{ 
+{
 	int		optval = 0, voptval;
 	int		hiconf = -1, loconf = -1;
 	unsigned int	voptlen;
 	int		phase = 0, iterations = 0;
 
-	if (s < 0) { 
+	if (s < 0) {
 		sx_report(SX_FATAL,"Unable to maximize sockbuf on invalid "
 		    "socket %i\n", s);
 		exit(1);
@@ -65,30 +61,27 @@ sx_maxsockbuf(int s, int dir)
 		return -1;
 	}
 
-	for (;;) { 
+	for (;;) {
 		iterations++;
 
 		if (phase == 0)
-			optval<<=1; 
-		else { 
+			optval <<= 1;
+		else {
 			if (optval == (hiconf + loconf) / 2)
 				break;
 			optval = (hiconf + loconf) / 2;
 		}
 
-		if (optval > SX_MAXSOCKBUF_MAX && phase == 0) 
-			break;
-
 		if (setsockopt(s, SOL_SOCKET, dir, (void*)&optval,
 		    sizeof(optval)) == -1) {
 
 			if (phase == 0)
-				phase = 1; 
+				phase = 1;
 
-			hiconf = optval; 
+			hiconf = optval;
 
 			continue;
-		} else { 
+		} else {
 			loconf = optval;
 		}
 
@@ -99,39 +92,26 @@ sx_maxsockbuf(int s, int dir)
 			sx_report(SX_ERROR,"getsockopt failed: %s\n",
 			    strerror(errno));
 			return -1;
-		} else if (voptval < optval) { 
-			if (phase == 0) { 
+		} else if (voptval < optval) {
+			if (phase == 0) {
 				phase = 1;
 				optval >>= 1;
 				continue;
-			} else if (phase == 1) { 
+			} else if (phase == 1) {
 				phase = 2;
 				optval -= 2048;
 				continue;
 			} else
 				break;
-		} else if (voptval >= SX_MAXSOCKBUF_MAX) { 
-			/*
-			 * ... and getsockopt not failed and voptval>=optval.
-			 * Do not allow to increase sockbuf too much even in
-			 * case OS permits it
-			 */
-			break;
 		}
 	}
 
 	voptlen = sizeof(voptval);
 	if (getsockopt(s, SOL_SOCKET, dir, (void*)&voptval,
 	    &voptlen) == -1) {
-		sx_report(SX_ERROR,"getsockopt(final stage) failed: %s\n", 
+		sx_report(SX_ERROR,"getsockopt(final stage) failed: %s\n",
 		    strerror(errno));
 		return -1;
-	} else { 
-		/*
-		printf("Finally got %i bytes of recvspace in %i interations\n", 
-			voptval, iterations);
-		*/
-	}
-
-	return voptval;
+	} else
+		return voptval;
 }

sx_prefix.c

@@ -26,6 +26,7 @@
  */
 
 #include <ctype.h>
+#include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,13 +39,13 @@
 int debug_aggregation = 0;
 extern int debug_expander;
 
-struct sx_prefix*
+struct sx_prefix *
 sx_prefix_alloc(struct sx_prefix *p)
 {
-	struct sx_prefix *sp = malloc(sizeof(struct sx_prefix));
+	struct sx_prefix *sp;
 
-	if (!sp)
-		return NULL;
+	if ((sp = malloc(sizeof(struct sx_prefix))) == NULL)
+		err(1, NULL);
 
 	if (p)
 		memcpy(sp, p, sizeof(struct sx_prefix));
@@ -55,7 +56,7 @@ sx_prefix_alloc(struct sx_prefix *p)
 }
 
 void
-sx_prefix_destroy(struct sx_prefix *p)
+sx_prefix_free(struct sx_prefix *p)
 {
 	if (p)
 		free(p);
@@ -64,15 +65,16 @@ sx_prefix_destroy(struct sx_prefix *p)
 void
 sx_radix_node_destroy(struct sx_radix_node *n)
 {
-	if (n) {
-		if (n->payload)
-			free(n->payload);
+	if (!n)
+		return;
 
-    		if (n->prefix)
-			free(n->prefix);
+	if (n->payload)
+		free(n->payload);
 
-    		free(n);
-	}
+	if (n->prefix)
+		free(n->prefix);
+
+	free(n);
 }
 
 void
@@ -133,16 +135,16 @@ sx_prefix_parse(struct sx_prefix *p, int af, char *text)
 {
 	char	*c = NULL;
 	int	 masklen, ret;
-	char	 mtext[INET6_ADDRSTRLEN+5];
+	char	 mtext[INET6_ADDRSTRLEN + 5];
 
 	strlcpy(mtext, text, sizeof(mtext));
 
 	c = strchr(mtext,'/');
 
 	if (c) {
-		char* eod;
+		char *eod;
 		*c = 0;
-		masklen = strtol(c+1, &eod, 10);
+		masklen = strtol(c + 1, &eod, 10);
 		if (eod && eod[0] && !isspace(eod[0])) {
 			*c = '/';
 			sx_report(SX_ERROR, "Invalid masklen in prefix %s\n",
@@ -257,25 +259,19 @@ sx_prefix_setbit(struct sx_prefix *p, int n)
 
 
 static int
-sx_radix_tree_insert_specifics(struct sx_radix_tree *t, struct sx_prefix *p,
+sx_radix_tree_insert_specifics(struct sx_radix_tree *t, struct sx_prefix p,
     unsigned min, unsigned max)
 {
-	struct sx_prefix *np;
-	np = sx_prefix_alloc(p);
+	if (p.masklen >= min)
+		sx_radix_tree_insert(t, &p);
 
-	if (np->masklen >= min) {
-		struct sx_radix_node *nn = sx_radix_tree_insert(t, np);
-		sx_prefix_destroy(np);
-		np = nn->prefix;
-	}
-
-	if (np->masklen + 1 > max)
+	if (p.masklen + 1 > max)
 		return 1;
 
-	np->masklen += 1;
-	sx_radix_tree_insert_specifics(t, np, min, max);
-	sx_prefix_setbit(np, np->masklen);
-	sx_radix_tree_insert_specifics(t, np, min, max);
+	p.masklen += 1;
+	sx_radix_tree_insert_specifics(t, p, min, max);
+	sx_prefix_setbit(&p, p.masklen);
+	sx_radix_tree_insert_specifics(t, p, min, max);
 
 	return 1;
 }
@@ -284,46 +280,44 @@ int
 sx_prefix_range_parse(struct sx_radix_tree *tree, int af, unsigned int maxlen,
     char *text)
 {
-	char			*d = strchr(text, '^');
-	struct sx_prefix	*p;
+	struct sx_prefix	 p;
 	unsigned long		 min, max = 0;
-
-	p = sx_prefix_alloc(NULL);
+	char			*d = strchr(text, '^');
 
 	if (!d || !d[1])
 		return 0;
 
 	*d = 0;
 
-	if (!sx_prefix_parse(p, 0, text)) {
+	if (!sx_prefix_parse(&p, 0, text)) {
 		sx_report(SX_ERROR, "Unable to parse prefix %s^%s\n", text,
-		    d+1);
+		    d + 1);
 		return 0;
 	}
 
 	*d = '^';
 
-	if (af && p->family != af) {
+	if (af && p.family != af) {
 		sx_report(SX_ERROR, "Ignoring prefix %s, wrong af %i\n", text,
-		    p->family);
+		    p.family);
 		return 0;
 	}
 
-	if (maxlen && p->masklen > maxlen) {
+	if (maxlen && p.masklen > maxlen) {
 		SX_DEBUG(debug_expander, "Ignoring prefix %s, masklen %i > max"
-		    " masklen %u\n", text, p->masklen, maxlen);
+		    " masklen %u\n", text, p.masklen, maxlen);
 		return 0;
 	}
 
 	if (d[1] == '-') {
-		min = p->masklen + 1;
+		min = p.masklen + 1;
 		max = maxlen;
 	} else if (d[1] == '+') {
-		min = p->masklen;
+		min = p.masklen;
 		max = maxlen;
 	} else if (isdigit(d[1])) {
 		char *dm = NULL;
-		min = strtoul(d+1, &dm, 10);
+		min = strtoul(d + 1, &dm, 10);
 		if (dm && *dm == '-' && isdigit(dm[1])) {
 			max = strtoul(dm + 1, NULL, 10);
 		} else if (dm && *dm) {
@@ -336,9 +330,9 @@ sx_prefix_range_parse(struct sx_radix_tree *tree, int af, unsigned int maxlen,
 		return 0;
 	}
 
-	if (min < p->masklen) {
+	if (min < p.masklen) {
 		sx_report(SX_ERROR, "Invalid prefix-range %s: min %lu < "
-		    "masklen %u\n", text, min, p->masklen);
+		    "masklen %u\n", text, min, p.masklen);
 		return 0;
 	}
 
@@ -377,7 +371,7 @@ sx_prefix_new(int af, char *text)
 		return NULL;
 
 	if (!sx_prefix_parse(p, af, text)) {
-		sx_prefix_destroy(p);
+		sx_prefix_free(p);
 		return NULL;
 	}
 
@@ -483,7 +477,7 @@ sx_prefix_snprintf_fmt(struct sx_prefix *p, FILE *f,
 			}
 			c += 2;
 		} else if (*c == '\\') {
-			switch(*(c+1)) {
+			switch(*(c + 1)) {
 			case 'n':
 				fprintf(f, "\n");
 				break;
@@ -519,13 +513,13 @@ sx_prefix_jsnprintf(struct sx_prefix *p, char *rbuffer, int srb)
 	return snprintf(rbuffer, srb, "%s\\/%i", buffer, p->masklen);
 }
 
-struct sx_radix_tree*
+struct sx_radix_tree *
 sx_radix_tree_new(int af)
 {
-	struct sx_radix_tree *rt = malloc(sizeof(struct sx_radix_tree));
+	struct sx_radix_tree *rt;
 
-	if (!rt)
-		return NULL;
+	if ((rt = malloc(sizeof(struct sx_radix_tree))) == NULL)
+		err(1, NULL);
 
 	memset(rt, 0, sizeof(struct sx_radix_tree));
 	rt->family = af;
@@ -539,13 +533,13 @@ sx_radix_tree_empty(struct sx_radix_tree *t)
 	return t->head == NULL;
 }
 
-struct sx_radix_node*
+struct sx_radix_node *
 sx_radix_node_new(struct sx_prefix *prefix)
 {
-	struct sx_radix_node *rn = malloc(sizeof(struct sx_radix_node));
+	struct sx_radix_node *rn;
 
-	if (!rn)
-		return NULL;
+	if ((rn = malloc(sizeof(struct sx_radix_node))) == NULL)
+		err(1, NULL);
 
 	memset(rn, 0, sizeof(struct sx_radix_node));
 
@@ -582,7 +576,7 @@ sx_prefix_eqbits(struct sx_prefix *a, struct sx_prefix *b)
 	return b->masklen;
 }
 
-struct sx_prefix*
+struct sx_prefix *
 sx_prefix_overlay(struct sx_prefix *p, int n)
 {
 	struct sx_prefix *sp = sx_prefix_alloc(p);
@@ -668,7 +662,7 @@ next:
 }
 	
 			
-struct sx_radix_node*
+struct sx_radix_node *
 sx_radix_tree_lookup(struct sx_radix_tree *tree, struct sx_prefix *prefix)
 {
 	unsigned int 		 eb;
@@ -725,18 +719,18 @@ next:
 		char pbuffer[128], cbuffer[128];
 		sx_prefix_snprintf(prefix, pbuffer, sizeof(pbuffer));
 		sx_prefix_snprintf(chead->prefix, cbuffer, sizeof(cbuffer));
-		printf("Unreachible point... eb=%i, prefix=%s, chead=%s\n",
+		printf("Unreachable point... eb=%i, prefix=%s, chead=%s\n",
 		    eb, pbuffer, cbuffer);
 		abort();
 	}
 }
 
 
-struct sx_radix_node*
+struct sx_radix_node *
 sx_radix_tree_insert(struct sx_radix_tree *tree, struct sx_prefix *prefix)
 {
-	unsigned int		 eb;
-	struct sx_radix_node	**candidate=NULL, *chead;
+	unsigned int eb;
+	struct sx_radix_node *chead, **candidate = NULL;
 
 	if (!tree || !prefix)
 		return NULL;
@@ -752,7 +746,7 @@ sx_radix_tree_insert(struct sx_radix_tree *tree, struct sx_prefix *prefix)
 	candidate = &tree->head;
 	chead = tree->head;
 
-next:
+ next:
 	eb = sx_prefix_eqbits(prefix, chead->prefix);
 	if (eb < prefix->masklen && eb < chead->prefix->masklen) {
 		struct sx_prefix *neoRoot = sx_prefix_alloc(prefix);
@@ -761,7 +755,7 @@ next:
 		neoRoot->masklen = eb;
 		sx_prefix_adjust_masklen(neoRoot);
 		rn=sx_radix_node_new(neoRoot);
-                sx_prefix_destroy(neoRoot);
+                sx_prefix_free(neoRoot);
                 neoRoot = rn->prefix;
 		if (!rn) {
 			sx_report(SX_ERROR,"Unable to create node: %s\n",
@@ -785,11 +779,10 @@ next:
 		return ret;
 	} else if (eb == prefix->masklen && eb < chead->prefix->masklen) {
 		struct sx_radix_node *ret = sx_radix_node_new(prefix);
-		if (sx_prefix_isbitset(chead->prefix, eb + 1)) {
+		if (sx_prefix_isbitset(chead->prefix, eb + 1))
 			ret->r = chead;
-		} else {
+		else
 			ret->l = chead;
-		}
 		ret->parent = chead->parent;
 		chead->parent = ret;
 		*candidate = ret;
@@ -826,7 +819,7 @@ next:
 		char pbuffer[128], cbuffer[128];
 		sx_prefix_snprintf(prefix, pbuffer, sizeof(pbuffer));
 		sx_prefix_snprintf(chead->prefix, cbuffer, sizeof(cbuffer));
-		printf("Unreachible point... eb=%i, prefix=%s, chead=%s\n", eb,
+		printf("Unreachable point... eb=%i, prefix=%s, chead=%s\n", eb,
 		    pbuffer, cbuffer);
 		abort();
 	}
@@ -848,7 +841,7 @@ sx_radix_node_fprintf(struct sx_radix_node *node, void *udata)
 
 int
 sx_radix_node_foreach(struct sx_radix_node *node,
-    void (*func)(struct sx_radix_node*, void*), void *udata)
+    void (*func)(struct sx_radix_node *, void *), void *udata)
 {
 	func(node, udata);
 
@@ -925,7 +918,7 @@ sx_radix_node_aggregate(struct sx_radix_node *node)
 		if (!node->r->isAggregate && !node->l->isAggregate
 		    && !node->r->isGlue && !node->l->isGlue
 		    && node->r->prefix->masklen == node->l->prefix->masklen) {
-			if (node->r->prefix->masklen == node->prefix->masklen+1) {
+			if (node->r->prefix->masklen == node->prefix->masklen + 1) {
 				node->isAggregate = 1;
 				node->r->isGlue = 1;
 				node->l->isGlue = 1;
@@ -1019,7 +1012,7 @@ sx_radix_node_aggregate(struct sx_radix_node *node)
 		    && node->l->aggregateHi == node->r->son->aggregateHi
 		    && node->l->aggregateLow == node->r->son->aggregateLow) {
 			if (node->l->prefix->masklen == node->prefix->masklen + 1
-			    && node->r->prefix->masklen == node->prefix->masklen+1) {
+			    && node->r->prefix->masklen == node->prefix->masklen + 1) {
 				if (node->isGlue) {
 					node->l->isGlue = 1;
 					node->r->son->isGlue = 1;
@@ -1055,7 +1048,7 @@ sx_radix_tree_aggregate(struct sx_radix_tree *tree)
 static void
 setGlueUpTo(struct sx_radix_node *node, void *udata)
 {
-	unsigned refine = *(unsigned*)udata;
+	unsigned refine = *(unsigned *)udata;
 
 	if (node && node->prefix->masklen <= refine)
 		node->isGlue = 1;
@@ -1115,7 +1108,7 @@ sx_radix_tree_refine(struct sx_radix_tree *tree, unsigned refine)
 static void
 setGlueFrom(struct sx_radix_node *node, void *udata)
 {
-	unsigned refine = *(unsigned*)udata;
+	unsigned refine = *(unsigned *)udata;
 
 	if (node && node->prefix->masklen <= refine)
 		node->isGlue = 1;

sx_prefix.h

@@ -68,7 +68,7 @@ struct sx_radix_node *sx_radix_tree_lookup_exact(struct sx_radix_tree *tree,
 	struct sx_prefix *prefix);
 
 struct sx_prefix *sx_prefix_alloc(struct sx_prefix *p);
-void sx_prefix_destroy(struct sx_prefix *p);
+void sx_prefix_free(struct sx_prefix *p);
 void sx_radix_node_destroy(struct sx_radix_node *p);
 void sx_prefix_adjust_masklen(struct sx_prefix *p);
 struct sx_prefix *sx_prefix_new(int af, char *text);

sx_slentry.c

@@ -31,15 +31,15 @@
 
 #include "extern.h"
 
-struct sx_slentry *
+struct slentry *
 sx_slentry_new(char *t)
 {
-	struct sx_slentry	*e = malloc(sizeof(struct sx_slentry));
+	struct slentry	*e = malloc(sizeof(struct slentry));
 
 	if (!e)
 		return NULL;
 
-	memset(e, 0, sizeof(struct sx_slentry));
+	memset(e, 0, sizeof(struct slentry));
 
 	e->text = strdup(t);