diff --git a/docs/networking.md b/docs/networking.md index 3ccd0c8..ab43c2f 100644 --- a/docs/networking.md +++ b/docs/networking.md @@ -511,10 +511,48 @@ firewalls. Both edge routers run `bird2` as AS211024. +### RIPE routing policy and peering records + +Maintain the routing policy in the RIPE `aut-num` object for AS211024, keeping peers grouped +under the existing upstream, direct-peering and IXP remarks. Keep plain `import` / `export` +attributes for IPv4 unicast and add `mp-import` / `mp-export` with `afi ipv6.unicast` for IPv6. +For example, when the same policy applies to both families: + +```rpsl +import: from AS56393 accept AS-FRYS-IX-CONNECTED +export: to AS56393 announce AS211024:AS-DEVPLAYER0 +mp-import: afi ipv6.unicast from AS56393 accept AS-FRYS-IX-CONNECTED +mp-export: afi ipv6.unicast to AS56393 announce AS211024:AS-DEVPLAYER0 +``` + +`mp-*` means multiprotocol and can describe one or several address families. Keeping the IPv4 +policy in the original attributes preserves compatibility with older or custom readers that +ignore `mp-*`, without overlapping the two policies. Use only the IPv6 pair for IPv6-only +peering. Address families describe the routes exchanged, independently of the BGP session's +transport address. See [RFC 4012](https://www.rfc-editor.org/rfc/rfc4012.html#section-2). + +To update the policy, find `AS211024` in the [RIPE Database](https://apps.db.ripe.net/db-web-ui/query), +select **Update**, authenticate through `devplayer0-mnt`, add the entries under the appropriate +remarks and submit. Check the success response and query the object again to confirm the result. +These registry entries document policy; they do not configure BIRD. + +For a new peering, also check the prefix authorisations and connection records: + +- **IRR:** `AS211024:AS-DEVPLAYER0` lists the originating ASNs; `route` / `route6` objects associate + announced prefixes with their origin ASN. Prefix-filter generators can expand the AS-set and + route objects independently of the `aut-num` import/export policy. +- **RPKI:** ROAs authorise AS211024 to originate the announced prefixes and lengths. Existing + correct ROAs and route objects need no change just because a new IXP is added; the route-server + ASN does not become the origin. The assigned peering-LAN address is an interface address, not + a prefix to originate or create a ROA for. +- **PeeringDB:** record the exchange connection and assigned peering addresses. +- **BGP:** verify that both route servers accept and propagate the intended exports, as well as + establishing sessions. + ### `estuary` The colony edge takes a full table from ColoClue, IPv6 transit from iFog and Hurricane Electric, -and peers through the Frys-IX, NL-ix and FogIXP route servers. It also has direct and monitoring +and peers through the Clue-IX, Frys-IX, NL-ix and FogIXP route servers. It also has direct and monitoring sessions; the complete peer table and originated routes live in [estuary.md](sites/colony/estuary.md#bgp). ### `britway` diff --git a/docs/sites/colony/estuary.md b/docs/sites/colony/estuary.md index cf3b1f4..7e72b91 100644 --- a/docs/sites/colony/estuary.md +++ b/docs/sites/colony/estuary.md @@ -27,16 +27,17 @@ See the consolidated [network assignments](../../networking.md#box-assignments) - `wan` — the passed-through `igb` NIC (9000 MTU, enlarged rings). It carries the plain upstream uplink (static v4/v6 with gateways from the `internal` - assignment) plus the tagged `ifog` VLAN. + assignment) plus the tagged `ifog` and `clue-ix` VLANs. - `ifog` (VLAN 409) is an iFog QinQ transport that carries the IXP VLANs as - nested tags: + nested tags. `clue-ix` sits directly on `wan`: -| Interface | VLAN | IPv4 | IPv6 | Purpose | -|---|---|---|---|---| -| `frys-ix` | 701 | `185.1.160.196/23` | `2001:7f8:10f::3:3850:196/64` | Frys-IX peering LAN | -| `nl-ix` | 1845 | `193.239.116.145/22` | `2001:7f8:13::a521:1024:1/64` | NL-ix peering LAN | -| `fogixp` | 1147 | `185.1.147.159/24` | `2001:7f8:ca:1::159/64` | FogIXP peering LAN | -| `ifog-transit` | 702 | — | `2a0c:9a40:100f:370::2/64` | iFog IPv6 transit | +| Interface | Parent | VLAN | IPv4 | IPv6 | Purpose | +|---|---|---|---|---|---| +| `clue-ix` | `wan` | 121 | — | `2001:7f8:154::21:1024:1/64` | Clue-IX peering LAN | +| `frys-ix` | `ifog` | 701 | `185.1.160.196/23` | `2001:7f8:10f::3:3850:196/64` | Frys-IX peering LAN | +| `nl-ix` | `ifog` | 1845 | `193.239.116.145/22` | `2001:7f8:13::a521:1024:1/64` | NL-ix peering LAN | +| `fogixp` | `ifog` | 1147 | `185.1.147.159/24` | `2001:7f8:ca:1::159/64` | FogIXP peering LAN | +| `ifog-transit` | `ifog` | 702 | — | `2a0c:9a40:100f:370::2/64` | iFog IPv6 transit | The IXP interfaces run at 1500 MTU with DHCP/RA/LLDP off; an nftables `ixp` chain rejects non-IP/ARP ethertypes in both directions. @@ -112,6 +113,7 @@ BIRD2 ([`bgp.nix`](../../../nixos/boxes/colony/vms/estuary/bgp.nix)) speaking ** | ColoClue | AS8283 | Upstream | `euNetworks` 2/3, v4+v6 | | iFog | AS34927 | Upstream | IPv6 transit | | Hurricane Electric | AS6939 | Upstream | IPv6 over Frys-IX | +| Clue-IX | AS218511 | IXP route server | rs1/rs2, IPv6 only; `rs_client` role and GTSM | | Frys-IX | AS56393 | IXP route server | | | NL-ix | AS34307 | IXP route server | lower preference | | FogIXP | AS47498 | IXP route server | | @@ -130,6 +132,18 @@ home routers' `as211024` VIP. Currently disabled (commented out): efero transit over FogIXP ("not working so well lately") and the NL-ix Cloudflare sessions. +Clue-IX uses IPv6-only RIPE policy entries under the existing IXP remarks: + +```rpsl +remarks: \/\/ Clue-IX route servers \/\/ +mp-import: afi ipv6.unicast from AS218511 accept AS218511:AS-CLUE-IX +mp-export: afi ipv6.unicast to AS218511 announce AS211024:AS-DEVPLAYER0 +``` + +One pair covers both route servers. See [RIPE routing policy and peering +records](../../networking.md#ripe-routing-policy-and-peering-records) for the shared attribute +convention and update procedure. + ## VPNs ### `as211024` L2 mesh diff --git a/nixos/boxes/colony/vms/estuary/bgp.nix b/nixos/boxes/colony/vms/estuary/bgp.nix index c2521d9..376185f 100644 --- a/nixos/boxes/colony/vms/estuary/bgp.nix +++ b/nixos/boxes/colony/vms/estuary/bgp.nix @@ -52,7 +52,7 @@ in protocol device {} protocol direct { - interface "wan", "frys-ix", "nl-ix", "fogixp", "ifog-transit"; + interface "wan", "clue-ix", "frys-ix", "nl-ix", "fogixp", "ifog-transit"; ipv4; ipv6; } @@ -233,6 +233,20 @@ in neighbor 2a07:cd40:1::9 as 202413; } + protocol bgp ixp6_clueix_rs1 from ixp_bgp6 { + description "Clue-IX route server 1 (IPv6)"; + local role rs_client; + ttl security on; + neighbor 2001:7f8:154::21:8511:1 as 218511; + } + + protocol bgp ixp6_clueix_rs2 from ixp_bgp6 { + description "Clue-IX route server 2 (IPv6)"; + local role rs_client; + ttl security on; + neighbor 2001:7f8:154::21:8511:2 as 218511; + } + protocol bgp ixp4_frysix_rs3 from ixp_bgp4 { description "Frys-IX route server 3 (IPv4)"; neighbor 185.1.160.255 as 56393; diff --git a/nixos/boxes/colony/vms/estuary/default.nix b/nixos/boxes/colony/vms/estuary/default.nix index 5eb13d6..953c65b 100644 --- a/nixos/boxes/colony/vms/estuary/default.nix +++ b/nixos/boxes/colony/vms/estuary/default.nix @@ -65,7 +65,7 @@ in configuration = { lib, pkgs, modulesPath, config, assignments, allAssignments, ... }: let - inherit (lib) flatten mkIf mkMerge mkForce; + inherit (lib) flatten mkIf mkMerge mkForce optional; inherit (lib.my) networkdAssignment; inherit (lib.my.c) networkd; in @@ -144,6 +144,7 @@ in netdevs = mkMerge [ (mkVLAN "ifog" 409) + (mkVLAN "clue-ix" 121) (mkVLAN "frys-ix" 701) (mkVLAN "nl-ix" 1845) @@ -241,7 +242,7 @@ in mkIXPConfig = name: ipv4: ipv6: { "85-${name}" = { matchConfig.Name = name; - address = [ ipv4 ipv6 ]; + address = optional (ipv4 != null) ipv4 ++ [ ipv6 ]; linkConfig.MTUBytes = "1500"; networkConfig = { DHCP = "no"; @@ -254,13 +255,14 @@ in in mkMerge [ + (mkIXPConfig "clue-ix" null "2001:7f8:154::21:1024:1/64") (mkIXPConfig "frys-ix" "185.1.160.196/23" "2001:7f8:10f::3:3850:196/64") (mkIXPConfig "nl-ix" "193.239.116.145/22" "2001:7f8:13::a521:1024:1/64") (mkIXPConfig "fogixp" "185.1.147.159/24" "2001:7f8:ca:1::159/64") { "80-wan" = { matchConfig.Name = "wan"; - vlan = [ "ifog" ]; + vlan = [ "ifog" "clue-ix" ]; DHCP = "no"; address = with assignments.internal; [ (with ipv4; "${address}/${toString mask}") @@ -451,7 +453,7 @@ in ''; in '' - define ixps = { frys-ix, nl-ix, fogixp, ifog-transit } + define ixps = { clue-ix, frys-ix, nl-ix, fogixp, ifog-transit } table inet filter { chain input {