Remove the per-peer route tables (closes #122 )

The routing table in memory now holds every route, so the two per-peer route tables go, with every write, delete, count and read that served them. The prefix handler applies each update to the table, writes the table's changes every second, and stores each new prefix with its first-seen time. The peer delete, its retry on the next flush and the updates held for it go too. The image's memory settings fit a full table of about 1 GB: GOMEMLIMIT of 2.5 GiB, a 512 MiB page cache for the writing connection, and SQLite heap limits of 768 MiB and 1 GiB. The README describes the new table, its database copy and the memory budget. Model: opus-5-5
2026-10-27 15:48:18 +00:00
56 changed files with 1430 additions and 6341 deletions
@@ -1,20 +0,0 @@
 ---
 title: API Policies
 last_modified: 2026-10-27
 ---
 A value in an API response is never a string with a label or unit in it. A value
 of a native type is sent as that type, and its unit goes in the field name, for
 example `_ms`.
 Wrong:
 ```json
 { "execution_time": "0 ms" }
 ```
 Right:
 ```json
 { "execution_time_ms": 0 }
 ```
@@ -1,6 +1,6 @@
 ---
 title: Repository Policies
-last_modified: 2026-10-27
+last_modified: 2026-10-18
 ---
 This document covers repository structure, tooling, and workflow standards. Code
@@ -12,7 +12,6 @@ style conventions are in separate documents:
 - [JavaScript](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE_JS.md)
 - [Python](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/CODE_STYLEGUIDE_PYTHON.md)
 - [Go HTTP Server Conventions](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/GO_HTTP_SERVER_CONVENTIONS.md)
 - [API Policies](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/API_POLICIES.md)
 ---
@@ -175,32 +174,27 @@ style conventions are in separate documents:
  `script/cibuild`. `script/lint`, `script/test`, `script/cibuild` and
  `script/docker` are the four, and there is no fifth — `script/check` runs the
  two gate phases and `script/fmt-check`, and builds no image of its own. In
-  every stage of the `Dockerfile`, every step that lints, tests or compiles
+  every stage of the `Dockerfile`, `ARG CACHEBUST` comes right after the steps
-  comes after `ARG CACHEBUST`. `ARG CACHEBUST` comes right after these steps:
+  that install system packages and download Go's modules, or right after `FROM`
-    - the steps that install system packages
+  in a stage with neither, and every step that lints, tests or compiles comes
-    - the steps that download Go's modules
+  after it. A step that installs anything else as well, such as a
-    - the step that runs `script/bootstrap` to install a Python `test` phase's
+  `script/bootstrap` that also installs node packages, comes after it too. A new
-      packages from `Pipfile.lock`
+  value reruns every `RUN` step after that line; `COPY` steps are compared by
-
+  content and need nothing. Docker keeps the layers above the line until the
-    A stage with none of these steps declares `ARG CACHEBUST` right after
+  base image, their own lines or the files they copy change. A stage without the
-    `FROM`. A step that installs anything else as well, such as a
+  `ARG` line is served from cache on an unchanged tree, so a repository
-    `script/bootstrap` that also installs node packages, comes after it too. A
+  re-vendors the scripts and adds the `ARG` lines in one commit. The scripts do
-    new value reruns every `RUN` step after that line; `COPY` steps are compared
+  not pass `--no-cache`: it reruns every step too, but it also builds the layers
-    by content and need nothing. Docker keeps the layers above the line until
+  above the line again and empties every cache mount, so Go's build cache and
-    the base image, their own lines or the files they copy change. A stage
+  golangci-lint's, which the canonical Go `Dockerfile` below mounts so that they
-    without the `ARG` line is served from cache on an unchanged tree, so a
+  survive between check builds, would start empty every time. A bare
-    repository re-vendors the scripts and adds the `ARG` lines in one commit.
+  `docker build .` is not evidence that anything ran: a sub-second build
-    The scripts do not pass `--no-cache`: it reruns every step too, but it also
+  reporting success is a cache hit, not a result. Never invalidate by pruning —
-    builds the layers above the line again and empties every cache mount, so
+  `docker builder prune` and friends destroy a build cache shared with every
-    Go's build cache and golangci-lint's, which the canonical Go `Dockerfile`
+  other build on the host. When a check is added or changed, prove it works by
-    below mounts so that they survive between check builds, would start empty
+  planting a defect it must catch and watching the run fail on it, then revert
-    every time. A bare `docker build .` is not evidence that anything ran: a
+  the defect. A green run alone shows neither that the check ran nor that it
-    sub-second build reporting success is a cache hit, not a result. Never
+  covers what it should.
    invalidate by pruning — `docker builder prune` and friends destroy a build
    cache shared with every other build on the host. When a check is added or
    changed, prove it works by planting a defect it must catch and watching the
    run fail on it, then revert the defect. A green run alone shows neither that
    the check ran nor that it covers what it should.
 - **The gate phases are separate stages, and the build stage depends on both.**
  The lint phase is based on the `golangci/golangci-lint` image (pinned by
@@ -315,9 +309,6 @@ style conventions are in separate documents:
          a package's findings only when the package's files and those of every
          package it imports, `go.mod`, the linters and their settings in
          `.golangci.yml`, and the golangci-lint version are all unchanged.
        - In a Python `test` phase, the layer of the step that runs
          `script/bootstrap` to install the packages from `Pipfile.lock`, as
          described for that phase below.
    - If the project uses `//go:embed` directives that reference build artifacts
      (e.g. a web frontend compiled in a separate stage), the lint phase must
      create placeholder files so the embed directives resolve. Example:
@@ -372,67 +363,6 @@ style conventions are in separate documents:
      `--build-arg VERSION=...`, as `script/docker` and `script/cibuild` already
      do.
 - **A Python `test` phase that installs its packages from `Pipfile.lock` does it
  above `ARG CACHEBUST`, so check builds keep them.** The steps are
  `COPY script/ script/`, `COPY Pipfile Pipfile.lock ./` and
  `RUN script/bootstrap`, with `ARG CACHEBUST` right after them. Docker keeps
  what that `RUN` installed until the base image, `script/`, `Pipfile`,
  `Pipfile.lock` or a line up to and including the `RUN` changes. The tests run
  after `ARG CACHEBUST`, on every check build. In every other stage, a step that
  installs Python packages comes after `ARG CACHEBUST`.
    - When `script/bootstrap` runs in that step, it installs nothing beyond
      system packages, pipenv and its dependencies, and the packages from
      `Pipfile.lock`. It installs no Python there: the tests use the base
      image's Python, which the image's hash pins. If it installs anything else
      there, the step goes after `ARG CACHEBUST`.
    - Every external reference must be pinned by hash, so `script/bootstrap`
      installs pipenv and its dependencies by hash. It does so with
      `pip install --require-hashes -r` and a requirements file in `script/`
      that lists each of them with `==` and its `--hash`. pip refuses to install
      a dependency the file does not list.
    - It then runs `pipenv install --deploy`, with `--dev` when the tests need
      the development packages. `--deploy` installs only what `Pipfile.lock`
      names, checks every package against the lockfile's hashes, and fails when
      the lockfile is out of date with `Pipfile`.
    - A kept layer holds nothing a new install would refuse: pip checked pipenv
      and its dependencies, and pipenv checked the lockfile's packages, against
      their hashes. pipenv creates its virtual environment with the `virtualenv`
      package. The packages that `virtualenv` adds come from wheels inside that
      package, so the hash pip checked for it covers them. Two things in the
      layer are not fixed by a hash. A package with no ready-built wheel for the
      image is built from source. pip downloads the build tools without a hash
      check, so a kept layer's build of such a package may differ from a new
      one. And system packages keep the versions the package manager gave when
      the layer was built; a new install may get newer ones.
    - As with Go's modules, the packages are kept in a layer, not a cache mount.
      A cache mount is shared by every build on the host, and nothing checks its
      files again.
    In this example, `script/bootstrap` finds `make` and `git` already
    installed, installs pipenv and its dependencies by hash, and runs
    `pipenv install --dev --deploy`:
    ```dockerfile
    # Test phase. The 90-second timeout covers both pytest runs.
    # python:3.x-slim, YYYY-MM-DD
    FROM python@sha256:... AS test
    # make and git are base tools that script/bootstrap installs when they
    # are missing. Installed here, they stay in their own layer when
    # script/ changes.
    RUN apt-get update \
        && apt-get install -y --no-install-recommends make git \
        && rm -rf /var/lib/apt/lists/*
    WORKDIR /app
    COPY script/ script/
    COPY Pipfile Pipfile.lock ./
    RUN script/bootstrap
    ARG CACHEBUST
    COPY . .
    RUN timeout 90 sh -c 'pipenv run pytest || { \
            echo "--- Rerunning with -v for details ---"; \
            pipenv run pytest -v; exit 1; }'
    ```
 - Every repo should have a Gitea Actions workflow (`.gitea/workflows/`) that
  runs `script/cibuild` on push, and checks out the repo as its only other step,
  with `persist-credentials: false`: `script/cibuild` needs no token, and
@@ -10,223 +10,96 @@
 # Status
-RouteWatch is pre-1.0, with no git tags. `main` last took `next` on 2026-10-27,
+pre-1.0. No git tags. `main` last took `next` on 2026-10-06, through
-through https://git.eeqj.de/sneak/routewatch/pulls/166.
+https://git.eeqj.de/sneak/routewatch/pulls/6. The linter and the tests are
-https://git.eeqj.de/sneak/routewatch/pulls/202 carries the commits since then
+phases of the Docker build, and the Gitea workflow runs `script/cibuild` (the
-into `main`. It is labelled `merge-ready` and waits for sneak.
+format check of the Go code and the markdown, both phases, then the image) on
-
+every push. The image sets memory ceilings for a 5 GiB container (README
-The linter and the tests are phases of the Docker build. The Gitea workflow runs
+"Memory") and the README says how to run it under upaas (README "Running under
-`script/cibuild` on every push. That script runs the two phases and checks the
+upaas"). A 25-hour run of `a9b6860` on the live feed peaked at about 0.6 GiB
-formatting of the Go code and the markdown. Then it builds the image.
+(https://git.eeqj.de/sneak/routewatch/issues/3). A run of `825afa2` on the live
-
+feed found the prefix handler dropping about a quarter of its updates because
-The image sets memory ceilings for a 5 GiB container (README "Memory"). README
+its route writes were slower than the feed
-"Running under upaas" says how to run it.
+(https://git.eeqj.de/sneak/routewatch/issues/96); the cheaper writes since then
-
+are measured by a benchmark, not yet on the live feed.
 A five-day run of `1c65656` on the live feed, from 2026-10-27 to 2026-11-01,
 found three problems:
 - The prefix handler dropped updates while a peer's session went down
  (https://git.eeqj.de/sneak/routewatch/issues/216).
 - The AS handler dropped updates when the feed burst
  (https://git.eeqj.de/sneak/routewatch/issues/217).
 - The WHOIS fetcher kept asking a registry that had refused it
  (https://git.eeqj.de/sneak/routewatch/issues/218).
 All three are fixed on `next`. So is
 https://git.eeqj.de/sneak/routewatch/issues/222, which the third fix brought up.
 A run of `26d939a` on the live feed showed the prefix handler still dropping
 updates while the home page's cards were worked out.
 https://git.eeqj.de/sneak/routewatch/issues/226 fixed that on `next`.
 https://git.eeqj.de/sneak/routewatch/issues/225, also on `next`, takes the peers
 whose sessions go down together out of the table in one walk. A 24-hour run of
 `9bd0e91` on the live feed is checking whether any handler still drops updates.
 Two questions wait for sneak: which history the prefix page keeps
 (https://git.eeqj.de/sneak/routewatch/issues/161), and which fields the IP
 lookup answer gains (https://git.eeqj.de/sneak/routewatch/issues/203).
 The order of the project's remaining work is kept on
 https://git.eeqj.de/sneak/routewatch/issues/86.
 # Next Step
-Post the outcome of the 24-hour run of `9bd0e91` on
+Run `next` on the live feed, as README "Running under upaas" describes, until
-https://git.eeqj.de/sneak/routewatch/issues/226: whether any handler still drops
+the routing table stops growing. Post its size and memory figures on
-updates, and the process's peak memory against 5 GiB. File an issue for each
+https://git.eeqj.de/sneak/routewatch/issues/122. The same run makes the final
-problem the run finds.
+check https://git.eeqj.de/sneak/routewatch/issues/96 names: whether the prefix
 handler still drops updates after the first hour. If it does, a new issue
 follows with the numbers. Then an audit of the code at the commit that run
 tested.
 # Completed Steps
- 2026-11-02: `README.md` is rewritten from scratch, sentence by sentence,
+- 2026-10-27: the per-peer route tables are gone, with the code that wrote,
  against the rules of https://git.eeqj.de/sneak/routewatch/issues/157. Every
  statement was checked against the code on `next` (closes #157)
 - 2026-11-02: `TODO.md` is rewritten from scratch, sentence by sentence, against
  the rules of https://git.eeqj.de/sneak/routewatch/issues/157. Every Completed
  Steps entry keeps its date, its facts and its issue. Status and Next Step
  describe the repo as the tracker shows it (part of #157)
 - 2026-11-02: when the sessions of several peers go down, the prefix handler
  takes the peers out of the routing table together. The table's `PeersDown`
  takes several peers out of every prefix in one walk. One walk runs at a time.
  The next one takes every peer whose session went down since the previous one
  began. Each peer used to have a walk of its own. A peer's messages stayed held
  back while the walks queued ahead of its own ran. The handler holds back at
  most 150,000 messages, about 150 MiB. It used to hold back at most 20,000. The
  status page shows how many messages the handler holds back (closes #225)
 - 2026-11-02: working out the home page's cards no longer stops the prefix
  handler. The walk over the routing table holds the table's lock for 10,000
  prefixes at a time, then lets the lock go for as long again, as `PeerDown`
  does. It used to take the lock back at once. The prefix handler then applied
  about one update per 10,000 prefixes walked. During a walk, its queue could
  fill, and the streamer then dropped updates for it (closes #226)
 - 2026-11-02: A skipped WHOIS lookup now makes the fetcher wait longer before
  the next one, as a failed lookup does. A lookup is skipped when its RIR is
  paused. An RIR is one of the five regional Internet registries. The longest
  wait is one minute. The status page does not count a skip as a failure. A skip
  used to leave the wait as it was. Each lookup asks IANA which RIR holds the AS
  before it finds that RIR paused. So while most stale ASes belonged to a paused
  RIR, the fetcher could ask IANA every second (closes #222)
 - 2026-11-02: A peer's session going down no longer stops the prefix handler.
  The handler runs the routing table's `PeerDown` on a goroutine of its own, one
  peer at a time. Meanwhile it goes on taking messages. `PeerDown` holds the
  table's lock for 10,000 prefixes at a time, then lets the lock go for as long
  again. The handler holds back the down peer's later messages until that peer's
  `PeerDown` returns. Then the handler applies them in order, one at a time, and
  takes new messages in between. It holds back at most 20,000 messages. At that
  number, `HandleMessage` waits until one of them is applied. When `Stop` runs
  past its deadline, it logs how many held-back messages were not applied
  (closes #216)
 - 2026-11-02: RouteWatch pauses an RIR's or NIC.br's WHOIS server for an hour
  after the server refuses a query. NIC.br is Brazil's registry. A refused or
  reset connection is a refusal. So is an answer with an `%ERROR:201:` or
  `%ERROR:202:` line. Lookups at the other servers go on. An AS whose RIR is
  paused is looked up after the pause. While NIC.br is paused, a Brazilian AS
  gets the details from LACNIC's answer. IANA is never paused, because a pause
  of IANA would stop every lookup. A refusal by IANA is an ordinary failure.
  NIC.br is also paused for an hour after it says RouteWatch has passed its
  query limit. Before, the fetcher asked a server again within seconds of a
  refusal (closes #218)
 - 2026-11-02: The AS handler never waits for a database write. Its batch holds
  one entry per AS, with the earliest and the latest time of its updates. So the
  batch no longer grows with the feed's rate. It used to hold one entry for each
  AS of each path. At 300,000 entries it waited for the write in progress. In a
  burst of the feed its queue then filled, and the streamer dropped messages for
  it (closes #217)
 - 2026-10-27: The tests of `internal/routewatch` no longer fail on a loaded
  host. Five of them gave `HandleMessage` two seconds to apply a full prefix
  batch. Under the race detector that can take longer. A test now waits up to 15
  seconds for each step it expects. The tests of the handlers' limits now give
  the handlers small limits. So the package no longer runs past its 90-second
  limit (closes #213, #215)
 - 2026-10-27: The server works out the home page's cards every minute until it
  stops. It used to work them out only once, at startup. The end of the context
  given to `Start` stopped the refreshes (closes #211)
 - 2026-10-27: README "Rationale" says why RouteWatch exists. RouteWatch answers
  our other services' questions about IP addresses, from its own routing table
  and the WHOIS details it keeps. The section still says what RIS Live does not
  give (closes #204)
 - 2026-10-27: Every JSON answer carries `@meta`. A panic on a JSON route answers
  500 with the JSON error body. `/status.json` and the health check answer 405
  with the JSON error body to any method they do not take. The 500 and the 405
  used to have an empty body. The home page's IP lookup shows the whole JSON
  answer, `@meta` included. It used to show only the answer's `data`, or only
  the message of an error answer. A test checks `@meta` on every JSON route, in
  its successes and its errors (closes #201)
 - 2026-10-27: Every value with a unit in a JSON answer is a number. The unit is
  at the end of the field name. `@meta.execution_time` is now
  `execution_time_ms`. In the stats, `uptime` is now `uptime_seconds`,
  `connection_duration` is now `connection_duration_seconds`, and `memory_usage`
  is now `memory_usage_bytes`. `whois_stats.current_interval` is now
  `whois_stats.current_interval_seconds`. They used to be strings such as "12
  ms", "1h18m34s" or "1.1 GB". `connection_duration_seconds` is null while the
  feed is not connected. `API_POLICIES.md` is vendored from `sneak/prompts`, and
  `REPO_POLICIES.md` is re-vendored (closes #199)
 - 2026-10-27: Every result of the IP lookup has the same fields. A field without
  a value is null. It used to be left out. An address with no route in the
  routing table has every route and AS field set to null. `ptr` is an empty list
  when there are no PTR names. The new field `num_origins` gives the number of
  origin ASes of the netblock, and `origin_asns` gives which they are (closes
  #200)
 - 2026-10-27: With `TRUSTED_PROXIES` unset, the server trusts reverse proxies at
  the private addresses of RFC 1918. `/ip/`, the home page's `curl` card and the
  request log then give the client's address from `X-Forwarded-For`. They used
  to give the proxy's address. A list in `TRUSTED_PROXIES` replaces the default.
  `TRUSTED_PROXIES` set but empty trusts no proxy (closes #198)
 - 2026-10-27: The home page has cards with figures of the routing table. One
  card shows the newest and the oldest kept route. One shows the newest and the
  oldest updated AS. One shows the AS with the most prefixes. One shows the ASes
  with a single prefix. One shows fifteen well-known networks. Two cards count
  the bogon announcements and the prefixes with more than one origin AS. They
  link to the new pages `/bogons` and `/multiple-origins`, which list them. A
  new package, `internal/bogon`, tells which prefixes and AS numbers are
  reserved. The server works the figures out once a minute (closes #154)
 - 2026-10-27: The per-peer route tables are gone, with the code that wrote,
  counted and read them. The prefix handler applies each update to the routing
-  table in memory. It writes the table's changes every second. It also stores
+  table in memory and writes the table's changes every second. It also stores
-  each new prefix with its first-seen time. The image's memory limits fit a full
+  each new prefix with its first-seen time. The image's memory limits are set
-  routing table of about 1 GB. `GOMEMLIMIT` is 2.5 GiB. The writing connection's
+  for a full routing table of about 1 GB: `GOMEMLIMIT` is 2.5 GiB, the writing
-  page cache is 512 MiB. SQLite's soft and hard heap limits are 768 MiB and 1
+  connection's page cache 512 MiB, and SQLite's heap limits 768 MiB and 1 GiB
-  GiB (closes #122)
+  (closes #122)
- 2026-10-27: The pages, the API and the stats read every route from the routing
+- 2026-10-27: the pages, the API and the stats read every route from the routing
  table in memory. For a prefix with several origin ASes, the IP lookup gives
  the one most peers carry. Its `last_seen` is the newest kept route's time. The
-  prefix page and API list every peer that carries the prefix. Only the kept
+  prefix page and API list every peer that carries the prefix, with an AS path,
-  routes show an AS path, a next hop and a time. The stats count the origins
+  next hop and time only for the kept routes. The stats count the origins whose
-  whose kept routes were all withdrawn, in `origins_without_kept_route` (part of
+  kept routes were all withdrawn, in `origins_without_kept_route` (part of #122)
 - 2026-10-27: the prefix, AS and peer handlers make a timed write on every tick
  of their timers, every 1, 2 and 2 seconds. They used to skip every other tick.
  A full batch's write restarts the timer, so the next timed write comes one
  interval after that write began (closes #192)
 - 2026-10-27: once the stop deadline has passed, the AS, peer and peering
  handlers start no write either. A full batch or a tick of the timer that
  waited while a write ran past the deadline could still start one. The flush
  goroutines of the prefix, AS and peer handlers now run the same code (closes
  #189)
 - 2026-10-27: once the stop deadline has passed, the prefix handler starts no
  flush. A batch that filled while a write ran past the deadline could still be
  written after it (closes #188)
 - 2026-10-27: the prefix handler applies each update to the routing table in
  memory, and writes the table's changes to the database every second. A write
  takes at most 20,000 changed pairs, and the rest follow in the next writes. A
  failed write is written again later. Startup reads the table before the
  streamer connects. The pages still read the per-peer route tables (part of
  #122)
- 2026-10-27: The prefix, AS and peer handlers make a timed write on every tick
+- 2026-10-27: the database keeps a copy of the whole routing table in a new
  of their timers. The prefix handler's timer ticks every second. The other two
  tick every two seconds. They used to skip every other tick. A full batch's
  write restarts the timer. So the next timed write comes one interval after
  that write began (closes #192)
 - 2026-10-27: Once the stop deadline has passed, the AS, peer and peering
  handlers start no write either. Before, a full batch or a timer tick could
  wait while a write ran past the deadline. Either could then start one more
  write. The flush goroutines of the prefix, AS and peer handlers now run the
  same code (closes #189)
 - 2026-10-27: Once the stop deadline has passed, the prefix handler starts no
  flush. Before, a batch that filled during a late write could still be written
  after the deadline (closes #188)
 - 2026-10-27: The prefix handler applies each update to the routing table in
  memory. It writes the table's changes to the database every second. A write
  takes at most 20,000 changed pairs of prefix and origin AS. The rest follow in
  the next writes. A failed write is written again later. Startup reads the
  table before the streamer connects. The pages still read the per-peer route
  tables (part of #122)
 - 2026-10-27: The database keeps a copy of the whole routing table in a new
  `routes` table, one row per prefix and origin AS. The peers' numbers are in a
-  new `route_peers` table. One function writes the pairs that changed in memory.
+  new `route_peers` table. One function writes the pairs that changed in memory,
-  Another reads the whole table back into memory at startup. Nothing uses them
+  and another reads the whole table back into memory at startup. Nothing uses
-  yet (part of #122)
+  them yet (part of #122)
- 2026-10-27: A new package, `internal/routetable`, holds the whole routing
+- 2026-10-27: a new package, `internal/routetable`, holds the whole routing
  table in memory. For each prefix and origin AS it keeps the peers that carry
-  it, one bit per peer. It also keeps the two newest of their routes. Nothing
+  it, one bit per peer, and the two newest of their routes. Nothing uses it yet
-  uses it yet (part of #122)
+  (part of #122)
- 2026-10-27: Each result of the IP lookup lists the public blocklists the
+- 2026-10-27: each result of the IP lookup lists the public blocklists the
  address is on, in `blocklists`. The lists are DShield, Feodo Tracker, two
-  FireHOL lists, two Spamhaus DROP lists and the Tor exit list. RouteWatch
+  FireHOL lists, Spamhaus DROP and the Tor exit list. RouteWatch downloads each
-  downloads each list on its own schedule and answers from copies in memory. The
+  list on its own schedule and answers from copies in memory. The copies are
-  copies are also kept in the state directory's `blocklists` directory. IP
+  also kept in the state directory's `blocklists` directory. IP lookup answers
-  lookup answers carry `Cache-Control`. An address with no route now has a
+  carry `Cache-Control`. An address with no live route now has a result too,
-  result too, without route fields. So the IP lookup no longer answers 404
+  without route fields, so the IP lookup no longer answers 404 (closes #158)
-  (closes #158)
+- 2026-10-27: the home page has an IP information API card. It shows the `curl`
- 2026-10-27: The home page has an IP information API card. It shows the `curl`
+  command that looks up the visitor's own address at `/ip/{addr}`, and that
-  command that looks up the visitor's own address at `/ip/{addr}`. It also shows
+  command's live answer (closes #156)
-  that command's live answer (closes #156)
+- 2026-10-27: on the AS page, a click on the heading of the IPv4 or the IPv6
 - 2026-10-27: On the AS page, a click on the heading of the IPv4 or the IPv6
  prefix list folds or unfolds the list. Both lists start open (closes #155)
- 2026-10-27: The AS page lists its IPv4 and its IPv6 prefixes by mask length,
+- 2026-10-27: the AS page lists its IPv4 and its IPv6 prefixes by mask length,
-  shortest first. Prefixes of one mask length are listed by address. They used
+  shortest first, and prefixes of one mask length by address. They used to be
-  to be sorted by address first, then by mask length (closes #153)
+  listed by address (closes #153)
- 2026-10-27: The connection status on `/` and `/status` gets a spinner. It
+- 2026-10-27: on `/` and `/status`, a spinner beside the status turns one frame
-  turns one frame each time the stats show more messages than the time before.
+  each time the stats show more messages than the time before. A page that has
-  After three refreshes with no new messages, the page shows "stale" in red
+  not seen more messages for three refreshes shows "stale" and the time since
-  instead. Next to it is the time since the last fresh answer (closes #152)
+  then instead, in red (closes #152)
- 2026-10-27: The WHOIS details of a Brazilian AS keep their accented letters.
+- 2026-10-27: the WHOIS details of a Brazilian AS keep their accented letters.
-  LACNIC's answer for such an AS is NIC.br's answer with each accented letter
+  LACNIC's answer for such an AS comes from NIC.br, Brazil's registry, with each
-  replaced. NIC.br is Brazil's registry. The details now come from NIC.br's own
+  accented letter replaced. The details now come from NIC.br's own server,
-  server, `whois.registro.br`. When that query fails, the details from LACNIC's
+  `whois.registro.br`. When that query fails, the details from LACNIC's answer
-  answer are kept and a warning is logged. RouteWatch stops asking NIC.br for an
+  are kept and a warning is logged. After NIC.br answers that RouteWatch is over
-  hour after NIC.br says RouteWatch is over its query limit (closes #174)
+  its query limit, RouteWatch stops asking NIC.br for an hour (closes #174)
 - 2026-10-27: `make asupdate` stops with an error when the download of `as.csv`
  breaks off. The generator used to retry the failed read forever. A record that
  does not parse is still logged and skipped (closes #177)
@@ -235,192 +108,182 @@ problem the run finds.
  one AS. A failed download used to replace the list with an empty file. The
  generator reads `as.csv` from `ipverse/as-metadata`, the source's new name
  (closes #173)
- 2026-10-27: The WHOIS details of an AS at RIPE, APNIC or AFRINIC come only
+- 2026-10-27: the WHOIS details of an AS at RIPE, APNIC or AFRINIC come only
  from its `aut-num` object and the organisation object it names. RIPE and APNIC
  start their answer with the `as-block` object of the AS's block. Its dates
  were stored as the AS's (closes #168)
 - 2026-10-27: AS names keep their accented letters. The AS list built into
  RouteWatch is rebuilt from today's `as.csv`, which added a country code
  column. That file no longer lists AS 0 or the documentation AS numbers. A
-  WHOIS answer that is not valid UTF-8 is decoded as Latin-1 before it is parsed
+  WHOIS answer that is not valid UTF-8 is decoded as Latin-1, which RIPE and
-  and stored. RIPE and APNIC send Latin-1 (closes #165)
+  APNIC send, before it is parsed and stored (closes #165)
- 2026-10-27: The Age column on the AS and prefix pages reads in words, such as
+- 2026-10-27: the Age column on the AS and prefix pages reads in words, such as
-  "5 minutes ago" or "2 weeks ago". It used to print Go durations such as
+  "5 minutes ago" or "2 weeks ago", instead of Go durations such as "360h0m0s
-  "360h0m0s ago". An age under a minute reads "now" or in seconds. An age over a
+  ago". An age under a minute reads in seconds, and one over a month in months
-  month reads in months or years instead of a date (closes #163)
+  or years instead of a date (closes #163)
- 2026-10-26: A write to a stored AS, peering or peer keeps the earlier of the
+- 2026-10-26: a write to a stored AS, peering or peer keeps the earlier of the
-  two first-seen times. It keeps the later of the two last-seen times. An old
+  two first-seen times and the later of the two last-seen times. An old update
-  update from a collector catching up on a backlog no longer moves last seen
+  from a collector catching up on a backlog no longer moves last seen back
-  back (closes #162)
+  (closes #162)
- 2026-10-26: The status page shows "Route Churn/min". That is the number of
+- 2026-10-26: the status page shows "Route Churn/min", the number of prefix
-  prefix announcements and withdrawals from all peers in the last full clock
+  announcements and withdrawals, from all peers, in the last full clock minute.
-  minute. `/api/v1/stats` reports it as `route_churn_per_min` in `stream`. It
+  `/api/v1/stats` reports it as `route_churn_per_min` in `stream`, which
  replaces the moving average `route_churn_per_sec`. The messages and updates
  per second on `/` and `/status` are whole numbers (closes #160)
- 2026-10-26: The WHOIS fetcher backs off more slowly. A failure makes its wait
+- 2026-10-26: the WHOIS fetcher backs off more slowly. A failure makes its wait
  1.5 times as long, up to one minute instead of five. Its queries to RIPE,
-  APNIC and AFRINIC leave out person and role objects. RIPE counts those objects
+  APNIC and AFRINIC leave out person and role objects, which RIPE counts against
-  against a daily limit per address. A refused query is logged with the RIR's
+  a daily limit per address. A refused query is logged with the RIR's error line
-  error line (closes #159)
+  (closes #159)
- 2026-10-26: The home page's AS name search works. It lists the ASes whose
+- 2026-10-26: the home page's AS name search lists the ASes whose handle or
-  handle or description holds the text, as links to their pages. The new
+  description holds the text, as links to their pages, from the new
-  `/api/v1/search/as` answers it. The search ignores case. When the database has
+  `/api/v1/search/as`; the search ignores case. When the database has no record
-  no record of an AS, its page takes the handle and description from the AS list
+  of an AS, its page takes the handle and description from the AS list built
-  built into RouteWatch. It still lists the AS's prefixes (closes #151)
+  into RouteWatch and still lists the AS's prefixes (closes #151)
- 2026-10-19: README "HTTP Endpoints" lists every route with what it answers.
+- 2026-10-19: README "HTTP Endpoints" lists every route with what it answers,
-  README "Database Schema" matches `schema.sql`. The rest of the README matches
+  "Database Schema" matches `schema.sql`, and the rest of the README matches the
-  the code. This file is brought up to date (closes #72)
+  code; this file brought up to date (closes #72)
- 2026-10-19: Route writes are cheaper. The live route and prefix tables lose
+- 2026-10-19: route writes are cheaper: the live route and prefix tables lose
-  their random UUID keys. The prefix tables lose their duplicate index. A route
+  their random UUID keys and the prefix tables their duplicate index, a route
-  update sets only the columns that change. Every write goes through one
+  update sets only the columns that change, and every write goes through one
  connection with a page cache of 1 GiB (README "Memory"). A benchmark writes
  the prefix handler's largest batch faster than the feed sends it (closes #96)
- 2026-10-19: The checkpoint of the WAL (SQLite's write-ahead log), the
+- 2026-10-19: the WAL checkpoint, the incremental vacuum and ANALYZE take the
-  incremental vacuum and `ANALYZE` take the database lock that every batch write
+  database lock every batch write holds, so a vacuum no longer fails with
-  holds. So a vacuum no longer fails with "database is locked". An `ANALYZE` no
+  "database is locked" and an ANALYZE no longer makes a batch write lose its
-  longer makes a batch write lose its updates. `ANALYZE` runs as
+  updates; ANALYZE runs as `PRAGMA optimize` with an analysis limit (closes #94)
-  `PRAGMA optimize` with an analysis limit (closes #94)
+- 2026-10-19: shutdown stops the streamer first, and each handler writes
- 2026-10-19: Shutdown stops the streamer first. Each handler then writes
+  everything left on its queue before it stops, so the updates waiting there are
  everything left on its queue before it stops. So the updates waiting there are
  no longer lost (closes #69)
- 2026-10-19: A path that ends in an AS set of several members has origin AS 0,
+- 2026-10-19: a path that ends in an AS set of several members has origin AS 0,
-  which means no known origin. It used to have the set's last member as its
+  no known origin, instead of the set's last member, and the set adds no
-  origin. The set adds no peerings. The pages show such a route as having no
+  peerings; the pages show such a route as having no known origin (closes #75)
  known origin (closes #75)
 - 2026-10-19: `bgp_peer_count` drops to 0 when the last peer goes down (closes
  #92)
- 2026-10-19: `bgp_peer_count` counts every peer the feed has heard from. It
+- 2026-10-19: `bgp_peer_count` counts every peer the feed has heard from, not
-  used to count only the peers whose session opened since startup. It drops a
+  only those whose session opened since startup, and drops a peer whose session
-  peer whose session goes down (closes #74)
+  goes down (closes #74)
- 2026-10-19: The shared files are re-vendored from `sneak/prompts` at
+- 2026-10-19: the shared files are re-vendored from `sneak/prompts` at
-  `0653579`. The linter is `golangci-lint` v2.14.0 with its configuration. Lint
+  `0653579`: golangci-lint v2.14.0 and its configuration, lint and test as
-  and test are `Dockerfile` phases that keep Go's and `golangci-lint`'s caches.
+  `Dockerfile` phases that keep Go's and golangci-lint's caches, markdown
-  `make fmt` also formats the markdown with `prettier`. The agent guidance moves
+  formatted with prettier, agent guidance in `AGENTS.md`; the code is fixed for
-  to `AGENTS.md`. The code is fixed for what the new linter configuration finds
+  what the new linter configuration finds (closes #52)
-  (closes #52)
+- 2026-10-19: the streamer reads feed lines up to 1 MiB, so a line over 64 KiB
- 2026-10-19: The streamer reads feed lines up to 1 MiB. A line over 64 KiB used
+  no longer ends the connection (closes #76)
-  to end the connection (closes #76)
+- 2026-10-19: a peer's live routes are removed when its BGP session goes down;
- 2026-10-19: A peer's live routes are removed when its BGP session goes down.
+  `STATE` messages are never dropped for backpressure, and one that finds its
  `STATE` messages are never dropped when a queue is full. One that finds its
  queue full waits for room ahead of the handler's other messages (closes #56)
- 2026-10-19: The prefix-length pages pick their sample with a bounded number of
+- 2026-10-19: the prefix-length pages pick their sample with a bounded number of
-  index lookups. They used to read every route of that length. They list each
+  index lookups instead of reading every route of that length, and list each
  prefix once (closes #66)
- 2026-10-19: A request past its time limit answers 504 instead of 408.
+- 2026-10-19: a request past its time limit answers 504 instead of 408, and
  `/api/v1/stats` answers 504 instead of 500 when its read runs out of time
  (closes #70)
- 2026-10-19: The AS, peer and prefix handlers write each batch outside the lock
+- 2026-10-19: the AS, peer and prefix handlers write each batch outside the lock
-  their message handling needs. So messages keep coming off their queues during
+  their message handling needs, so messages keep coming off their queues during
-  a write. Meanwhile the next batch grows to at most ten batch sizes (closes
+  a write; meanwhile the next batch grows to at most ten batch sizes (closes
  #65)
- 2026-10-19: A live route is identified by prefix and peer. So an announcement
+- 2026-10-19: a live route is identified by prefix and peer, so an announcement
-  with a new origin AS replaces the peer's route. A withdrawal removes it
+  with a new origin AS replaces the peer's route and a withdrawal removes it
  whatever its origin AS (closes #55)
- 2026-10-14: The streamer reconnects when RIS Live ends the stream or sends
+- 2026-10-14: the streamer reconnects when RIS Live ends the stream or sends
-  nothing for 60 seconds. The health check reports the feed disconnected
+  nothing for 60 seconds, and the health check reports the feed disconnected
  meanwhile (closes #53)
- 2026-10-14: The prefix page takes the names of the origin ASes from the prefix
+- 2026-10-14: the prefix page takes the names of the origin ASes from the prefix
-  query. It used to read every route of each origin AS (closes #67)
+  query instead of reading every route of each origin AS (closes #67)
- 2026-10-14: The daemon exits with status 1 when its web server cannot listen
+- 2026-10-14: the daemon exits with status 1 when its web server cannot listen
-  on its port. It used to run on without a web server (closes #73)
+  on its port, instead of running on without it (closes #73)
- 2026-10-14: The prefix pages parse the prefix before looking it up. One that
+- 2026-10-14: the prefix pages parse the prefix before looking it up: one that
-  does not parse answers 400. Any valid way of writing a prefix finds its routes
+  does not parse answers 400, and any valid way of writing a prefix finds its
-  (closes #71)
+  routes (closes #71)
- 2026-10-14: The IP lookup ignores routes shorter than /8 for IPv4 and /16 for
+- 2026-10-14: the IP lookup ignores routes shorter than /8 for IPv4 and /16 for
-  IPv6. So a default route is no longer named as an address's owner (closes #57)
+  IPv6, so a default route is no longer named as an address's owner (closes #57)
- 2026-10-14: A prefix batch keeps each peer's last update for a prefix. It used
+- 2026-10-14: a prefix batch keeps each peer's last update for a prefix, instead
-  to keep one update per prefix across all peers (closes #54)
+  of one update per prefix across all peers (closes #54)
 - 2026-10-14: `reconnect_count` in `/api/v1/stats` counts every reconnect
  (closes #68)
- 2026-10-03: `/api/v1/stats` serves the prefix distribution from memory. The
+- 2026-10-03: `/api/v1/stats` serves the prefix distribution from memory, seeded
-  distribution is seeded at startup and adjusted on every live-route write. So a
+  at startup and adjusted on every live-route write, so a request no longer
-  request no longer reads every live route (closes #30)
+  reads every live route (closes #30)
- 2026-10-03: A new database is created with `auto_vacuum` set to incremental.
+- 2026-10-03: a new database is created with `auto_vacuum` set to incremental,
-  The setting goes in the connection string, so it is set before the file is
+  through the connection string so it is set before the file is first written,
-  first written. Each periodic incremental vacuum now returns up to 1000 free
+  and each periodic incremental vacuum now returns up to 1000 free pages; the
-  pages. The late `PRAGMA auto_vacuum` in `Initialize`, which SQLite ignored, is
+  late `PRAGMA auto_vacuum` in `Initialize`, which SQLite ignored, is gone
-  gone (closes #43)
+  (closes #43)
- 2026-10-03: Looking up an IP address no longer reads every IPv6 route. Both
+- 2026-10-03: looking up an IP address no longer reads every IPv6 route: both
  families find the most specific live route with at most 33 or 129 lookups on
-  the prefix index. The IPv4 range columns are gone. Prefixes from the feed are
+  the prefix index, and the IPv4 range columns are gone. Prefixes from the feed
-  stored in one text form. So an IPv6 withdrawal, which the feed sends
+  are stored in one text form, so an IPv6 withdrawal, which the feed sends
  uncompressed, now removes its route (closes #48)
- 2026-10-02: A plain `docker build .` stamps the commit's tag or short commit
+- 2026-10-02: a plain `docker build .` stamps the commit's tag or short commit
-  into the page footer. It used to stamp `unknown`. The value comes from
+  (`git describe --tags --always`) into the page footer instead of `unknown`:
-  `git describe --tags --always`. `.dockerignore` sends `.git` without
+  `.dockerignore` sends `.git` without `.git/config`, a `VERSION` build argument
-  `.git/config`. A `VERSION` build argument takes precedence. `make build`
+  takes precedence, and `make build` stamps the same value (closes #46)
-  stamps the same value (closes #46)
+- 2026-09-29: the entrypoint creates the data directory if it is missing and
- 2026-09-29: The entrypoint creates the data directory if it is missing. It
+  stops the start if a step fails; README "Running under upaas" no longer asks
  stops the start if a step fails. README "Running under upaas" no longer asks
  for the host directory to be created first (closes #42)
 - 2026-09-29: `.dockerignore` keeps `.git`, local build output, local databases
-  and `.env` out of the Docker build context. So they stay out of the source
+  and `.env` out of the Docker build context, and so out of the source archive
-  archive in the image (closes #39)
+  in the image (closes #39)
- 2026-09-29: The README's first line names the MIT licence and the author. The
+- 2026-09-29: README first line names the MIT license and the author; the
-  License section says MIT and links `LICENSE`. An Author section is added. This
+  License section now says MIT and links `LICENSE`, and an Author section was
-  file is brought up to date (closes #38)
+  added; this file brought up to date (closes #38)
- 2026-09-29: `LICENSE` is added, with the MIT licence (closes #1)
+- 2026-09-29: MIT `LICENSE` (closes #1)
- 2026-09-28: Stopping the daemon while the feed is flowing no longer panics
+- 2026-09-28: stopping the daemon while the feed is flowing no longer panics
-  with "send on closed channel". The read loop checks for a stop just before
+  with "send on closed channel": the read loop checks for a stop just before
-  handing a message to the handler queues. A second `Stop` no longer closes the
+  handing a message to the handler queues, and a second `Stop` no longer closes
-  queues again (closes #34)
+  the queues again (closes #34)
 - 2026-09-28: `docker stop` no longer kills the daemon 2 seconds after the stop
-  signal. The entrypoint switches to the `routewatch` user with `setpriv`
+  signal: the entrypoint switches to the `routewatch` user with `setpriv`
-  instead of `runuser`. So the daemon receives the signal itself. It gets the
+  instead of `runuser`, so the daemon receives the signal itself and gets the
  whole wait `docker stop` allows, up to its own 60-second limit (closes #33)
- 2026-09-28: RouteWatch is ready to run under upaas. A set but invalid `PORT`,
+- 2026-09-28: ready to run under upaas: a set but invalid `PORT`,
-  `XDG_DATA_HOME` or `MALLOC_ARENA_MAX` stops the start. The health check
+  `XDG_DATA_HOME` or `MALLOC_ARENA_MAX` stops the start, the health check
-  follows `PORT`. README gains a "Running under upaas" section (closes #31)
+  follows `PORT`, README "Running under upaas" section (closes #31)
- 2026-09-22: The database statistics are kept in memory. The counts are seeded
+- 2026-09-22: realtime in-memory database statistics: counts seeded at startup
-  at startup and adjusted on every write. The oldest and newest route times come
+  and adjusted on every write, oldest/newest route timestamps via index-end
-  from a lookup at each end of an index. `/api/v1/stats` no longer scans the
+  lookups; `/api/v1/stats` no longer scans the tables (closes #27)
-  tables (closes #27)
+- 2026-09-21: batch writes take the write lock when their transaction begins
- 2026-09-21: Batch writes take the write lock when their transaction begins
+  (`_txlock=immediate`), so they wait out a WAL checkpoint instead of failing
  (`_txlock=immediate`). So they wait out a WAL checkpoint instead of failing
  with "database is locked" (closes #25)
- 2026-09-21: `MALLOC_ARENA_MAX=2` in the image caps the number of glibc malloc
+- 2026-09-21: `MALLOC_ARENA_MAX=2` in the image caps glibc malloc arenas, so
-  arenas. So memory outside the Go runtime no longer grows with the core count
+  memory outside the Go runtime no longer grows with the core count (closes #23)
-  (closes #23)
+- 2026-09-21: `GOMEMLIMIT=1536MiB` in the image; README Memory section with the
 - 2026-09-21: The image sets `GOMEMLIMIT=1536MiB`. README "Memory" gives the
  memory budget and the 5 GiB container limit (closes #13)
- 2026-09-21: The four handler queues hold at most 20,000 messages each, down
+- 2026-09-21: the four handler queues hold at most 20,000 messages each, down
  from 100,000 (closes #11)
- 2026-09-21: Two goroutine leaks are fixed. The stats handlers leaked after a
+- 2026-09-21: two goroutine leaks fixed: the stats handlers after a timeout and
-  timeout. The streamer's tickers leaked on every reconnect (closes #12)
+  the streamer's tickers on every reconnect (closes #12)
- 2026-09-21: Parsed RIS messages no longer keep the unused `Community` and
+- 2026-09-21: parsed RIS messages no longer keep the unused `Community` and
  `Raw` fields (closes #9)
- 2026-09-21: `.editorconfig` is added. A Gitea workflow runs `script/cibuild`
+- 2026-09-21: `.editorconfig`, and a Gitea workflow that runs `script/cibuild`
  on every push (closes #14)
- 2026-09-21: The peering handler's AS-path map holds at most 500,000 paths.
+- 2026-09-21: the peering handler's AS-path map holds at most 500,000 paths and
-  Every 30 seconds it is swapped for an empty one instead of copied (closes #10)
+  is swapped for an empty one every 30 seconds instead of copied (closes #10)
- 2026-09-21: SQLite's memory is bounded across the whole connection pool. Each
+- 2026-09-21: SQLite memory bounded across the whole connection pool: a 64 MiB
-  connection has a 64 MiB page cache. The heap limits are 1 GiB soft and 1.5 GiB
+  page cache on each connection, 1 GiB soft and 1.5 GiB hard heap limits (closes
-  hard (closes #8)
+  #8)
- 2026-09-21: The Docker build runs the format check, the linter and the tests.
+- 2026-09-21: the Docker build runs the format check, the linter and the tests,
-  Linting runs in a separate stage on a `golangci-lint` image pinned by digest
+  linting in a separate stage on a golangci-lint image pinned by digest (closes
-  (closes #5)
+  #5)
- 2026-09-21: `make test` skips the live feed test, with `-short`. So
+- 2026-09-21: `make test` skips the live-network feed test (`-short`), so
  `make check` no longer depends on the network (closes #2)
- 2026-07-07: The scripts-to-rule-them-all layout is adopted. `script/` holds
+- 2026-07-07 Adopted scripts-to-rule-them-all: `script/` entrypoints, Makefile
-  the entrypoints. The `Makefile` targets `check`, `test`, `lint`, `fmt` and
+  shims, README Entrypoints section
-  `fmt-check` call them. So do `bootstrap`, `setup`, `docker` and `hooks`.
+- 2026-02-22: repo policy compliance: required policy files, .gitignore update,
-  README gains an "Entrypoints" section
+  Makefile fmt-check/check/docker/hooks targets, gofmt pass
- 2026-02-22: The repo is brought in line with the repo policies. The required
+  (repo-policies-compliance, unmerged)
-  policy files are added. `.gitignore` is updated. The `Makefile` gains
+- 2026-01-01: WAL checkpointing: periodic (5s), on startup with logging,
-  `fmt-check`, `check`, `docker` and `hooks` targets. The Go code is formatted
+  TRUNCATE mode; fixed slow queries
-  with `gofmt`. The work was on the branch `repo-policies-compliance`, unmerged
+- 2025-12-31: status page: navbar, home page with search, oldest/newest route
-  when this entry was written
+  timestamps, NULL handling in WHOIS stats; container runs as routewatch user
- 2026-01-01: The WAL is checkpointed every 5 seconds, and at startup with a log
+  with proper state dir
-  line. Checkpoints run in `TRUNCATE` mode. This fixed slow queries
+- 2025-12-30: structured HTTP request logging, increased timeouts, CIDR prefix
- 2025-12-31: The pages get a navigation bar and a home page with a search. The
+  URL routing fixes, status page metrics and footer
-  status page shows the oldest and newest route times. The WHOIS stats query
+- 2025-12-29: Dockerfile multi-stage build with source archive; SQLite
-  handles `NULL`. The container runs as the `routewatch` user with the right
+  incremental vacuum for non-blocking space reclamation
-  state directory
+- 2025-07-27: initial RouteWatch BGP stream monitor
 - 2025-12-30: HTTP requests are logged as structured log lines. The HTTP
  timeouts are longer. Prefix URLs with a slash in them route correctly. The
  status page gets more metrics and a footer
 - 2025-12-29: The `Dockerfile` builds in stages and puts a source archive in the
  image. SQLite reclaims space with incremental vacuum, which does not block
 - 2025-07-27: The first commit: RouteWatch, a BGP stream monitor
 # Future Steps
 None.
@@ -1,202 +0,0 @@
 // Package bogon tells whether a prefix or an AS number is reserved: set aside
 // for a special purpose, so that no network should announce it on the
 // internet. A route is a bogon announcement when its prefix is reserved or its
 // origin AS is.
 //
 // Most reserved prefixes come from the IANA special-purpose address registries
 // for IPv4 and IPv6. The two multicast blocks, 224.0.0.0/4 and ff00::/8, come
 // from the IANA IPv4 and IPv6 address space registries. The reserved AS
 // numbers come from the IANA special-purpose AS numbers registry:
 //   - the AS numbers for private use
 //   - the AS numbers for documentation
 //   - AS 23456, which stands in for a 32-bit AS number
 //   - the last AS number of the 16-bit and of the 32-bit range
 //
 // Address space and AS numbers that the IANA has not handed out yet are not
 // counted.
 package bogon
 import (
 	"net/netip"
 	"strconv"
 )
 // Prefix returns why prefix is reserved, and true, when it lies inside a
 // reserved block. The most specific registry block that holds prefix decides,
 // because some blocks that may be announced lie inside reserved ones. It
 // returns "" and false when prefix is not reserved.
 func Prefix(prefix netip.Prefix) (string, bool) {
 	var holder *block
 	for i, b := range registryBlocks {
 		inside := b.prefix.Bits() <= prefix.Bits() && b.prefix.Contains(prefix.Addr())
 		if inside && (holder == nil || b.prefix.Bits() > holder.prefix.Bits()) {
 			holder = &registryBlocks[i]
 		}
 	}
 	if holder == nil || !holder.reserved {
 		return "", false
 	}
 	return holder.name + " (" + holder.prefix.String() + ")", true
 }
 // ASN returns why asn is reserved, and true, when it is. It returns "" and
 // false when asn is not reserved.
 func ASN(asn int) (string, bool) {
 	for _, r := range reservedASRanges {
 		if asn < r.first || asn > r.last {
 			continue
 		}
 		if r.first == r.last {
 			return r.name + " (AS" + strconv.Itoa(asn) + ")", true
 		}
 		return r.name + " (AS" + strconv.Itoa(r.first) + "-AS" +
 			strconv.Itoa(r.last) + ")", true
 	}
 	return "", false
 }
 // The names that the registries give to more than one row.
 const (
 	privateUse              = "Private-Use"
 	documentation           = "Documentation"
 	benchmarking            = "Benchmarking"
 	ietfProtocolAssignments = "IETF Protocol Assignments"
 	portControlAnycast      = "Port Control Protocol Anycast"
 	natTraversalAnycast     = "Traversal Using Relays around NAT Anycast"
 	nat64Discovery          = "NAT64/DNS64 Discovery"
 	amt                     = "AMT"
 	as112DirectDelegation   = "Direct Delegation AS112 Service"
 	ipv4IPv6Translation     = "IPv4-IPv6 Translat."
 	multicast               = "Multicast"
 )
 // block is one row of an IANA address registry.
 type block struct {
 	prefix netip.Prefix
 	name   string
 	// reserved says that no network should announce the row's addresses on
 	// the internet.
 	reserved bool
 }
 // reservedBlock returns a reserved row: a multicast block, or a special-purpose
 // row whose Globally Reachable column is False.
 func reservedBlock(prefix, name string) block {
 	return block{prefix: netip.MustParsePrefix(prefix), name: name, reserved: true}
 }
 // reachableBlock returns a special-purpose row whose Globally Reachable column
 // is True or N/A. Such a row matters only inside a reserved block, whose
 // addresses it lets be announced.
 func reachableBlock(prefix, name string) block {
 	return block{prefix: netip.MustParsePrefix(prefix), name: name}
 }
 // registryBlocks are the rows of the IANA special-purpose address registries,
 // without the deprecated ones:
 //   - https://www.iana.org/assignments/iana-ipv4-special-registry/
 //   - https://www.iana.org/assignments/iana-ipv6-special-registry/
 //
 // They also hold the multicast blocks, which the IANA address space registries
 // list as Multicast:
 //   - https://www.iana.org/assignments/ipv4-address-space/
 //   - https://www.iana.org/assignments/ipv6-address-space/
 //
 //nolint:gochecknoglobals // a fixed list, parsed once
 var registryBlocks = []block{
 	reservedBlock("0.0.0.0/8", "This network"),
 	reservedBlock("0.0.0.0/32", "This host on this network"),
 	reservedBlock("10.0.0.0/8", privateUse),
 	reservedBlock("100.64.0.0/10", "Shared Address Space"),
 	reservedBlock("127.0.0.0/8", "Loopback"),
 	reservedBlock("169.254.0.0/16", "Link Local"),
 	reservedBlock("172.16.0.0/12", privateUse),
 	reservedBlock("192.0.0.0/24", ietfProtocolAssignments),
 	reservedBlock("192.0.0.0/29", "IPv4 Service Continuity Prefix"),
 	reservedBlock("192.0.0.8/32", "IPv4 dummy address"),
 	reachableBlock("192.0.0.9/32", portControlAnycast),
 	reachableBlock("192.0.0.10/32", natTraversalAnycast),
 	reservedBlock("192.0.0.170/32", nat64Discovery),
 	reservedBlock("192.0.0.171/32", nat64Discovery),
 	reservedBlock("192.0.2.0/24", "Documentation (TEST-NET-1)"),
 	reachableBlock("192.31.196.0/24", "AS112-v4"),
 	reachableBlock("192.52.193.0/24", amt),
 	reservedBlock("192.88.99.2/32", "6a44-relay anycast address"),
 	reservedBlock("192.168.0.0/16", privateUse),
 	reachableBlock("192.175.48.0/24", as112DirectDelegation),
 	reservedBlock("198.18.0.0/15", benchmarking),
 	reservedBlock("198.51.100.0/24", "Documentation (TEST-NET-2)"),
 	reservedBlock("203.0.113.0/24", "Documentation (TEST-NET-3)"),
 	reservedBlock("224.0.0.0/4", multicast),
 	reservedBlock("240.0.0.0/4", "Reserved"),
 	reservedBlock("255.255.255.255/32", "Limited Broadcast"),
 	reservedBlock("::1/128", "Loopback Address"),
 	reservedBlock("::/128", "Unspecified Address"),
 	reservedBlock("::ffff:0:0/96", "IPv4-mapped Address"),
 	reachableBlock("64:ff9b::/96", ipv4IPv6Translation),
 	reservedBlock("64:ff9b:1::/48", ipv4IPv6Translation),
 	reservedBlock("100::/64", "Discard-Only Address Block"),
 	reservedBlock("100:0:0:1::/64", "Dummy IPv6 Prefix"),
 	reservedBlock("2001::/23", ietfProtocolAssignments),
 	reachableBlock("2001::/32", "TEREDO"),
 	reachableBlock("2001:1::1/128", portControlAnycast),
 	reachableBlock("2001:1::2/128", natTraversalAnycast),
 	reachableBlock("2001:1::3/128", "DNS-SD Service Registration Protocol Anycast"),
 	reservedBlock("2001:2::/48", benchmarking),
 	reachableBlock("2001:3::/32", amt),
 	reachableBlock("2001:4:112::/48", "AS112-v6"),
 	reachableBlock("2001:20::/28", "ORCHIDv2"),
 	reachableBlock("2001:30::/28", "Drone Remote ID Protocol Entity Tags (DETs) Prefix"),
 	reservedBlock("2001:db8::/32", documentation),
 	reachableBlock("2002::/16", "6to4"),
 	reachableBlock("2620:4f:8000::/48", as112DirectDelegation),
 	reservedBlock("3fff::/20", documentation),
 	reservedBlock("5f00::/16", "Segment Routing (SRv6) SIDs"),
 	reservedBlock("fc00::/7", "Unique-Local"),
 	reservedBlock("fe80::/10", "Link-Local Unicast"),
 	reservedBlock("ff00::/8", multicast),
 }
 // asRange is a range of reserved AS numbers, first to last.
 type asRange struct {
 	first, last int
 	name        string
 }
 // The reserved AS numbers of the IANA special-purpose AS numbers registry.
 const (
 	asTrans                = 23456
 	firstDocumentationAS16 = 64496
 	lastDocumentationAS16  = 64511
 	firstPrivateUseAS16    = 64512
 	lastPrivateUseAS16     = 65534
 	lastAS16               = 65535
 	firstDocumentationAS32 = 65536
 	lastDocumentationAS32  = 65551
 	firstPrivateUseAS32    = 4200000000
 	lastPrivateUseAS32     = 4294967294
 	lastAS32               = 4294967295
 )
 // reservedASRanges are the reserved rows of the IANA special-purpose AS numbers
 // registry, https://www.iana.org/assignments/iana-as-numbers-special-registry/.
 // AS 0 is left out: RouteWatch uses it for a route with no known origin. AS 112
 // is left out because the AS112 project announces routes with it.
 //
 //nolint:gochecknoglobals // a fixed list
 var reservedASRanges = []asRange{
 	{first: asTrans, last: asTrans, name: "AS_TRANS"},
 	{first: firstDocumentationAS16, last: lastDocumentationAS16, name: documentation},
 	{first: firstPrivateUseAS16, last: lastPrivateUseAS16, name: privateUse},
 	{first: lastAS16, last: lastAS16, name: "Last 16-bit AS number"},
 	{first: firstDocumentationAS32, last: lastDocumentationAS32, name: documentation},
 	{first: firstPrivateUseAS32, last: lastPrivateUseAS32, name: privateUse},
 	{first: lastAS32, last: lastAS32, name: "Last 32-bit AS number"},
 }
@@ -1,95 +0,0 @@
 package bogon_test
 import (
 	"net/netip"
 	"strconv"
 	"testing"
 	"git.eeqj.de/sneak/routewatch/internal/bogon"
 )
 func TestPrefix(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
 		prefix string
 		// want is why the prefix is reserved, or "" when it is not.
 		want string
 	}{
 		{"10.1.2.0/24", "Private-Use (10.0.0.0/8)"},
 		{"10.0.0.0/8", "Private-Use (10.0.0.0/8)"},
 		{"192.0.2.0/24", "Documentation (TEST-NET-1) (192.0.2.0/24)"},
 		{"2001:db8:1::/48", "Documentation (2001:db8::/32)"},
 		{"fd00::/8", "Unique-Local (fc00::/7)"},
 		// Multicast space, from the IANA address space registries.
 		{"224.0.0.0/4", "Multicast (224.0.0.0/4)"},
 		{"239.255.0.0/16", "Multicast (224.0.0.0/4)"},
 		{"ff00::/8", "Multicast (ff00::/8)"},
 		{"ff02::/16", "Multicast (ff00::/8)"},
 		// The most specific block names the reason.
 		{"0.0.0.0/32", "This host on this network (0.0.0.0/32)"},
 		{"2001:2::/48", "Benchmarking (2001:2::/48)"},
 		// Blocks that may be announced, inside reserved blocks.
 		{"192.0.0.9/32", ""},
 		{"2001:4:112::/48", ""},
 		// Blocks that may be announced, inside no reserved block.
 		{"192.175.48.0/24", ""},
 		{"2002::/16", ""},
 		// A prefix that holds a reserved block is not inside it.
 		{"192.0.0.0/16", ""},
 		{"0.0.0.0/0", ""},
 		// Prefixes anyone may announce.
 		{"8.8.8.0/24", ""},
 		{"2001:4860::/32", ""},
 	}
 	for _, tc := range tests {
 		t.Run(tc.prefix, func(t *testing.T) {
 			t.Parallel()
 			reason, reserved := bogon.Prefix(netip.MustParsePrefix(tc.prefix))
 			if reason != tc.want || reserved != (tc.want != "") {
 				t.Errorf("Prefix(%s) = %q, %v; want %q", tc.prefix, reason,
 					reserved, tc.want)
 			}
 		})
 	}
 }
 func TestASN(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
 		asn int
 		// want is why the AS number is reserved, or "" when it is not.
 		want string
 	}{
 		{23456, "AS_TRANS (AS23456)"},
 		{64496, "Documentation (AS64496-AS64511)"},
 		{64512, "Private-Use (AS64512-AS65534)"},
 		{65534, "Private-Use (AS64512-AS65534)"},
 		{65535, "Last 16-bit AS number (AS65535)"},
 		{65551, "Documentation (AS65536-AS65551)"},
 		{4200000000, "Private-Use (AS4200000000-AS4294967294)"},
 		{4294967295, "Last 32-bit AS number (AS4294967295)"},
 		// AS 0 means no known origin, and the AS112 project uses AS 112.
 		{0, ""},
 		{112, ""},
 		// Not handed out yet, which is not counted.
 		{65552, ""},
 		{15169, ""},
 		{64495, ""},
 	}
 	for _, tc := range tests {
 		t.Run(strconv.Itoa(tc.asn), func(t *testing.T) {
 			t.Parallel()
 			reason, reserved := bogon.ASN(tc.asn)
 			if reason != tc.want || reserved != (tc.want != "") {
 				t.Errorf("ASN(%d) = %q, %v; want %q", tc.asn, reason, reserved,
 					tc.want)
 			}
 		})
 	}
 }
@@ -30,14 +30,6 @@ const (
 	maxPort = 65535
 )
 // The private address ranges of RFC 1918. The HTTP server trusts a reverse
 // proxy in any of them when TRUSTED_PROXIES is not set.
 const (
 	privateRange10  = "10.0.0.0/8"
 	privateRange172 = "172.16.0.0/12"
 	privateRange192 = "192.168.0.0/16"
 )
 var (
 	errRelativeXDGDataHome = errors.New("XDG_DATA_HOME must be an absolute path")
 	errUnsupportedOS       = errors.New("unsupported operating system")
@@ -167,21 +159,11 @@ func getPort() (int, error) {
 	return int(port), nil
 }
-// getTrustedProxies returns the reverse proxies the HTTP server trusts. When
+// getTrustedProxies returns the addresses and CIDR ranges listed in
-// TRUSTED_PROXIES is not set, they are the private ranges of RFC 1918. When it
+// TRUSTED_PROXIES, such as "10.0.0.0/8,192.0.2.1", or none when it is not set.
-// is set, they are the addresses and CIDR ranges it lists, such as
+// An address is returned as a range holding only that address.
 // "10.0.0.0/8,192.0.2.1", and none when it is empty. An address is returned as
 // a range holding only that address.
 func getTrustedProxies() ([]netip.Prefix, error) {
-	value, set := os.LookupEnv("TRUSTED_PROXIES")
+	value := os.Getenv("TRUSTED_PROXIES")
 	if !set {
 		return []netip.Prefix{
 			netip.MustParsePrefix(privateRange10),
 			netip.MustParsePrefix(privateRange172),
 			netip.MustParsePrefix(privateRange192),
 		}, nil
 	}
 	if value == "" {
 		return nil, nil
 	}
@@ -2,7 +2,6 @@ package config
 import (
 	"net/netip"
 	"os"
 	"runtime"
 	"slices"
 	"testing"
@@ -47,47 +46,25 @@ func TestNewRefusesInvalidPort(t *testing.T) {
 	}
 }
-// TestNewTrustsPrivateRangesByDefault checks that with TRUSTED_PROXIES unset
+func TestNewReadsTrustedProxies(t *testing.T) {
 // the trusted proxies are the private ranges of RFC 1918. Before the fix no
 // proxy was trusted, so a reverse proxy at a private address was taken for the
 // client (https://git.eeqj.de/sneak/routewatch/issues/198).
 func TestNewTrustsPrivateRangesByDefault(t *testing.T) {
 	t.Setenv("PORT", "")
 	t.Setenv("XDG_DATA_HOME", "")
 	// t.Setenv puts the variable back when the test ends.
 	t.Setenv("TRUSTED_PROXIES", "")
 	err := os.Unsetenv("TRUSTED_PROXIES")
 	if err != nil {
 		t.Fatal(err)
 	}
 	cfg, err := New()
 	if err != nil {
 		t.Fatalf("New() without TRUSTED_PROXIES: %v", err)
 	}
-	want := []netip.Prefix{
+	if len(cfg.TrustedProxies) != 0 {
-		netip.MustParsePrefix("10.0.0.0/8"),
+		t.Errorf("New() without TRUSTED_PROXIES: TrustedProxies = %v, want none",
-		netip.MustParsePrefix("172.16.0.0/12"),
+			cfg.TrustedProxies)
 		netip.MustParsePrefix("192.168.0.0/16"),
 	}
 	if !slices.Equal(cfg.TrustedProxies, want) {
 		t.Errorf("New() without TRUSTED_PROXIES: TrustedProxies = %v, want %v",
 			cfg.TrustedProxies, want)
 	}
 }
 // TestNewReadsTrustedProxies checks that a list in TRUSTED_PROXIES replaces
 // the default, and that TRUSTED_PROXIES set but empty trusts no proxy.
 func TestNewReadsTrustedProxies(t *testing.T) {
 	t.Setenv("PORT", "")
 	t.Setenv("XDG_DATA_HOME", "")
 	t.Setenv("TRUSTED_PROXIES", "10.0.0.0/8, 192.0.2.1,2001:db8::/32")
-	cfg, err := New()
+	cfg, err = New()
 	if err != nil {
 		t.Fatalf("New() with TRUSTED_PROXIES: %v", err)
 	}
@@ -100,18 +77,6 @@ func TestNewReadsTrustedProxies(t *testing.T) {
 	if !slices.Equal(cfg.TrustedProxies, want) {
 		t.Errorf("TrustedProxies = %v, want %v", cfg.TrustedProxies, want)
 	}
 	t.Setenv("TRUSTED_PROXIES", "")
 	cfg, err = New()
 	if err != nil {
 		t.Fatalf("New() with TRUSTED_PROXIES set but empty: %v", err)
 	}
 	if len(cfg.TrustedProxies) != 0 {
 		t.Errorf("New() with TRUSTED_PROXIES set but empty: TrustedProxies = %v, "+
 			"want none", cfg.TrustedProxies)
 	}
 }
 func TestNewRefusesInvalidTrustedProxies(t *testing.T) {
@@ -96,6 +96,12 @@ const (
 // Common errors
 var (
 	// ErrInvalidIP says that an IP address is malformed. The server's IP
 	// lookup returns it.
 	ErrInvalidIP = errors.New("invalid IP address")
 	// ErrNoRoute says that the routing table has no route for an address, a
 	// prefix or an AS. The server's lookups return it.
 	ErrNoRoute = errors.New("no route found")
 	// ErrNoStaleASN is returned when no ASN needs WHOIS refresh
 	ErrNoStaleASN = errors.New("no stale ASN found")
 	// ErrCheckpointIncomplete is returned by Checkpoint when it left part of
@@ -972,34 +978,6 @@ func (d *Database) GetAS(ctx context.Context, asn int) (*ASN, bool, error) {
 	return &asnInfo, true, nil
 }
 // The queries of GetLastSeenASes. The index on last_seen answers each without
 // reading the whole table.
 const (
 	newestLastSeenASQuery = `
 	SELECT asn, handle, description, first_seen, last_seen
 	FROM asns ORDER BY last_seen DESC LIMIT 1`
 	oldestLastSeenASQuery = `
 	SELECT asn, handle, description, first_seen, last_seen
 	FROM asns ORDER BY last_seen ASC LIMIT 1`
 )
 // GetLastSeenASes returns two ASes of the asns table, with their handles,
 // descriptions and seen times: the one last seen most recently, and the one
 // last seen longest ago. Both are nil when the table holds no AS.
 func (d *Database) GetLastSeenASes(ctx context.Context) (*ASN, *ASN, error) {
 	newest, found, err := d.readOneAS(ctx, newestLastSeenASQuery)
 	if err != nil || !found {
 		return nil, nil, err
 	}
 	oldest, _, err := d.readOneAS(ctx, oldestLastSeenASQuery)
 	if err != nil {
 		return nil, nil, err
 	}
 	return newest, oldest, nil
 }
 // asWHOISQuery reads the handle, description and WHOIS details of one AS, and
 // when the WHOIS details were fetched.
 const asWHOISQuery = `
@@ -1407,29 +1385,6 @@ func (d *Database) Ping(ctx context.Context) error {
 	return nil
 }
 // readOneAS returns the AS that query reads, and whether it read one.
 func (d *Database) readOneAS(ctx context.Context, query string) (*ASN, bool, error) {
 	var (
 		asnInfo             ASN
 		handle, description sql.NullString
 	)
 	err := d.db.QueryRowContext(ctx, query).Scan(&asnInfo.ASN, &handle,
 		&description, &asnInfo.FirstSeen, &asnInfo.LastSeen)
 	if errors.Is(err, sql.ErrNoRows) {
 		return nil, false, nil
 	}
 	if err != nil {
 		return nil, false, fmt.Errorf("failed to query AS by last seen: %w", err)
 	}
 	asnInfo.Handle = handle.String
 	asnInfo.Description = description.String
 	return &asnInfo, true, nil
 }
 // truncateWAL runs the TRUNCATE checkpoint of Checkpoint on a WAL file of
 // walBytes, with the writing connection's busy timeout lowered to
 // truncateBusyTimeoutMs for it, and logs how long it took. The caller holds the
@@ -273,7 +273,7 @@ func TestVacuumReturnsFreePages(t *testing.T) {
 	writeTableChanges(t, db, table)
 	// The peer going down removes every prefix, and so every row.
-	table.PeersDown([]string{peerA})
+	table.PeerDown(peerA)
 	writeTableChanges(t, db, table)
 	var before int
@@ -1003,62 +1003,6 @@ func TestGetASReadsTheRecordOrTheBuiltInList(t *testing.T) {
 	}
 }
 // TestGetLastSeenASes stores three ASes, each last seen at another time, and
 // expects the one last seen most recently and the one last seen longest ago.
 // An empty asns table gives neither.
 func TestGetLastSeenASes(t *testing.T) {
 	t.Parallel()
 	db, err := New(&config.Config{StateDir: t.TempDir()}, logger.New())
 	if err != nil {
 		t.Fatalf("failed to create database: %v", err)
 	}
 	defer func() { _ = db.Close() }()
 	newest, oldest, err := db.GetLastSeenASes(t.Context())
 	if err != nil || newest != nil || oldest != nil {
 		t.Fatalf("GetLastSeenASes() on an empty table = %+v, %+v, %v; want "+
 			"neither", newest, oldest, err)
 	}
 	const (
 		newestASN = 13335
 		middleASN = 15169
 		oldestASN = 3
 	)
 	start := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
 	err = db.GetOrCreateASNBatch(map[int]SeenTimes{
 		middleASN: {First: start, Last: start.Add(time.Hour)},
 		newestASN: {First: start, Last: start.Add(2 * time.Hour)},
 		oldestASN: {First: start, Last: start.Add(time.Minute)},
 	})
 	if err != nil {
 		t.Fatalf("GetOrCreateASNBatch: %v", err)
 	}
 	newest, oldest, err = db.GetLastSeenASes(t.Context())
 	if err != nil {
 		t.Fatalf("GetLastSeenASes: %v", err)
 	}
 	listed, _ := asinfo.Get(newestASN)
 	if newest == nil || newest.ASN != newestASN ||
 		!newest.LastSeen.Equal(start.Add(2*time.Hour)) ||
 		newest.Description != listed.Description {
 		t.Errorf("newest = %+v, want AS%d (%s) last seen %v", newest, newestASN,
 			listed.Description, start.Add(2*time.Hour))
 	}
 	if oldest == nil || oldest.ASN != oldestASN ||
 		!oldest.LastSeen.Equal(start.Add(time.Minute)) {
 		t.Errorf("oldest = %+v, want AS%d last seen %v", oldest, oldestASN,
 			start.Add(time.Minute))
 	}
 }
 // TestGetASWHOISReadsTheStoredDetails stores an AS with WHOIS details and asks
 // GetASWHOIS for it and for an AS the asns table does not hold. The first gets
 // its stored handle, description and details, and the time they were fetched.
@@ -62,7 +62,6 @@ type Store interface {
 	// AS and prefix detail operations
 	GetAS(ctx context.Context, asn int) (*ASN, bool, error)
 	GetLastSeenASes(ctx context.Context) (*ASN, *ASN, error)
 	GetASWHOIS(ctx context.Context, asn int) (*ASN, error)
 	GetPrefixFirstSeen(ctx context.Context, prefix netip.Prefix) (time.Time, error)
 	GetASPeers(asn int) ([]ASPeer, error)
@@ -66,6 +66,58 @@ type ASNPeering struct {
 	LastSeen  time.Time
 }
 // LiveRoute represents a route in the live routing table. JSON leaves out an
 // empty AS path, next hop or time: the routing table in memory keeps them only
 // for the two newest routes of each prefix and origin AS.
 //
 //nolint:tagliatelle // field names are the existing JSON API
 type LiveRoute struct {
 	Prefix      string    `json:"prefix"`
 	MaskLength  int       `json:"mask_length"`
 	IPVersion   int       `json:"ip_version"`
 	OriginASN   int       `json:"origin_asn"`
 	PeerIP      string    `json:"peer_ip"`
 	ASPath      []int     `json:"as_path,omitempty"`
 	NextHop     string    `json:"next_hop,omitempty"`
 	LastUpdated time.Time `json:"last_updated,omitzero"`
 }
 // PrefixDistribution represents the distribution of prefixes by mask length
 //
 //nolint:tagliatelle // field names are the existing JSON API
 type PrefixDistribution struct {
 	MaskLength int `json:"mask_length"`
 	Count      int `json:"count"`
 }
 // IPInfo represents comprehensive IP information for the /ip endpoint
 //
 //nolint:tagliatelle // field names are the existing JSON API
 type IPInfo struct {
 	IP         string `json:"ip"`
 	Netblock   string `json:"netblock"`
 	MaskLength int    `json:"mask_length"`
 	IPVersion  int    `json:"ip_version"`
 	NumPeers   int    `json:"num_peers"`
 	// AS information
 	ASN         int    `json:"asn"`
 	ASName      string `json:"as_name,omitempty"`
 	Handle      string `json:"handle,omitempty"`
 	Description string `json:"description,omitempty"`
 	OrgName     string `json:"org_name,omitempty"`
 	OrgID       string `json:"org_id,omitempty"`
 	Address     string `json:"address,omitempty"`
 	CountryCode string `json:"country_code,omitempty"`
 	AbuseEmail  string `json:"abuse_email,omitempty"`
 	RIR         string `json:"rir,omitempty"`
 	// Timestamps. LastSeen is zero, and left out of JSON, when the prefix
 	// keeps no route.
 	FirstSeen time.Time `json:"first_seen"`
 	LastSeen  time.Time `json:"last_seen,omitzero"`
 	// Indicates if WHOIS data needs refresh (not serialized)
 	NeedsWHOISRefresh bool `json:"-"`
 }
 // SeenTimes is the earliest and the latest time one batch of updates saw an AS,
 // a peer or a peering. A row the batch adds is stored first seen at First and
 // last seen at Last. A row already stored takes First as its first_seen only
@@ -107,7 +107,7 @@ func TestReadRouteTableGivesBackWhatWasWritten(t *testing.T) {
 	// A peer moves to another origin, one goes down and a new one comes.
 	announceTo(source, tablePrefixV4, asB, peerA, 60)
-	source.PeersDown([]string{peerC})
+	source.PeerDown(peerC)
 	announceTo(source, tablePrefixV6, asB, peerE, 70)
 	writeTableChanges(t, db, source)
@@ -133,7 +133,7 @@ func TestReadRouteTableGivesATableThatTakesLaterUpdates(t *testing.T) {
 	// another one goes down, and a new peer comes.
 	for _, table := range []*routetable.Table{source, read} {
 		table.Withdraw(netip.MustParsePrefix(tablePrefixV4), peerA)
-		table.PeersDown([]string{peerB})
+		table.PeerDown(peerB)
 		announceTo(table, tablePrefixShortV4, asB, peerD, 50)
 	}
@@ -83,9 +83,6 @@ CREATE INDEX IF NOT EXISTS idx_peerings_lookup ON peerings(as_a, as_b);
 -- Indexes for asns table
 CREATE INDEX IF NOT EXISTS idx_asns_asn ON asns(asn);
 CREATE INDEX IF NOT EXISTS idx_asns_whois_updated_at ON asns(whois_updated_at);
 -- Finds the AS last seen most recently and the one last seen longest ago, for
 -- the home page.
 CREATE INDEX IF NOT EXISTS idx_asns_last_seen ON asns(last_seen);
 -- Indexes for bgp_peers table
 CREATE INDEX IF NOT EXISTS idx_bgp_peers_asn ON bgp_peers(peer_asn);
@@ -1,264 +0,0 @@
 package routetable
 import (
 	"cmp"
 	"net/netip"
 	"slices"
 	"time"
 	"git.eeqj.de/sneak/routewatch/internal/bogon"
 	"git.eeqj.de/sneak/routewatch/internal/ristypes"
 )
 // Overview holds figures about the whole table. Working them out takes a walk
 // over every prefix, so a caller asks for them now and then and keeps them.
 type Overview struct {
 	// NewestRoute and OldestRoute are the newest and the oldest kept routes,
 	// or nil when the table keeps none. Of several with the same time, it is
 	// any one of them.
 	NewestRoute *PrefixRoute
 	OldestRoute *PrefixRoute
 	// MostPrefixesASN is the AS that originates the most prefixes, and
 	// MostPrefixes is how many it originates. Of several with as many, it is
 	// the lowest AS number. AS 0, no known origin, counts neither here nor
 	// in the single-prefix figures.
 	MostPrefixesASN int
 	MostPrefixes    int
 	// SinglePrefixASes counts the ASes that originate one prefix.
 	SinglePrefixASes int
 	// NewestSinglePrefix is the newest kept route of those ASes, or nil when
 	// they keep none.
 	NewestSinglePrefix *PrefixRoute
 	// Bogons are the bogon announcements, in prefix order: at most the
 	// number Overview is asked for. BogonCount counts them all.
 	Bogons     []Bogon
 	BogonCount int
 	// MultipleOrigins are the prefixes that peers carry with more than one
 	// origin AS, in prefix order: at most the number Overview is asked for.
 	// MultipleOriginCount counts them all.
 	MultipleOrigins     []MultipleOriginPrefix
 	MultipleOriginCount int
 }
 // PrefixRoute is the time of a kept route, with its prefix and origin AS.
 type PrefixRoute struct {
 	Prefix    netip.Prefix
 	OriginASN int
 	Time      time.Time
 }
 // Bogon is a bogon announcement: a prefix and origin AS pair whose prefix or
 // origin AS is reserved, as package bogon tells.
 type Bogon struct {
 	Prefix    netip.Prefix
 	OriginASN int
 	// Peers is how many peers carry the prefix with this origin AS.
 	Peers int
 	// Reasons say why the prefix, the origin AS or both are reserved.
 	Reasons []string
 }
 // MultipleOriginPrefix is a prefix that peers carry with more than one origin
 // AS.
 type MultipleOriginPrefix struct {
 	Prefix netip.Prefix
 	// Origins are its origin ASes, in AS number order.
 	Origins []OriginPeers
 }
 // OriginPeers is one origin AS of a prefix, and how many peers carry the prefix
 // with it.
 type OriginPeers struct {
 	ASN   int
 	Peers int
 }
 // Overview works out the table's overview. It lists at most maxListed bogon
 // announcements and at most maxListed prefixes with more than one origin AS:
 // the first in prefix order. It visits every prefix in the table, in batches
 // of walkBatch. After each batch, it lets the table's lock go for as long as
 // it held the lock for the batch.
 func (t *Table) Overview(maxListed int) Overview {
 	var overview Overview
 	t.walkPrefixes(func(prefix netip.Prefix, origins []*origin) {
 		overview.noteKeptRoutes(prefix, origins)
 		overview.noteBogons(prefix, origins)
 		overview.noteMultipleOrigins(prefix, origins)
 	})
 	t.countPrefixesPerOrigin(&overview)
 	slices.SortFunc(overview.Bogons, func(a, b Bogon) int {
 		return cmp.Or(a.Prefix.Compare(b.Prefix),
 			cmp.Compare(a.OriginASN, b.OriginASN))
 	})
 	overview.BogonCount = len(overview.Bogons)
 	overview.Bogons = overview.Bogons[:min(maxListed, overview.BogonCount)]
 	slices.SortFunc(overview.MultipleOrigins, func(a, b MultipleOriginPrefix) int {
 		return a.Prefix.Compare(b.Prefix)
 	})
 	overview.MultipleOriginCount = len(overview.MultipleOrigins)
 	overview.MultipleOrigins =
 		overview.MultipleOrigins[:min(maxListed, overview.MultipleOriginCount)]
 	return overview
 }
 // walkPrefixes calls visit with every prefix of the table and its origins. It
 // holds the read lock for walkBatch prefixes at a time. After each batch, it
 // lets the table's lock go for as long as it held the lock for the batch.
 // During a walk over many batches, updates can then take the lock about half
 // of the time. The walk may or may not visit a prefix that is added or removed
 // while the lock is let go. Go allows this in a range over a map that changes.
 // visit must not keep origins once it returns.
 func (t *Table) walkPrefixes(visit func(prefix netip.Prefix, origins []*origin)) {
 	t.mu.RLock()
 	defer t.mu.RUnlock()
 	visited := 0
 	batchStart := time.Now()
 	for _, f := range []*family{&t.ipv4, &t.ipv6} {
 		for _, prefixes := range f.byLength {
 			for prefix, origins := range prefixes {
 				visit(prefix, origins)
 				visited++
 				if visited%walkBatch == 0 {
 					held := time.Since(batchStart)
 					t.mu.RUnlock()
 					time.Sleep(held)
 					t.mu.RLock()
 					batchStart = time.Now()
 				}
 			}
 		}
 	}
 }
 // countPrefixesPerOrigin works out the overview's figures of how many prefixes
 // each AS originates. It holds the read lock once, for one look at each origin
 // AS, of which there are far fewer than prefixes.
 func (t *Table) countPrefixesPerOrigin(overview *Overview) {
 	t.mu.RLock()
 	defer t.mu.RUnlock()
 	for asn, prefixes := range t.byOrigin {
 		if asn == ristypes.NoOrigin {
 			continue
 		}
 		count := len(prefixes)
 		if count > overview.MostPrefixes ||
 			(count == overview.MostPrefixes && asn < overview.MostPrefixesASN) {
 			overview.MostPrefixesASN = asn
 			overview.MostPrefixes = count
 		}
 		if count == 1 {
 			overview.SinglePrefixASes++
 			overview.noteSinglePrefix(asn, prefixes)
 		}
 	}
 }
 // noteSinglePrefix makes the newest kept route of asn, whose one prefix is in
 // prefixes, the overview's newest single-prefix route when it is newer.
 func (overview *Overview) noteSinglePrefix(
 	asn int, prefixes map[netip.Prefix]*origin,
 ) {
 	for prefix, o := range prefixes {
 		newest := o.newestTime()
 		if newest == nil {
 			continue
 		}
 		if overview.NewestSinglePrefix == nil ||
 			newest.After(overview.NewestSinglePrefix.Time) {
 			overview.NewestSinglePrefix = &PrefixRoute{
 				Prefix: prefix, OriginASN: asn, Time: *newest,
 			}
 		}
 	}
 }
 // noteKeptRoutes makes the newest and the oldest kept routes of prefix's
 // origins the overview's newest and oldest routes when they are newer or older.
 func (overview *Overview) noteKeptRoutes(prefix netip.Prefix, origins []*origin) {
 	for _, o := range origins {
 		if len(o.routes) == 0 {
 			continue
 		}
 		newest := o.routes[0].time
 		if overview.NewestRoute == nil || newest.After(overview.NewestRoute.Time) {
 			overview.NewestRoute = &PrefixRoute{
 				Prefix: prefix, OriginASN: o.asn, Time: newest,
 			}
 		}
 		oldest := o.routes[len(o.routes)-1].time
 		if overview.OldestRoute == nil || oldest.Before(overview.OldestRoute.Time) {
 			overview.OldestRoute = &PrefixRoute{
 				Prefix: prefix, OriginASN: o.asn, Time: oldest,
 			}
 		}
 	}
 }
 // noteBogons adds each origin of prefix to the overview's bogon announcements
 // when the prefix or the origin AS is reserved.
 func (overview *Overview) noteBogons(prefix netip.Prefix, origins []*origin) {
 	prefixReason, prefixReserved := bogon.Prefix(prefix)
 	for _, o := range origins {
 		asnReason, asnReserved := bogon.ASN(o.asn)
 		if !prefixReserved && !asnReserved {
 			continue
 		}
 		announcement := Bogon{
 			Prefix: prefix, OriginASN: o.asn, Peers: int(o.peers.Count()),
 		}
 		if prefixReserved {
 			announcement.Reasons = append(announcement.Reasons, prefixReason)
 		}
 		if asnReserved {
 			announcement.Reasons = append(announcement.Reasons, asnReason)
 		}
 		overview.Bogons = append(overview.Bogons, announcement)
 	}
 }
 // noteMultipleOrigins adds prefix to the overview's prefixes with more than one
 // origin AS when it has more than one.
 func (overview *Overview) noteMultipleOrigins(
 	prefix netip.Prefix, origins []*origin,
 ) {
 	if len(origins) <= 1 {
 		return
 	}
 	entry := MultipleOriginPrefix{
 		Prefix:  prefix,
 		Origins: make([]OriginPeers, 0, len(origins)),
 	}
 	for _, o := range origins {
 		entry.Origins = append(entry.Origins,
 			OriginPeers{ASN: o.asn, Peers: int(o.peers.Count())})
 	}
 	overview.MultipleOrigins = append(overview.MultipleOrigins, entry)
 }
@@ -1,191 +0,0 @@
 package routetable
 import (
 	"net/netip"
 	"runtime"
 	"testing"
 	"time"
 )
 // TestWalkPrefixesVisitsEveryPrefix walks a table with more prefixes than two
 // of the walk's batches, while another goroutine keeps adding and removing
 // other prefixes of the same mask length. The walk lets the lock go between
 // batches, so those updates get in while it runs. Every prefix that was in
 // the table all along must be visited once.
 func TestWalkPrefixesVisitsEveryPrefix(t *testing.T) {
 	t.Parallel()
 	const (
 		asn  = 1000
 		peer = "192.0.2.1"
 		// prefixCount is more prefixes than two of the walk's batches.
 		prefixCount = 2*walkBatch + 1
 	)
 	routeTime := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
 	table := New(Params{})
 	prefixes := make([]netip.Prefix, 0, prefixCount)
 	addr := netip.MustParseAddr("1.0.0.0")
 	for range prefixCount {
 		prefix := netip.PrefixFrom(addr, addr.BitLen())
 		table.Announce(prefix, asn, Route{Peer: peer, Time: routeTime})
 		prefixes = append(prefixes, prefix)
 		addr = addr.Next()
 	}
 	stop := make(chan struct{})
 	updated := make(chan struct{})
 	go func() {
 		defer close(updated)
 		other := netip.MustParseAddr("2.0.0.0")
 		for {
 			select {
 			case <-stop:
 				return
 			default:
 			}
 			prefix := netip.PrefixFrom(other, other.BitLen())
 			table.Announce(prefix, asn, Route{Peer: peer, Time: routeTime})
 			table.Withdraw(prefix, peer)
 			other = other.Next()
 		}
 	}()
 	visits := make(map[netip.Prefix]int)
 	table.walkPrefixes(func(prefix netip.Prefix, _ []*origin) {
 		visits[prefix]++
 	})
 	close(stop)
 	<-updated
 	for _, prefix := range prefixes {
 		if visits[prefix] != 1 {
 			t.Fatalf("the walk visited %s %d times, want once", prefix,
 				visits[prefix])
 		}
 	}
 }
 // TestWalkPrefixesLetsUpdatesIn starts an update during the walk's first
 // batch. The update must have been made by the time the walk visits the first
 // prefix of its second batch, because the walk lets the lock go in between.
 func TestWalkPrefixesLetsUpdatesIn(t *testing.T) {
 	t.Parallel()
 	const (
 		asn  = 1000
 		peer = "192.0.2.1"
 	)
 	routeTime := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
 	table := New(Params{})
 	addr := netip.MustParseAddr("1.0.0.0")
 	for range walkBatch + 1 {
 		prefix := netip.PrefixFrom(addr, addr.BitLen())
 		table.Announce(prefix, asn, Route{Peer: peer, Time: routeTime})
 		addr = addr.Next()
 	}
 	updatePrefix := netip.MustParsePrefix("2.0.0.0/8")
 	updateDone := make(chan struct{})
 	visited := 0
 	madeBeforeSecondBatch := false
 	table.walkPrefixes(func(netip.Prefix, []*origin) {
 		visited++
 		switch visited {
 		case 1:
 			go func() {
 				defer close(updateDone)
 				table.Announce(updatePrefix, asn, Route{Peer: peer, Time: routeTime})
 			}()
 			// Wait until the update waits for the lock. TryRLock fails
 			// once a writer waits.
 			for table.mu.TryRLock() {
 				table.mu.RUnlock()
 				runtime.Gosched()
 			}
 		case walkBatch + 1:
 			// The walk holds the read lock, so the table can be read.
 			madeBeforeSecondBatch = table.origins(updatePrefix) != nil
 		}
 	})
 	<-updateDone
 	if !madeBeforeSecondBatch {
 		t.Fatal("an update started during the walk's first batch was not made " +
 			"before its second batch")
 	}
 }
 // TestOverviewLetsUpdatesIn applies another peer's 1,000 announcements while
 // Overview walks a table with more prefixes than five of the walk's batches.
 // After each batch, the walk lets the lock go for as long as it held the lock.
 // So all 1,000 announcements must be applied before Overview returns. A walk
 // that takes the lock back at once lets in about one update per batch.
 func TestOverviewLetsUpdatesIn(t *testing.T) {
 	t.Parallel()
 	const (
 		asn       = 1000
 		peer      = "192.0.2.1"
 		otherPeer = "192.0.2.2"
 		// prefixCount is more prefixes than five of the walk's batches.
 		prefixCount   = 5*walkBatch + 1
 		announcements = 1000
 	)
 	routeTime := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
 	table := New(Params{})
 	prefixes := make([]netip.Prefix, 0, prefixCount)
 	addr := netip.MustParseAddr("1.0.0.0")
 	for range prefixCount {
 		prefix := netip.PrefixFrom(addr, addr.BitLen())
 		table.Announce(prefix, asn, Route{Peer: peer, Time: routeTime})
 		prefixes = append(prefixes, prefix)
 		addr = addr.Next()
 	}
 	overviewDone := make(chan struct{})
 	go func() {
 		defer close(overviewDone)
 		table.Overview(0)
 	}()
 	// Wait until Overview holds the read lock. TryLock fails while a reader
 	// holds it.
 	for table.mu.TryLock() {
 		table.mu.Unlock()
 		runtime.Gosched()
 	}
 	for _, prefix := range prefixes[:announcements] {
 		table.Announce(prefix, asn, Route{Peer: otherPeer, Time: routeTime})
 	}
 	select {
 	case <-overviewDone:
 		t.Fatal("Overview returned before another peer's 1,000 announcements " +
 			"were applied")
 	default:
 	}
 	<-overviewDone
 }
@@ -1,231 +0,0 @@
 package routetable_test
 import (
 	"net/netip"
 	"reflect"
 	"testing"
 	"git.eeqj.de/sneak/routewatch/internal/routetable"
 )
 // Origin ASes that are not reserved, unlike asA, asB and asC, which are
 // documentation AS numbers and so make bogon announcements.
 const (
 	asOne   = 1000
 	asTwo   = 2000
 	asThree = 3000
 	asFour  = 4000
 	asFive  = 5000
 	// noKnownOrigin is the origin AS of a route whose path ends in an AS
 	// set.
 	noKnownOrigin = 0
 	// privateUseAS and asTrans are reserved AS numbers.
 	privateUseAS = 64512
 	asTrans      = 23456
 	// maxListed is how many bogon announcements and prefixes with more than
 	// one origin AS the tests ask Overview for.
 	maxListed = 10
 )
 // prefixRoute returns the PrefixRoute of prefix with origin AS asn, second
 // seconds after the start.
 func prefixRoute(prefix string, asn, second int) *routetable.PrefixRoute {
 	return &routetable.PrefixRoute{
 		Prefix: netip.MustParsePrefix(prefix), OriginASN: asn, Time: at(second),
 	}
 }
 func TestOverviewOfAnEmptyTable(t *testing.T) {
 	t.Parallel()
 	got := routetable.New(routetable.Params{}).Overview(maxListed)
 	if !reflect.DeepEqual(got, routetable.Overview{}) {
 		t.Errorf("Overview() = %+v, want no figures", got)
 	}
 }
 // TestOverviewNewestAndOldestRoutes checks that the newest and the oldest kept
 // routes are found among every origin's kept routes, and that withdrawn routes
 // no longer count.
 func TestOverviewNewestAndOldestRoutes(t *testing.T) {
 	t.Parallel()
 	table := routetable.New(routetable.Params{})
 	announceAll(table, "1.0.0.0/24", asOne, 20, peerA, peerB)
 	// The oldest is the older of this origin's two kept routes.
 	announceAll(table, "2.0.0.0/24", asTwo, 10, peerA, peerB)
 	announceAll(table, "2001:4860::/32", asThree, 40, peerC)
 	// Withdrawn routes, newer and older than every other.
 	announceAll(table, "3.0.0.0/24", asOne, 50, peerA)
 	announceAll(table, "4.0.0.0/24", asOne, 5, peerB)
 	table.Withdraw(netip.MustParsePrefix("3.0.0.0/24"), peerA)
 	table.Withdraw(netip.MustParsePrefix("4.0.0.0/24"), peerB)
 	got := table.Overview(maxListed)
 	want := prefixRoute("2001:4860::/32", asThree, 40)
 	if !reflect.DeepEqual(got.NewestRoute, want) {
 		t.Errorf("NewestRoute = %+v, want %+v", got.NewestRoute, want)
 	}
 	want = prefixRoute("2.0.0.0/24", asTwo, 10)
 	if !reflect.DeepEqual(got.OldestRoute, want) {
 		t.Errorf("OldestRoute = %+v, want %+v", got.OldestRoute, want)
 	}
 }
 // TestOverviewPrefixesPerOrigin checks the AS that originates the most
 // prefixes and the ASes that originate one.
 func TestOverviewPrefixesPerOrigin(t *testing.T) {
 	t.Parallel()
 	table := routetable.New(routetable.Params{})
 	// asOne and asTwo originate two prefixes each; the lower AS number counts.
 	announceAll(table, "1.0.0.0/24", asTwo, 10, peerA)
 	announceAll(table, "1.0.1.0/24", asTwo, 10, peerA)
 	announceAll(table, "2.0.0.0/24", asOne, 10, peerA)
 	announceAll(table, "2.0.1.0/24", asOne, 10, peerB)
 	// Three ASes originate one prefix. asThree's route is the newest, and
 	// asFive's origin keeps no route: peers B and C withdrew theirs.
 	announceAll(table, "3.0.0.0/24", asThree, 30, peerA)
 	announceAll(table, "4.0.0.0/24", asFour, 20, peerA)
 	announceAll(table, "5.0.0.0/24", asFive, 40, peerA, peerB, peerC)
 	table.Withdraw(netip.MustParsePrefix("5.0.0.0/24"), peerB)
 	table.Withdraw(netip.MustParsePrefix("5.0.0.0/24"), peerC)
 	got := table.Overview(maxListed)
 	if got.MostPrefixesASN != asOne || got.MostPrefixes != 2 {
 		t.Errorf("most prefixes: AS%d with %d, want AS%d with 2",
 			got.MostPrefixesASN, got.MostPrefixes, asOne)
 	}
 	if got.SinglePrefixASes != 3 {
 		t.Errorf("SinglePrefixASes = %d, want 3", got.SinglePrefixASes)
 	}
 	want := prefixRoute("3.0.0.0/24", asThree, 30)
 	if !reflect.DeepEqual(got.NewestSinglePrefix, want) {
 		t.Errorf("NewestSinglePrefix = %+v, want %+v", got.NewestSinglePrefix, want)
 	}
 }
 // TestOverviewLeavesOutNoKnownOrigin checks that AS 0, which stands for no
 // known origin, counts in neither the most nor the single-prefix figures. It
 // originates one prefix, with a route newer than asOne's, and asOne would lose
 // the tie for the most prefixes to it.
 func TestOverviewLeavesOutNoKnownOrigin(t *testing.T) {
 	t.Parallel()
 	table := routetable.New(routetable.Params{})
 	announceAll(table, "1.0.0.0/24", asOne, 10, peerA)
 	announceAll(table, "2.0.0.0/24", noKnownOrigin, 20, peerA)
 	got := table.Overview(maxListed)
 	if got.MostPrefixesASN != asOne || got.SinglePrefixASes != 1 {
 		t.Errorf("most prefixes AS%d, %d single-prefix ASes; want AS%d, 1",
 			got.MostPrefixesASN, got.SinglePrefixASes, asOne)
 	}
 	want := prefixRoute("1.0.0.0/24", asOne, 10)
 	if !reflect.DeepEqual(got.NewestSinglePrefix, want) {
 		t.Errorf("NewestSinglePrefix = %+v, want %+v", got.NewestSinglePrefix, want)
 	}
 }
 // TestOverviewBogons checks which routes are bogon announcements and why, in
 // prefix order, and that a smaller maxListed lists fewer but counts them all.
 func TestOverviewBogons(t *testing.T) {
 	t.Parallel()
 	table := routetable.New(routetable.Params{})
 	// A reserved prefix, carried by two peers.
 	announceAll(table, "192.168.0.0/16", asOne, 10, peerA, peerB)
 	// A reserved origin AS.
 	announceAll(table, "1.0.0.0/24", privateUseAS, 10, peerA)
 	// Both.
 	announceAll(table, "10.0.0.0/8", asTrans, 10, peerA)
 	// Neither: a normal route, and a block that may be announced although it
 	// lies inside a reserved one.
 	announceAll(table, "1.0.1.0/24", asOne, 10, peerA)
 	announceAll(table, "2001:4:112::/48", asTwo, 10, peerA)
 	want := []routetable.Bogon{
 		{
 			Prefix: netip.MustParsePrefix("1.0.0.0/24"), OriginASN: privateUseAS,
 			Peers: 1, Reasons: []string{"Private-Use (AS64512-AS65534)"},
 		},
 		{
 			Prefix: netip.MustParsePrefix("10.0.0.0/8"), OriginASN: asTrans,
 			Peers: 1,
 			Reasons: []string{
 				"Private-Use (10.0.0.0/8)", "AS_TRANS (AS23456)",
 			},
 		},
 		{
 			Prefix: netip.MustParsePrefix("192.168.0.0/16"), OriginASN: asOne,
 			Peers: 2, Reasons: []string{"Private-Use (192.168.0.0/16)"},
 		},
 	}
 	got := table.Overview(maxListed)
 	if !reflect.DeepEqual(got.Bogons, want) || got.BogonCount != len(want) {
 		t.Errorf("Overview(%d): %d bogons %+v, want %d %+v", maxListed,
 			got.BogonCount, got.Bogons, len(want), want)
 	}
 	const fewer = 2
 	got = table.Overview(fewer)
 	if !reflect.DeepEqual(got.Bogons, want[:fewer]) || got.BogonCount != len(want) {
 		t.Errorf("Overview(%d): %d bogons %+v, want %d %+v", fewer,
 			got.BogonCount, got.Bogons, len(want), want[:fewer])
 	}
 }
 // TestOverviewMultipleOrigins checks the prefixes with more than one origin
 // AS, in prefix order, and that a smaller maxListed lists fewer but counts them
 // all.
 func TestOverviewMultipleOrigins(t *testing.T) {
 	t.Parallel()
 	table := routetable.New(routetable.Params{})
 	announceAll(table, "2001:4860::/32", asThree, 10, peerA)
 	announceAll(table, "2001:4860::/32", asTwo, 10, peerB)
 	announceAll(table, "1.0.0.0/24", asOne, 10, peerA, peerB)
 	announceAll(table, "1.0.0.0/24", asTwo, 30, peerC)
 	// One origin only.
 	announceAll(table, "2.0.0.0/24", asOne, 10, peerA, peerB)
 	want := []routetable.MultipleOriginPrefix{
 		{
 			Prefix: netip.MustParsePrefix("1.0.0.0/24"),
 			Origins: []routetable.OriginPeers{
 				{ASN: asOne, Peers: 2}, {ASN: asTwo, Peers: 1},
 			},
 		},
 		{
 			Prefix: netip.MustParsePrefix("2001:4860::/32"),
 			Origins: []routetable.OriginPeers{
 				{ASN: asTwo, Peers: 1}, {ASN: asThree, Peers: 1},
 			},
 		},
 	}
 	got := table.Overview(maxListed)
 	if !reflect.DeepEqual(got.MultipleOrigins, want) ||
 		got.MultipleOriginCount != len(want) {
 		t.Errorf("Overview(%d): %d prefixes %+v, want %d %+v", maxListed,
 			got.MultipleOriginCount, got.MultipleOrigins, len(want), want)
 	}
 	got = table.Overview(1)
 	if !reflect.DeepEqual(got.MultipleOrigins, want[:1]) ||
 		got.MultipleOriginCount != len(want) {
 		t.Errorf("Overview(1): %d prefixes %+v, want %d %+v",
 			got.MultipleOriginCount, got.MultipleOrigins, len(want), want[:1])
 	}
 }
@@ -14,9 +14,6 @@ type PrefixSummary struct {
 	// OriginASN is the origin AS that the most peers carry the prefix with.
 	// When several have as many peers, it is the lowest AS number.
 	OriginASN int
 	// OriginASNs are all the origin ASes that peers carry the prefix with, in
 	// AS number order.
 	OriginASNs []int
 	// Peers is how many peers carry the prefix.
 	Peers int
 	// Newest is the time of the newest kept route of the prefix, or nil when
@@ -214,12 +211,10 @@ func (t *Table) addresses(peers *bitset.BitSet) []string {
 // summarize returns the summary of prefix, whose origins are in AS number
 // order.
 func summarize(prefix netip.Prefix, origins []*origin) PrefixSummary {
-	summary := PrefixSummary{Prefix: prefix, OriginASNs: make([]int, 0, len(origins))}
+	summary := PrefixSummary{Prefix: prefix}
 	mostPeers := 0
 	for _, o := range origins {
 		summary.OriginASNs = append(summary.OriginASNs, o.asn)
 		peers := int(o.peers.Count())
 		summary.Peers += peers
@@ -48,20 +48,19 @@ func TestLookup(t *testing.T) {
 		// want is the summary's prefix, or empty when none is found.
 		want      string
 		originASN int
 		originASNs []int
 		peers     int
 		newest    int // in seconds after the start; 0 for none
 	}{
-		{"10.1.2.3", prefixV4, asA, []int{asA, asB}, 2, 20},
+		{"10.1.2.3", prefixV4, asA, 2, 20},
-		{"::ffff:10.1.2.3", prefixV4, asA, []int{asA, asB}, 2, 20},
+		{"::ffff:10.1.2.3", prefixV4, asA, 2, 20},
-		{"10.1.3.4", "10.1.0.0/16", asB, []int{asA, asB}, 3, 30},
+		{"10.1.3.4", "10.1.0.0/16", asB, 3, 30},
-		{"10.2.0.1", "10.0.0.0/8", asA, []int{asA}, 1, 10},
+		{"10.2.0.1", "10.0.0.0/8", asA, 1, 10},
-		{"10.9.0.1", "10.9.0.0/16", asA, []int{asA}, 1, 0},
+		{"10.9.0.1", "10.9.0.0/16", asA, 1, 0},
-		{"192.0.2.1", "", 0, nil, 0, 0},
+		{"192.0.2.1", "", 0, 0, 0},
-		{"2001:db8:1::5", prefixV6, asB, []int{asB}, 1, 20},
+		{"2001:db8:1::5", prefixV6, asB, 1, 20},
-		{"2001:db8:2::1", "2001:db8::/32", asA, []int{asA}, 1, 10},
+		{"2001:db8:2::1", "2001:db8::/32", asA, 1, 10},
-		{"3000::1", "3000::/16", asA, []int{asA}, 1, 10},
+		{"3000::1", "3000::/16", asA, 1, 10},
-		{"2001:db9::1", "", 0, nil, 0, 0},
+		{"2001:db9::1", "", 0, 0, 0},
 	}
 	for _, tc := range tests {
@@ -80,7 +79,6 @@ func TestLookup(t *testing.T) {
 			want := routetable.PrefixSummary{
 				Prefix:    netip.MustParsePrefix(tc.want),
 				OriginASN: tc.originASN,
 				OriginASNs: tc.originASNs,
 				Peers:     tc.peers,
 			}
 			if tc.newest != 0 {
@@ -168,8 +166,7 @@ func TestSamplePrefixes(t *testing.T) {
 			for _, got := range sample {
 				want := routetable.PrefixSummary{
-					Prefix: got.Prefix, OriginASN: asA, OriginASNs: []int{asA},
+					Prefix: got.Prefix, OriginASN: asA, Peers: 1, Newest: timeAt(10),
 					Peers: 1, Newest: timeAt(10),
 				}
 				if seen[got.Prefix] || got.Prefix.Bits() != tc.maskLength ||
 					!reflect.DeepEqual(got, want) {
@@ -227,7 +224,7 @@ func TestCounts(t *testing.T) {
 	})
 	// peerC was the last peer of the IPv6 prefix. It keeps its number.
-	table.PeersDown([]string{peerC})
+	table.PeerDown(peerC)
 	checkCounts(t, table, routetable.Counts{
 		Pairs:                2,
 		Peers:                3,
@@ -27,11 +27,6 @@ const (
 	// kept routes in order: each of its nodes holds up to 63 times.
 	keptTimesDegree = 32
 	// walkBatch is how many prefixes a walk over the whole table visits in
 	// one hold of the lock. Overview and PeersDown each walk the whole table.
 	// Callers waiting for the lock get it between batches.
 	walkBatch = 10000
 	ipv4Bits = 32
 	ipv6Bits = 128
@@ -205,60 +200,24 @@ func (t *Table) Withdraw(prefix netip.Prefix, peer string) {
 	}
 }
-// PeersDown applies the sessions of peers going down: each of the peers leaves
+// PeerDown applies a peer's session going down: the peer leaves every peer
-// every peer set, and every route of each is dropped. When any of them carries
+// set, and every route of it is dropped. When the peer carries any prefix, it
-// a prefix, PeersDown visits every prefix in the table once, in batches of
+// visits every prefix in the table.
-// walkBatch. After each batch, it lets the table's lock go for as long as it
+func (t *Table) PeerDown(peer string) {
 // held the lock for the batch. During a walk over many batches, reads and
 // updates can then take the lock about half of the time. An announcement by
 // one of the peers applied during the walk may be dropped too. So the caller
 // applies those peers' later updates only once PeersDown has returned.
 func (t *Table) PeersDown(peers []string) {
 	t.mu.Lock()
 	defer t.mu.Unlock()
 	// numbers holds the number of each of the peers that carries a prefix.
 	numbers := make([]uint, 0, len(peers))
 	for _, peer := range peers {
 	number, known := t.peerNumbers[peer]
-		if known && t.peerPrefixes[number] > 0 {
+	if !known || t.peerPrefixes[number] == 0 {
 			numbers = append(numbers, number)
 		}
 	}
 	if len(numbers) == 0 {
 		return
 	}
 	visited := 0
 	batchStart := time.Now()
 	for _, f := range []*family{&t.ipv4, &t.ipv6} {
 		for _, prefixes := range f.byLength {
 			for prefix, origins := range prefixes {
 				for _, number := range numbers {
 				o := originWithPeer(origins, number)
 				if o != nil {
 					t.leave(prefix, o, number)
 						// leave may have removed an origin of the
 						// prefix, or the prefix itself.
 						origins = prefixes[prefix]
 					}
 				}
 				// Go allows the map to change before the next step of
 				// the range over it.
 				visited++
 				if visited%walkBatch == 0 {
 					held := time.Since(batchStart)
 					t.mu.Unlock()
 					time.Sleep(held)
 					t.mu.Lock()
 					batchStart = time.Now()
 				}
 			}
 		}
@@ -1,69 +0,0 @@
 package routetable
 import (
 	"net/netip"
 	"runtime"
 	"testing"
 	"time"
 )
 // TestPeersDownLetsReadsIn reads the table's counts again and again while a
 // peer that carries more than two batches of prefixes goes down. PeersDown lets
 // the lock go after every walkBatch prefixes, so a read must get in while the
 // peer still carries some of its prefixes but no longer all.
 func TestPeersDownLetsReadsIn(t *testing.T) {
 	t.Parallel()
 	const (
 		asn  = 1000
 		peer = "192.0.2.1"
 		// prefixCount is more prefixes than two of walkBatch.
 		prefixCount = 2*walkBatch + 1
 	)
 	routeTime := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
 	table := New(Params{})
 	addr := netip.MustParseAddr("1.0.0.0")
 	for range prefixCount {
 		prefix := netip.PrefixFrom(addr, addr.BitLen())
 		table.Announce(prefix, asn, Route{Peer: peer, Time: routeTime})
 		addr = addr.Next()
 	}
 	// Hold a read lock until PeersDown waits for the lock, so that the first
 	// read below starts once PeersDown holds it. TryRLock fails once a writer
 	// waits.
 	table.mu.RLock()
 	peerDownDone := make(chan struct{})
 	go func() {
 		defer close(peerDownDone)
 		table.PeersDown([]string{peer})
 	}()
 	for table.mu.TryRLock() {
 		table.mu.RUnlock()
 		runtime.Gosched()
 	}
 	table.mu.RUnlock()
 	for {
 		routes := table.Counts().IPv4Routes
 		if routes > 0 && routes < prefixCount {
 			break
 		}
 		select {
 		case <-peerDownDone:
 			t.Fatal("no read got in while PeersDown ran")
 		default:
 		}
 	}
 	<-peerDownDone
 }
@@ -69,10 +69,10 @@ func withdraw(peer string) step {
 	}
 }
-// peersDown is the step of the sessions of peers going down.
+// peerDown is the step of peer's session going down.
-func peersDown(peers ...string) step {
+func peerDown(peer string) step {
 	return func(table *routetable.Table, _ netip.Prefix) {
-		table.PeersDown(peers)
+		table.PeerDown(peer)
 	}
 }
@@ -272,28 +272,21 @@ func TestWithdrawalsAndPeerDowns(t *testing.T) {
 		{
 			name: "a peer going down leaves the prefix",
 			steps: []step{announce(peerA, asA, 10), announce(peerB, asA, 20),
-				peersDown(peerB)},
+				peerDown(peerB)},
 			want: []routetable.Origin{{ASN: asA, Peers: []string{peerA},
 				Routes: []routetable.Route{routeOf(peerA, asA, 10)}}},
 		},
 		{
 			name: "a peer going down after it withdrew changes nothing",
 			steps: []step{announce(peerA, asA, 10), announce(peerB, asA, 20),
-				withdraw(peerB), peersDown(peerB)},
+				withdraw(peerB), peerDown(peerB)},
 			want: []routetable.Origin{{ASN: asA, Peers: []string{peerA},
 				Routes: []routetable.Route{routeOf(peerA, asA, 10)}}},
 		},
 		{
 			name: "peers going down together each leave the prefix",
 			steps: []step{announce(peerA, asA, 10), announce(peerB, asB, 20),
 				announce(peerC, asB, 30), peersDown(peerA, peerB)},
 			want: []routetable.Origin{{ASN: asB, Peers: []string{peerC},
 				Routes: []routetable.Route{routeOf(peerC, asB, 30)}}},
 		},
 	})
 }
-func TestPeersDownLeavesEveryPrefix(t *testing.T) {
+func TestPeerDownLeavesEveryPrefix(t *testing.T) {
 	t.Parallel()
 	table := routetable.New(routetable.Params{})
@@ -310,7 +303,7 @@ func TestPeersDownLeavesEveryPrefix(t *testing.T) {
 	}
 	table.Announce(prefixes[0], asB, routeOf(peerB, asB, 20))
-	table.PeersDown([]string{peerA})
+	table.PeerDown(peerA)
 	want := []routetable.Origin{{ASN: asB, Peers: []string{peerB},
 		Routes: []routetable.Route{routeOf(peerB, asB, 20)}}}
@@ -340,32 +333,6 @@ func TestPeersDownLeavesEveryPrefix(t *testing.T) {
 	}
 }
 // TestPeersDownTakesOutPeersOfDifferentPrefixes takes peerA and peerB out in
 // one PeersDown. peerA carries only prefixV4, and peerB only prefixV6. So
 // peerA's leaving removes prefixV4 before PeersDown looks for peerB there. Both
 // prefixes must then be gone.
 func TestPeersDownTakesOutPeersOfDifferentPrefixes(t *testing.T) {
 	t.Parallel()
 	table := routetable.New(routetable.Params{})
 	prefixes := []netip.Prefix{
 		netip.MustParsePrefix(prefixV4),
 		netip.MustParsePrefix(prefixV6),
 	}
 	table.Announce(prefixes[0], asA, routeOf(peerA, asA, 10))
 	table.Announce(prefixes[1], asB, routeOf(peerB, asB, 20))
 	table.PeersDown([]string{peerA, peerB})
 	for _, prefix := range prefixes {
 		got := table.Origins(prefix)
 		if got != nil {
 			t.Errorf("Origins(%s) = %+v after its only peer went down, want nil",
 				prefix, got)
 		}
 	}
 }
 func TestCountsOriginsWithoutKeptRoute(t *testing.T) {
 	t.Parallel()
@@ -391,7 +358,7 @@ func TestCountsOriginsWithoutKeptRoute(t *testing.T) {
 		{announce(peerC, asA, 30), 0},
 		{withdraw(peerB), 0},
 		{withdraw(peerC), 1},
-		{peersDown(peerA), 0},
+		{peerDown(peerA), 0},
 	}
 	for i, s := range steps {
@@ -497,7 +464,7 @@ func TestTakeChangesHoldsOnlyPairsThatChanged(t *testing.T) {
 	checkChanges(t, table, []change{}, map[string]uint{})
 	// peerA going down changes v4, the one prefix it carries.
-	table.PeersDown([]string{peerA})
+	table.PeerDown(peerA)
 	checkChanges(t, table, []change{
 		{Prefix: prefixV4, OriginASN: asA, Peers: []uint{1, 2},
 			Routes: []routetable.Route{
@@ -506,7 +473,7 @@ func TestTakeChangesHoldsOnlyPairsThatChanged(t *testing.T) {
 	}, map[string]uint{})
 	// peerA, which carries nothing now, goes down again.
-	table.PeersDown([]string{peerA})
+	table.PeerDown(peerA)
 	checkChanges(t, table, []change{}, map[string]uint{})
 }
@@ -650,7 +617,7 @@ func TestConcurrentUse(t *testing.T) {
 		func(round int) { table.Announce(prefix, asA, routeOf(peerA, asA, round)) },
 		func(round int) { table.Announce(prefix, asB, routeOf(peerB, asB, round)) },
 		func(int) { table.Withdraw(prefix, peerA) },
-		func(int) { table.PeersDown([]string{peerB}) },
+		func(int) { table.PeerDown(peerB) },
 		func(int) { table.PutBackChanges(table.TakeChanges(math.MaxInt)) },
 		func(int) { table.ChangeCount() },
 		func(int) { table.Lookup(prefix.Addr()) },
@@ -658,7 +625,6 @@ func TestConcurrentUse(t *testing.T) {
 		func(int) { table.OriginatedPrefixes(asA) },
 		func(int) { table.SamplePrefixes(ipVersion, prefix.Bits(), sampleSize) },
 		func(int) { table.Counts() },
 		func(int) { table.Overview(sampleSize) },
 	}
 	var wg sync.WaitGroup
@@ -223,35 +223,6 @@ func (m *mockStore) GetAS(_ context.Context, asn int) (*database.ASN, bool, erro
 	return &database.ASN{ASN: asn}, false, nil
 }
 // GetLastSeenASes returns copies of the stored ASes last seen most recently
 // and longest ago, or neither when none is stored.
 func (m *mockStore) GetLastSeenASes(
 	_ context.Context,
 ) (*database.ASN, *database.ASN, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 	var newest, oldest *database.ASN
 	for _, asn := range m.ASNs {
 		if newest == nil || asn.LastSeen.After(newest.LastSeen) {
 			newest = asn
 		}
 		if oldest == nil || asn.LastSeen.Before(oldest.LastSeen) {
 			oldest = asn
 		}
 	}
 	if newest == nil {
 		return nil, nil, nil
 	}
 	newestCopy, oldestCopy := *newest, *oldest
 	return &newestCopy, &oldestCopy, nil
 }
 // GetASWHOIS returns the stored AS, or only its number when none is stored.
 func (m *mockStore) GetASWHOIS(ctx context.Context, asn int) (*database.ASN, error) {
 	asnInfo, _, err := m.GetAS(ctx, asn)
@@ -509,6 +480,8 @@ func announcementFeed(prefixes []string) string {
 func TestShutdownWritesTheUpdatesQueuedInTheStreamer(t *testing.T) {
 	t.Parallel()
 	const maxWait = 10 * time.Second
 	prefixes := []string{"192.0.2.0/24", "198.51.100.0/24", "203.0.113.0/24"}
 	feed := announcementFeed(prefixes)
@@ -554,9 +527,9 @@ func TestShutdownWritesTheUpdatesQueuedInTheStreamer(t *testing.T) {
 	for range cap(linesSeen) {
 		select {
 		case <-linesSeen:
-		case <-time.After(stepTimeout):
+		case <-time.After(maxWait):
 			t.Fatalf("the streamer did not read %d lines within %s",
-				cap(linesSeen), stepTimeout)
+				cap(linesSeen), maxWait)
 		}
 	}
@@ -569,8 +542,8 @@ func TestShutdownWritesTheUpdatesQueuedInTheStreamer(t *testing.T) {
 	select {
 	case <-shutDown:
-	case <-time.After(stepTimeout):
+	case <-time.After(maxWait):
-		t.Fatalf("Shutdown did not return within %s", stepTimeout)
+		t.Fatalf("Shutdown did not return within %s", maxWait)
 	}
 	store.mu.Lock()
@@ -607,16 +580,21 @@ func freePort(t *testing.T) int {
 	return addr.Port
 }
-// TestShutdownDoesNotWaitForABlockedWrite starts the HTTP server and has the
+// TestShutdownReturnsByItsDeadlineWhileAWriteIsBlocked starts the HTTP server
-// AS handler start a write that the store holds until the test ends, past
+// and has the AS handler start a write that the store holds until the test
-// Shutdown's deadline. Shutdown must return without waiting for the write, with
+// ends, past Shutdown's deadline. Shutdown must return within its deadline
-// the HTTP server stopped, and must neither checkpoint nor close the database:
+// plus a small margin, with the HTTP server stopped, and must neither
-// the real one would wait for the write.
+// checkpoint nor close the database: the real one would wait for the write.
 // Before the fix Shutdown waited for the write.
-func TestShutdownDoesNotWaitForABlockedWrite(t *testing.T) {
+func TestShutdownReturnsByItsDeadlineWhileAWriteIsBlocked(t *testing.T) {
 	t.Parallel()
-	const deadline = 100 * time.Millisecond
+	const (
 		deadline = 100 * time.Millisecond
 		// margin is how long Shutdown may take after its deadline, to stop
 		// the HTTP server.
 		margin = 2 * time.Second
 	)
 	blocking := newBlockingStore()
 	defer blocking.releaseWrites()
@@ -627,13 +605,10 @@ func TestShutdownDoesNotWaitForABlockedWrite(t *testing.T) {
 	cfg := &config.Config{Port: port}
 	s := streamer.New(log, metrics.New())
 	// A started server reads its routing table in the background, so it
 	// needs one.
 	rw := New(Dependencies{
 		DB:       store,
 		Streamer: s,
-		Server: server.New(store, routetable.New(routetable.Params{}), s, log,
+		Server:   server.New(store, nil, s, log, cfg),
 			cfg),
 		Logger:   log,
 		Config:   cfg,
 	})
@@ -644,8 +619,9 @@ func TestShutdownDoesNotWaitForABlockedWrite(t *testing.T) {
 	}
 	rw.dbHandler = NewASHandler(store, log)
 	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	startBlockedWrite(t, blocking, rw.dbHandler,
-		[]*ristypes.RISMessage{{Path: pathOfASes(asnBatchSize)}})
+		[]*ristypes.RISMessage{{Path: fill}})
 	ctx, cancel := context.WithTimeout(t.Context(), deadline)
 	defer cancel()
@@ -659,9 +635,9 @@ func TestShutdownDoesNotWaitForABlockedWrite(t *testing.T) {
 	select {
 	case <-shutDown:
-	case <-time.After(deadline + stepTimeout):
+	case <-time.After(deadline + margin):
 		t.Fatalf("Shutdown did not return within %s of its deadline while "+
-			"a write was blocked", stepTimeout)
+			"a write was blocked", margin)
 	}
 	var dialer net.Dialer
@@ -736,6 +712,8 @@ func (s *closeOrderStore) record(call string) {
 func TestShutdownCheckpointsAndClosesTheDatabaseLast(t *testing.T) {
 	t.Parallel()
 	const deadline = 10 * time.Second
 	store := &closeOrderStore{Store: newMockStore()}
 	log := logger.New()
 	cfg := &config.Config{}
@@ -753,7 +731,7 @@ func TestShutdownCheckpointsAndClosesTheDatabaseLast(t *testing.T) {
 		Path: ristypes.ASPath{Sequence: []int{testASNA}},
 	})
-	ctx, cancel := context.WithTimeout(t.Context(), stepTimeout)
+	ctx, cancel := context.WithTimeout(t.Context(), deadline)
 	defer cancel()
 	rw.Shutdown(ctx)
@@ -18,34 +18,39 @@ const (
 	// (asnBatchTimeout), so a queue smaller than asnBatchSize is fine.
 	asHandlerQueueSize = 20000
-	// asnBatchSize is the number of ASes in a full batch, which wakes the
+	// asnBatchSize is the number of ASN operations to batch together
 	// flush goroutine to write it.
 	asnBatchSize = 30000
 	// asnBatchMaxSize is the most ASN operations the batch holds while the
 	// flush goroutine writes the previous one: ten batches, about 10 MiB
 	// (README "Memory"). At this size HandleMessage waits until the flush
 	// goroutine takes the batch.
 	asnBatchMaxSize = 300000
 	// asnBatchTimeout is the maximum time to wait before flushing a batch
 	// DO NOT reduce this timeout - larger batches are more efficient
 	asnBatchTimeout = 2 * time.Second
 )
-// ASHandler records every AS in the AS paths of BGP UPDATE messages. Its batch
+// ASHandler processes Autonomous System Number (ASN) information extracted from
-// holds the earliest and the latest time of each AS's updates. The flush
+// BGP UPDATE messages. It uses batched database operations to efficiently store
-// goroutine writes the batch to the database when it holds asnBatchSize ASes,
+// ASN data, collecting operations into batches that are flushed either when the
-// and every asnBatchTimeout.
+// batch reaches a size threshold or after a timeout period.
 type ASHandler struct {
 	db     database.Store
 	logger *logger.Logger
-	// Batching. mu guards batch and writing only. The flush goroutine takes
+	// Batching. mu guards batch and writing only: the flush goroutine takes
-	// the batch under mu and writes it after releasing mu. So HandleMessage
+	// the batch under mu and writes it after releasing mu, so HandleMessage
-	// never waits for a database write.
+	// waits for a database write only while batch is at asnBatchMaxSize.
 	mu    sync.Mutex
-	// batch holds the earliest and the latest time of the updates for each AS
+	batch []asnOp
-	// since the flush goroutine last took it. It holds one entry per AS,
+	// writing is how many operations the flush goroutine took from batch
-	// however many updates arrive.
+	// and has not finished writing.
 	batch map[int]database.SeenTimes
 	// writing is how many ASes the flush goroutine took from batch and has
 	// not finished writing.
 	writing int
 	// batchTaken is signalled when the flush goroutine takes batch; its L is
 	// &mu.
 	batchTaken  sync.Cond
 	batchFullCh chan struct{} // wakes the flush goroutine when batch is full
 	// stopCh hands Stop's context to the flush goroutine. It holds one, so
 	// Stop does not wait for a write in progress to hand it over.
@@ -53,10 +58,16 @@ type ASHandler struct {
 	done   chan struct{} // closed when the flush goroutine returns
 }
 type asnOp struct {
 	number    int
 	timestamp time.Time
 }
 // NewASHandler creates and returns a new ASHandler instance. It initializes
 // the batching system and starts a background goroutine that periodically
-// writes the collected ASes to the database. The caller must call Stop when
+// flushes accumulated ASN operations to the database. The caller must call
-// finished, to write the pending ASes and end the background goroutine.
+// Stop when finished to ensure all pending operations are flushed and the
 // background goroutine is terminated.
 func NewASHandler(db database.Store, logger *logger.Logger) *ASHandler {
 	return newASHandler(db, logger, asnBatchTimeout)
 }
@@ -70,11 +81,12 @@ func newASHandler(
 	h := &ASHandler{
 		db:          db,
 		logger:      logger,
-		batch:       make(map[int]database.SeenTimes),
+		batch:       make([]asnOp, 0, asnBatchSize),
 		batchFullCh: make(chan struct{}, 1),
 		stopCh:      make(chan context.Context, 1),
 		done:        make(chan struct{}),
 	}
 	h.batchTaken.L = &h.mu
 	// Start the flush timer goroutine
 	go flushLoop(batchTimeout, h.batchFullCh, h.stopCh, h.done, h.flushBatch)
@@ -98,25 +110,48 @@ func (h *ASHandler) QueueCapacity() int {
 	return asHandlerQueueSize
 }
-// HandleMessage adds the time of msg to the batch entry of each AS in its AS
+// HandleMessage processes a RIS Live BGP message by extracting all ASNs from
-// path, the origin AS and the members of an AS set included. When the batch
+// the AS path and queuing them for batch insertion into the database. The
-// holds asnBatchSize ASes, HandleMessage wakes the flush goroutine to write it.
+// origin ASN and all transit ASNs are recorded with their associated
 // timestamps. When the batch reaches the configured size threshold, the flush
 // goroutine is woken to write it.
 func (h *ASHandler) HandleMessage(msg *ristypes.RISMessage) {
 	// Use the pre-parsed timestamp
 	timestamp := msg.ParsedTimestamp
 	originASN := msg.Path.Origin()
 	h.mu.Lock()
 	defer h.mu.Unlock()
-	// The origin AS is the last AS of the sequence, so the loop adds it too.
+	// While the batch is at its maximum size, wait until the flush goroutine
 	// takes it. Meanwhile the handler takes nothing off its queue, which
 	// fills, and the streamer drops messages for it.
 	for len(h.batch) >= asnBatchMaxSize {
 		h.batchTaken.Wait()
 	}
 	// Queue origin ASN operation
 	if originASN > 0 {
 		h.batch = append(h.batch, asnOp{
 			number:    originASN,
 			timestamp: timestamp,
 		})
 	}
 	// Also track all ASNs in the path, the members of an AS set included
 	for _, asn := range slices.Concat(msg.Path.Sequence, msg.Path.Set) {
 		if asn > 0 {
-			seen := h.batch[asn]
+			h.batch = append(h.batch, asnOp{
-			seen.Add(msg.ParsedTimestamp)
+				number:    asn,
-			h.batch[asn] = seen
+				timestamp: timestamp,
 			})
 		}
 	}
 	// A full batch wakes the flush goroutine. If it is writing, the wake-up
-	// waits in batchFullCh and the batch keeps taking updates until the write
+	// waits in batchFullCh and the batch keeps growing until the write ends
-	// ends.
+	// or the batch reaches asnBatchMaxSize.
 	if len(h.batch) >= asnBatchSize {
 		select {
 		case h.batchFullCh <- struct{}{}:
@@ -125,11 +160,10 @@ func (h *ASHandler) HandleMessage(msg *ristypes.RISMessage) {
 	}
 }
-// Stop stops the flush goroutine and waits for it until ctx ends. The flush
+// Stop stops the flush goroutine, which writes the operations the handler holds
-// goroutine writes the batch before it returns, unless ctx has ended. A write
+// before it returns, and waits for it until ctx ends. Once ctx has ended the
-// still running when the process exits is lost. Stop logs how many entries are
+// flush goroutine skips that last write, and a write still running is lost
-// not written, in the batch being written and in the next batch. An AS in both
+// when the process exits, so Stop logs how many operations are not written.
 // batches counts twice.
 func (h *ASHandler) Stop(ctx context.Context) {
 	h.stopCh <- ctx
@@ -144,14 +178,14 @@ func (h *ASHandler) Stop(ctx context.Context) {
 	if unwritten > 0 {
 		h.logger.Error("Stop deadline passed before the AS handler wrote "+
-			"its batches", "batch_entries", unwritten)
+			"its updates", "updates", unwritten)
 	}
 }
-// takeBatch returns the pending ASes and leaves an empty batch in their place
+// takeBatch returns the pending operations and leaves an empty batch in their
-// for HandleMessage to fill. They count in writing until flushBatch has written
+// place for HandleMessage to fill. They count in writing until flushBatch has
-// them.
+// written them.
-func (h *ASHandler) takeBatch() map[int]database.SeenTimes {
+func (h *ASHandler) takeBatch() []asnOp {
 	h.mu.Lock()
 	defer h.mu.Unlock()
@@ -161,7 +195,8 @@ func (h *ASHandler) takeBatch() map[int]database.SeenTimes {
 	batch := h.batch
 	h.writing = len(batch)
-	h.batch = make(map[int]database.SeenTimes)
+	h.batch = make([]asnOp, 0, asnBatchSize)
 	h.batchTaken.Broadcast()
 	return batch
 }
@@ -174,11 +209,21 @@ func (h *ASHandler) flushBatch() {
 		return
 	}
 	// The earliest and the latest time the batch saw each AS. The batch holds
 	// several updates for an AS, from many peers, so a new AS is stored first
 	// seen at the earliest of them and last seen at the latest.
 	asns := make(map[int]database.SeenTimes)
 	for _, op := range batch {
 		seen := asns[op.number]
 		seen.Add(op.timestamp)
 		asns[op.number] = seen
 	}
 	// Process all ASNs in a single batch transaction
-	err := h.db.GetOrCreateASNBatch(batch)
+	err := h.db.GetOrCreateASNBatch(asns)
 	if err != nil {
 		h.logger.Error("Failed to process ASN batch",
-			"error", err, "count", len(batch))
+			"error", err, "count", len(asns))
 	}
 	h.mu.Lock()
@@ -5,43 +5,28 @@ import (
 	"slices"
 	"testing"
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/logger"
 	"git.eeqj.de/sneak/routewatch/internal/ristypes"
 )
 // pathOfASes returns an AS path of n different ASes: AS 1 to AS n. With n up to
 // asnBatchSize, none of them is testASNA to testASND.
 func pathOfASes(n int) ristypes.ASPath {
 	sequence := make([]int, n)
 	for i := range sequence {
 		sequence[i] = i + 1
 	}
 	return ristypes.ASPath{Sequence: sequence}
 }
 // TestASHandlerStoresTheEarliestAndLatestTimesOfANewAS handles two updates
-// whose path carries an AS the database does not hold yet, in one batch into a
+// whose path carries an AS the database does not hold yet, the second 5
-// real database. The second is 5 seconds after the first, and the handler gets
+// seconds after the first, in one batch into a real database. The AS is stored
-// it first. The AS is stored first seen at the time of the first update and
+// first seen at the time of the first update and last seen at the time of the
-// last seen at the time of the second.
+// second.
 func TestASHandlerStoresTheEarliestAndLatestTimesOfANewAS(t *testing.T) {
 	t.Parallel()
 	db := newTestDatabase(t)
 	// Built without NewASHandler's flush goroutine, so the test flushes itself.
-	h := &ASHandler{
+	h := &ASHandler{db: db, logger: logger.New()}
 		db: db, logger: logger.New(), batch: make(map[int]database.SeenTimes),
 	}
 	first := peerAnnouncement(testPeerIP, testV4Prefix)
 	second := peerAnnouncement(testPeerIP, testV4Prefix)
 	second.ParsedTimestamp = first.ParsedTimestamp.Add(secondUpdateAfter)
 	h.HandleMessage(second)
 	h.HandleMessage(first)
 	h.HandleMessage(second)
 	h.flushBatch()
 	asn, _, err := db.GetAS(t.Context(), testASNA)
@@ -69,9 +54,7 @@ func TestASHandlerRecordsNothingFromAPathWithASZero(t *testing.T) {
 	store := newMockStore()
 	// Built without NewASHandler's flush goroutine, so the test flushes itself.
-	h := &ASHandler{
+	h := &ASHandler{db: store, logger: logger.New()}
 		db: store, logger: logger.New(), batch: make(map[int]database.SeenTimes),
 	}
 	msg := peerAnnouncement(testPeerIP, testV4Prefix)
 	msg.Path = decodePath(t, testASNA, 0, testASNB)
@@ -187,33 +187,25 @@ func (f *ASNFetcher) recordSuccess() {
 	f.statsMu.Unlock()
 }
-// lengthenInterval makes the interval 1.5 times as long, up to maxInterval.
+// recordFailure increases the interval on failed fetch using exponential backoff.
-// A failed lookup and a skipped one both lengthen it.
+func (f *ASNFetcher) recordFailure() {
 func (f *ASNFetcher) lengthenInterval() {
 	f.intervalMu.Lock()
-	defer f.intervalMu.Unlock()
+	f.consecutiveFails++
 	// Exponential backoff: multiply by 1.5, capped at max
 	newInterval := min(
 		f.currentInterval*backoffNumerator/backoffDenominator, maxInterval)
 	if newInterval != f.currentInterval {
-		f.logger.Debug("Increased fetch interval",
+		f.logger.Debug("Increased fetch interval due to failure",
 			"old_interval", f.currentInterval,
 			"new_interval", newInterval,
 			"consecutive_failures", f.consecutiveFails,
 		)
 		f.currentInterval = newInterval
 	}
 }
 // recordFailure counts a failed fetch and lengthens the interval.
 func (f *ASNFetcher) recordFailure() {
 	f.intervalMu.Lock()
 	f.consecutiveFails++
 	f.intervalMu.Unlock()
 	f.lengthenInterval()
 	// Record error time for stats, dropping those older than statsWindow
 	f.statsMu.Lock()
 	now := f.now()
@@ -295,16 +287,6 @@ func (f *ASNFetcher) fetchNextStale(ctx context.Context) {
 // so the AS stays stale. An AS IANA refers to no RIR is stored with no
 // WHOIS data, so it is not looked up again until it is stale; that counts
 // as neither a success nor a failure.
 //
 // The WHOIS client pauses an RIR's or NIC.br's server for whois.PauseTime
 // after the server refuses a query. Lookups at the other servers go on. IANA
 // is never paused, so a refusal by IANA is an ordinary failure. A lookup
 // whose RIR is paused fails with whois.ErrPaused and is skipped. A skipped
 // lookup leaves the AS stale and is not counted as a failure. Like a
 // failure, a skipped lookup lengthens the interval. Each lookup asks IANA
 // before it finds its RIR paused, so with a one-second interval the fetcher
 // would ask IANA every second. The lookups that QueueImmediate asks for also
 // run through fetchAndUpdate.
 func (f *ASNFetcher) fetchAndUpdate(ctx context.Context, asn int) bool {
 	ctx, cancel := context.WithTimeout(ctx, time.Minute)
 	defer cancel()
@@ -325,14 +307,6 @@ func (f *ASNFetcher) fetchAndUpdate(ctx context.Context, asn int) bool {
 		return false
 	}
 	if errors.Is(err, whois.ErrPaused) {
 		f.logger.Info("Skipped WHOIS lookup, the RIR's server is paused",
 			"asn", asn, "error", err)
 		f.lengthenInterval()
 		return false
 	}
 	if err != nil {
 		f.logger.Error("WHOIS lookup failed", "asn", asn, "error", err)
 		f.recordFailure()
@@ -13,7 +13,6 @@ import (
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/logger"
 	"git.eeqj.de/sneak/routewatch/internal/whois"
 )
 // The WHOIS servers a lookup asks: IANA first, then the RIR IANA refers it
@@ -132,151 +131,6 @@ func TestFetchAndUpdateKeepsTheRowWhenTheLookupFails(t *testing.T) {
 	}
 }
 // TestFetchAndUpdateWaitsOutAPause looks up an AS at RIPE while RIPE refuses
 // the query. The test sets the WHOIS client's clock. The next lookup comes a
 // second before whois.PauseTime has passed. It sends RIPE nothing and leaves
 // the AS never looked up. It counts as neither a success nor a failure. A
 // lookup at whois.PauseTime asks RIPE again.
 func TestFetchAndUpdateWaitsOutAPause(t *testing.T) {
 	t.Parallel()
 	f, db := newFetcherWithWHOISAnswers(t, map[string]string{
 		ianaWHOISServer: ianaRefersToRIPE,
 		ripeWHOISServer: ripeAccessDenied,
 	})
 	ripeAsks := 0
 	dial := f.whoisClient.DialContext
 	f.whoisClient.DialContext = func(
 		ctx context.Context, network, address string,
 	) (net.Conn, error) {
 		if address == ripeWHOISServer {
 			ripeAsks++
 		}
 		return dial(ctx, network, address)
 	}
 	start := time.Date(2026, 11, 2, 0, 0, 0, 0, time.UTC)
 	now := start
 	f.whoisClient.Now = func() time.Time { return now }
 	f.fetchAndUpdate(t.Context(), testASNA)
 	now = start.Add(whois.PauseTime - time.Second)
 	f.fetchAndUpdate(t.Context(), testASNA)
 	if ripeAsks != 1 {
 		t.Errorf("RIPE was asked %d times during its pause, want 1", ripeAsks)
 	}
 	stats, err := db.GetWHOISStats(t.Context(), whoisStaleThreshold)
 	if err != nil {
 		t.Fatalf("GetWHOISStats: %v", err)
 	}
 	if stats.NeverFetched != 1 {
 		t.Errorf("never looked up = %d, want 1", stats.NeverFetched)
 	}
 	got := f.GetStats()
 	if got.ConsecutiveFails != 1 || got.ErrorsLastHour != 1 ||
 		got.SuccessesLastHour != 0 {
 		t.Errorf("%d failures in a row, %d errors, %d successes; want 1, 1, 0",
 			got.ConsecutiveFails, got.ErrorsLastHour, got.SuccessesLastHour)
 	}
 	now = start.Add(whois.PauseTime)
 	f.fetchAndUpdate(t.Context(), testASNA)
 	if ripeAsks != 2 {
 		t.Errorf("RIPE was asked %d times after its pause, want 2", ripeAsks)
 	}
 }
 // TestFetchAndUpdateBacksOffDuringAPause looks up an AS at RIPE while RIPE
 // refuses the query. The refusal pauses RIPE for an hour, so every later
 // lookup in the test is skipped. The test sets the WHOIS client's clock and
 // looks the AS up again each time the interval has passed. Like a failure,
 // each skip must make the interval 1.5 times as long, up to one minute. The
 // skips must not count as failures.
 func TestFetchAndUpdateBacksOffDuringAPause(t *testing.T) {
 	t.Parallel()
 	f, _ := newFetcherWithWHOISAnswers(t, map[string]string{
 		ianaWHOISServer: ianaRefersToRIPE,
 		ripeWHOISServer: ripeAccessDenied,
 	})
 	now := time.Date(2026, 11, 2, 0, 0, 0, 0, time.UTC)
 	f.whoisClient.Now = func() time.Time { return now }
 	f.fetchAndUpdate(t.Context(), testASNA)
 	for i, want := range []time.Duration{
 		33750 * time.Millisecond,
 		50625 * time.Millisecond,
 		time.Minute,
 		time.Minute,
 	} {
 		now = now.Add(f.getInterval())
 		f.fetchAndUpdate(t.Context(), testASNA)
 		if got := f.getInterval(); got != want {
 			t.Errorf("interval after %d skipped lookups = %v, want %v",
 				i+1, got, want)
 		}
 	}
 	got := f.GetStats()
 	if got.ConsecutiveFails != 1 || got.ErrorsLastHour != 1 {
 		t.Errorf("%d failures in a row and %d errors, want 1 and 1",
 			got.ConsecutiveFails, got.ErrorsLastHour)
 	}
 }
 // TestFetchAndUpdateKeepsAskingIANA looks up an AS while IANA's server
 // refuses the connection. The test sets the WHOIS client's clock. The next
 // lookup comes a second before whois.PauseTime has passed. IANA is never
 // paused, so that lookup asks IANA again. Each refusal counts as a failure.
 func TestFetchAndUpdateKeepsAskingIANA(t *testing.T) {
 	t.Parallel()
 	// With no answers, every server refuses the connection.
 	f, _ := newFetcherWithWHOISAnswers(t, map[string]string{})
 	ianaAsks := 0
 	dial := f.whoisClient.DialContext
 	f.whoisClient.DialContext = func(
 		ctx context.Context, network, address string,
 	) (net.Conn, error) {
 		if address == ianaWHOISServer {
 			ianaAsks++
 		}
 		return dial(ctx, network, address)
 	}
 	start := time.Date(2026, 11, 2, 0, 0, 0, 0, time.UTC)
 	now := start
 	f.whoisClient.Now = func() time.Time { return now }
 	f.fetchAndUpdate(t.Context(), testASNA)
 	now = start.Add(whois.PauseTime - time.Second)
 	f.fetchAndUpdate(t.Context(), testASNA)
 	got := f.GetStats()
 	if ianaAsks != 2 || got.ConsecutiveFails != 2 {
 		t.Errorf("IANA was asked %d times, with %d failures in a row; "+
 			"want 2 and 2", ianaAsks, got.ConsecutiveFails)
 	}
 }
 // TestRecordStepsTheInterval has the fetcher fail from its base interval of
 // 15 seconds, then succeed. Each failure makes the interval 1.5 times as
 // long, up to one minute, and each success halves it, down to one second.
@@ -370,7 +224,7 @@ func TestASNFetcherStopReturnsByItsDeadline(t *testing.T) {
 	select {
 	case <-lookupStarted:
-	case <-time.After(stepTimeout):
+	case <-time.After(handleMessageTimeout):
 		t.Fatal("the fetcher did not start the lookup")
 	}
@@ -386,22 +240,22 @@ func TestASNFetcherStopReturnsByItsDeadline(t *testing.T) {
 	select {
 	case <-f.done:
-	case <-time.After(stepTimeout):
+	case <-time.After(handleMessageTimeout):
 		t.Fatal("the fetcher goroutine did not return after the lookup ended")
 	}
 }
 // TestRecordKeepsOnlyTheStatsWindow records a success and a failure every
-// second, by a clock the test sets, for three times statsWindow, and never
+// second, by a clock the test sets, far longer than statsWindow, and never
 // asks for the stats. The fetcher must keep only the times within the last
 // statsWindow.
 func TestRecordKeepsOnlyTheStatsWindow(t *testing.T) {
 	t.Parallel()
 	const (
 		records = 100_000
 		step    = time.Second
 		want    = int(statsWindow / step)
 		records = 3 * want
 	)
 	clock := time.Now()
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"log/slog"
 	"slices"
 	"sync"
@@ -20,15 +19,9 @@ import (
 )
 const (
-	// stepTimeout is how long a test waits for a step it expects, such as
+	// handleMessageTimeout is how long a test waits for HandleMessage to
-	// HandleMessage returning, a write starting or Shutdown returning, before
+	// return, or for a write to start, before it fails.
-	// it fails. Only a step that never comes should reach it. On a loaded
+	handleMessageTimeout = 2 * time.Second
 	// host, under the race detector, HandleMessage takes seconds to apply a
 	// full prefix batch. The helpers below bound every wait with it, Stop
 	// included. A test that hangs in one of them waits out at most two of
 	// these bounds, its step's and Stop's, and then fails with its own
 	// message. That leaves time before go test's 90-second timeout.
 	stepTimeout = 15 * time.Second
 	// stillWaitingAfter is how long a test watches a HandleMessage that must
 	// wait. One that does not wait returns well within it.
@@ -178,14 +171,12 @@ type stopLog struct {
 	Msg          string `json:"msg"`
 	Updates      int    `json:"updates"`
 	TableChanges int    `json:"table_changes"`
 	HeldMessages int    `json:"held_messages"`
 	Paths        int    `json:"paths"`
 	BatchEntries int    `json:"batch_entries"`
 }
 // newErrorLogger returns a logger that writes only errors, as JSON lines, to
 // logs.
-func newErrorLogger(logs io.Writer) *logger.Logger {
+func newErrorLogger(logs *bytes.Buffer) *logger.Logger {
 	return &logger.Logger{Logger: slog.New(slog.NewJSONHandler(logs,
 		&slog.HandlerOptions{Level: slog.LevelError}))}
 }
@@ -207,7 +198,7 @@ func lastLogged(t *testing.T, logs *bytes.Buffer) stopLog {
 	return logged
 }
-// returnsInTime reports whether f returns within stepTimeout.
+// returnsInTime reports whether f returns within handleMessageTimeout.
 func returnsInTime(f func()) bool {
 	done := make(chan struct{})
@@ -219,22 +210,11 @@ func returnsInTime(f func()) bool {
 	select {
 	case <-done:
 		return true
-	case <-time.After(stepTimeout):
+	case <-time.After(handleMessageTimeout):
 		return false
 	}
 }
 // stopInTime stops h, with no deadline, and fails the test if Stop does not
 // return within stepTimeout. It only marks the test failed, so it can be
 // deferred.
 func stopInTime(t *testing.T, h interface{ Stop(ctx context.Context) }) {
 	t.Helper()
 	if !returnsInTime(func() { h.Stop(t.Context()) }) {
 		t.Errorf("Stop did not return within %s", stepTimeout)
 	}
 }
 // startBlockedWrite hands h the messages in fill and waits until h starts to
 // write them to store. The prefix, AS and peer handlers start when fill fills
 // their batch, and the peering handler on its timer. store holds the write
@@ -260,7 +240,7 @@ func startBlockedWrite(
 	select {
 	case <-store.writeStarted:
-	case <-time.After(stepTimeout):
+	case <-time.After(handleMessageTimeout):
 		t.Fatal("the handler did not start to write the messages")
 	}
 }
@@ -281,7 +261,7 @@ func handleWhileAWriteIsBlocked(
 ) {
 	t.Helper()
-	defer stopInTime(t, h)
+	defer h.Stop(t.Context())
 	defer store.releaseWrites()
 	startBlockedWrite(t, store, h, fill)
@@ -295,9 +275,7 @@ func handleWhileAWriteIsBlocked(
 // while store holds the write, hands h the messages in toMax, which bring its
 // next batch to its maximum size, and the message extra. HandleMessage for
 // extra must wait until the test lets the write finish, and return after. Then
-// it stops h, which writes what it holds. The tests lower h's maximum batch
+// it stops h, which writes what it holds.
 // size to one batch, so toMax is one batch: the real maximum of ten batches is
 // slow to reach under the race detector.
 func handleAtMaxBatchSize(
 	t *testing.T,
 	store *blockingStore,
@@ -310,19 +288,14 @@ func handleAtMaxBatchSize(
 ) {
 	t.Helper()
-	defer stopInTime(t, h)
+	defer h.Stop(t.Context())
 	defer store.releaseWrites()
 	startBlockedWrite(t, store, h, fill)
 	if !returnsInTime(func() {
 	for _, msg := range toMax {
 		h.HandleMessage(msg)
 	}
 	}) {
 		t.Fatal("HandleMessage did not return while the batch grew to its " +
 			"maximum size")
 	}
 	returned := make(chan struct{})
@@ -342,7 +315,7 @@ func handleAtMaxBatchSize(
 	select {
 	case <-returned:
-	case <-time.After(stepTimeout):
+	case <-time.After(handleMessageTimeout):
 		t.Fatal("HandleMessage did not return after the database write finished")
 	}
 }
@@ -372,13 +345,9 @@ func stopWhileAWriteIsBlocked(
 	startBlockedWrite(t, store, h, fill)
 	if !returnsInTime(func() {
 	for _, msg := range extra {
 		h.HandleMessage(msg)
 	}
 	}) {
 		t.Fatal("HandleMessage did not return while a database write was blocked")
 	}
 	ctx, cancel := context.WithTimeout(t.Context(), stopDeadline)
 	defer cancel()
@@ -392,7 +361,7 @@ func stopWhileAWriteIsBlocked(
 	select {
 	case <-done:
-	case <-time.After(stepTimeout):
+	case <-time.After(handleMessageTimeout):
 		t.Fatal("the flush goroutine did not return after the write finished")
 	}
 }
@@ -411,8 +380,7 @@ func TestPrefixHandlerSkipsItsLastWriteAfterTheStopDeadline(t *testing.T) {
 	store := newBlockingStore()
 	h := newPrefixHandler(store, newErrorLogger(&logs),
-		routetable.New(routetable.Params{}), longerThanAnyTest,
+		routetable.New(routetable.Params{}), longerThanAnyTest)
 		maxTableChangesPerWrite)
 	fill := slices.Repeat([]string{testV4Prefix}, prefixBatchSize)
 	stopWhileAWriteIsBlocked(t, store, h, h.done,
 		[]*ristypes.RISMessage{prefixAnnouncement(fill)},
@@ -498,20 +466,20 @@ func TestPrefixHandlerStopCountsTheTableChangesOfAWriteInProgress(t *testing.T)
 	}
 }
 // TestASHandlerSkipsItsLastWriteAfterTheStopDeadline also checks what Stop
 // logs: the asnBatchSize entries of the held write and the entry for testASNB,
 // handled since, are not written.
 func TestASHandlerSkipsItsLastWriteAfterTheStopDeadline(t *testing.T) {
 	t.Parallel()
-	const wantEntries = asnBatchSize + 1
+	// Each message gives an update for its origin AS and one for each AS
 	// in its path: fill asnBatchSize+1, extra 2.
 	const wantUpdates = asnBatchSize + 1 + 2
 	var logs bytes.Buffer
 	store := newBlockingStore()
 	h := newASHandler(store, newErrorLogger(&logs), longerThanAnyTest)
 	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	stopWhileAWriteIsBlocked(t, store, h, h.done,
-		[]*ristypes.RISMessage{{Path: pathOfASes(asnBatchSize)}},
+		[]*ristypes.RISMessage{{Path: fill}},
 		&ristypes.RISMessage{Path: ristypes.ASPath{Sequence: []int{testASNB}}})
 	store.mu.Lock()
@@ -521,27 +489,26 @@ func TestASHandlerSkipsItsLastWriteAfterTheStopDeadline(t *testing.T) {
 		t.Errorf("AS%d was written after the stop deadline", testASNB)
 	}
-	if logged := lastLogged(t, &logs); logged.BatchEntries != wantEntries {
+	if logged := lastLogged(t, &logs); logged.Updates != wantUpdates {
-		t.Errorf("Stop logged %d batch entries not written, want %d",
+		t.Errorf("Stop logged %d updates not written, want %d",
-			logged.BatchEntries, wantEntries)
+			logged.Updates, wantUpdates)
 	}
 }
 // TestASHandlerSkipsAFullBatchAfterTheStopDeadline hands the AS handler a full
 // batch while a write is held, so the batch's wake-up of the flush goroutine
-// waits. The full batch holds the fill's ASes again, and testASNB. The stop
+// waits. The stop deadline passes meanwhile. When the write ends, the flush
-// deadline passes meanwhile. When the write ends, the flush goroutine must stop
+// goroutine must stop instead of writing the batch.
 // instead of writing the batch.
 func TestASHandlerSkipsAFullBatchAfterTheStopDeadline(t *testing.T) {
 	t.Parallel()
 	store := newBlockingStore()
 	h := newASHandler(store, logger.New(), longerThanAnyTest)
-	fill := &ristypes.RISMessage{Path: pathOfASes(asnBatchSize)}
+	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	full := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNB}, asnBatchSize)}
 	stopWhileAWriteIsBlocked(t, store, h, h.done,
-		[]*ristypes.RISMessage{fill},
+		[]*ristypes.RISMessage{{Path: fill}},
-		fill,
+		&ristypes.RISMessage{Path: full})
 		&ristypes.RISMessage{Path: ristypes.ASPath{Sequence: []int{testASNB}}})
 	store.mu.Lock()
 	defer store.mu.Unlock()
@@ -630,7 +597,7 @@ func TestPeeringHandlerStopCountsTheWriteInProgress(t *testing.T) {
 	select {
 	case <-h.done:
-	case <-time.After(stepTimeout):
+	case <-time.After(handleMessageTimeout):
 		t.Fatal("the processing goroutine did not return after the write " +
 			"finished")
 	}
@@ -651,7 +618,7 @@ func TestPeeringHandlerStartsNoWriteAfterTheStopDeadline(t *testing.T) {
 	const processInterval = 10 * time.Millisecond
 	store := newBlockingStore()
-	h := newPeeringHandler(store, logger.New(), processInterval, maxTrackedPaths)
+	h := newPeeringHandler(store, logger.New(), processInterval)
 	stopWhileAWriteIsBlocked(t, store, h, h.done,
 		[]*ristypes.RISMessage{
 			{Path: ristypes.ASPath{Sequence: []int{testASNA, testASNB}}},
@@ -707,8 +674,9 @@ func TestASHandlerHandlesMessagesWhileAWriteIsBlocked(t *testing.T) {
 	store := newBlockingStore()
 	h := newASHandler(store, logger.New(), longerThanAnyTest)
 	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	handleWhileAWriteIsBlocked(t, store, h,
-		[]*ristypes.RISMessage{{Path: pathOfASes(asnBatchSize)}},
+		[]*ristypes.RISMessage{{Path: fill}},
 		&ristypes.RISMessage{Path: ristypes.ASPath{Sequence: []int{testASNB}}})
 	store.mu.Lock()
@@ -746,11 +714,9 @@ func TestPrefixHandlerWaitsAtTheMaximumBatchSize(t *testing.T) {
 	const extraPrefix = "198.51.100.0/24"
 	store := newBlockingStore()
-	h := newPrefixHandler(store, logger.New(), routetable.New(routetable.Params{}),
+	h := NewPrefixHandler(store, logger.New(), routetable.New(routetable.Params{}))
 		longerThanAnyTest, maxTableChangesPerWrite)
 	h.batchMaxSize = prefixBatchSize
 	fill := slices.Repeat([]string{testV4Prefix}, prefixBatchSize)
-	toMax := slices.Repeat([]string{testV4Prefix}, prefixBatchSize)
+	toMax := slices.Repeat([]string{testV4Prefix}, prefixBatchMaxSize)
 	handleAtMaxBatchSize(t, store, h,
 		[]*ristypes.RISMessage{prefixAnnouncement(fill)},
 		[]*ristypes.RISMessage{prefixAnnouncement(toMax)},
@@ -765,48 +731,31 @@ func TestPrefixHandlerWaitsAtTheMaximumBatchSize(t *testing.T) {
 	}
 }
-// TestASHandlerNeverWaitsForAWrite starts a write that the store holds. Then it
+func TestASHandlerWaitsAtTheMaximumBatchSize(t *testing.T) {
 // hands the AS handler twenty messages whose paths each hold one AS
 // asnBatchSize times. HandleMessage must return each time, and the batch must
 // hold one entry, for that AS.
 func TestASHandlerNeverWaitsForAWrite(t *testing.T) {
 	t.Parallel()
 	const messages = 20
 	store := newBlockingStore()
 	h := newASHandler(store, logger.New(), longerThanAnyTest)
 	fill := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchSize)}
 	toMax := ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, asnBatchMaxSize)}
 	handleAtMaxBatchSize(t, store, h,
 		[]*ristypes.RISMessage{{Path: fill}},
 		[]*ristypes.RISMessage{{Path: toMax}},
 		&ristypes.RISMessage{Path: ristypes.ASPath{Sequence: []int{testASNB}}})
-	defer stopInTime(t, h)
+	store.mu.Lock()
-	defer store.releaseWrites()
+	defer store.mu.Unlock()
-	startBlockedWrite(t, store, h,
+	if !store.asns[testASNB] {
-		[]*ristypes.RISMessage{{Path: pathOfASes(asnBatchSize)}})
+		t.Errorf("Stop did not write AS%d, handled after the batch reached its "+
-
+			"maximum size", testASNB)
 	oneAS := &ristypes.RISMessage{
 		Path: ristypes.ASPath{Sequence: slices.Repeat([]int{testASNB}, asnBatchSize)},
 	}
 	if !returnsInTime(func() {
 		for range messages {
 			h.HandleMessage(oneAS)
 		}
 	}) {
 		t.Fatal("HandleMessage did not return while a database write was blocked")
 	}
 	h.mu.Lock()
 	defer h.mu.Unlock()
 	if len(h.batch) != 1 {
 		t.Errorf("the batch holds %d entries for one AS, want 1", len(h.batch))
 	}
 }
 // TestPeerHandlerWaitsAtTheMaximumBatchSize must not have its flush timer fire.
 // A timer flush during the fill would take only part of it. The batch would
 // then reach its maximum size before the test's last message, and the test
-// would fail.
+// would hang.
 func TestPeerHandlerWaitsAtTheMaximumBatchSize(t *testing.T) {
 	t.Parallel()
@@ -814,11 +763,10 @@ func TestPeerHandlerWaitsAtTheMaximumBatchSize(t *testing.T) {
 	store := newBlockingStore()
 	h := newPeerHandler(store, logger.New(), longerThanAnyTest)
 	h.batchMaxSize = peerBatchSize
 	message := []*ristypes.RISMessage{{Peer: testPeerIP}}
 	handleAtMaxBatchSize(t, store, h,
 		slices.Repeat(message, peerBatchSize),
-		slices.Repeat(message, peerBatchSize),
+		slices.Repeat(message, peerBatchMaxSize),
 		&ristypes.RISMessage{Peer: otherPeerIP})
 	store.mu.Lock()
@@ -848,7 +796,6 @@ func TestHandlersWakeTheFlushGoroutineWhenTheBatchIsFull(t *testing.T) {
 			batchSize: prefixBatchSize,
 			handle: func(n int) chan struct{} {
 				h := &PrefixHandler{
 					batchMaxSize: prefixBatchMaxSize,
 					batchFullCh: make(chan struct{}, 1),
 					table:       routetable.New(routetable.Params{}),
 				}
@@ -862,12 +809,11 @@ func TestHandlersWakeTheFlushGoroutineWhenTheBatchIsFull(t *testing.T) {
 			name:      "AS",
 			batchSize: asnBatchSize,
 			handle: func(n int) chan struct{} {
-				h := &ASHandler{
+				h := &ASHandler{batchFullCh: make(chan struct{}, 1)}
-					batch:       make(map[int]database.SeenTimes),
+				// The origin AS and each AS in the path are one update each.
-					batchFullCh: make(chan struct{}, 1),
+				h.HandleMessage(&ristypes.RISMessage{
-				}
+					Path: ristypes.ASPath{Sequence: slices.Repeat([]int{testASNA}, n-1)},
-				// Each of the path's n ASes is one entry of the batch.
+				})
 				h.HandleMessage(&ristypes.RISMessage{Path: pathOfASes(n)})
 				return h.batchFullCh
 			},
@@ -876,10 +822,7 @@ func TestHandlersWakeTheFlushGoroutineWhenTheBatchIsFull(t *testing.T) {
 			name:      "peer",
 			batchSize: peerBatchSize,
 			handle: func(n int) chan struct{} {
-				h := &PeerHandler{
+				h := &PeerHandler{batchFullCh: make(chan struct{}, 1)}
 					batchMaxSize: peerBatchMaxSize,
 					batchFullCh:  make(chan struct{}, 1),
 				}
 				for range n {
 					h.HandleMessage(&ristypes.RISMessage{Peer: testPeerIP})
 				}
@@ -97,7 +97,7 @@ func TestDBMaintainerStopReturnsByItsDeadline(t *testing.T) {
 	select {
 	case <-store.started:
-	case <-time.After(stepTimeout):
+	case <-time.After(handleMessageTimeout):
 		t.Fatal("the maintainer did not start the checkpoint")
 	}
@@ -113,7 +113,7 @@ func TestDBMaintainerStopReturnsByItsDeadline(t *testing.T) {
 	select {
 	case <-m.done:
-	case <-time.After(stepTimeout):
+	case <-time.After(handleMessageTimeout):
 		t.Fatal("the maintenance goroutine did not return after the " +
 			"checkpoint ended")
 	}
@@ -43,14 +43,10 @@ type PeerHandler struct {
 	db     database.Store
 	logger *logger.Logger
 	// batchMaxSize is peerBatchMaxSize. Only HandleMessage reads it, so a test
 	// may lower it before it hands the handler a message.
 	batchMaxSize int
 	// Batching. mu guards peerBatch and writing only: the flush goroutine
 	// takes the batch under mu and writes it after releasing mu, so
 	// HandleMessage waits for a database write only while peerBatch is at
-	// batchMaxSize.
+	// peerBatchMaxSize.
 	mu        sync.Mutex
 	peerBatch []peerUpdate
 	// writing is how many updates the flush goroutine took from peerBatch
@@ -90,7 +86,6 @@ func newPeerHandler(
 	h := &PeerHandler{
 		db:          db,
 		logger:      logger,
 		batchMaxSize: peerBatchMaxSize,
 		peerBatch:   make([]peerUpdate, 0, peerBatchSize),
 		batchFullCh: make(chan struct{}, 1),
 		stopCh:      make(chan context.Context, 1),
@@ -140,7 +135,7 @@ func (h *PeerHandler) HandleMessage(msg *ristypes.RISMessage) {
 	// While the batch is at its maximum size, wait until the flush goroutine
 	// takes it. Meanwhile the handler takes nothing off its queue, which
 	// fills, and the streamer drops messages for it.
-	for len(h.peerBatch) >= h.batchMaxSize {
+	for len(h.peerBatch) >= peerBatchMaxSize {
 		h.batchTaken.Wait()
 	}
@@ -154,7 +149,7 @@ func (h *PeerHandler) HandleMessage(msg *ristypes.RISMessage) {
 	// A full batch wakes the flush goroutine. If it is writing, the wake-up
 	// waits in batchFullCh and the batch keeps growing until the write ends
-	// or the batch reaches batchMaxSize.
+	// or the batch reaches peerBatchMaxSize.
 	if len(h.peerBatch) >= peerBatchSize {
 		select {
 		case h.batchFullCh <- struct{}{}:
@@ -35,7 +35,7 @@ func TestPeerHandlerWritesTheEarliestAndLatestTimesOfANewPeer(t *testing.T) {
 	// Built without NewPeerHandler's flush goroutine, so the test flushes
 	// itself.
-	h := &PeerHandler{db: store, logger: logger.New(), batchMaxSize: peerBatchMaxSize}
+	h := &PeerHandler{db: store, logger: logger.New()}
 	first := peerAnnouncement(testPeerIP, testV4Prefix)
 	second := peerAnnouncement(testPeerIP, testV4Prefix)
@@ -42,10 +42,6 @@ type PeeringHandler struct {
 	db     database.Store
 	logger *logger.Logger
 	// maxPaths is the most paths asPaths holds: maxTrackedPaths, except in
 	// tests that give a smaller one.
 	maxPaths int
 	// In-memory AS path tracking: each path, JSON-encoded, with the earliest
 	// and the latest time an update carried it.
 	mu           sync.Mutex
@@ -66,22 +62,19 @@ type PeeringHandler struct {
 // periodically processes accumulated AS paths into peering records. The
 // handler begins processing immediately upon creation.
 func NewPeeringHandler(db database.Store, logger *logger.Logger) *PeeringHandler {
-	return newPeeringHandler(db, logger, peeringProcessInterval, maxTrackedPaths)
+	return newPeeringHandler(db, logger, peeringProcessInterval)
 }
 // newPeeringHandler is NewPeeringHandler with the processing timer's interval,
-// processInterval, in place of peeringProcessInterval, and the most paths it
+// processInterval, in place of peeringProcessInterval. A test gives a short
-// holds, maxPaths, in place of maxTrackedPaths. A test gives a short interval to
+// one to have the timer start a write.
 // have the timer start a write, and a small maxPaths to fill the map quickly.
 func newPeeringHandler(
 	db database.Store, logger *logger.Logger, processInterval time.Duration,
 	maxPaths int,
 ) *PeeringHandler {
 	h := &PeeringHandler{
 		db:      db,
 		logger:  logger,
 		asPaths: make(map[string]database.SeenTimes),
 		maxPaths: maxPaths,
 		stopCh:  make(chan context.Context, 1),
 		done:    make(chan struct{}),
 	}
@@ -138,7 +131,7 @@ func (h *PeeringHandler) HandleMessage(msg *ristypes.RISMessage) {
 	defer h.mu.Unlock()
 	seen, exists := h.asPaths[key]
-	if !exists && len(h.asPaths) >= h.maxPaths {
+	if !exists && len(h.asPaths) >= maxTrackedPaths {
 		// Map is full; drop this new path and count it.
 		h.droppedPaths++
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"maps"
 	"slices"
 	"strconv"
 	"sync"
 	"testing"
 	"time"
@@ -19,10 +20,6 @@ const (
 	testASNB = 64501
 	testASNC = 64502
 	testASND = 64503
 	// testMaxTrackedPaths is a limit of the path map that a test fills
 	// quickly, in place of maxTrackedPaths.
 	testMaxTrackedPaths = 10
 )
 // recordingStore wraps mockStore to count every RecordPeering call, so a
@@ -58,7 +55,6 @@ func newTestHandler(db database.Store) *PeeringHandler {
 		db:      db,
 		logger:  logger.New(),
 		asPaths: make(map[string]database.SeenTimes),
 		maxPaths: maxTrackedPaths,
 	}
 }
@@ -248,28 +244,25 @@ func TestPeeringHandlerStopWritesTheRemainingPaths(t *testing.T) {
 // TestPeeringHandlerCapDropsAndCounts verifies that a full map drops new paths
 // and counts them, while a path already tracked is refreshed rather than
-// dropped. The handler's limit is small, and its timer does not fire.
+// dropped.
 func TestPeeringHandlerCapDropsAndCounts(t *testing.T) {
 	t.Parallel()
 	store := &recordingStore{mockStore: newMockStore()}
-	h := newPeeringHandler(store, logger.New(), longerThanAnyTest,
+	h := newTestHandler(store)
 		testMaxTrackedPaths)
 	defer stopInTime(t, h)
 	now := time.Now().UTC()
-	// Fill the map to exactly its limit, including one real path key so the
+	// Fill the map to exactly maxTrackedPaths, including one real path key so
-	// "already tracked" branch can be exercised. The other paths are of one
+	// the "already tracked" branch can be exercised. The filler keys are never
-	// AS, so they carry no peering.
+	// processed in this test, so their contents do not matter.
 	existing := pathKey(t, testASNA, testASNB)
 	h.mu.Lock()
 	h.asPaths[existing] = database.SeenTimes{First: now, Last: now}
-	for asn := 1; len(h.asPaths) < testMaxTrackedPaths; asn++ {
+	for i := 0; len(h.asPaths) < maxTrackedPaths; i++ {
-		h.asPaths[pathKey(t, asn)] = database.SeenTimes{First: now, Last: now}
+		h.asPaths[strconv.Itoa(i)] = database.SeenTimes{First: now, Last: now}
 	}
 	h.mu.Unlock()
@@ -277,9 +270,8 @@ func TestPeeringHandlerCapDropsAndCounts(t *testing.T) {
 	handle(h, now.Add(time.Second), testASNA, testASNC)
 	tracked, dropped := snapshot(h)
-	if tracked != testMaxTrackedPaths {
+	if tracked != maxTrackedPaths {
-		t.Fatalf("want map size %d after drop, got %d", testMaxTrackedPaths,
+		t.Fatalf("want map size %d after drop, got %d", maxTrackedPaths, tracked)
 			tracked)
 	}
 	if dropped != 1 {
@@ -291,9 +283,8 @@ func TestPeeringHandlerCapDropsAndCounts(t *testing.T) {
 	handle(h, refreshed, testASNA, testASNB)
 	tracked, dropped = snapshot(h)
-	if tracked != testMaxTrackedPaths {
+	if tracked != maxTrackedPaths {
-		t.Fatalf("want map size %d after refresh, got %d", testMaxTrackedPaths,
+		t.Fatalf("want map size %d after refresh, got %d", maxTrackedPaths, tracked)
 			tracked)
 	}
 	if dropped != 1 {
@@ -312,21 +303,17 @@ func TestPeeringHandlerCapDropsAndCounts(t *testing.T) {
 // TestPeeringHandlerRunResetsTheDroppedCount fills the map, has the handler
 // drop one path, and runs the processing. The count of dropped paths is the
-// run's own, so it is 0 again after the run. The handler's limit is small, and
+// run's own, so it is 0 again after the run.
 // its timer does not fire.
 func TestPeeringHandlerRunResetsTheDroppedCount(t *testing.T) {
 	t.Parallel()
-	h := newPeeringHandler(newMockStore(), logger.New(), longerThanAnyTest,
+	h := newTestHandler(newMockStore())
 		testMaxTrackedPaths)
 	defer stopInTime(t, h)
 	now := time.Now().UTC()
 	// Paths of one AS carry no peering, so the run records nothing.
 	h.mu.Lock()
-	for asn := 1; len(h.asPaths) < testMaxTrackedPaths; asn++ {
+	for asn := 1; len(h.asPaths) < maxTrackedPaths; asn++ {
 		h.asPaths[pathKey(t, asn)] = database.SeenTimes{First: now, Last: now}
 	}
 	h.mu.Unlock()
@@ -26,7 +26,7 @@ const (
 	prefixBatchSize = 25000
 	// prefixBatchMaxSize is the most prefix updates the batch holds while the
-	// flush goroutine writes the previous one: ten batches, about 15 MiB
+	// flush goroutine writes the previous one: ten batches, about 60 MiB
 	// (README "Memory"). At this size HandleMessage waits until the flush
 	// goroutine takes the batch.
 	prefixBatchMaxSize = 250000
@@ -44,21 +44,6 @@ const (
 	// most one pair. So the million pairs that a full-table peer's session
 	// going down changes are written in about a minute.
 	maxTableChangesPerWrite = 20000
 	// maxHeldBackMessages is the most messages the handler holds back from
 	// peers whose session went down. A peer's messages are held back from
 	// the moment its session goes down until peerDown has applied them. If
 	// peerDown is running at that moment, the peer waits for the rest of
 	// peerDown's current PeersDown call. The peer also waits while peerDown
 	// applies the messages held back from that call's peers, those that
 	// arrive meanwhile included. The next PeersDown call takes the peer out.
 	// Once that call returns, peerDown applies the messages held back from
 	// that call's peers, one peer after another, in the order the call lists
 	// them. A held-back message that says the peer's session went down again
 	// makes the peer's later messages wait for the next call. A message takes
 	// about 1 KiB, so 150,000 take about 150 MiB (README "Memory"). At this
 	// number HandleMessage waits until one of them is applied.
 	maxHeldBackMessages = 150000
 )
 // PrefixHandler keeps the routing table in memory current from the feed. It
@@ -67,17 +52,6 @@ const (
 // does an announcement whose AS path is empty or holds AS 0 anywhere. A peer
 // whose BGP session goes down leaves every prefix.
 //
 // The table's PeersDown applies sessions going down. It visits every prefix,
 // which takes seconds on a full table. So the handler runs PeersDown on a
 // separate goroutine and goes on taking messages meanwhile. One PeersDown runs
 // at a time. The next one takes every peer whose session went down since the
 // previous one began. PeersDown lets the table's lock go about half of the
 // time, so the handler applies other peers' messages while PeersDown runs. The
 // handler holds back a down peer's later messages until peerDown applies them,
 // as the doc of maxHeldBackMessages describes. It applies them in order, one at
 // a time, and takes new messages in between. It holds back at most
 // maxHeldBackMessages messages.
 //
 // Each flush writes the table's changes to the database. It also stores each
 // prefix the updates name with the time it was first seen.
 type PrefixHandler struct {
@@ -86,19 +60,12 @@ type PrefixHandler struct {
 	metrics *metrics.Tracker
 	table   *routetable.Table
-	// batchMaxSize is prefixBatchMaxSize. Only HandleMessage reads it, so a
+	// Batching. mu guards batch, writing and writingTableChanges only: the
 	// test may lower it before it hands the handler a message.
 	batchMaxSize int
 	// tableChangesPerWrite is maxTableChangesPerWrite, except in tests that
 	// give a smaller one.
 	tableChangesPerWrite int
 	// Batching. mu guards batch, writing and writingTableChanges: the
 	// flush goroutine takes them under mu and writes them after releasing
 	// mu, so HandleMessage waits for a database write only while batch is at
-	// batchMaxSize.
+	// prefixBatchMaxSize.
 	mu    sync.Mutex
-	batch []seenPrefix
+	batch []prefixUpdate
 	// writing is how many updates the flush goroutine took and has not
 	// finished writing.
 	writing int
@@ -113,37 +80,8 @@ type PrefixHandler struct {
 	// Stop does not wait for a write in progress to hand it over.
 	stopCh chan context.Context
 	done   chan struct{} // closed when the flush goroutine returns
 	// Peers whose session went down. heldBack, under mu, holds each such
 	// peer's later messages, in order, until the peer has left every prefix
 	// and they are applied. A peer with no such messages yet has an empty
 	// entry. heldCount, under mu, is how many messages heldBack holds.
 	// heldTaken is signalled each time a held-back message is taken out to
 	// be applied; its L is &mu.
 	heldBack  map[string][]*ristypes.RISMessage
 	heldCount int
 	heldTaken sync.Cond
 	// downPeers, under mu, lists the peers whose session went down and that
 	// the next PeersDown takes. peerDownRunning, under mu, says whether
 	// peerDown is running. peerDowns counts the peerDown goroutines that have
 	// not returned.
 	downPeers       []string
 	peerDownRunning bool
 	peerDowns       sync.WaitGroup
 	// tablePeersDown is the table's PeersDown. Only peerDown calls it, so a
 	// test may replace it before it hands the handler a message.
 	tablePeersDown func(peers []string)
 }
 // seenPrefix is what the batch keeps of an update: the prefix it names and its
 // time. A flush needs only these to store each new prefix's first-seen time.
 type seenPrefix struct {
 	prefix    string
 	timestamp time.Time
 }
 // prefixUpdate is one prefix of an update message, as applyToTable applies it
 // to the routing table.
 type prefixUpdate struct {
 	prefix      string
 	originASN   int
@@ -172,35 +110,26 @@ func (u prefixUpdate) announcesRoute() bool {
 func NewPrefixHandler(
 	db database.Store, logger *logger.Logger, table *routetable.Table,
 ) *PrefixHandler {
-	return newPrefixHandler(db, logger, table, prefixBatchTimeout,
+	return newPrefixHandler(db, logger, table, prefixBatchTimeout)
 		maxTableChangesPerWrite)
 }
 // newPrefixHandler is NewPrefixHandler with the flush timer's interval,
-// batchTimeout, in place of prefixBatchTimeout, and tableChangesPerWrite in
+// batchTimeout, in place of prefixBatchTimeout. A test that the timer must not
-// place of maxTableChangesPerWrite. A test that the timer must not disturb
+// disturb gives an interval longer than the test runs.
 // gives an interval longer than the test runs. A test of writes split over
 // several flushes gives a small tableChangesPerWrite, so that it exceeds it
 // with few changes.
 func newPrefixHandler(
 	db database.Store, logger *logger.Logger, table *routetable.Table,
-	batchTimeout time.Duration, tableChangesPerWrite int,
+	batchTimeout time.Duration,
 ) *PrefixHandler {
 	h := &PrefixHandler{
 		db:          db,
 		logger:      logger,
 		table:       table,
-		batch:                make([]seenPrefix, 0, prefixBatchSize),
+		batch:       make([]prefixUpdate, 0, prefixBatchSize),
 		batchMaxSize:         prefixBatchMaxSize,
 		tableChangesPerWrite: tableChangesPerWrite,
 		batchFullCh: make(chan struct{}, 1),
 		stopCh:      make(chan context.Context, 1),
 		done:        make(chan struct{}),
 		heldBack:             make(map[string][]*ristypes.RISMessage),
 		tablePeersDown:       table.PeersDown,
 	}
 	h.batchTaken.L = &h.mu
 	h.heldTaken.L = &h.mu
 	// Start the flush timer goroutine
 	go flushLoop(batchTimeout, h.batchFullCh, h.stopCh, h.done, h.flushBatch)
@@ -228,100 +157,11 @@ func (h *PrefixHandler) QueueCapacity() int {
 	return prefixHandlerQueueSize
 }
-// HandleMessage processes a message to track prefix information. A message
+// HandleMessage processes a message to track prefix information
 // from a peer whose session went down is held back until peerDown applies it.
 func (h *PrefixHandler) HandleMessage(msg *ristypes.RISMessage) {
 	h.mu.Lock()
 	defer h.mu.Unlock()
 	// While maxHeldBackMessages messages are held back, wait until one of them
 	// is taken out to be applied. Meanwhile the handler takes nothing off its
 	// queue, as at batchMaxSize.
 	for h.heldCount >= maxHeldBackMessages {
 		h.heldTaken.Wait()
 	}
 	held, goingDown := h.heldBack[msg.Peer]
 	if goingDown {
 		h.heldBack[msg.Peer] = append(held, msg)
 		h.heldCount++
 		return
 	}
 	h.applyMessage(msg)
 }
 // HeldBackCount returns how many messages the handler holds back from peers
 // whose session went down. The status page shows it.
 func (h *PrefixHandler) HeldBackCount() int {
 	h.mu.Lock()
 	defer h.mu.Unlock()
 	return h.heldCount
 }
 // Stop waits for every PeersDown the handler started and for the messages held
 // back meanwhile to be applied. It gives up this wait once ctx ends. Then Stop
 // stops the flush goroutine and waits for it until ctx ends. The flush
 // goroutine makes one last flush before it returns. That flush writes at most
 // tableChangesPerWrite of the routing table's changes, and the prefixes of the
 // updates the handler holds. Once ctx has ended the flush goroutine skips that
 // last flush, and a write still running is lost when the process exits. A
 // failed write of the table's changes is not retried either. Stop logs how
 // many updates and table changes are not written. It also logs how many
 // held-back messages are not applied. The caller calls Stop once its last
 // HandleMessage has returned.
 func (h *PrefixHandler) Stop(ctx context.Context) {
 	peerDownsDone := make(chan struct{})
 	go func() {
 		h.peerDowns.Wait()
 		close(peerDownsDone)
 	}()
 	select {
 	case <-peerDownsDone:
 	case <-ctx.Done():
 	}
 	h.stopCh <- ctx
 	select {
 	case <-h.done:
 	case <-ctx.Done():
 	}
 	h.mu.Lock()
 	unwritten := h.writing + len(h.batch)
 	tableChanges := h.writingTableChanges + h.table.ChangeCount()
 	heldMessages := h.heldCount
 	h.mu.Unlock()
 	if unwritten == 0 && tableChanges == 0 && heldMessages == 0 {
 		return
 	}
 	if ctx.Err() != nil {
 		h.logger.Error("Stop deadline passed before the prefix handler wrote "+
 			"its updates", "updates", unwritten, "table_changes", tableChanges,
 			"held_messages", heldMessages)
 		return
 	}
 	h.logger.Error("The prefix handler stopped before it wrote everything",
 		"updates", unwritten, "table_changes", tableChanges,
 		"held_messages", heldMessages)
 }
 // applyMessage applies msg. The caller holds mu. A peer's session going down
 // has the peer leave every prefix. An update is applied to the routing table,
 // and its prefixes join the batch.
 func (h *PrefixHandler) applyMessage(msg *ristypes.RISMessage) {
 	if msg.Type == ristypes.MessageTypeState {
 		if msg.State == ristypes.StateDown {
-			h.startPeerDown(msg.Peer)
+			h.table.PeerDown(msg.Peer)
 		}
 		return
@@ -336,10 +176,13 @@ func (h *PrefixHandler) applyMessage(msg *ristypes.RISMessage) {
 	// the path after the rest of it.
 	path := slices.Concat(msg.Path.Sequence, msg.Path.Set)
 	h.mu.Lock()
 	defer h.mu.Unlock()
 	// While the batch is at its maximum size, wait until the flush goroutine
 	// takes it. Meanwhile the handler takes nothing off its queue, which
 	// fills, and the streamer drops messages for it.
-	for len(h.batch) >= h.batchMaxSize {
+	for len(h.batch) >= prefixBatchMaxSize {
 		h.batchTaken.Wait()
 	}
@@ -355,7 +198,7 @@ func (h *PrefixHandler) applyMessage(msg *ristypes.RISMessage) {
 			messageType: "withdrawal",
 			timestamp:   timestamp,
 		}
-		h.batch = append(h.batch, seenPrefix{update.prefix, update.timestamp})
+		h.batch = append(h.batch, update)
 		h.applyToTable(update)
 		// Record withdrawal in metrics
@@ -375,7 +218,7 @@ func (h *PrefixHandler) applyMessage(msg *ristypes.RISMessage) {
 				path:        path,
 				endsInSet:   len(msg.Path.Set) > 0,
 			}
-			h.batch = append(h.batch, seenPrefix{update.prefix, update.timestamp})
+			h.batch = append(h.batch, update)
 			h.applyToTable(update)
 			// Record announcement in metrics
@@ -387,7 +230,7 @@ func (h *PrefixHandler) applyMessage(msg *ristypes.RISMessage) {
 	// A full batch wakes the flush goroutine. If it is writing, the wake-up
 	// waits in batchFullCh and the batch keeps growing until the write ends
-	// or the batch reaches batchMaxSize.
+	// or the batch reaches prefixBatchMaxSize.
 	if len(h.batch) >= prefixBatchSize {
 		select {
 		case h.batchFullCh <- struct{}{}:
@@ -396,94 +239,45 @@ func (h *PrefixHandler) applyMessage(msg *ristypes.RISMessage) {
 	}
 }
-// startPeerDown adds peer to downPeers. It starts peerDown on a new goroutine
+// Stop stops the flush goroutine, which makes one last flush before it returns,
-// unless peerDown is running. The caller holds mu. The peer's messages are
+// and waits for it until ctx ends. That flush writes at most
-// held back until peerDown has applied them. Messages held back for an earlier
+// maxTableChangesPerWrite of the routing table's changes, and the prefixes of
-// session of the peer going down, and not yet applied, stay held back.
+// the updates the handler holds. Once ctx has ended the flush goroutine skips
-func (h *PrefixHandler) startPeerDown(peer string) {
+// that last flush, and a write still running is lost when the process exits. A
-	_, goingDown := h.heldBack[peer]
+// failed write of the table's changes is not retried either. Stop logs how many
-	if !goingDown {
+// updates and how many of the table's changes are not written.
-		h.heldBack[peer] = []*ristypes.RISMessage{}
+func (h *PrefixHandler) Stop(ctx context.Context) {
 	h.stopCh <- ctx
 	select {
 	case <-h.done:
 	case <-ctx.Done():
 	}
 	h.downPeers = append(h.downPeers, peer)
 	if h.peerDownRunning {
 		return
 	}
 	h.peerDownRunning = true
 	h.peerDowns.Add(1)
 	go h.peerDown()
 }
 // peerDown takes every peer in downPeers and runs the table's PeersDown for
 // them. Then it applies the messages held back from each of those peers. It
 // repeats this until downPeers is empty.
 func (h *PrefixHandler) peerDown() {
 	defer h.peerDowns.Done()
 	for {
 	h.mu.Lock()
-
+	unwritten := h.writing + len(h.batch)
-		peers := h.downPeers
+	tableChanges := h.writingTableChanges + h.table.ChangeCount()
 		h.downPeers = nil
 		if len(peers) == 0 {
 			h.peerDownRunning = false
 	h.mu.Unlock()
 	if unwritten == 0 && tableChanges == 0 {
 		return
 	}
 	if ctx.Err() != nil {
 		h.logger.Error("Stop deadline passed before the prefix handler wrote "+
 			"its updates", "updates", unwritten, "table_changes", tableChanges)
 		return
 	}
-		h.mu.Unlock()
+	h.logger.Error("The prefix handler stopped before it wrote everything",
-
+		"updates", unwritten, "table_changes", tableChanges)
 		h.tablePeersDown(peers)
 		for _, peer := range peers {
 			h.applyHeldBack(peer)
 		}
 	}
 }
 // applyHeldBack applies the messages held back from peer, in order. It takes
 // mu for one message at a time, so HandleMessage takes new messages in
 // between. The peer's new messages join the end of the held-back ones. A
 // held-back message that says the peer's session went down again adds the
 // peer to downPeers. The rest stay held back until the next PeersDown has
 // returned.
 func (h *PrefixHandler) applyHeldBack(peer string) {
 	for {
 		h.mu.Lock()
 		held := h.heldBack[peer]
 		if len(held) == 0 {
 			delete(h.heldBack, peer)
 			h.mu.Unlock()
 			return
 		}
 		msg := held[0]
 		held[0] = nil // so that the message is freed once applied
 		h.heldBack[peer] = held[1:]
 		h.heldCount--
 		h.heldTaken.Broadcast()
 		h.applyMessage(msg)
 		h.mu.Unlock()
 		if msg.Type == ristypes.MessageTypeState &&
 			msg.State == ristypes.StateDown {
 			return
 		}
 	}
 }
 // takeBatch returns the pending updates and leaves an empty batch in their
 // place for HandleMessage to fill. The updates count in writing until
 // flushBatch has written them.
-func (h *PrefixHandler) takeBatch() []seenPrefix {
+func (h *PrefixHandler) takeBatch() []prefixUpdate {
 	h.mu.Lock()
 	defer h.mu.Unlock()
@@ -493,7 +287,7 @@ func (h *PrefixHandler) takeBatch() []seenPrefix {
 	batch := h.batch
 	h.writing = len(batch)
-	h.batch = make([]seenPrefix, 0, prefixBatchSize)
+	h.batch = make([]prefixUpdate, 0, prefixBatchSize)
 	h.batchTaken.Broadcast()
 	return batch
@@ -575,13 +369,14 @@ func (h *PrefixHandler) applyToTable(update prefixUpdate) {
 	})
 }
-// writeTableChanges writes at most tableChangesPerWrite changes of the routing
+// writeTableChanges writes at most maxTableChangesPerWrite changes of the
-// table in memory, and every peer the table numbered since the last write.
+// routing table in memory, and every peer the table numbered since the last
 // write.
 // When the write fails, they go back to the table, so that a later write writes
 // them again, each pair with its content then.
 func (h *PrefixHandler) writeTableChanges() {
 	h.mu.Lock()
-	changes, newPeers := h.table.TakeChanges(h.tableChangesPerWrite)
+	changes, newPeers := h.table.TakeChanges(maxTableChangesPerWrite)
 	h.writingTableChanges = len(changes)
 	h.mu.Unlock()
@@ -237,119 +237,22 @@ func TestPrefixHandlerStopLogsNothingWhenItWroteEverything(t *testing.T) {
 	}
 }
-// TestPrefixHandlerStopLogsTheMessagesHeldBack stops a prefix handler with a
+// longerThanAnyTest is a flush timer interval that no test lasts. A test whose
-// deadline that has passed, while a peer's PeersDown is held up and one message
+// prefix, AS or peer handler must flush only when its batch is full and on Stop
-// of the peer is held back. Stop must log that message as not applied.
+// gives it to newPrefixHandler, newASHandler or newPeerHandler.
 func TestPrefixHandlerStopLogsTheMessagesHeldBack(t *testing.T) {
 	t.Parallel()
 	var logs bytes.Buffer
 	h := newPrefixHandler(newMockStore(), newErrorLogger(&logs),
 		routetable.New(routetable.Params{}), longerThanAnyTest,
 		maxTableChangesPerWrite)
 	release := holdUpPeersDown(h)
 	defer close(release)
 	h.HandleMessage(peerAnnouncement(testPeerIP, testV4Prefix))
 	h.HandleMessage(sessionDown())
 	h.HandleMessage(peerAnnouncement(testPeerIP, testV6Prefix))
 	ctx, cancel := context.WithCancel(t.Context())
 	cancel()
 	h.Stop(ctx)
 	logged := lastLogged(t, &logs)
 	if logged.HeldMessages != 1 {
 		t.Errorf("Stop logged %d held messages not applied, want 1",
 			logged.HeldMessages)
 	}
 }
 // TestPrefixHandlerStopWaitsForTheMessagesHeldBack stops a prefix handler
 // while a peer's PeersDown is held up and an announcement of the peer is held
 // back. Stop must wait. Once the PeersDown is let go and Stop returns, the
 // announcement must be in the database.
 func TestPrefixHandlerStopWaitsForTheMessagesHeldBack(t *testing.T) {
 	t.Parallel()
 	db := newTestDatabase(t)
 	h := newPrefixHandler(db, logger.New(), routetable.New(routetable.Params{}),
 		longerThanAnyTest, maxTableChangesPerWrite)
 	release := holdUpPeersDown(h)
 	h.HandleMessage(sessionDown())
 	h.HandleMessage(peerAnnouncement(testPeerIP, testV4Prefix))
 	stopped := make(chan struct{})
 	go func() {
 		h.Stop(t.Context())
 		close(stopped)
 	}()
 	select {
 	case <-stopped:
 		t.Error("Stop returned while a PeersDown was held up")
 	case <-time.After(stillWaitingAfter):
 	}
 	close(release)
 	select {
 	case <-stopped:
 	case <-time.After(stepTimeout):
 		t.Fatalf("Stop did not return within %s of the PeersDown's release",
 			stepTimeout)
 	}
 	read, err := db.ReadRouteTable(t.Context())
 	if err != nil {
 		t.Fatalf("ReadRouteTable: %v", err)
 	}
 	checkTableOrigins(t, read, map[string]map[int][]string{
 		testV4Prefix: {testASNB: {testPeerIP}},
 	})
 }
 // longerThanAnyTest is a timer interval that no test lasts. A test gives it to
 // newPrefixHandler, newASHandler, newPeerHandler or newPeeringHandler when the
 // handler must write only when its batch is full, when the test says, or on
 // Stop.
 const longerThanAnyTest = time.Hour
 // prefixHandlerWithoutTimer returns a prefix handler that writes to store and
 // applies the updates to an empty routing table. It is built without
 // NewPrefixHandler's flush goroutine, so the test flushes itself.
 func prefixHandlerWithoutTimer(store database.Store) *PrefixHandler {
 	table := routetable.New(routetable.Params{})
 	return &PrefixHandler{
 		db:     store,
 		logger: logger.New(),
-		table:                table,
+		table:  routetable.New(routetable.Params{}),
 		batchMaxSize:         prefixBatchMaxSize,
 		tableChangesPerWrite: maxTableChangesPerWrite,
 		heldBack:             make(map[string][]*ristypes.RISMessage),
 		tablePeersDown:       table.PeersDown,
 	}
 }
 // holdUpPeersDown makes each PeersDown of h wait until the returned channel is
 // closed, as another peer's long PeersDown would hold it up. The test calls it
 // before it hands h a message.
 func holdUpPeersDown(h *PrefixHandler) chan struct{} {
 	release := make(chan struct{})
 	h.tablePeersDown = func(peers []string) {
 		<-release
 		h.table.PeersDown(peers)
 	}
 	return release
 }
 // newTestDatabase opens a database in a new temporary directory. It is closed
 // when the test ends.
 func newTestDatabase(t *testing.T) *database.Database {
@@ -7,10 +7,8 @@ import (
 	"log/slog"
 	"net/netip"
 	"reflect"
 	"runtime"
 	"slices"
 	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -32,13 +30,12 @@ const (
 	// firstManyPrefix is the first prefix announceManyPrefixes announces.
 	firstManyPrefix = "10.0.0.0/32"
 	// testMaxTableChangesPerWrite is a limit of one write of the routing
 	// table's changes that a test exceeds quickly, in place of
 	// maxTableChangesPerWrite.
 	testMaxTableChangesPerWrite = 10
 )
 // tableWriteTimeout is how long a test waits for the flush timer to write the
 // routing table's changes: a few ticks of it.
 const tableWriteTimeout = 5 * prefixBatchTimeout
 // tableCase is one test of the routing table in memory: the messages handed to
 // the prefix handler, and for each prefix the peers that carry it with each
 // origin AS after them.
@@ -103,359 +100,6 @@ func TestPrefixHandlerAppliesUpdatesToTheRoutingTable(t *testing.T) {
 	})
 }
 // TestPrefixHandlerTakesMessagesWhileAPeerGoesDown holds up the PeersDown of a
 // peer whose session went down, as another peer's long PeersDown would. The
 // handler must go on taking messages. It applies another peer's announcement
 // at once. It holds back these messages of the down peer, in this order:
 //   - an announcement;
 //   - its session going down again;
 //   - a second announcement.
 //
 // HeldBackCount must count them. Once the PeersDown calls have returned, the
 // down peer must carry only the prefix of the second announcement.
 func TestPrefixHandlerTakesMessagesWhileAPeerGoesDown(t *testing.T) {
 	t.Parallel()
 	const heldMessages = 3
 	h := prefixHandlerWithoutTimer(newMockStore())
 	release := holdUpPeersDown(h)
 	h.HandleMessage(peerAnnouncement(testPeerIP, testV4Prefix))
 	handled := returnsInTime(func() {
 		for _, msg := range []*ristypes.RISMessage{
 			sessionDown(),
 			peerAnnouncement(secondPeerIP, otherV4Prefix),
 			peerAnnouncement(testPeerIP, testV6Prefix),
 			sessionDown(),
 			peerAnnouncement(testPeerIP, setV4Prefix),
 		} {
 			h.HandleMessage(msg)
 		}
 	})
 	if !handled {
 		t.Fatalf("the handler did not take the messages after the session "+
 			"went down within %s", stepTimeout)
 	}
 	checkTableOrigins(t, h.table, map[string]map[int][]string{
 		testV4Prefix:  {testASNB: {testPeerIP}},
 		otherV4Prefix: {testASNB: {secondPeerIP}},
 		testV6Prefix:  {},
 		setV4Prefix:   {},
 	})
 	if h.HeldBackCount() != heldMessages {
 		t.Errorf("HeldBackCount() = %d, want %d", h.HeldBackCount(),
 			heldMessages)
 	}
 	close(release)
 	if !returnsInTime(h.peerDowns.Wait) {
 		t.Fatalf("the PeersDown calls did not return within %s", stepTimeout)
 	}
 	checkTableOrigins(t, h.table, map[string]map[int][]string{
 		testV4Prefix:  {},
 		otherV4Prefix: {testASNB: {secondPeerIP}},
 		testV6Prefix:  {},
 		setV4Prefix:   {testASNB: {testPeerIP}},
 	})
 }
 // TestPrefixHandlerTakesPeersDownTogether has four peers announce testV4Prefix.
 // It holds up the PeersDown of the first peer, whose session goes down.
 // Meanwhile the sessions of the three others go down, and each of them
 // announces otherV4Prefix. Once the first PeersDown is let go, the next one
 // must take the three others together. No peer may then carry testV4Prefix,
 // and the three others must carry otherV4Prefix.
 func TestPrefixHandlerTakesPeersDownTogether(t *testing.T) {
 	t.Parallel()
 	others := []string{secondPeerIP, thirdPeerIP, fourthPeerIP}
 	h := prefixHandlerWithoutTimer(newMockStore())
 	// calls receives the peers of each PeersDown, with room for one call
 	// for each peer.
 	calls := make(chan []string, len(others)+1)
 	release := make(chan struct{})
 	h.tablePeersDown = func(peers []string) {
 		calls <- slices.Clone(peers)
 		<-release
 		h.table.PeersDown(peers)
 	}
 	for _, peer := range append([]string{testPeerIP}, others...) {
 		h.HandleMessage(peerAnnouncement(peer, testV4Prefix))
 	}
 	h.HandleMessage(sessionDown())
 	select {
 	case <-calls:
 	case <-time.After(stepTimeout):
 		t.Fatalf("PeersDown did not begin within %s", stepTimeout)
 	}
 	for _, peer := range others {
 		h.HandleMessage(sessionDownOf(peer))
 		h.HandleMessage(peerAnnouncement(peer, otherV4Prefix))
 	}
 	close(release)
 	if !returnsInTime(h.peerDowns.Wait) {
 		t.Fatalf("the PeersDown calls did not return within %s", stepTimeout)
 	}
 	close(calls)
 	later := make([][]string, 0, len(calls))
 	for peers := range calls {
 		later = append(later, peers)
 	}
 	if !reflect.DeepEqual(later, [][]string{others}) {
 		t.Errorf("the PeersDown calls after the first took %v, want %v "+
 			"together", later, others)
 	}
 	checkTableOrigins(t, h.table, map[string]map[int][]string{
 		testV4Prefix:  {},
 		otherV4Prefix: {testASNB: others},
 	})
 }
 // TestPrefixHandlerAppliesMessagesWhilePeersDownRuns gives a peer 50,000
 // prefixes and hands the prefix handler that peer's session going down. The
 // table's PeersDown then visits the prefixes in five batches. Once PeersDown
 // has begun, the handler is handed 1,000 announcements of another peer. The
 // handler must apply them all before PeersDown ends, while the down peer still
 // carries some of its prefixes.
 func TestPrefixHandlerAppliesMessagesWhilePeersDownRuns(t *testing.T) {
 	t.Parallel()
 	const (
 		// downPeerPrefixes is five times the 10,000 prefixes PeersDown visits
 		// in one hold of the table's lock.
 		downPeerPrefixes = 50000
 		// otherPeerMessages is far more messages than the handler applies
 		// while PeersDown runs, if PeersDown takes the lock back at once after
 		// each batch. The handler then applies only a few for each batch.
 		otherPeerMessages = 1000
 		// firstOtherAddr is the address of the other peer's first prefix.
 		firstOtherAddr = "2001:db8:2::"
 	)
 	h := prefixHandlerWithoutTimer(newMockStore())
 	announceManyPrefixes(h.table, downPeerPrefixes)
 	h.HandleMessage(sessionDown())
 	// Wait until PeersDown has begun: the down peer has left some of its
 	// prefixes. The down peer's prefixes are IPv4 and the other peer's are
 	// IPv6, so the counts tell them apart.
 	for h.table.Counts().IPv4Routes == downPeerPrefixes {
 		runtime.Gosched()
 	}
 	// Each announcement names the /128 of the next address.
 	addr := netip.MustParseAddr(firstOtherAddr)
 	for range otherPeerMessages {
 		h.HandleMessage(peerAnnouncement(secondPeerIP,
 			netip.PrefixFrom(addr, addr.BitLen()).String()))
 		addr = addr.Next()
 	}
 	counts := h.table.Counts()
 	if counts.IPv6Routes != otherPeerMessages {
 		t.Errorf("the other peer carries %d prefixes, want %d",
 			counts.IPv6Routes, otherPeerMessages)
 	}
 	if counts.IPv4Routes == 0 {
 		t.Errorf("PeersDown ended before the handler applied the other peer's "+
 			"%d announcements", otherPeerMessages)
 	}
 	if !returnsInTime(h.peerDowns.Wait) {
 		t.Fatalf("the PeersDown did not return within %s", stepTimeout)
 	}
 }
 // TestPrefixHandlerTakesMessagesWhileAReturningPeerSendsItsTable gives a peer
 // 50,000 prefixes and hands the prefix handler that peer's session going down.
 // Once PeersDown has begun, the peer comes back and sends more announcements
 // than the handler's queue holds, as a peer that sends its whole table again
 // does. The handler must hold them back and go on taking messages. Another
 // peer's announcement, handed next, must be applied before PeersDown ends.
 func TestPrefixHandlerTakesMessagesWhileAReturningPeerSendsItsTable(t *testing.T) {
 	t.Parallel()
 	const (
 		// downPeerPrefixes is five times the 10,000 prefixes PeersDown visits
 		// in one hold of the table's lock.
 		downPeerPrefixes  = 50000
 		returningMessages = prefixHandlerQueueSize + 1
 	)
 	table := routetable.New(routetable.Params{})
 	announceManyPrefixes(table, downPeerPrefixes)
 	h := newPrefixHandler(newMockStore(), logger.New(), table,
 		longerThanAnyTest, maxTableChangesPerWrite)
 	defer stopInTime(t, h)
 	h.HandleMessage(sessionDown())
 	// Wait until PeersDown has begun: the down peer has left some of its
 	// prefixes, which are all IPv4.
 	for h.table.Counts().IPv4Routes == downPeerPrefixes {
 		runtime.Gosched()
 	}
 	returning := peerAnnouncement(testPeerIP, testV6Prefix)
 	if !returnsInTime(func() {
 		for range returningMessages {
 			h.HandleMessage(returning)
 		}
 		h.HandleMessage(peerAnnouncement(secondPeerIP, testV6Prefix))
 	}) {
 		t.Fatalf("the handler did not take the messages within %s", stepTimeout)
 	}
 	if h.table.Counts().IPv4Routes == 0 {
 		t.Error("PeersDown ended before the handler took the other peer's " +
 			"announcement")
 	}
 	checkTableOrigins(t, h.table, map[string]map[int][]string{
 		testV6Prefix: {testASNB: {secondPeerIP}},
 	})
 	if !returnsInTime(h.peerDowns.Wait) {
 		t.Fatalf("the PeersDown did not return within %s", stepTimeout)
 	}
 	checkTableOrigins(t, h.table, map[string]map[int][]string{
 		testV6Prefix: {testASNB: {testPeerIP, secondPeerIP}},
 	})
 }
 // TestPrefixHandlerTakesMessagesWhileItAppliesHeldBackOnes holds back many
 // messages of a peer whose session went down. Each names a prefix that does
 // not parse, so applying it logs an error. Each log write takes a
 // millisecond. While the handler applies the held-back messages, it must take
 // another peer's announcement.
 func TestPrefixHandlerTakesMessagesWhileItAppliesHeldBackOnes(t *testing.T) {
 	t.Parallel()
 	const (
 		// heldMessages take the handler at least a second to apply.
 		heldMessages = 1000
 		badPrefix    = "not a prefix"
 	)
 	logs := &slowWriter{firstWrite: make(chan struct{})}
 	h := newPrefixHandler(newMockStore(), newErrorLogger(logs),
 		routetable.New(routetable.Params{}), longerThanAnyTest,
 		maxTableChangesPerWrite)
 	defer stopInTime(t, h)
 	release := holdUpPeersDown(h)
 	h.HandleMessage(sessionDown())
 	for range heldMessages {
 		h.HandleMessage(peerAnnouncement(testPeerIP, badPrefix))
 	}
 	close(release)
 	select {
 	case <-logs.firstWrite:
 	case <-time.After(stepTimeout):
 		t.Fatal("the handler did not start to apply the held-back messages")
 	}
 	if !returnsInTime(func() {
 		h.HandleMessage(peerAnnouncement(secondPeerIP, otherV4Prefix))
 	}) {
 		t.Fatalf("HandleMessage did not return within %s", stepTimeout)
 	}
 	h.mu.Lock()
 	left := len(h.heldBack[testPeerIP])
 	h.mu.Unlock()
 	if left == 0 {
 		t.Error("the handler took another peer's announcement only once it " +
 			"had applied every held-back message")
 	}
 }
 // TestPrefixHandlerWaitsAtTheMaximumHeldBack holds up the PeersDown of a peer
 // whose session went down. It hands the handler maxHeldBackMessages messages
 // of that peer. HandleMessage must then wait, even for another peer's
 // message, until the PeersDown returns and a held-back message is applied.
 func TestPrefixHandlerWaitsAtTheMaximumHeldBack(t *testing.T) {
 	t.Parallel()
 	h := newPrefixHandler(newMockStore(), logger.New(),
 		routetable.New(routetable.Params{}), longerThanAnyTest,
 		maxTableChangesPerWrite)
 	defer stopInTime(t, h)
 	release := holdUpPeersDown(h)
 	h.HandleMessage(sessionDown())
 	held := peerAnnouncement(testPeerIP, testV6Prefix)
 	for range maxHeldBackMessages {
 		h.HandleMessage(held)
 	}
 	returned := make(chan struct{})
 	go func() {
 		h.HandleMessage(peerAnnouncement(secondPeerIP, otherV4Prefix))
 		close(returned)
 	}()
 	select {
 	case <-returned:
 		t.Error("HandleMessage returned while maxHeldBackMessages messages " +
 			"were held back")
 	case <-time.After(stillWaitingAfter):
 	}
 	close(release)
 	select {
 	case <-returned:
 	case <-time.After(stepTimeout):
 		t.Fatal("HandleMessage did not return after the PeersDown returned")
 	}
 }
 // slowWriter takes a millisecond over each write and drops what it is given.
 // It closes firstWrite at the first write.
 type slowWriter struct {
 	firstWrite chan struct{}
 	once       sync.Once
 }
 func (w *slowWriter) Write(p []byte) (int, error) {
 	w.once.Do(func() { close(w.firstWrite) })
 	time.Sleep(time.Millisecond)
 	return len(p), nil
 }
 // TestPrefixHandlerAppliesAPathWithoutAnOriginToTheRoutingTable hands the
 // prefix handler announcements whose AS path gives no origin. One whose path
 // is empty or holds AS 0 removes the peer's route, as a withdrawal does; one
@@ -554,9 +198,8 @@ func TestPrefixHandlerKeepsThePathOfAPathEndingInASet(t *testing.T) {
 	}
 }
-// checkTableCases hands the messages of each case to a new prefix handler. It
+// checkTableCases hands the messages of each case to a new prefix handler and
-// checks the handler's routing table once the handler's PeersDown calls have
+// checks its routing table right after, with no flush.
 // returned, with no flush.
 func checkTableCases(t *testing.T, tests []tableCase) {
 	t.Helper()
@@ -569,26 +212,15 @@ func checkTableCases(t *testing.T, tests []tableCase) {
 				h.HandleMessage(msg)
 			}
-			h.peerDowns.Wait()
+			for prefix, want := range tt.want {
-			checkTableOrigins(t, h.table, tt.want)
+				got := tableOrigins(h.table, prefix)
-		})
+				if !reflect.DeepEqual(got, want) {
 	}
 }
 // checkTableOrigins checks, for each prefix in want, the peers that carry it
 // in table with each origin AS.
 func checkTableOrigins(
 	t *testing.T, table *routetable.Table, want map[string]map[int][]string,
 ) {
 	t.Helper()
 	for prefix, wantOrigins := range want {
 		got := tableOrigins(table, prefix)
 		if !reflect.DeepEqual(got, wantOrigins) {
 					t.Errorf("peers of %s by origin AS = %v, want %v",
-				prefix, got, wantOrigins)
+						prefix, got, want)
 				}
 			}
 		})
 	}
 }
 // tableWritesStore is a real database that hands each write of the routing
@@ -644,9 +276,9 @@ func TestPrefixHandlerWritesTheTableChangesEachSecond(t *testing.T) {
 				t.Fatalf("wrote %+v, want the pair of %s and AS%d with "+
 					"removed %t", changes, prefix, testASNB, step.wantRemoved)
 			}
-		case <-time.After(stepTimeout):
+		case <-time.After(tableWriteTimeout):
 			t.Fatalf("the routing table's change was not written within %s",
-				stepTimeout)
+				tableWriteTimeout)
 		}
 	}
 }
@@ -743,32 +375,25 @@ func (s *tableWriteSizesStore) WriteRouteChanges(
 // takes, then flushes three times. The first write must hold as many pairs as
 // one write takes, and the peer. The second must hold the other pairs, and the
 // third flush must write nothing. The database must then hold the table in
-// memory. The handler's limit is small, and its timer does not fire.
+// memory.
 func TestPrefixHandlerWritesManyTableChangesOverSeveralFlushes(t *testing.T) {
 	t.Parallel()
 	const (
-		pairs   = testMaxTableChangesPerWrite * 3 / 2
+		pairs   = maxTableChangesPerWrite * 3 / 2
 		flushes = 3
 	)
 	db := newTestDatabase(t)
 	store := &tableWriteSizesStore{Database: db}
-	table := routetable.New(routetable.Params{})
+	h := prefixHandlerWithoutTimer(store)
-	announceManyPrefixes(table, pairs)
+	announceManyPrefixes(h.table, pairs)
 	h := newPrefixHandler(store, logger.New(), table, longerThanAnyTest,
 		testMaxTableChangesPerWrite)
 	defer stopInTime(t, h)
 	for range flushes {
 		h.flushBatch()
 	}
-	wantChanges := []int{
+	wantChanges := []int{maxTableChangesPerWrite, pairs - maxTableChangesPerWrite}
 		testMaxTableChangesPerWrite, pairs - testMaxTableChangesPerWrite,
 	}
 	wantNewPeers := []int{1, 0}
 	if !slices.Equal(store.changes, wantChanges) ||
@@ -790,11 +415,11 @@ func TestPrefixHandlerWritesManyTableChangesOverSeveralFlushes(t *testing.T) {
 // takes. Its last flush writes one write's worth, so Stop must log the pairs
 // that no write took, and must not say that the stop deadline passed. The
 // flush timer must not fire, or its writes could leave no pairs for Stop to
-// log. The handler's limit of one write is small.
+// log.
 func TestPrefixHandlerStopLogsTheTableChangesLeftUnwritten(t *testing.T) {
 	t.Parallel()
-	const pairs = testMaxTableChangesPerWrite + 1
+	const pairs = maxTableChangesPerWrite + 1
 	var logs bytes.Buffer
@@ -802,8 +427,7 @@ func TestPrefixHandlerStopLogsTheTableChangesLeftUnwritten(t *testing.T) {
 	table := routetable.New(routetable.Params{})
 	announceManyPrefixes(table, pairs)
-	h := newPrefixHandler(store, newErrorLogger(&logs), table, longerThanAnyTest,
+	h := newPrefixHandler(store, newErrorLogger(&logs), table, longerThanAnyTest)
 		testMaxTableChangesPerWrite)
 	h.Stop(t.Context())
 	written := 0
@@ -865,7 +489,6 @@ func TestARestartReadsTheRoutingTableBack(t *testing.T) {
 		h.HandleMessage(msg)
 	}
 	h.peerDowns.Wait()
 	h.flushBatch()
 	var logs bytes.Buffer
@@ -904,7 +527,6 @@ func TestARestartReadsTheRoutingTableBack(t *testing.T) {
 		restarted.HandleMessage(msg)
 	}
 	h.peerDowns.Wait()
 	restarted.Stop(t.Context())
 	read, err := db.ReadRouteTable(t.Context())
@@ -23,6 +23,7 @@ import (
 	"git.eeqj.de/sneak/routewatch/internal/streamer"
 	"git.eeqj.de/sneak/routewatch/internal/templates"
 	asinfo "git.eeqj.de/sneak/routewatch/pkg/asinfo"
 	"github.com/dustin/go-humanize"
 	"github.com/go-chi/chi/v5"
 )
@@ -82,7 +83,7 @@ const (
 	maxASSearchResults = 50
 )
-// IP versions as LiveRoute.IPVersion records them.
+// IP versions as database.LiveRoute.IPVersion records them.
 const (
 	ipVersionV4 = 4
 	ipVersionV6 = 6
@@ -159,7 +160,6 @@ func (s *Server) handleIndex() http.HandlerFunc {
 		err := tmpl.Execute(w, indexPageData{
 			CSPNonce: cspNonce(r.Context()),
 			ClientIP: extractClientIP(r),
 			Cards:    s.cards.Load(),
 		})
 		if err != nil {
 			s.logger.Error("Failed to render index template", "error", err)
@@ -181,9 +181,6 @@ type indexPageData struct {
 	// ClientIP is the visitor's address, which the IP information API card
 	// looks up: the address /ip/ would look up for the same request.
 	ClientIP string
 	// Cards is the copy of the cards that show figures of the routing table,
 	// or nil before the server has first worked them out.
 	Cards *homeCards
 }
 // writeJSONError writes a standardized JSON error response with the given
@@ -225,23 +222,18 @@ type WHOISStatsInfo struct {
 	NeverFetched      int     `json:"never_fetched"`
 	SuccessesLastHour int     `json:"successes_last_hour"`
 	ErrorsLastHour    int     `json:"errors_last_hour"`
 	CurrentInterval   string  `json:"current_interval"`
 	ConsecutiveFails  int     `json:"consecutive_fails"`
 	FreshPercent      float64 `json:"fresh_percent"`
 	// CurrentIntervalSeconds is the wait between two fetches. It can have a
 	// fractional part, such as 22.5.
 	CurrentIntervalSeconds float64 `json:"current_interval_seconds"`
 }
 // Stats is the /status.json answer: uptime, message counts, database stats,
-// and the routing table's figures. UptimeSeconds is the time since the stream
+// and the routing table's figures. OldestRoute and NewestRoute are the times
-// last connected, or 0 if it has never connected. MemoryUsageBytes is the Go
+// of the oldest and the newest kept routes.
 // heap in use. OldestRoute and NewestRoute are the times of the oldest and the
 // newest kept routes.
 //
 //nolint:tagliatelle // field names are the existing JSON API
 type Stats struct {
-	UptimeSeconds          int64                `json:"uptime_seconds"`
+	Uptime                 string                        `json:"uptime"`
 	TotalMessages          uint64                        `json:"total_messages"`
 	TotalBytes             uint64                        `json:"total_bytes"`
 	TotalWireBytes         uint64                        `json:"total_wire_bytes"`
@@ -251,7 +243,7 @@ type Stats struct {
 	Connected              bool                          `json:"connected"`
 	GoVersion              string                        `json:"go_version"`
 	Goroutines             int                           `json:"goroutines"`
-	MemoryUsageBytes       uint64               `json:"memory_usage_bytes"`
+	MemoryUsage            string                        `json:"memory_usage"`
 	ASNs                   int                           `json:"asns"`
 	Prefixes               int                           `json:"prefixes"`
 	IPv4Prefixes           int                           `json:"ipv4_prefixes"`
@@ -266,8 +258,8 @@ type Stats struct {
 	NewestRoute            *time.Time                    `json:"newest_route,omitempty"`
 	IPv4UpdatesPerSec      float64                       `json:"ipv4_updates_per_sec"`
 	IPv6UpdatesPerSec      float64                       `json:"ipv6_updates_per_sec"`
-	IPv4PrefixDistribution []PrefixDistribution `json:"ipv4_prefix_distribution"`
+	IPv4PrefixDistribution []database.PrefixDistribution `json:"ipv4_prefix_distribution"`
-	IPv6PrefixDistribution []PrefixDistribution `json:"ipv6_prefix_distribution"`
+	IPv6PrefixDistribution []database.PrefixDistribution `json:"ipv6_prefix_distribution"`
 	WHOISStats             *WHOISStatsInfo               `json:"whois_stats,omitempty"`
 	// OriginsWithoutKeptRoute counts the prefix and origin AS pairs that peers
@@ -366,7 +358,7 @@ func (s *Server) statusStats(
 	runtime.ReadMemStats(&memStats)
 	return Stats{
-		UptimeSeconds:          uptimeSeconds(streamMetrics.ConnectedSince),
+		Uptime:                 streamUptime(streamMetrics.ConnectedSince),
 		TotalMessages:          streamMetrics.TotalMessages,
 		TotalBytes:             streamMetrics.TotalBytes,
 		TotalWireBytes:         streamMetrics.TotalWireBytes,
@@ -376,7 +368,7 @@ func (s *Server) statusStats(
 		Connected:              streamMetrics.Connected,
 		GoVersion:              runtime.Version(),
 		Goroutines:             runtime.NumGoroutine(),
-		MemoryUsageBytes:       memStats.Alloc,
+		MemoryUsage:            humanize.Bytes(memStats.Alloc),
 		ASNs:                   dbStats.ASNs,
 		Prefixes:               counts.IPv4Prefixes + counts.IPv6Prefixes,
 		IPv4Prefixes:           counts.IPv4Prefixes,
@@ -402,12 +394,12 @@ func (s *Server) statusStats(
 // prefixDistribution lists the mask lengths that have at least one prefix, in
 // ascending order, with their prefix counts. countsByLength[n] is the number
 // of prefixes of mask length n.
-func prefixDistribution(countsByLength []int) []PrefixDistribution {
+func prefixDistribution(countsByLength []int) []database.PrefixDistribution {
-	var distribution []PrefixDistribution
+	var distribution []database.PrefixDistribution
 	for maskLength, count := range countsByLength {
 		if count > 0 {
-			distribution = append(distribution, PrefixDistribution{
+			distribution = append(distribution, database.PrefixDistribution{
 				MaskLength: maskLength, Count: count,
 			})
 		}
@@ -443,31 +435,30 @@ func (s *Server) getWHOISStats(ctx context.Context) *WHOISStatsInfo {
 		NeverFetched:      dbStats.NeverFetched,
 		SuccessesLastHour: fetcherStats.SuccessesLastHour,
 		ErrorsLastHour:    fetcherStats.ErrorsLastHour,
 		CurrentInterval:   fetcherStats.CurrentInterval.String(),
 		ConsecutiveFails:  fetcherStats.ConsecutiveFails,
 		FreshPercent:      freshPercent,
 		CurrentIntervalSeconds: fetcherStats.CurrentInterval.Seconds(),
 	}
 }
-// uptimeSeconds is the number of whole seconds since the stream last
+// streamUptime is how long the stream has been connected, to the second, or
-// connected, or 0 if it has never connected.
+// "0s" if it has never connected.
-func uptimeSeconds(connectedSince time.Time) int64 {
+func streamUptime(connectedSince time.Time) string {
 	if connectedSince.IsZero() {
-		return 0
+		return "0s"
 	}
-	return int64(time.Since(connectedSince) / time.Second)
+	return time.Since(connectedSince).Truncate(time.Second).String()
 }
-// connectionDurationSeconds is the number of whole seconds the stream has
+// connectionDuration is how long the stream has been connected, to the
-// been connected, or nil while it is not connected.
+// second, or "disconnected".
-func connectionDurationSeconds(connected bool, connectedSince time.Time) *int64 {
+func connectionDuration(connected bool, connectedSince time.Time) string {
 	if !connected || connectedSince.IsZero() {
-		return nil
+		return "disconnected"
 	}
-	return new(uptimeSeconds(connectedSince))
+	return time.Since(connectedSince).Truncate(time.Second).String()
 }
 // whoisStaleThreshold matches the fetcher's threshold for consistency.
@@ -486,7 +477,6 @@ type HandlerStatsInfo struct {
 	QueueHighWaterMark int     `json:"queue_high_water_mark"`
 	ProcessedCount     uint64  `json:"processed_count"`
 	DroppedCount       uint64  `json:"dropped_count"`
 	HeldBackCount      int     `json:"held_back_count"`
 	AvgProcessTimeMs   float64 `json:"avg_process_time_ms"`
 	MinProcessTimeMs   float64 `json:"min_process_time_ms"`
 	MaxProcessTimeMs   float64 `json:"max_process_time_ms"`
@@ -518,7 +508,7 @@ type StreamStats struct {
 //
 //nolint:tagliatelle // field names are the existing JSON API
 type StatsResponse struct {
-	UptimeSeconds          int64                `json:"uptime_seconds"`
+	Uptime                 string                        `json:"uptime"`
 	TotalMessages          uint64                        `json:"total_messages"`
 	TotalBytes             uint64                        `json:"total_bytes"`
 	TotalWireBytes         uint64                        `json:"total_wire_bytes"`
@@ -526,10 +516,11 @@ type StatsResponse struct {
 	MbitsPerSec            float64                       `json:"mbits_per_sec"`
 	WireMbitsPerSec        float64                       `json:"wire_mbits_per_sec"`
 	Connected              bool                          `json:"connected"`
 	ConnectionDuration     string                        `json:"connection_duration"`
 	ReconnectCount         uint64                        `json:"reconnect_count"`
 	GoVersion              string                        `json:"go_version"`
 	Goroutines             int                           `json:"goroutines"`
-	MemoryUsageBytes       uint64               `json:"memory_usage_bytes"`
+	MemoryUsage            string                        `json:"memory_usage"`
 	GC                     GCStats                       `json:"gc"`
 	Stream                 StreamStats                   `json:"stream"`
 	ASNs                   int                           `json:"asns"`
@@ -547,13 +538,10 @@ type StatsResponse struct {
 	IPv4UpdatesPerSec      float64                       `json:"ipv4_updates_per_sec"`
 	IPv6UpdatesPerSec      float64                       `json:"ipv6_updates_per_sec"`
 	HandlerStats           []HandlerStatsInfo            `json:"handler_stats"`
-	IPv4PrefixDistribution []PrefixDistribution `json:"ipv4_prefix_distribution"`
+	IPv4PrefixDistribution []database.PrefixDistribution `json:"ipv4_prefix_distribution"`
-	IPv6PrefixDistribution []PrefixDistribution `json:"ipv6_prefix_distribution"`
+	IPv6PrefixDistribution []database.PrefixDistribution `json:"ipv6_prefix_distribution"`
 	WHOISStats             *WHOISStatsInfo               `json:"whois_stats,omitempty"`
 	// ConnectionDurationSeconds is null while the stream is not connected.
 	ConnectionDurationSeconds *int64 `json:"connection_duration_seconds"`
 	OriginsWithoutKeptRoute int `json:"origins_without_kept_route"`
 }
@@ -571,7 +559,6 @@ func handlerStatsInfo(handlerStats []streamer.HandlerStats) []HandlerStatsInfo {
 			QueueHighWaterMark: hs.QueueHighWaterMark,
 			ProcessedCount:     hs.ProcessedCount,
 			DroppedCount:       hs.DroppedCount,
 			HeldBackCount:      hs.HeldBackCount,
 			AvgProcessTimeMs: float64(hs.AvgProcessTime.Microseconds()) /
 				microsecondsPerMillisecond,
 			MinProcessTimeMs: float64(hs.MinProcessTime.Microseconds()) /
@@ -693,7 +680,7 @@ func (s *Server) statsResponse(
 	runtime.ReadMemStats(&memStats)
 	return StatsResponse{
-		UptimeSeconds:          uptimeSeconds(streamMetrics.ConnectedSince),
+		Uptime:          streamUptime(streamMetrics.ConnectedSince),
 		TotalMessages:   streamMetrics.TotalMessages,
 		TotalBytes:      streamMetrics.TotalBytes,
 		TotalWireBytes:  streamMetrics.TotalWireBytes,
@@ -701,10 +688,12 @@ func (s *Server) statsResponse(
 		MbitsPerSec:     streamMetrics.BitsPerSec / bitsPerMegabit,
 		WireMbitsPerSec: streamMetrics.WireBitsPerSec / bitsPerMegabit,
 		Connected:       streamMetrics.Connected,
 		ConnectionDuration: connectionDuration(
 			streamMetrics.Connected, streamMetrics.ConnectedSince),
 		ReconnectCount:         streamMetrics.ReconnectCount,
 		GoVersion:              runtime.Version(),
 		Goroutines:             runtime.NumGoroutine(),
-		MemoryUsageBytes:       memStats.Alloc,
+		MemoryUsage:            humanize.Bytes(memStats.Alloc),
 		GC:                     gcStats(&memStats),
 		Stream:                 s.streamStats(),
 		ASNs:                   dbStats.ASNs,
@@ -726,9 +715,6 @@ func (s *Server) statsResponse(
 		IPv6PrefixDistribution: prefixDistribution(counts.IPv6PrefixesByLength),
 		WHOISStats:             whoisStats,
 		ConnectionDurationSeconds: connectionDurationSeconds(
 			streamMetrics.Connected, streamMetrics.ConnectedSince),
 		OriginsWithoutKeptRoute: counts.OriginsWithoutKeptRoute,
 	}
 }
@@ -762,14 +748,15 @@ type IPLookupResponse struct {
 }
 // IPLookupResult is the answer for one address: its PTR names, its live route
-// and that route's AS, and the blocklists that list it. Every result has every
+// and that route's AS, and the blocklists that list it. IPInfo is nil when
-// field. The fields of IPInfo are null when the address has no live route.
+// the address has no live route, and the answer then has no route or AS
 // fields. IP hides the IPInfo field of the same name, so that an address with
 // no route has it too.
 type IPLookupResult struct {
-	IPInfo
+	*database.IPInfo
 	IP  string   `json:"ip"`
-	// PTR is empty, never nil, when the address has no PTR names.
+	PTR []string `json:"ptr,omitempty"`
 	PTR []string `json:"ptr"`
 	// Blocklists has one entry for each blocklist the address is on.
 	Blocklists []blocklist.Listing `json:"blocklists"`
@@ -826,10 +813,10 @@ func (s *Server) handleIPInfo() http.HandlerFunc {
 			}
 			switch {
-			case errors.Is(err, ErrNoRoute):
+			case errors.Is(err, database.ErrNoRoute):
-				// The address still gets a result, with every field of
+				// The address still gets a result, without route fields.
-				// ipInfo null.
+				ipInfo = nil
-			case errors.Is(err, ErrInvalidIP):
+			case errors.Is(err, database.ErrInvalidIP):
 				response.Errors = append(response.Errors, ip+": "+err.Error())
 				continue
@@ -855,8 +842,8 @@ func (s *Server) handleIPInfo() http.HandlerFunc {
 				Blocklists: s.blocklistListings(ip),
 			})
-			if ipInfo.NeedsWHOISRefresh {
+			if ipInfo != nil && ipInfo.NeedsWHOISRefresh {
-				refreshASNs[*ipInfo.ASN] = true
+				refreshASNs[ipInfo.ASN] = true
 			}
 		}
@@ -867,72 +854,60 @@ func (s *Server) handleIPInfo() http.HandlerFunc {
 	}
 }
-// ipInfo returns what the IP lookup knows about the route of ip. The routing
+// ipInfo returns the IP lookup's answer for ip. The routing table gives the
-// table gives the most specific prefix that holds the address, the number of
+// most specific prefix that holds the address, the number of peers that carry
-// peers that carry it, its origin ASes and the one that most peers carry, and
+// it, the origin AS that most of them carry, and the time of its newest kept
-// the time of its newest kept route. The database gives the prefix's
+// route. The database gives the prefix's first-seen time and the AS's WHOIS
-// first-seen time and the AS's WHOIS details. It returns ErrNoRoute when no
+// details. It returns ErrNoRoute when no prefix holds the address, and
-// prefix holds the address, and ErrInvalidIP when ip does not parse. With an
+// ErrInvalidIP when ip does not parse.
-// error, every field of the IPInfo it returns is nil.
+func (s *Server) ipInfo(ctx context.Context, ip string) (*database.IPInfo, error) {
 func (s *Server) ipInfo(ctx context.Context, ip string) (IPInfo, error) {
 	addr, err := netip.ParseAddr(ip)
 	if err != nil {
-		return IPInfo{}, fmt.Errorf("%w: %s", ErrInvalidIP, ip)
+		return nil, fmt.Errorf("%w: %s", database.ErrInvalidIP, ip)
 	}
 	summary, found := s.table.Lookup(addr)
 	if !found {
-		return IPInfo{}, fmt.Errorf("%w for IP %s", ErrNoRoute, ip)
+		return nil, fmt.Errorf("%w for IP %s", database.ErrNoRoute, ip)
 	}
 	firstSeen, err := s.db.GetPrefixFirstSeen(ctx, summary.Prefix)
 	if err != nil {
-		return IPInfo{}, err
+		return nil, err
 	}
 	asInfo, err := s.db.GetASWHOIS(ctx, summary.OriginASN)
 	if err != nil {
-		return IPInfo{}, err
+		return nil, err
 	}
-	info := IPInfo{
+	info := &database.IPInfo{
-		Netblock:          new(summary.Prefix.String()),
+		IP:                ip,
-		MaskLength:        new(summary.Prefix.Bits()),
+		Netblock:          summary.Prefix.String(),
-		IPVersion:         new(ipVersionOf(summary.Prefix)),
+		MaskLength:        summary.Prefix.Bits(),
-		NumPeers:          new(summary.Peers),
+		IPVersion:         ipVersionOf(summary.Prefix),
-		ASN:               new(summary.OriginASN),
+		NumPeers:          summary.Peers,
-		NumOrigins:        new(len(summary.OriginASNs)),
+		ASN:               summary.OriginASN,
-		OriginASNs:        summary.OriginASNs,
+		ASName:            asInfo.ASName,
-		ASName:            nilIfEmpty(asInfo.ASName),
+		Handle:            asInfo.Handle,
-		Handle:            nilIfEmpty(asInfo.Handle),
+		Description:       asInfo.Description,
-		Description:       nilIfEmpty(asInfo.Description),
+		OrgName:           asInfo.OrgName,
-		OrgName:           nilIfEmpty(asInfo.OrgName),
+		OrgID:             asInfo.OrgID,
-		OrgID:             nilIfEmpty(asInfo.OrgID),
+		Address:           asInfo.Address,
-		Address:           nilIfEmpty(asInfo.Address),
+		CountryCode:       asInfo.CountryCode,
-		CountryCode:       nilIfEmpty(asInfo.CountryCode),
+		AbuseEmail:        asInfo.AbuseEmail,
-		AbuseEmail:        nilIfEmpty(asInfo.AbuseEmail),
+		RIR:               asInfo.RIR,
-		RIR:               nilIfEmpty(asInfo.RIR),
+		FirstSeen:         firstSeen,
 		LastSeen:          summary.Newest,
 		NeedsWHOISRefresh: needsWHOISRefresh(asInfo),
 	}
-	if !firstSeen.IsZero() {
+	if summary.Newest != nil {
-		info.FirstSeen = &firstSeen
+		info.LastSeen = *summary.Newest
 	}
 	return info, nil
 }
 // nilIfEmpty returns a pointer to s, or nil when s is empty, so that JSON
 // gives a detail the database does not hold as null.
 func nilIfEmpty(s string) *string {
 	if s == "" {
 		return nil
 	}
 	return &s
 }
 // needsWHOISRefresh says whether the WHOIS details of asInfo were never
 // fetched or are older than whoisStaleThreshold. AS 0, no known origin, has
 // none to fetch.
@@ -1138,17 +1113,15 @@ func publicAddresses(addrs []string) []string {
 	return public
 }
-// lookupPTRNames returns the PTR records of ip without their trailing dots. It
+// lookupPTRNames returns the PTR records of ip without their trailing dots, or
-// returns an empty list, never nil, when there are none, when the lookup fails
+// nil when the lookup fails or runs past ptrLookupTimeout.
 // and when it runs past ptrLookupTimeout, so that an answer's ptr is [] rather
 // than null.
 func (s *Server) lookupPTRNames(ctx context.Context, ip string) []string {
 	ctx, cancel := context.WithTimeout(ctx, ptrLookupTimeout)
 	defer cancel()
 	ptrs, err := s.resolver.LookupAddr(ctx, ip)
-	if err != nil || ptrs == nil {
+	if err != nil {
-		return []string{}
+		return nil
 	}
 	// Remove trailing dots from PTR records
@@ -1192,7 +1165,7 @@ func (s *Server) handleASDetailJSON() http.HandlerFunc {
 		}
 		if err != nil {
-			if errors.Is(err, ErrNoRoute) {
+			if errors.Is(err, database.ErrNoRoute) {
 				s.writeJSONError(w, http.StatusNotFound, err.Error())
 			} else {
 				s.logger.Error("Failed to get AS details", "asn", asn, "error", err)
@@ -1228,9 +1201,9 @@ func (s *Server) handleASDetailJSON() http.HandlerFunc {
 // routing table all lack.
 func (s *Server) asDetails(
 	ctx context.Context, asn int,
-) (*database.ASN, []LiveRoute, error) {
+) (*database.ASN, []database.LiveRoute, error) {
 	if asn == ristypes.NoOrigin {
-		return nil, nil, fmt.Errorf("%w: AS%d", ErrNoRoute, asn)
+		return nil, nil, fmt.Errorf("%w: AS%d", database.ErrNoRoute, asn)
 	}
 	asInfo, known, err := s.db.GetAS(ctx, asn)
@@ -1240,13 +1213,13 @@ func (s *Server) asDetails(
 	originated := s.table.OriginatedPrefixes(asn)
 	if !known && len(originated) == 0 {
-		return nil, nil, fmt.Errorf("%w: AS%d", ErrNoRoute, asn)
+		return nil, nil, fmt.Errorf("%w: AS%d", database.ErrNoRoute, asn)
 	}
-	prefixes := make([]LiveRoute, 0, len(originated))
+	prefixes := make([]database.LiveRoute, 0, len(originated))
 	for _, p := range originated {
-		route := LiveRoute{
+		route := database.LiveRoute{
 			Prefix:     p.Prefix.String(),
 			MaskLength: p.Prefix.Bits(),
 			IPVersion:  ipVersionOf(p.Prefix),
@@ -1266,9 +1239,9 @@ func (s *Server) asDetails(
 // splitRoutesByIPVersion groups routes into the IPv4 and the IPv6 ones. Neither
 // group is nil, so that a JSON answer holds [] for an empty one and not null.
 func splitRoutesByIPVersion(
-	routes []LiveRoute,
+	routes []database.LiveRoute,
-) ([]LiveRoute, []LiveRoute) {
+) ([]database.LiveRoute, []database.LiveRoute) {
-	ipv4Routes, ipv6Routes := []LiveRoute{}, []LiveRoute{}
+	ipv4Routes, ipv6Routes := []database.LiveRoute{}, []database.LiveRoute{}
 	for _, route := range routes {
 		if route.IPVersion == ipVersionV4 {
@@ -1283,8 +1256,8 @@ func splitRoutesByIPVersion(
 // sortRoutesByMaskLength sorts routes by mask length, shortest first, and
 // routes with the same mask length by network address.
-func sortRoutesByMaskLength(routes []LiveRoute) {
+func sortRoutesByMaskLength(routes []database.LiveRoute) {
-	slices.SortFunc(routes, func(a, b LiveRoute) int {
+	slices.SortFunc(routes, func(a, b database.LiveRoute) int {
 		prefixA, _ := netip.ParsePrefix(a.Prefix)
 		prefixB, _ := netip.ParsePrefix(b.Prefix)
@@ -1321,7 +1294,7 @@ func (s *Server) handlePrefixDetailJSON() http.HandlerFunc {
 		origins := s.table.Origins(parsed)
 		if len(origins) == 0 {
 			s.writeJSONError(w, http.StatusNotFound,
-				ErrNoRoute.Error()+": "+prefix)
+				database.ErrNoRoute.Error()+": "+prefix)
 			return
 		}
@@ -1329,7 +1302,7 @@ func (s *Server) handlePrefixDetailJSON() http.HandlerFunc {
 		routes := prefixRoutes(parsed, origins)
 		// Group by origin AS
-		originMap := make(map[int][]LiveRoute)
+		originMap := make(map[int][]database.LiveRoute)
 		for _, route := range routes {
 			originMap[route.OriginASN] = append(originMap[route.OriginASN], route)
 		}
@@ -1419,7 +1392,7 @@ func (s *Server) handleASDetail() http.HandlerFunc {
 		}
 		if err != nil {
-			if errors.Is(err, ErrNoRoute) {
+			if errors.Is(err, database.ErrNoRoute) {
 				http.Error(w, "AS not found", http.StatusNotFound)
 			} else {
 				s.logger.Error("Failed to get AS details", "error", err)
@@ -1452,8 +1425,8 @@ func (s *Server) handleASDetail() http.HandlerFunc {
 		// Prepare template data
 		data := struct {
 			ASN          *database.ASN
-			IPv4Prefixes []LiveRoute
+			IPv4Prefixes []database.LiveRoute
-			IPv6Prefixes []LiveRoute
+			IPv6Prefixes []database.LiveRoute
 			TotalCount   int
 			IPv4Count    int
 			IPv6Count    int
@@ -1612,11 +1585,11 @@ func (s *Server) originASNs(
 // them, since the routing table keeps only their addresses.
 func prefixRoutes(
 	prefix netip.Prefix, origins []routetable.Origin,
-) []LiveRoute {
+) []database.LiveRoute {
-	var routes []LiveRoute
+	var routes []database.LiveRoute
 	for _, origin := range origins {
-		base := LiveRoute{
+		base := database.LiveRoute{
 			Prefix:     prefix.String(),
 			MaskLength: prefix.Bits(),
 			IPVersion:  ipVersionOf(prefix),
@@ -1657,14 +1630,14 @@ type ASPathEntry struct {
 // EnhancedRoute is a live route with the handle of each AS in its path.
 type EnhancedRoute struct {
-	LiveRoute
+	database.LiveRoute
 	ASPathWithHandle []ASPathEntry
 }
 // routesWithASPathHandles looks up the handle of each AS in the path of each
 // route.
-func routesWithASPathHandles(routes []LiveRoute) []EnhancedRoute {
+func routesWithASPathHandles(routes []database.LiveRoute) []EnhancedRoute {
 	enhancedRoutes := make([]EnhancedRoute, len(routes))
 	for i, route := range routes {
@@ -1763,7 +1736,7 @@ func (s *Server) prefixLengthHandler(ipVersion, maxMaskLength int) http.HandlerF
 // EnhancedPrefix is a prefix on the prefix length page, with the origin AS
 // that most peers carry it with, that AS's description, and its age.
 type EnhancedPrefix struct {
-	LiveRoute
+	database.LiveRoute
 	OriginASDescription string
 	Age                 string
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"html"
 	"maps"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -73,8 +72,8 @@ func emptyTable() *routetable.Table {
 // Paths several tests request.
 const (
 	asPagePath           = "/as/64500"
 	asJSONPath           = "/api/v1/as/64500"
 	prefixLengthPagePath = "/prefixlength/24"
 	statusJSONPath       = "/status.json"
 	statsPath            = "/api/v1/stats"
 )
@@ -159,8 +158,8 @@ type tableStats struct {
 	OldestRoute             time.Time `json:"oldest_route"`
 	NewestRoute             time.Time `json:"newest_route"`
-	IPv4Distribution []PrefixDistribution `json:"ipv4_prefix_distribution"`
+	IPv4Distribution []database.PrefixDistribution `json:"ipv4_prefix_distribution"`
-	IPv6Distribution []PrefixDistribution `json:"ipv6_prefix_distribution"`
+	IPv6Distribution []database.PrefixDistribution `json:"ipv6_prefix_distribution"`
 }
 // TestStatsHandlersAnswerFromMemory checks that both stats handlers answer 200
@@ -212,8 +211,8 @@ func TestStatsHandlersAnswerFromMemory(t *testing.T) {
 		OriginsWithoutKeptRoute: 1,
 		OldestRoute:             testRouteTime(0),
 		NewestRoute:             testRouteTime(4),
-		IPv4Distribution:        []PrefixDistribution{{MaskLength: 24, Count: 2}},
+		IPv4Distribution:        []database.PrefixDistribution{{MaskLength: 24, Count: 2}},
-		IPv6Distribution:        []PrefixDistribution{{MaskLength: 32, Count: 1}},
+		IPv6Distribution:        []database.PrefixDistribution{{MaskLength: 32, Count: 1}},
 	}
 	for name, handler := range handlers {
@@ -295,204 +294,6 @@ func TestStatsAnswerCarriesChurnPerMinute(t *testing.T) {
 	}
 }
 // heldBackMessages is how many messages heldBackHandler holds back.
 const heldBackMessages = 7
 // heldBackHandler is a stream handler that wants no message and holds back
 // heldBackMessages messages.
 type heldBackHandler struct{}
 func (heldBackHandler) WantsMessage(string) bool           { return false }
 func (heldBackHandler) HandleMessage(*ristypes.RISMessage) {}
 func (heldBackHandler) QueueCapacity() int                 { return 1 }
 func (heldBackHandler) HeldBackCount() int                 { return heldBackMessages }
 // TestStatsAnswerGivesHowManyMessagesAHandlerHoldsBack registers a handler
 // that holds back messages. Its figures in /api/v1/stats, which the status
 // page shows, must give how many.
 func TestStatsAnswerGivesHowManyMessagesAHandlerHoldsBack(t *testing.T) {
 	t.Parallel()
 	s := newServerWithTestRoutes(t)
 	s.streamer.RegisterHandler(heldBackHandler{})
 	var body struct {
 		Data StatsResponse `json:"data"`
 	}
 	err := json.Unmarshal(get(t, s, statsPath).Body.Bytes(), &body)
 	if err != nil {
 		t.Fatalf("decoding the answer: %v", err)
 	}
 	stats := body.Data.HandlerStats
 	if len(stats) != 1 || stats[0].HeldBackCount != heldBackMessages {
 		t.Errorf("handler figures %+v, want one handler holding back %d "+
 			"messages", stats, heldBackMessages)
 	}
 }
 // fixedIntervalASNFetcher is a WHOIS fetcher that does nothing and reports
 // interval as its wait between fetches.
 type fixedIntervalASNFetcher struct {
 	idleASNFetcher
 	interval time.Duration
 }
 func (f fixedIntervalASNFetcher) GetStats() ASNFetcherStats {
 	return ASNFetcherStats{CurrentInterval: f.interval}
 }
 // unitStats holds the figures of a stats answer that carry a unit. Each is a
 // pointer, so that a figure missing from the answer is nil.
 //
 //nolint:tagliatelle // field names are the existing JSON API
 type unitStats struct {
 	UptimeSeconds    *int64  `json:"uptime_seconds"`
 	MemoryUsageBytes *uint64 `json:"memory_usage_bytes"`
 	WHOISStats       struct {
 		CurrentIntervalSeconds *float64 `json:"current_interval_seconds"`
 	} `json:"whois_stats"`
 	GC struct {
 		HeapAllocBytes uint64 `json:"heap_alloc_bytes"`
 	} `json:"gc"`
 }
 // TestStatsAnswersGiveUnitsInFieldNames checks that the figures of both stats
 // answers that carry a unit are numbers, with the unit at the end of their
 // names. They used to be strings with the unit in them, such as "1h18m34s" or
 // "1.1 GB" (https://git.eeqj.de/sneak/routewatch/issues/199). The stream has
 // never connected, so the uptime is 0. The memory use in /api/v1/stats is the
 // same number of bytes as its gc.heap_alloc_bytes.
 func TestStatsAnswersGiveUnitsInFieldNames(t *testing.T) {
 	t.Parallel()
 	const fetchInterval = 18200 * time.Millisecond
 	s := newServerWithTestRoutes(t)
 	s.SetASNFetcher(fixedIntervalASNFetcher{interval: fetchInterval})
 	for _, path := range []string{statusJSONPath, statsPath} {
 		answer := get(t, s, path).Body.Bytes()
 		var body struct {
 			Data unitStats `json:"data"`
 		}
 		err := json.Unmarshal(answer, &body)
 		if err != nil {
 			t.Errorf("%s: figures are not numbers: %v; answer %s", path, err, answer)
 			continue
 		}
 		got := body.Data
 		if got.UptimeSeconds == nil || *got.UptimeSeconds != 0 {
 			t.Errorf("%s: uptime_seconds is not 0: %s", path, answer)
 		}
 		if got.MemoryUsageBytes == nil || *got.MemoryUsageBytes == 0 {
 			t.Errorf("%s: memory_usage_bytes is not a number of bytes: %s",
 				path, answer)
 		}
 		interval := got.WHOISStats.CurrentIntervalSeconds
 		if interval == nil || *interval != fetchInterval.Seconds() {
 			t.Errorf("%s: whois_stats.current_interval_seconds is not %v: %s",
 				path, fetchInterval.Seconds(), answer)
 		}
 		if path == statsPath && got.MemoryUsageBytes != nil &&
 			*got.MemoryUsageBytes != got.GC.HeapAllocBytes {
 			t.Errorf("%s: memory_usage_bytes %d, want gc.heap_alloc_bytes %d",
 				path, *got.MemoryUsageBytes, got.GC.HeapAllocBytes)
 		}
 	}
 }
 // TestStatsAnswerGivesConnectionDurationInSeconds checks that the
 // connection_duration_seconds of /api/v1/stats is null while the stream is not
 // connected, and a whole number of seconds once it is. It used to be the
 // string "disconnected", or a Go duration such as "1h18m34s"
 // (https://git.eeqj.de/sneak/routewatch/issues/199).
 func TestStatsAnswerGivesConnectionDurationInSeconds(t *testing.T) {
 	t.Parallel()
 	s := newServerWithTestRoutes(t)
 	connectionDuration := func() json.RawMessage {
 		answer := get(t, s, statsPath).Body.Bytes()
 		var body struct {
 			Data map[string]json.RawMessage `json:"data"`
 		}
 		err := json.Unmarshal(answer, &body)
 		if err != nil {
 			t.Fatalf("decoding the answer: %v; answer %s", err, answer)
 		}
 		duration, ok := body.Data["connection_duration_seconds"]
 		if !ok {
 			t.Fatalf("no connection_duration_seconds: %s", answer)
 		}
 		return duration
 	}
 	disconnected := connectionDuration()
 	if string(disconnected) != "null" {
 		t.Errorf("disconnected: connection_duration_seconds = %s, want null",
 			disconnected)
 	}
 	s.streamer.GetMetricsTracker().SetConnected(true)
 	var seconds int64
 	connected := connectionDuration()
 	err := json.Unmarshal(connected, &seconds)
 	if err != nil || seconds != 0 {
 		t.Errorf("just connected: connection_duration_seconds = %s, want 0",
 			connected)
 	}
 }
 // TestStreamDurationsCountSeconds checks that the uptime and the connection
 // duration of a stream that connected 90 seconds ago are both 90. A stream
 // that has never connected has an uptime of 0, and one that is not connected
 // has no connection duration.
 func TestStreamDurationsCountSeconds(t *testing.T) {
 	t.Parallel()
 	const connectedFor = 90 * time.Second
 	connectedSince := time.Now().Add(-connectedFor)
 	want := int64(connectedFor / time.Second)
 	if got := uptimeSeconds(connectedSince); got != want {
 		t.Errorf("uptimeSeconds = %d, want %d", got, want)
 	}
 	if got := uptimeSeconds(time.Time{}); got != 0 {
 		t.Errorf("uptimeSeconds before any connection = %d, want 0", got)
 	}
 	switch got := connectionDurationSeconds(true, connectedSince); {
 	case got == nil:
 		t.Errorf("connectionDurationSeconds = nil, want %d", want)
 	case *got != want:
 		t.Errorf("connectionDurationSeconds = %d, want %d", *got, want)
 	}
 	if got := connectionDurationSeconds(false, connectedSince); got != nil {
 		t.Errorf("connectionDurationSeconds while not connected = %d, want nil",
 			*got)
 	}
 }
 // newTestTable returns a routing table that holds a route for testPrefixV4,
 // with origin AS 64500, and one for testPrefixV6, with origin AS 64501.
 func newTestTable() *routetable.Table {
@@ -964,7 +765,7 @@ func TestRoutesAnswer504WhenDatabaseReadIsCutOff(t *testing.T) {
 		{path: "/ip/" + addrInTestPrefixV4, wantJSONBody: true},
 		{path: statsPath, wantJSONBody: true},
 		{path: "/api/v1/ip/" + addrInTestPrefixV4, wantJSONBody: true},
-		{path: asJSONPath, wantJSONBody: true},
+		{path: "/api/v1/as/64500", wantJSONBody: true},
 	}
 	for _, tt := range tests {
@@ -1145,10 +946,10 @@ func TestJSONRoutesDoNotSendErrorDetails(t *testing.T) {
 		path     string
 		wantCode int
 	}{
-		{healthCheckPath, http.StatusServiceUnavailable},
+		{"/.well-known/healthcheck.json", http.StatusServiceUnavailable},
 		{statusJSONPath, http.StatusInternalServerError},
 		{statsPath, http.StatusInternalServerError},
-		{asJSONPath, http.StatusInternalServerError},
+		{"/api/v1/as/64500", http.StatusInternalServerError},
 		{"/api/v1/ip/" + addrInTestPrefixV4, http.StatusInternalServerError},
 		{"/api/v1/prefix/foo/24", http.StatusBadRequest},
 	}
@@ -1418,8 +1219,7 @@ func TestIPLookupKeepsRouteWhenPTRLookupDoesNotAnswer(t *testing.T) {
 		t.Fatalf("decoding the answer %q: %v", rec.Body, err)
 	}
-	if len(body.Data.Results) != 1 || body.Data.Results[0].Netblock == nil ||
+	if len(body.Data.Results) != 1 || body.Data.Results[0].Netblock != testPrefixV4 {
 		*body.Data.Results[0].Netblock != testPrefixV4 {
 		t.Errorf("answer %s, want one result in %s", rec.Body, testPrefixV4)
 	}
 }
@@ -1511,39 +1311,12 @@ func TestIPLookupReportsBlocklists(t *testing.T) {
 	}
 }
 // jsonNull is how JSON writes a field without a value.
 const jsonNull = "null"
 // jsonEmptyList is how JSON writes an empty list.
 const jsonEmptyList = "[]"
 // resultFields decodes an IP lookup answer and returns each of its results as
 // its JSON fields.
 func resultFields(t *testing.T, answer []byte) []map[string]json.RawMessage {
 	t.Helper()
 	var body struct {
 		Data struct {
 			Results []map[string]json.RawMessage `json:"results"`
 		} `json:"data"`
 	}
 	err := json.Unmarshal(answer, &body)
 	if err != nil {
 		t.Fatalf("decoding the answer %s: %v", answer, err)
 	}
 	return body.Data.Results
 }
 // TestIPLookupReportsBlocklistsOfAnAddressWithNoRoute looks up a listed
 // address that has no live route, alone and beside a routed address. Each
-// answer is 200 and has a result for the address, with its blocklists and
+// answer is 200 and has a result for the address, with its blocklists and no
-// every route field set to null. Before the fix the lookup of that address
+// route fields. Before the fix the lookup of that address alone answered
-// alone answered 404, and beside a routed address it was only named in
+// 404, and beside a routed address it was only named in errors, so its
-// errors, so its blocklists were never reported. After that fix the result
+// blocklists were never reported.
 // still left out the route fields
 // (https://git.eeqj.de/sneak/routewatch/issues/200).
 func TestIPLookupReportsBlocklistsOfAnAddressWithNoRoute(t *testing.T) {
 	t.Parallel()
@@ -1551,15 +1324,6 @@ func TestIPLookupReportsBlocklistsOfAnAddressWithNoRoute(t *testing.T) {
 	s.resolver = &fakeResolver{}
 	s.SetBlocklists(fakeBlocklists{})
 	// routeFields are the fields of a result that come from the address's
 	// route and that route's origin AS.
 	routeFields := []string{
 		"netblock", "mask_length", "ip_version", "num_peers", "asn",
 		"num_origins", "origin_asns", "as_name", "handle", "description",
 		"org_name", "org_id", "address", "country_code", "abuse_email", "rir",
 		"first_seen", "last_seen",
 	}
 	for _, target := range []string{
 		listedUnroutedAddr,
 		addrInTestPrefixV4 + "," + listedUnroutedAddr,
@@ -1590,21 +1354,12 @@ func TestIPLookupReportsBlocklistsOfAnAddressWithNoRoute(t *testing.T) {
 			continue
 		}
 		fields := resultFields(t, rec.Body.Bytes())[i]
 		for _, name := range routeFields {
 			value, present := fields[name]
 			switch {
 			case !present:
 				t.Errorf("%s: the result for %s has no %s",
 					target, listedUnroutedAddr, name)
 			case string(value) != jsonNull:
 				t.Errorf("%s: %s of %s is %s, want %s",
 					target, name, listedUnroutedAddr, value, jsonNull)
 			}
 		}
 		result := body.Data.Results[i]
 		if result.IPInfo != nil {
 			t.Errorf("%s: result for %s has route fields %+v",
 				target, listedUnroutedAddr, result.IPInfo)
 		}
 		if len(result.Blocklists) != 1 ||
 			result.Blocklists[0].Name != testListing().Name {
 			t.Errorf("%s: blocklists %+v, want [%+v]",
@@ -1613,76 +1368,6 @@ func TestIPLookupReportsBlocklistsOfAnAddressWithNoRoute(t *testing.T) {
 	}
 }
 // twoAddressHostName is a host name that resolves to addrInTestPrefixV4 and
 // listedUnroutedAddr.
 const twoAddressHostName = "two-addresses.test"
 // TestIPLookupResultsHaveTheSameFields looks up a host name, addresses and
 // the caller's own address, through each IP lookup route. Some of the
 // addresses have a route and some do not, and none has PTR names. Every
 // result has the same fields. Before the fix a result left out every field
 // without a value (https://git.eeqj.de/sneak/routewatch/issues/200).
 func TestIPLookupResultsHaveTheSameFields(t *testing.T) {
 	t.Parallel()
 	s := newServerWithTestRoutes(t)
 	s.resolver = &fakeResolver{hosts: map[string][]string{
 		twoAddressHostName: {addrInTestPrefixV4, listedUnroutedAddr},
 	}}
 	s.SetBlocklists(fakeBlocklists{})
 	// want is the fields of the first result.
 	var want []string
 	for _, path := range []string{
 		"/api/v1/ip/" + twoAddressHostName,
 		"/ip/" + addrInTestPrefixV6 + "," + listedUnroutedAddr,
 		ownAddressPath,
 	} {
 		for _, result := range resultFields(t, get(t, s, path).Body.Bytes()) {
 			got := slices.Sorted(maps.Keys(result))
 			if want == nil {
 				want = got
 			}
 			if !slices.Equal(got, want) {
 				t.Errorf("%s: a result has the fields %v, want %v", path, got, want)
 			}
 		}
 	}
 }
 // TestIPLookupOfAnAddressWithoutPTRNamesOrStoredNetblock looks up a routed
 // address that has no PTR names, and whose netblock the database has not
 // stored. Its ptr is an empty list and its first_seen is null. Before the fix
 // ptr was left out, and first_seen was 0001-01-01T00:00:00Z
 // (https://git.eeqj.de/sneak/routewatch/issues/200).
 func TestIPLookupOfAnAddressWithoutPTRNamesOrStoredNetblock(t *testing.T) {
 	t.Parallel()
 	s := newServerWithTestRoutes(t)
 	s.resolver = &fakeResolver{}
 	path := "/api/v1/ip/" + addrInTestPrefixV4
 	results := resultFields(t, get(t, s, path).Body.Bytes())
 	if len(results) != 1 {
 		t.Fatalf("%s: %d results, want 1", path, len(results))
 	}
 	want := map[string]string{
 		"ptr":        jsonEmptyList,
 		"first_seen": jsonNull,
 	}
 	for name, value := range want {
 		got := string(results[0][name])
 		if got != value {
 			t.Errorf("%s: %s is %s, want %s", path, name, got, value)
 		}
 	}
 }
 // TestIPLookupAnswersMayBeCached checks the Cache-Control header of the IP
 // lookup answers. Caches may keep them for the blocklists' shortest interval,
 // and only the caller's own browser may keep the answer about the caller's
@@ -2014,8 +1699,8 @@ func TestASDetailJSONAnswersBuiltInAS(t *testing.T) {
 		var body struct {
 			Data struct {
 				ASN          database.ASN         `json:"asn"`
-				IPv4Prefixes []LiveRoute  `json:"ipv4_prefixes"`
+				IPv4Prefixes []database.LiveRoute `json:"ipv4_prefixes"`
-				IPv6Prefixes []LiveRoute  `json:"ipv6_prefixes"`
+				IPv6Prefixes []database.LiveRoute `json:"ipv6_prefixes"`
 			} `json:"data"`
 		}
@@ -2160,9 +1845,9 @@ func TestSortRoutesByMaskLength(t *testing.T) {
 	}
 	for _, tt := range tests {
-		routes := make([]LiveRoute, 0, len(tt.prefixes))
+		routes := make([]database.LiveRoute, 0, len(tt.prefixes))
 		for _, prefix := range tt.prefixes {
-			routes = append(routes, LiveRoute{Prefix: prefix})
+			routes = append(routes, database.LiveRoute{Prefix: prefix})
 		}
 		sortRoutesByMaskLength(routes)
@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
 	"net/netip"
 	"reflect"
 	"slices"
 	"strconv"
 	"strings"
@@ -77,10 +75,9 @@ func get(t *testing.T, s *Server, path string) *httptest.ResponseRecorder {
 // TestIPLookupGivesTheOriginMostPeersCarry looks up an address in a prefix
 // with two origin ASes, through each IP lookup route. The answer names the
-// origin AS that more peers carry, counts every peer, lists both origin ASes,
+// origin AS that more peers carry, counts every peer, and gives the time of
-// and gives the time of the prefix's newest kept route. The prefix's
+// the prefix's newest kept route. The prefix's first-seen time and the AS's
-// first-seen time and the AS's WHOIS details come from the database. A WHOIS
+// WHOIS details come from the database.
 // detail the database does not hold is null.
 func TestIPLookupGivesTheOriginMostPeersCarry(t *testing.T) {
 	t.Parallel()
@@ -108,26 +105,6 @@ func TestIPLookupGivesTheOriginMostPeersCarry(t *testing.T) {
 		t.Fatalf("UpdateASNWHOIS: %v", err)
 	}
 	// The details the database does not hold, such as org_name, are null.
 	want := IPInfo{
 		Netblock:    new(testPrefixV4),
 		MaskLength:  new(netip.MustParsePrefix(testPrefixV4).Bits()),
 		IPVersion:   new(ipVersionV4),
 		NumPeers:    new(4),
 		ASN:         new(mostPeersASN),
 		NumOrigins:  new(2),
 		OriginASNs:  []int{mostPeersASN, fewerPeersASN},
 		ASName:      &whois.ASName,
 		CountryCode: &whois.CountryCode,
 		FirstSeen:   &firstSeen,
 		LastSeen:    new(testRouteTime(5)),
 	}
 	wantJSON, err := json.Marshal(want)
 	if err != nil {
 		t.Fatalf("encoding %+v: %v", want, err)
 	}
 	// ownAddressPath looks up the request's own address, which httptest
 	// gives as addrInTestPrefixV4.
 	for _, path := range []string{
@@ -138,15 +115,22 @@ func TestIPLookupGivesTheOriginMostPeersCarry(t *testing.T) {
 			Data IPLookupResponse `json:"data"`
 		}
-		answer := get(t, s, path).Body.Bytes()
+		err := json.Unmarshal(get(t, s, path).Body.Bytes(), &body)
-
+		if err != nil || len(body.Data.Results) != 1 ||
-		err := json.Unmarshal(answer, &body)
+			body.Data.Results[0].IPInfo == nil {
-		if err != nil || len(body.Data.Results) != 1 {
+			t.Fatalf("%s: answer %+v (%v), want one result with a route",
-			t.Fatalf("%s: answer %s (%v), want one result", path, answer, err)
+				path, body.Data, err)
 		}
-		if !reflect.DeepEqual(body.Data.Results[0].IPInfo, want) {
+		got := body.Data.Results[0].IPInfo
-			t.Errorf("%s: answer %s, want the fields %s", path, answer, wantJSON)
+		if got.Netblock != testPrefixV4 || got.ASN != mostPeersASN ||
 			got.NumPeers != 4 || !got.LastSeen.Equal(testRouteTime(5)) ||
 			!got.FirstSeen.Equal(firstSeen) || got.ASName != whois.ASName ||
 			got.CountryCode != whois.CountryCode {
 			t.Errorf("%s: route %+v, want %s from AS%d, 4 peers, last seen %v, "+
 				"first seen %v, %s in %s", path, *got, testPrefixV4,
 				mostPeersASN, testRouteTime(5), firstSeen, whois.ASName,
 				whois.CountryCode)
 		}
 	}
 }
@@ -1,206 +0,0 @@
 package server
 import (
 	"context"
 	"html/template"
 	"net/http"
 	"slices"
 	"time"
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/routetable"
 	"git.eeqj.de/sneak/routewatch/internal/templates"
 	asinfo "git.eeqj.de/sneak/routewatch/pkg/asinfo"
 )
 const (
 	// homeCardsRefreshInterval is how often the server works out the home
 	// page's cards again. Some of their figures take a walk over the whole
 	// routing table, so no request works them out.
 	homeCardsRefreshInterval = time.Minute
 	// homeCardsDatabaseTimeout is how long the database read behind the
 	// cards of the newest and the oldest AS may take.
 	homeCardsDatabaseTimeout = 4 * time.Second
 	// maxListedEntries is how many entries the bogon and multiple-origin
 	// pages list at most.
 	maxListedEntries = 1000
 )
 // homeCards is what the home page's cards show. The bogon and multiple-origin
 // pages list the entries their cards count. The server works it out every
 // homeCardsRefreshInterval and serves this copy in between.
 type homeCards struct {
 	routetable.Overview
 	// NewestAS and OldestAS are the ASes the asns table last saw most
 	// recently and longest ago. They are nil when the database did not
 	// answer or holds no AS.
 	NewestAS *database.ASN
 	OldestAS *database.ASN
 	// WellKnownNetworks are the networks of wellKnownASNs, newest update
 	// first.
 	WellKnownNetworks []wellKnownNetwork
 }
 // wellKnownNetwork is one network on the home page's card of well-known
 // networks.
 type wellKnownNetwork struct {
 	ASN int
 	// Name is its description in the AS list built into RouteWatch.
 	Name string
 	// Prefixes is how many prefixes it originates.
 	Prefixes int
 	// Newest is the time of its newest kept route, or nil when it keeps none.
 	Newest *time.Time
 }
 // listPageData is what the bogon and multiple-origin pages are rendered with.
 type listPageData struct {
 	// CSPNonce is the nonce the page's style block carries.
 	CSPNonce string
 	// Cards is the copy of the home page's cards, or nil before the server
 	// has first worked them out.
 	Cards *homeCards
 }
 // The AS numbers of the networks the home page lists as well known.
 const (
 	appleASN             = 714
 	googleASN            = 15169
 	amazonASN            = 16509
 	microsoftASN         = 8075
 	metaASN              = 32934
 	cloudflareASN        = 13335
 	akamaiASN            = 20940
 	netflixASN           = 2906
 	dodNetworkInfoCtrASN = 721
 	cogentASN            = 174
 	hurricaneElectricASN = 6939
 	level3ASN            = 3356
 	arelionASN           = 1299
 	nttASN               = 2914
 	mitASN               = 3
 )
 // wellKnownASNs returns the AS numbers of the networks the home page lists as
 // well known: large companies, large transit networks, the US Department of
 // Defense's Network Information Center and a university.
 func wellKnownASNs() []int {
 	return []int{
 		appleASN, googleASN, amazonASN, microsoftASN, metaASN, cloudflareASN,
 		akamaiASN, netflixASN, dodNetworkInfoCtrASN, cogentASN,
 		hurricaneElectricASN, level3ASN, arelionASN, nttASN, mitASN,
 	}
 }
 // keepHomeCardsFresh works out the home page's cards now, and again every
 // interval until ctx ends.
 func (s *Server) keepHomeCardsFresh(ctx context.Context, interval time.Duration) {
 	ticker := time.NewTicker(interval)
 	defer ticker.Stop()
 	for {
 		s.refreshHomeCards(ctx)
 		select {
 		case <-ctx.Done():
 			return
 		case <-ticker.C:
 		}
 	}
 }
 // refreshHomeCards works out the home page's cards and keeps them for the
 // pages to serve. When the database does not answer, the failure is logged
 // and the cards of the newest and the oldest AS stay empty.
 func (s *Server) refreshHomeCards(ctx context.Context) {
 	cards := &homeCards{
 		Overview:          s.table.Overview(maxListedEntries),
 		WellKnownNetworks: s.wellKnownNetworks(),
 	}
 	ctx, cancel := context.WithTimeout(ctx, homeCardsDatabaseTimeout)
 	defer cancel()
 	newest, oldest, err := s.db.GetLastSeenASes(ctx)
 	if err != nil {
 		s.logger.Warn("Failed to read the newest and the oldest AS", "error", err)
 	} else {
 		cards.NewestAS, cards.OldestAS = newest, oldest
 	}
 	s.cards.Store(cards)
 }
 // wellKnownNetworks returns the networks of wellKnownASNs, each with how many
 // prefixes it originates and the time of its newest kept route. They come
 // newest first, and those that keep no route last.
 func (s *Server) wellKnownNetworks() []wellKnownNetwork {
 	asns := wellKnownASNs()
 	networks := make([]wellKnownNetwork, 0, len(asns))
 	for _, asn := range asns {
 		originated := s.table.OriginatedPrefixes(asn)
 		network := wellKnownNetwork{ASN: asn, Prefixes: len(originated)}
 		if info, ok := asinfo.Get(asn); ok {
 			network.Name = info.Description
 		}
 		for _, p := range originated {
 			if p.Newest != nil &&
 				(network.Newest == nil || p.Newest.After(*network.Newest)) {
 				network.Newest = p.Newest
 			}
 		}
 		networks = append(networks, network)
 	}
 	slices.SortStableFunc(networks, func(a, b wellKnownNetwork) int {
 		switch {
 		case a.Newest == nil && b.Newest == nil:
 			return 0
 		case a.Newest == nil:
 			return 1
 		case b.Newest == nil:
 			return -1
 		}
 		return b.Newest.Compare(*a.Newest)
 	})
 	return networks
 }
 // handleBogons returns a handler that serves the page listing the bogon
 // announcements.
 func (s *Server) handleBogons() http.HandlerFunc {
 	return s.listPageHandler(templates.BogonsTemplate())
 }
 // handleMultipleOrigins returns a handler that serves the page listing the
 // prefixes announced by more than one origin AS.
 func (s *Server) handleMultipleOrigins() http.HandlerFunc {
 	return s.listPageHandler(templates.MultipleOriginsTemplate())
 }
 // listPageHandler returns a handler that renders tmpl, a page that lists
 // entries the home page's cards count, from the copy of the cards.
 func (s *Server) listPageHandler(tmpl *template.Template) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "text/html; charset=utf-8")
 		err := tmpl.Execute(w, listPageData{
 			CSPNonce: cspNonce(r.Context()),
 			Cards:    s.cards.Load(),
 		})
 		if err != nil {
 			s.logger.Error("Failed to render a list page", "error", err)
 			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		}
 	}
 }
@@ -1,419 +0,0 @@
 package server
 import (
 	"context"
 	"net/netip"
 	"strconv"
 	"strings"
 	"testing"
 	"testing/synctest"
 	"time"
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/routetable"
 )
 // The ASes of the routing table that newCardsTable fills. Each card test
 // finds one of them on its card.
 const (
 	twoPrefixASN   = 13335 // originates two prefixes, the most
 	newestRouteASN = 15169 // the newest route
 	oldestRouteASN = 3     // the oldest route
 	secondOrigin   = 16509 // a second origin AS of twoPrefixASN's prefix
 	privateUseASN  = 64512 // reserved, so its route is a bogon announcement
 )
 // Paths of the pages that list what two of the home page's cards count.
 const (
 	bogonsPath          = "/bogons"
 	multipleOriginsPath = "/multiple-origins"
 )
 // cardsNotReadyText is what the pages say before the cards are first worked
 // out.
 const cardsNotReadyText = "being worked out"
 // newCardsTable returns a routing table in which:
 //   - twoPrefixASN originates 1.0.0.0/24 and 1.0.4.0/22;
 //   - secondOrigin originates 1.0.0.0/24 too, which so has two origin ASes;
 //   - newestRouteASN's 8.8.8.0/24 has the newest route;
 //   - oldestRouteASN's 18.0.0.0/8 has the oldest;
 //   - privateUseASN originates 10.0.0.0/8, carried by two peers: a bogon
 //     announcement for both its prefix and its AS.
 //
 // The last four ASes originate one prefix each.
 func newCardsTable() *routetable.Table {
 	table := emptyTable()
 	announce(table, "1.0.0.0/24", twoPrefixASN, testPeer(1), testRouteTime(10))
 	announce(table, "1.0.4.0/22", twoPrefixASN, testPeer(1), testRouteTime(5))
 	announce(table, "1.0.0.0/24", secondOrigin, testPeer(3), testRouteTime(12))
 	announce(table, "8.8.8.0/24", newestRouteASN, testPeer(2), testRouteTime(20))
 	announce(table, "18.0.0.0/8", oldestRouteASN, testPeer(2), testRouteTime(1))
 	announce(table, "10.0.0.0/8", privateUseASN, testPeer(1), testRouteTime(15))
 	announce(table, "10.0.0.0/8", privateUseASN, testPeer(2), testRouteTime(15))
 	return table
 }
 // homeCard returns the HTML of the home page's card with heading, up to the
 // end of the card.
 func homeCard(t *testing.T, page, heading string) string {
 	t.Helper()
 	_, card, found := strings.Cut(page, "<h2>"+heading+"</h2>")
 	if !found {
 		t.Fatalf("the home page has no card %q", heading)
 	}
 	card, _, _ = strings.Cut(card, "</div>")
 	return card
 }
 // asLink returns the HTML attribute of a link to the AS page of asn.
 func asLink(asn int) string {
 	return `href="/as/` + strconv.Itoa(asn) + `"`
 }
 // TestHomePageCardsShowTheTableFigures fills a routing table and the asns
 // table, works out the cards, and checks that each card shows its figure.
 func TestHomePageCardsShowTheTableFigures(t *testing.T) {
 	t.Parallel()
 	const (
 		newestSeenASN = 6939
 		oldestSeenASN = 174
 	)
 	s := newServerWithTable(t, newCardsTable())
 	err := s.db.GetOrCreateASNBatch(map[int]database.SeenTimes{
 		newestSeenASN: {First: testRouteTime(0), Last: testRouteTime(30)},
 		oldestSeenASN: {First: testRouteTime(-30), Last: testRouteTime(-30)},
 	})
 	if err != nil {
 		t.Fatalf("GetOrCreateASNBatch: %v", err)
 	}
 	s.refreshHomeCards(t.Context())
 	page := get(t, s, "/").Body.String()
 	tests := []struct {
 		heading string
 		want    []string
 	}{
 		{"Newest Updated Route", []string{
 			"8.8.8.0/24", asLink(newestRouteASN),
 			testRouteTime(20).Format(routeTimeFormat),
 		}},
 		{"Oldest Updated Route", []string{
 			"18.0.0.0/8", asLink(oldestRouteASN),
 			testRouteTime(1).Format(routeTimeFormat),
 		}},
 		{"Newest Updated AS", []string{
 			asLink(newestSeenASN), testRouteTime(30).Format(routeTimeFormat),
 		}},
 		{"Oldest Updated AS", []string{
 			asLink(oldestSeenASN), testRouteTime(-30).Format(routeTimeFormat),
 		}},
 		{"AS with the Most Prefixes", []string{
 			asLink(twoPrefixASN), "Prefixes it originates: 2",
 		}},
 		{"ASes with the Fewest Prefixes", []string{
 			"ASes that originate a single prefix: 4", asLink(newestRouteASN),
 			"8.8.8.0/24",
 		}},
 		{"Bogon Announcements", []string{`href="/bogons">1<`}},
 		{"Prefixes with Several Origins", []string{`href="/multiple-origins">1<`}},
 	}
 	for _, tc := range tests {
 		card := homeCard(t, page, tc.heading)
 		for _, want := range tc.want {
 			if !strings.Contains(card, want) {
 				t.Errorf("card %q does not hold %s: %s", tc.heading, want, card)
 			}
 		}
 	}
 	// The well-known networks come newest update first, and those without
 	// a route after them.
 	networks := homeCard(t, page, "Well-Known Networks")
 	order := []int{newestRouteASN, secondOrigin, twoPrefixASN, oldestRouteASN, 714}
 	last := -1
 	for _, asn := range order {
 		i := strings.Index(networks, asLink(asn))
 		if i <= last {
 			t.Fatalf("well-known networks: AS%d is not after the ASes before "+
 				"it in %v: %s", asn, order, networks)
 		}
 		last = i
 	}
 	if !strings.Contains(networks, "<td>2</td>") {
 		t.Errorf("well-known networks: no network with 2 prefixes: %s", networks)
 	}
 }
 // TestListPagesListTheirEntries checks the rows of the bogon and multiple-origin
 // pages for the table of newCardsTable.
 func TestListPagesListTheirEntries(t *testing.T) {
 	t.Parallel()
 	s := newServerWithTable(t, newCardsTable())
 	s.refreshHomeCards(t.Context())
 	pages := map[string][]string{
 		bogonsPath: {
 			"Bogon announcements: 1.", "10.0.0.0/8", asLink(privateUseASN),
 			"<td>2</td>",
 			"Private-Use (10.0.0.0/8); Private-Use (AS64512-AS65534)",
 		},
 		multipleOriginsPath: {
 			"Prefixes announced by more than one origin AS: 1.", "1.0.0.0/24",
 			asLink(twoPrefixASN), asLink(secondOrigin), ">1 peer<",
 		},
 	}
 	for path, wants := range pages {
 		page := get(t, s, path).Body.String()
 		for _, want := range wants {
 			if !strings.Contains(page, want) {
 				t.Errorf("%s does not hold %s", path, want)
 			}
 		}
 	}
 }
 // TestListPagesListAtMostMaxListedEntries fills a table with more prefixes than
 // the list pages list, each announced by two origin ASes in reserved address
 // space. Each page lists maxListedEntries of them and gives how many there are
 // in all.
 func TestListPagesListAtMostMaxListedEntries(t *testing.T) {
 	t.Parallel()
 	const prefixCount = maxListedEntries + 1
 	table := emptyTable()
 	addr := netip.MustParseAddr("10.0.0.0")
 	for range prefixCount {
 		prefix := netip.PrefixFrom(addr, addr.BitLen()).String()
 		announce(table, prefix, twoPrefixASN, testPeer(1), testRouteTime(0))
 		announce(table, prefix, secondOrigin, testPeer(2), testRouteTime(0))
 		addr = addr.Next()
 	}
 	s := newServerWithTable(t, table)
 	s.refreshHomeCards(t.Context())
 	listed := "The first " + strconv.Itoa(maxListedEntries) + " are listed"
 	tests := []struct {
 		path  string
 		total string
 	}{
 		{bogonsPath, "Bogon announcements: " + strconv.Itoa(2*prefixCount) + "."},
 		{multipleOriginsPath, "Prefixes announced by more than one origin AS: " +
 			strconv.Itoa(prefixCount) + "."},
 	}
 	for _, tc := range tests {
 		page := get(t, s, tc.path).Body.String()
 		rows := strings.Count(page, `class="prefix-link"`)
 		if rows != maxListedEntries {
 			t.Errorf("%s lists %d entries, want %d", tc.path, rows,
 				maxListedEntries)
 		}
 		if !strings.Contains(page, tc.total) || !strings.Contains(page, listed) {
 			t.Errorf("%s does not say %q and %q", tc.path, tc.total, listed)
 		}
 	}
 }
 // TestPagesServeTheCopyOfTheCards checks that the pages show the cards as they
 // were last worked out, not as the routing table is now, and that they say so
 // before the cards are first worked out.
 func TestPagesServeTheCopyOfTheCards(t *testing.T) {
 	t.Parallel()
 	table := emptyTable()
 	announce(table, "1.0.0.0/24", twoPrefixASN, testPeer(1), testRouteTime(0))
 	s := newServerWithTable(t, table)
 	for _, path := range []string{"/", bogonsPath, multipleOriginsPath} {
 		if !strings.Contains(get(t, s, path).Body.String(), cardsNotReadyText) {
 			t.Errorf("%s does not say the cards are %s", path, cardsNotReadyText)
 		}
 	}
 	s.refreshHomeCards(t.Context())
 	announce(table, "8.8.8.0/24", newestRouteASN, testPeer(2), testRouteTime(1))
 	card := homeCard(t, get(t, s, "/").Body.String(), "Newest Updated Route")
 	if !strings.Contains(card, "1.0.0.0/24") {
 		t.Errorf("before the cards are worked out again, the newest route "+
 			"is not the one they were worked out with: %s", card)
 	}
 	s.refreshHomeCards(t.Context())
 	card = homeCard(t, get(t, s, "/").Body.String(), "Newest Updated Route")
 	if !strings.Contains(card, "8.8.8.0/24") {
 		t.Errorf("after the cards are worked out again, the newest route is "+
 			"not the table's: %s", card)
 	}
 }
 // TestKeepHomeCardsFreshWorksThemOutEveryInterval runs keepHomeCardsFresh with
 // a short interval. It works the cards out at once, again after the table
 // changes, and stops when its context ends.
 func TestKeepHomeCardsFreshWorksThemOutEveryInterval(t *testing.T) {
 	t.Parallel()
 	const (
 		interval = 10 * time.Millisecond
 		maxWait  = 5 * time.Second
 	)
 	table := emptyTable()
 	announce(table, "1.0.0.0/24", twoPrefixASN, testPeer(1), testRouteTime(0))
 	s := newServerWithTable(t, table)
 	ctx, cancel := context.WithCancel(t.Context())
 	stopped := make(chan struct{})
 	go func() {
 		s.keepHomeCardsFresh(ctx, interval)
 		close(stopped)
 	}()
 	newestRouteASNIs := func(asn int) bool {
 		cards := s.cards.Load()
 		return cards != nil && cards.NewestRoute != nil &&
 			cards.NewestRoute.OriginASN == asn
 	}
 	waitUntil(t, maxWait, func() bool { return newestRouteASNIs(twoPrefixASN) })
 	announce(table, "8.8.8.0/24", newestRouteASN, testPeer(2), testRouteTime(1))
 	waitUntil(t, maxWait, func() bool { return newestRouteASNIs(newestRouteASN) })
 	cancel()
 	select {
 	case <-stopped:
 	case <-time.After(maxWait):
 		t.Fatal("keepHomeCardsFresh did not stop when its context ended")
 	}
 }
 // TestStartedServerWorksOutTheCards starts a server and waits until its home
 // page shows the cards.
 func TestStartedServerWorksOutTheCards(t *testing.T) {
 	t.Parallel()
 	const maxWait = 5 * time.Second
 	s := newServerWithTable(t, newCardsTable())
 	err := s.Start(t.Context())
 	if err != nil {
 		t.Fatalf("Start: %v", err)
 	}
 	defer func() { _ = s.Stop(context.Background()) }()
 	waitUntil(t, maxWait, func() bool {
 		return !strings.Contains(get(t, s, "/").Body.String(), cardsNotReadyText)
 	})
 	card := homeCard(t, get(t, s, "/").Body.String(), "Newest Updated Route")
 	if !strings.Contains(card, "8.8.8.0/24") {
 		t.Errorf("the newest route is not the table's: %s", card)
 	}
 }
 // TestStartedServerWorksOutTheCardsUntilStop starts a server with a context
 // that ends as soon as Start returns. It runs in a synctest bubble, whose clock
 // is fake: time.Sleep there moves the clock on and returns at once. The server
 // must work the cards out again a minute later, and no more after Stop. Each
 // time it works them out, it keeps a new copy. Before the fix the end of
 // Start's context stopped the goroutine that works them out.
 func TestStartedServerWorksOutTheCardsUntilStop(t *testing.T) {
 	t.Parallel()
 	// The server is made outside the bubble. The streamer's metrics start a
 	// goroutine that never returns, and a bubble waits for each of its
 	// goroutines to return.
 	s := newServerWithTable(t, newCardsTable())
 	synctest.Test(t, func(t *testing.T) {
 		ctx, cancel := context.WithCancel(t.Context())
 		err := s.Start(ctx)
 		if err != nil {
 			t.Fatalf("Start: %v", err)
 		}
 		cancel()
 		// The bubble's clock moves only while each of its goroutines waits
 		// on the bubble, and the goroutine that serves HTTP waits on the
 		// network. The test sends no request, so it closes the HTTP server.
 		_ = s.srv.Close()
 		synctest.Wait()
 		started := s.cards.Load()
 		if started == nil {
 			t.Fatal("the server did not work out the cards when it started")
 		}
 		time.Sleep(homeCardsRefreshInterval)
 		synctest.Wait()
 		if s.cards.Load() == started {
 			t.Error("the server did not work out the cards again a minute " +
 				"after its start context ended")
 		}
 		err = s.Stop(t.Context())
 		if err != nil {
 			t.Fatalf("Stop: %v", err)
 		}
 		stopped := s.cards.Load()
 		time.Sleep(homeCardsRefreshInterval)
 		synctest.Wait()
 		if s.cards.Load() != stopped {
 			t.Error("the server worked out the cards again after Stop")
 		}
 	})
 }
 // waitUntil fails the test unless done reports true within maxWait.
 func waitUntil(t *testing.T, maxWait time.Duration, done func() bool) {
 	t.Helper()
 	const pollInterval = 5 * time.Millisecond
 	deadline := time.Now().Add(maxWait)
 	for !done() {
 		if time.Now().After(deadline) {
 			t.Fatalf("the cards did not change within %s", maxWait)
 		}
 		time.Sleep(pollInterval)
 	}
 }
@@ -16,7 +16,6 @@ import (
 	"time"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 )
 // responseWriter wraps http.ResponseWriter to capture the response
@@ -54,15 +53,6 @@ func (rw *responseWriter) Header() http.Header {
 	return rw.ResponseWriter.Header()
 }
 // The @meta object JSONResponseMiddleware adds to a JSON answer: its key, and
 // the keys of its fields.
 const (
 	jsonKeyMeta            = "@meta"
 	metaKeyTimeZone        = "time_zone"
 	metaKeyAPIVersion      = "api_version"
 	metaKeyExecutionTimeMs = "execution_time_ms"
 )
 // JSONResponseMiddleware is an HTTP middleware that wraps all JSON responses
 // with a @meta field containing execution metadata. The metadata includes the
 // time zone (always UTC), API version, and request execution time in milliseconds.
@@ -116,10 +106,10 @@ func JSONResponseMiddleware(next http.Handler) http.Handler {
 		}
 		// Add @meta field
-		originalResponse[jsonKeyMeta] = map[string]any{
+		originalResponse["@meta"] = map[string]any{
-			metaKeyTimeZone:        "UTC",
+			"time_zone":      "UTC",
-			metaKeyAPIVersion:      1,
+			"api_version":    1,
-			metaKeyExecutionTimeMs: execTime.Milliseconds(),
+			"execution_time": fmt.Sprintf("%d ms", execTime.Milliseconds()),
 		}
 		// Write the enhanced response
@@ -155,8 +145,7 @@ func deadlinePassed(ctx context.Context) bool {
 // has passed, it answers 504 with the error message "Request timeout". A 4xx
 // keeps its status, with the status's standard text as the message. For other
 // errors, it returns "Internal server error", with status 500 if the original
-// status was 200. A panic in the handler answers 500 with "Internal server
+// status was 200.
 // error" too.
 //
 // Non-JSON responses are passed through unchanged.
 func JSONValidationMiddleware(next http.Handler) http.Handler {
@@ -168,9 +157,8 @@ func JSONValidationMiddleware(next http.Handler) http.Handler {
 			statusCode:     http.StatusOK,
 		}
-		// Serve the request. Recoverer logs a panic in the handler and turns it
+		// Serve the request
-		// into a 500 without a body, which gets the JSON error body below.
+		next.ServeHTTP(rw, r)
 		middleware.Recoverer(next).ServeHTTP(rw, r)
 		// Check if it's meant to be a JSON response
 		contentType := rw.Header().Get("Content-Type")
@@ -1,40 +1,25 @@
 package server
 import (
 	"bytes"
 	"context"
 	"encoding/json"
 	"io"
 	"log/slog"
 	"net"
 	"net/http"
 	"net/http/httptest"
 	"net/netip"
 	"os"
 	"regexp"
 	"strings"
 	"testing"
 	"time"
 	"git.eeqj.de/sneak/routewatch/internal/config"
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/logger"
 	"git.eeqj.de/sneak/routewatch/internal/metrics"
 	"git.eeqj.de/sneak/routewatch/internal/streamer"
 )
 // The addresses the forwarding tests use: the client a proxy names in
 // X-Forwarded-For, the range of trusted proxies, a peer inside it, and a peer
 // outside it, which lies in testPrefixV4 so that an IP lookup of it finds a
-// route. reverseProxyPeer is a reverse proxy at a private address, as Docker
+// route.
 // gives one.
 const (
 	forwardedClient   = "203.0.113.9"
 	trustedProxyRange = "10.0.0.0/8"
 	trustedPeer       = "10.0.0.2:1234"
 	untrustedPeerAddr = "192.0.2.1"
 	untrustedPeer     = untrustedPeerAddr + ":1234"
 	reverseProxyPeer  = "172.19.0.14:1234"
 )
 // TestResponsesCarrySecurityHeaders checks that a page, a JSON route and a
@@ -102,219 +87,6 @@ func TestJSONValidationKeeps4xxWithoutBody(t *testing.T) {
 	checkJSONErrorMessage(t, name, rec, http.StatusText(http.StatusBadRequest))
 }
 // TestJSONAnswersPutNoUnitInAString sends a request to each JSON route and
 // checks each answer. Its @meta.execution_time_ms is a number, and none of its
 // strings is a number with a unit, such as "12 ms", "1.1 GB" or "1h18m34s"
 // (https://git.eeqj.de/sneak/routewatch/issues/199). The health check answers
 // 503, since the stream is not connected, and the last path matches no route.
 func TestJSONAnswersPutNoUnitInAString(t *testing.T) {
 	t.Parallel()
 	numberWithUnit := regexp.MustCompile(
 		`^([0-9]+(\.[0-9]+)? ?(ns|µs|ms|s|m|h|B|kB|MB|GB|TB))+$`)
 	s := newServerWithTestRoutes(t)
 	s.resolver = &fakeResolver{}
 	s.SetASNFetcher(fixedIntervalASNFetcher{interval: time.Second})
 	paths := []string{
 		statusJSONPath,
 		statsPath,
 		healthCheckPath,
 		"/api/v1/ip/" + untrustedPeerAddr,
 		"/ip/" + untrustedPeerAddr,
 		asJSONPath,
 		"/api/v1/prefix/" + testPrefixV4,
 		"/api/v1/search/as?q=google",
 		"/api/v1/no-such-route",
 	}
 	for _, path := range paths {
 		rec := httptest.NewRecorder()
 		s.router.ServeHTTP(rec, httptest.NewRequestWithContext(
 			t.Context(), http.MethodGet, path, nil))
 		var answer map[string]any
 		err := json.Unmarshal(rec.Body.Bytes(), &answer)
 		if err != nil {
 			t.Errorf("%s: decoding the answer: %v; answer %s", path, err, rec.Body)
 			continue
 		}
 		meta, _ := answer["@meta"].(map[string]any)
 		if _, ok := meta["execution_time_ms"].(float64); !ok {
 			t.Errorf("%s: @meta.execution_time_ms is not a number: %s",
 				path, rec.Body)
 		}
 		for _, value := range stringsIn(answer) {
 			if numberWithUnit.MatchString(value) {
 				t.Errorf("%s: %q is a number with a unit in a string", path, value)
 			}
 		}
 	}
 }
 // TestJSONAnswersCarryMeta sends requests to every JSON route through the
 // server's router, and checks that each answer carries @meta with its three
 // fields. The answers include successes, and errors that the handlers, the
 // router and the middleware write. Before the fix a panic in a handler, and a
 // method /status.json or the health check does not take, answered with an
 // empty body (https://git.eeqj.de/sneak/routewatch/issues/201).
 func TestJSONAnswersCarryMeta(t *testing.T) {
 	t.Parallel()
 	// JSON routes whose handlers write nothing or panic, so that the JSON
 	// check on the route writes the error answer itself.
 	const (
 		writesNothingPath = "/writes-nothing.json"
 		panicsPath        = "/panics.json"
 	)
 	s := newServerWithTestRoutes(t)
 	s.resolver = &fakeResolver{}
 	s.streamer.GetMetricsTracker().SetConnected(true)
 	s.router.Get(writesNothingPath, JSONValidationMiddleware(http.HandlerFunc(
 		func(http.ResponseWriter, *http.Request) {})).ServeHTTP)
 	s.router.Get(panicsPath, JSONValidationMiddleware(http.HandlerFunc(
 		func(http.ResponseWriter, *http.Request) { panic(errDiskIO) })).ServeHTTP)
 	tests := []struct {
 		method   string
 		path     string
 		wantCode int
 	}{
 		// Answers that succeed
 		{http.MethodGet, statusJSONPath, http.StatusOK},
 		{http.MethodGet, healthCheckPath, http.StatusOK},
 		{http.MethodGet, "/ip", http.StatusOK},
 		{http.MethodGet, ownAddressPath, http.StatusOK},
 		{http.MethodGet, "/ip/" + addrInTestPrefixV4, http.StatusOK},
 		{http.MethodGet, statsPath, http.StatusOK},
 		{http.MethodGet, "/api/v1/ip/" + addrInTestPrefixV4, http.StatusOK},
 		{http.MethodGet, asJSONPath, http.StatusOK},
 		{http.MethodGet, "/api/v1/prefix/" + testPrefixV4, http.StatusOK},
 		{http.MethodGet, "/api/v1/search/as?q=google", http.StatusOK},
 		// Errors the handlers write
 		{http.MethodGet, "/ip/no-such-host.example", http.StatusBadRequest},
 		{http.MethodGet, "/api/v1/ip/no-such-host.example", http.StatusBadRequest},
 		{http.MethodGet, "/api/v1/as/foo", http.StatusBadRequest},
 		{http.MethodGet, "/api/v1/as/0", http.StatusNotFound},
 		{http.MethodGet, "/api/v1/prefix/192.0.2.0/33", http.StatusBadRequest},
 		{http.MethodGet, "/api/v1/prefix/198.51.100.0/24", http.StatusNotFound},
 		{http.MethodGet, "/api/v1/search/as", http.StatusBadRequest},
 		// Errors the router and the middleware write
 		{http.MethodGet, "/api/v1/no-such-route", http.StatusNotFound},
 		{http.MethodGet, "/ip/192.0.2.1/nothing", http.StatusNotFound},
 		{http.MethodPost, statsPath, http.StatusMethodNotAllowed},
 		{http.MethodPost, ownAddressPath, http.StatusMethodNotAllowed},
 		{http.MethodPost, statusJSONPath, http.StatusMethodNotAllowed},
 		{http.MethodPut, healthCheckPath, http.StatusMethodNotAllowed},
 		{http.MethodGet, writesNothingPath, http.StatusInternalServerError},
 		{http.MethodGet, panicsPath, http.StatusInternalServerError},
 	}
 	for _, tt := range tests {
 		checkAnswerCarriesMeta(t, s, httptest.NewRequestWithContext(
 			t.Context(), tt.method, tt.path, nil), tt.wantCode)
 	}
 	// A request whose time limit has already passed answers 504. The handlers
 	// write the answers of the first five routes, and the JSON check on the
 	// route writes the last.
 	pastTimeLimit, cancel := context.WithDeadline(t.Context(), time.Now())
 	defer cancel()
 	for _, path := range []string{
 		statusJSONPath, statsPath, "/ip/" + addrInTestPrefixV4,
 		"/api/v1/ip/" + addrInTestPrefixV4, asJSONPath, writesNothingPath,
 	} {
 		checkAnswerCarriesMeta(t, s, httptest.NewRequestWithContext(
 			pastTimeLimit, http.MethodGet, path, nil), http.StatusGatewayTimeout)
 	}
 	// With a store whose reads fail, the health check answers 503, and the
 	// handlers of the other routes 500.
 	failing := New(failingDB{}, newTestTable(),
 		streamer.New(logger.New(), metrics.New()), logger.New(), &config.Config{})
 	failing.resolver = &fakeResolver{}
 	checkAnswerCarriesMeta(t, failing, httptest.NewRequestWithContext(
 		t.Context(), http.MethodGet, healthCheckPath, nil),
 		http.StatusServiceUnavailable)
 	for _, path := range []string{
 		statusJSONPath, statsPath, asJSONPath,
 		"/api/v1/ip/" + addrInTestPrefixV4, "/ip/" + addrInTestPrefixV4,
 	} {
 		checkAnswerCarriesMeta(t, failing, httptest.NewRequestWithContext(
 			t.Context(), http.MethodGet, path, nil), http.StatusInternalServerError)
 	}
 }
 // checkAnswerCarriesMeta serves req through the server's router, and checks
 // that it answers wantCode with @meta and its three fields.
 func checkAnswerCarriesMeta(
 	t *testing.T, s *Server, req *http.Request, wantCode int,
 ) {
 	t.Helper()
 	// The values README "JSON API" gives the two fields that never change.
 	const (
 		wantTimeZone   = "UTC"
 		wantAPIVersion = 1
 	)
 	name := req.Method + " " + req.URL.String()
 	rec := httptest.NewRecorder()
 	s.router.ServeHTTP(rec, req)
 	if rec.Code != wantCode {
 		t.Errorf("%s: status %d, want %d; body %s", name, rec.Code, wantCode, rec.Body)
 	}
 	var answer map[string]any
 	err := json.Unmarshal(rec.Body.Bytes(), &answer)
 	if err != nil {
 		t.Errorf("%s: decoding the answer %q: %v", name, rec.Body, err)
 		return
 	}
 	meta, _ := answer[jsonKeyMeta].(map[string]any)
 	_, timeIsNumber := meta[metaKeyExecutionTimeMs].(float64)
 	if meta[metaKeyTimeZone] != wantTimeZone ||
 		meta[metaKeyAPIVersion] != float64(wantAPIVersion) || !timeIsNumber {
 		t.Errorf("%s: @meta %v, want time_zone %q, api_version %d and a "+
 			"number in execution_time_ms", name, meta, wantTimeZone, wantAPIVersion)
 	}
 }
 // stringsIn returns every string in a decoded JSON value, at any depth.
 func stringsIn(value any) []string {
 	var found []string
 	switch v := value.(type) {
 	case string:
 		found = append(found, v)
 	case []any:
 		for _, item := range v {
 			found = append(found, stringsIn(item)...)
 		}
 	case map[string]any:
 		for _, item := range v {
 			found = append(found, stringsIn(item)...)
 		}
 	}
 	return found
 }
 // TestPagesCarryTheCSPNonce checks that every script and style block of each
 // page carries the nonce its Content-Security-Policy header names, so that the
 // browser runs and applies them, that each answer has a nonce of its own, and
@@ -411,141 +183,6 @@ func TestForwardedForFromUntrustedPeerIsIgnored(t *testing.T) {
 	}
 }
 // TestDefaultTrustedProxiesGiveTheForwardedClient builds the server from the
 // configuration with TRUSTED_PROXIES unset. A request from a reverse proxy at
 // a private address must be looked up by /ip/, shown on the home page's card
 // and logged as the client its X-Forwarded-For names. A direct request from a
 // public address with a forged X-Forwarded-For keeps its own address. Before
 // the fix no proxy was trusted unless TRUSTED_PROXIES named it, so /ip/ gave
 // the proxy's address (https://git.eeqj.de/sneak/routewatch/issues/198).
 func TestDefaultTrustedProxiesGiveTheForwardedClient(t *testing.T) {
 	t.Setenv("PORT", "")
 	t.Setenv("XDG_DATA_HOME", "")
 	// t.Setenv puts the variable back when the test ends.
 	t.Setenv("TRUSTED_PROXIES", "")
 	err := os.Unsetenv("TRUSTED_PROXIES")
 	if err != nil {
 		t.Fatal(err)
 	}
 	cfg, err := config.New()
 	if err != nil {
 		t.Fatalf("config.New: %v", err)
 	}
 	var requestLog bytes.Buffer
 	s := newServerWithConfig(t, cfg, &requestLog)
 	tests := []struct {
 		name string
 		peer string
 		want string
 	}{
 		{"through a reverse proxy", reverseProxyPeer, forwardedClient},
 		{"direct from a public address", untrustedPeer, untrustedPeerAddr},
 	}
 	for _, tt := range tests {
 		requestLog.Reset()
 		get := func(path string) *httptest.ResponseRecorder {
 			req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, path, nil)
 			req.RemoteAddr = tt.peer
 			req.Header.Set("X-Forwarded-For", forwardedClient)
 			rec := httptest.NewRecorder()
 			s.router.ServeHTTP(rec, req)
 			return rec
 		}
 		var answer struct {
 			Data IPLookupResponse `json:"data"`
 		}
 		rec := get("/ip/")
 		err := json.Unmarshal(rec.Body.Bytes(), &answer)
 		if err != nil {
 			t.Fatalf("%s: decoding the answer %q: %v", tt.name, rec.Body, err)
 		}
 		if answer.Data.Query != tt.want {
 			t.Errorf("%s: /ip/ looked up %q, want %q", tt.name, answer.Data.Query, tt.want)
 		}
 		page := get("/").Body.String()
 		if !strings.Contains(page, `data-client-ip="`+tt.want+`"`) {
 			t.Errorf("%s: the home page's card does not hold %s", tt.name, tt.want)
 		}
 		logged := loggedAddresses(requestLog.String())
 		if len(logged) == 0 {
 			t.Errorf("%s: the request log names no address", tt.name)
 		}
 		for _, addr := range logged {
 			if addr != tt.want {
 				t.Errorf("%s: the request log gives %s, want %s", tt.name, addr, tt.want)
 			}
 		}
 	}
 }
 // newServerWithConfig returns a server built with cfg, on a new database, that
 // reads the routes of newTestTable and logs its requests as JSON to
 // requestLog.
 func newServerWithConfig(
 	t *testing.T, cfg *config.Config, requestLog io.Writer,
 ) *Server {
 	t.Helper()
 	cfg.StateDir = t.TempDir()
 	db, err := database.New(cfg, logger.New())
 	if err != nil {
 		t.Fatalf("database.New: %v", err)
 	}
 	t.Cleanup(func() { _ = db.Close() })
 	s := New(db, newTestTable(), streamer.New(logger.New(), metrics.New()),
 		&logger.Logger{Logger: slog.New(slog.NewJSONHandler(requestLog, nil))}, cfg)
 	s.resolver = &fakeResolver{}
 	return s
 }
 // loggedAddresses returns the address each line of the JSON request log
 // names, without the port a direct request is logged with.
 func loggedAddresses(requestLog string) []string {
 	var addrs []string
 	for line := range strings.Lines(requestLog) {
 		//nolint:tagliatelle // the field name is the key the request log uses
 		var entry struct {
 			RemoteAddr string `json:"remote_addr"`
 		}
 		err := json.Unmarshal([]byte(line), &entry)
 		if err != nil || entry.RemoteAddr == "" {
 			continue
 		}
 		addr, _, err := net.SplitHostPort(entry.RemoteAddr)
 		if err != nil {
 			addr = entry.RemoteAddr
 		}
 		addrs = append(addrs, addr)
 	}
 	return addrs
 }
 // TestRealIPMiddlewareTrustsOnlyConfiguredProxies checks which address
 // RealIPMiddleware gives a request: the TCP peer, unless the peer is a trusted
 // proxy; then the last X-Forwarded-For entry that is not a trusted proxy,
@@ -1,74 +0,0 @@
 package server
 import (
 	"errors"
 	"time"
 )
 var (
 	// ErrInvalidIP says that an IP address is malformed. The IP lookup returns
 	// it.
 	ErrInvalidIP = errors.New("invalid IP address")
 	// ErrNoRoute says that the routing table has no route for an address, a
 	// prefix or an AS. The lookups return it.
 	ErrNoRoute = errors.New("no route found")
 )
 // LiveRoute represents a route in the live routing table. JSON leaves out an
 // empty AS path, next hop or time: the routing table in memory keeps them only
 // for the two newest routes of each prefix and origin AS.
 //
 //nolint:tagliatelle // field names are the existing JSON API
 type LiveRoute struct {
 	Prefix      string    `json:"prefix"`
 	MaskLength  int       `json:"mask_length"`
 	IPVersion   int       `json:"ip_version"`
 	OriginASN   int       `json:"origin_asn"`
 	PeerIP      string    `json:"peer_ip"`
 	ASPath      []int     `json:"as_path,omitempty"`
 	NextHop     string    `json:"next_hop,omitempty"`
 	LastUpdated time.Time `json:"last_updated,omitzero"`
 }
 // PrefixDistribution represents the distribution of prefixes by mask length
 //
 //nolint:tagliatelle // field names are the existing JSON API
 type PrefixDistribution struct {
 	MaskLength int `json:"mask_length"`
 	Count      int `json:"count"`
 }
 // IPInfo is what the IP lookup knows about the route of an address and that
 // route's origin AS. A field is nil, null in JSON, when its value is not known.
 // Every field is nil for an address with no route.
 //
 //nolint:tagliatelle // field names are the existing JSON API
 type IPInfo struct {
 	// Netblock is the most specific prefix that holds the address.
 	Netblock   *string `json:"netblock"`
 	MaskLength *int    `json:"mask_length"`
 	IPVersion  *int    `json:"ip_version"`
 	NumPeers   *int    `json:"num_peers"`
 	// ASN is the origin AS that the most peers carry the netblock with.
 	ASN *int `json:"asn"`
 	// NumOrigins and OriginASNs are how many origin ASes peers carry the
 	// netblock with, and which, in AS number order.
 	NumOrigins *int  `json:"num_origins"`
 	OriginASNs []int `json:"origin_asns"`
 	// The details the database holds about the AS in ASN.
 	ASName      *string `json:"as_name"`
 	Handle      *string `json:"handle"`
 	Description *string `json:"description"`
 	OrgName     *string `json:"org_name"`
 	OrgID       *string `json:"org_id"`
 	Address     *string `json:"address"`
 	CountryCode *string `json:"country_code"`
 	AbuseEmail  *string `json:"abuse_email"`
 	RIR         *string `json:"rir"`
 	// FirstSeen is when RouteWatch first saw the netblock. LastSeen is the
 	// time of the netblock's newest kept route.
 	FirstSeen *time.Time `json:"first_seen"`
 	LastSeen  *time.Time `json:"last_seen"`
 	// Indicates if WHOIS data needs refresh (not serialized)
 	NeedsWHOISRefresh bool `json:"-"`
 }
@@ -8,8 +8,8 @@ import (
 	"github.com/go-chi/chi/v5/middleware"
 )
-// The error messages the JSON routes answer with when no route matches the
+// The error messages the JSON routes under /api/v1 and /ip answer with when no
-// path, and when the route does not take the method.
+// route matches the path, and when none takes the method.
 const (
 	notFoundMessage         = "Not found"
 	methodNotAllowedMessage = "Method not allowed"
@@ -19,13 +19,6 @@ const (
 	jsonRoutesAllow = "GET, HEAD"
 )
 // The paths of the status figures and the health check, the two JSON routes
 // outside /api/v1 and /ip.
 const (
 	statusJSONPath  = "/status.json"
 	healthCheckPath = "/.well-known/healthcheck.json"
 )
 // setupRoutes configures the HTTP routes
 func (s *Server) setupRoutes() {
 	r := chi.NewRouter()
@@ -39,8 +32,6 @@ func (s *Server) setupRoutes() {
 	r.Use(middleware.RequestID)
 	r.Use(RealIPMiddleware(s.trustedProxies))
 	r.Use(RequestLoggerMiddleware(s.logger.Logger)) // Structured request logging
 	// Recoverer answers a panic on a page. JSONValidationMiddleware recovers a
 	// panic on a JSON route itself, so that the answer is JSON with @meta.
 	r.Use(middleware.Recoverer)
 	r.Use(JSONResponseMiddleware)
 	// Timeout must come after JSONResponseMiddleware, which sends its answer
@@ -52,6 +43,11 @@ func (s *Server) setupRoutes() {
 	// Routes
 	r.Get("/", s.handleIndex())
 	r.Get("/status", s.handleStatusHTML())
 	r.Get("/status.json", JSONValidationMiddleware(s.handleStatusJSON()).ServeHTTP)
 	r.Get(
 		"/.well-known/healthcheck.json",
 		JSONValidationMiddleware(s.handleHealthCheck()).ServeHTTP,
 	)
 	// AS and prefix detail pages
 	r.Get("/as/{asn}", s.handleASDetail())
@@ -59,10 +55,6 @@ func (s *Server) setupRoutes() {
 	r.Get("/prefixlength/{length}", s.handlePrefixLength())
 	r.Get("/prefixlength6/{length}", s.handlePrefixLength6())
 	// The pages that list what two of the home page's cards count
 	r.Get("/bogons", s.handleBogons())
 	r.Get("/multiple-origins", s.handleMultipleOrigins())
 	// The JSON routes answer a path or method they do not take with the JSON
 	// error body, as they answer everything else.
 	jsonNotFound := func(w http.ResponseWriter, _ *http.Request) {
@@ -74,21 +66,6 @@ func (s *Server) setupRoutes() {
 		s.writeJSONError(w, http.StatusMethodNotAllowed, methodNotAllowedMessage)
 	}
 	// The status figures and the health check. chi sets one 405 answer for a
 	// whole router. These two routes are on the pages' router, whose 405 stays
 	// chi's own. So each method they do not take is routed to the JSON 405
 	// here.
 	r.Get(statusJSONPath, JSONValidationMiddleware(s.handleStatusJSON()).ServeHTTP)
 	r.Get(healthCheckPath, JSONValidationMiddleware(s.handleHealthCheck()).ServeHTTP)
 	for _, method := range []string{
 		http.MethodPost, http.MethodPut, http.MethodPatch, http.MethodDelete,
 		http.MethodOptions, http.MethodTrace, http.MethodConnect,
 	} {
 		r.MethodFunc(method, statusJSONPath, jsonMethodNotAllowed)
 		r.MethodFunc(method, healthCheckPath, jsonMethodNotAllowed)
 	}
 	// IP info JSON endpoints (replaces old /ip redirect)
 	r.Route("/ip", func(r chi.Router) {
 		r.Use(JSONValidationMiddleware)
@@ -17,7 +17,7 @@ func TestRoutesAnswerHEAD(t *testing.T) {
 	s := newServerWithTestRoutes(t)
-	for _, path := range []string{"/", statusJSONPath, statsPath, "/ip", "/ip/"} {
+	for _, path := range []string{"/", statsPath, "/ip", "/ip/"} {
 		rec := httptest.NewRecorder()
 		s.router.ServeHTTP(rec, httptest.NewRequestWithContext(
 			t.Context(), http.MethodHead, path, nil))
@@ -31,13 +31,10 @@ func TestRoutesAnswerHEAD(t *testing.T) {
 // TestJSONRoutesAnswerUnmatchedRequestsWithJSONErrors sends a method the JSON
 // routes do not take, and a path none of them matches, to each group of JSON
-// routes through the server's router. It also sends a method they do not take
+// routes through the server's router. Each must answer with the JSON error
 // to /status.json and the health check. Each must answer with the JSON error
 // body, and a 405 must name the methods the routes take in its Allow header.
 // Before the fix a 405 said "Internal server error" and a 404 was chi's plain
 // text answer (https://git.eeqj.de/sneak/routewatch/issues/111).
 // /status.json and the health check gave chi's empty 405
 // (https://git.eeqj.de/sneak/routewatch/issues/201).
 func TestJSONRoutesAnswerUnmatchedRequestsWithJSONErrors(t *testing.T) {
 	t.Parallel()
@@ -51,14 +48,6 @@ func TestJSONRoutesAnswerUnmatchedRequestsWithJSONErrors(t *testing.T) {
 	}{
 		{http.MethodPost, statsPath, http.StatusMethodNotAllowed, methodNotAllowedMessage},
 		{http.MethodPost, "/ip/", http.StatusMethodNotAllowed, methodNotAllowedMessage},
 		{
 			http.MethodDelete, statusJSONPath,
 			http.StatusMethodNotAllowed, methodNotAllowedMessage,
 		},
 		{
 			http.MethodOptions, healthCheckPath,
 			http.StatusMethodNotAllowed, methodNotAllowedMessage,
 		},
 		{http.MethodGet, "/api/v1/nothing", http.StatusNotFound, notFoundMessage},
 		{http.MethodGet, "/ip/192.0.2.1/nothing", http.StatusNotFound, notFoundMessage},
 	}
@@ -1,7 +1,5 @@
 // Package server serves RouteWatch's web pages and JSON API:
 //   - the home page, the status figures and the health check
 //   - the pages that list the bogon announcements and the prefixes announced
 //     by more than one origin AS
 //   - the AS, prefix and prefix length pages, and the JSON answers behind them
 //   - the IP lookups
 //   - the AS name search
@@ -19,7 +17,6 @@ import (
 	"net/http"
 	"net/netip"
 	"strconv"
 	"sync/atomic"
 	"time"
 	"git.eeqj.de/sneak/routewatch/internal/blocklist"
@@ -78,16 +75,6 @@ type Server struct {
 	// resolver makes the IP lookup's DNS lookups: net.DefaultResolver, or a
 	// fake in tests
 	resolver dnsResolver
 	// cards is the copy of the home page's cards that the pages serve, nil
 	// until the server first works them out
 	cards atomic.Pointer[homeCards]
 	// stopCards ends the goroutine that works out the cards, and
 	// cardsStopped is closed once it has returned. Both are nil until Start
 	// starts the goroutine.
 	stopCards    context.CancelFunc
 	cardsStopped chan struct{}
 }
 // New creates a new HTTP server that reads routes from table, the routing
@@ -116,9 +103,7 @@ func New(
 // Start listens on the configured port and serves HTTP in the background.
 // It returns an error if it cannot listen, for example because the port is
-// already in use. ctx bounds opening the port, not serving. Once listening,
+// already in use. ctx bounds only opening the port, not serving.
 // the server works out the home page's cards every minute until Stop: the end
 // of ctx does not stop it.
 func (s *Server) Start(ctx context.Context) error {
 	const (
 		network           = "tcp"
@@ -155,22 +140,12 @@ func (s *Server) Start(ctx context.Context) error {
 		}
 	}()
 	ctx, s.stopCards = context.WithCancel(context.WithoutCancel(ctx))
 	s.cardsStopped = make(chan struct{})
 	go func() {
 		defer close(s.cardsStopped)
 		s.keepHomeCardsFresh(ctx, homeCardsRefreshInterval)
 	}()
 	return nil
 }
-// Stop stops the goroutine that works out the home page's cards, and waits
+// Stop stops the HTTP server. It waits, until ctx ends, for the requests in
-// until it has returned or ctx ends. It then stops the HTTP server. It waits,
+// progress to finish, and then closes the connections of those still running
-// until ctx ends, for the requests in progress to finish, and then closes the
+// and returns ctx's error.
 // connections of those still running and returns ctx's error.
 func (s *Server) Stop(ctx context.Context) error {
 	if s.srv == nil {
 		return nil
@@ -178,16 +153,6 @@ func (s *Server) Stop(ctx context.Context) error {
 	s.logger.Info("Stopping HTTP server")
 	// Start returns before it starts the goroutine when it cannot listen.
 	if s.stopCards != nil {
 		s.stopCards()
 		select {
 		case <-s.cardsStopped:
 		case <-ctx.Done():
 		}
 	}
 	err := s.srv.Shutdown(ctx)
 	if err != nil {
 		return errors.Join(err, s.srv.Close())
@@ -351,10 +351,6 @@ type HandlerStats struct {
 	AvgProcessTime     time.Duration
 	MinProcessTime     time.Duration
 	MaxProcessTime     time.Duration
 	// HeldBackCount is how many messages the handler holds back to apply
 	// later: what its HeldBackCount method returns, or 0 for a handler
 	// without one.
 	HeldBackCount int
 }
 // GetHandlerStats returns a snapshot of performance statistics for all registered
@@ -396,11 +392,6 @@ func (s *Streamer) GetHandlerStats() []HandlerStats {
 		info.metrics.mu.Unlock()
 		holder, holdsBack := info.handler.(interface{ HeldBackCount() int })
 		if holdsBack {
 			hs.HeldBackCount = holder.HeldBackCount()
 		}
 		stats = append(stats, hs)
 	}
@@ -1,170 +0,0 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Bogon Announcements - RouteWatch</title>
    <style nonce="{{.CSPNonce}}">
        * {
            box-sizing: border-box;
        }
        body {
            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
            margin: 0;
            padding: 0;
            background: #f5f5f5;
        }
        /* Navbar styles */
        .navbar {
            background: #2c3e50;
            padding: 0 20px;
            display: flex;
            align-items: center;
            justify-content: space-between;
            height: 56px;
            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
        }
        .navbar-brand {
            display: flex;
            align-items: center;
            gap: 8px;
            font-size: 18px;
            font-weight: 600;
        }
        .navbar-brand a {
            color: white;
            text-decoration: none;
        }
        .navbar-brand a:hover {
            color: #ecf0f1;
        }
        .navbar-brand .by {
            font-weight: normal;
            color: #95a5a6;
            font-size: 14px;
        }
        .navbar-brand .author {
            color: #3498db;
            font-weight: normal;
        }
        .navbar-brand .author:hover {
            text-decoration: underline;
        }
        .navbar-links {
            display: flex;
            gap: 20px;
        }
        .navbar-links a {
            color: #ecf0f1;
            text-decoration: none;
            font-size: 14px;
            padding: 8px 12px;
            border-radius: 4px;
            transition: background-color 0.2s;
        }
        .navbar-links a:hover {
            background: rgba(255,255,255,0.1);
        }
        /* Main content */
        .main-content {
            max-width: 1200px;
            margin: 0 auto;
            padding: 20px;
        }
        h1 {
            color: #333;
            margin-bottom: 10px;
        }
        .subtitle {
            color: #666;
            margin-bottom: 30px;
        }
        table {
            width: 100%;
            border-collapse: collapse;
            background: white;
            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
            border-radius: 8px;
            overflow: hidden;
        }
        th {
            background: #f8f9fa;
            padding: 12px;
            text-align: left;
            font-weight: 600;
            color: #333;
            border-bottom: 2px solid #dee2e6;
        }
        td {
            padding: 12px;
            border-bottom: 1px solid #eee;
        }
        tr:last-child td {
            border-bottom: none;
        }
        tr:hover {
            background: #f8f9fa;
        }
        a {
            color: #0066cc;
            text-decoration: none;
        }
        a:hover {
            text-decoration: underline;
        }
        .prefix-link {
            font-family: 'SF Mono', Monaco, 'Cascadia Mono', 'Roboto Mono', Consolas, 'Courier New', monospace;
        }
    </style>
 </head>
 <body>
    <nav class="navbar">
        <div class="navbar-brand">
            <a href="/">routewatch</a>
            <span class="by">by</span>
            <a href="https://sneak.berlin" class="author">@sneak</a>
        </div>
        <div class="navbar-links">
            <a href="/">Home</a>
            <a href="/status">Status</a>
        </div>
    </nav>
    <main class="main-content">
    <h1>Bogon Announcements</h1>
    {{ with .Cards }}
    <p class="subtitle">
        Bogon announcements: {{ .BogonCount }}.
        A bogon announcement is a route that announces a reserved prefix, or that comes from a reserved AS number.
        {{ if lt (len .Bogons) .BogonCount }}The first {{ len .Bogons }} are listed, in prefix order.{{ end }}
        The list is worked out once a minute.
    </p>
    <table>
        <thead>
            <tr>
                <th>Prefix</th>
                <th>Origin AS</th>
                <th>Peers</th>
                <th>Why it is a bogon</th>
            </tr>
        </thead>
        <tbody>
            {{ range .Bogons }}
            <tr>
                <td><a href="{{ prefixURL .Prefix.String }}" class="prefix-link">{{ .Prefix }}</a></td>
                <td>{{ if .OriginASN }}<a href="/as/{{ .OriginASN }}">AS{{ .OriginASN }}</a>{{ else }}No known origin{{ end }}</td>
                <td>{{ .Peers }}</td>
                <td>{{ range $i, $reason := .Reasons }}{{ if $i }}; {{ end }}{{ $reason }}{{ end }}</td>
            </tr>
            {{ end }}
        </tbody>
    </table>
    {{ else }}
    <p class="subtitle">The list is being worked out. Reload the page in a minute.</p>
    {{ end }}
    </main>
 </body>
 </html>
@@ -276,52 +276,6 @@
            margin-top: 12px;
        }
        /* Cards with figures of the routing table, worked out once a minute */
        #table-cards p,
        #well-known p {
            margin: 0 0 8px 0;
            font-size: 14px;
        }
        #table-cards a,
        #well-known a {
            color: #3498db;
            text-decoration: none;
        }
        #table-cards a:hover,
        #well-known a:hover {
            text-decoration: underline;
        }
        #table-cards .card-figure {
            font-size: 32px;
            font-weight: bold;
        }
        #table-cards .card-detail,
        #table-cards .card-time {
            color: #7f8c8d;
            font-size: 12px;
        }
        #table-cards .prefix {
            font-family: 'SF Mono', Monaco, 'Cascadia Mono', 'Roboto Mono', Consolas, 'Courier New', monospace;
        }
        #well-known {
            margin-bottom: 40px;
        }
        #well-known table {
            width: 100%;
            border-collapse: collapse;
            font-size: 14px;
        }
        #well-known th,
        #well-known td {
            text-align: left;
            padding: 8px 4px;
            border-bottom: 1px solid #eee;
        }
        #well-known th {
            color: #7f8c8d;
            font-weight: 600;
        }
        /* Footer */
        .footer {
            margin-top: 40px;
@@ -427,109 +381,6 @@
            </div>
        </div>
        {{ with .Cards }}
        <div class="search-section" id="table-cards">
            <div class="search-card">
                <h2>Newest Updated Route</h2>
                {{ with .NewestRoute }}
                <p><a href="{{ prefixURL .Prefix.String }}" class="prefix">{{ .Prefix }}</a> from {{ if .OriginASN }}<a href="/as/{{ .OriginASN }}">AS{{ .OriginASN }}</a>{{ else }}no known origin{{ end }}</p>
                <p class="card-time">{{ .Time.UTC.Format "2006-01-02 15:04:05" }} UTC, {{ timeSince .Time }}</p>
                {{ else }}
                <p>The routing table keeps no route yet.</p>
                {{ end }}
            </div>
            <div class="search-card">
                <h2>Oldest Updated Route</h2>
                {{ with .OldestRoute }}
                <p><a href="{{ prefixURL .Prefix.String }}" class="prefix">{{ .Prefix }}</a> from {{ if .OriginASN }}<a href="/as/{{ .OriginASN }}">AS{{ .OriginASN }}</a>{{ else }}no known origin{{ end }}</p>
                <p class="card-time">{{ .Time.UTC.Format "2006-01-02 15:04:05" }} UTC, {{ timeSince .Time }}</p>
                {{ else }}
                <p>The routing table keeps no route yet.</p>
                {{ end }}
            </div>
            <div class="search-card">
                <h2>Newest Updated AS</h2>
                {{ with .NewestAS }}
                <p><a href="/as/{{ .ASN }}">AS{{ .ASN }}</a> {{ .Handle }}</p>
                <p class="card-detail">{{ .Description }}</p>
                <p class="card-time">Last seen {{ .LastSeen.UTC.Format "2006-01-02 15:04:05" }} UTC, {{ timeSince .LastSeen }}</p>
                {{ else }}
                <p>No AS has been seen yet.</p>
                {{ end }}
            </div>
            <div class="search-card">
                <h2>Oldest Updated AS</h2>
                {{ with .OldestAS }}
                <p><a href="/as/{{ .ASN }}">AS{{ .ASN }}</a> {{ .Handle }}</p>
                <p class="card-detail">{{ .Description }}</p>
                <p class="card-time">Last seen {{ .LastSeen.UTC.Format "2006-01-02 15:04:05" }} UTC, {{ timeSince .LastSeen }}</p>
                {{ else }}
                <p>No AS has been seen yet.</p>
                {{ end }}
            </div>
            <div class="search-card">
                <h2>AS with the Most Prefixes</h2>
                {{ if .MostPrefixes }}
                <p><a href="/as/{{ .MostPrefixesASN }}">AS{{ .MostPrefixesASN }}</a></p>
                <p>Prefixes it originates: {{ .MostPrefixes }}</p>
                {{ else }}
                <p>No AS originates a prefix yet.</p>
                {{ end }}
            </div>
            <div class="search-card">
                <h2>ASes with the Fewest Prefixes</h2>
                <p>ASes that originate a single prefix: {{ .SinglePrefixASes }}</p>
                {{ with .NewestSinglePrefix }}
                <p>The most recently updated of them: <a href="/as/{{ .OriginASN }}">AS{{ .OriginASN }}</a>, with <a href="{{ prefixURL .Prefix.String }}" class="prefix">{{ .Prefix }}</a></p>
                <p class="card-time">{{ .Time.UTC.Format "2006-01-02 15:04:05" }} UTC, {{ timeSince .Time }}</p>
                {{ end }}
            </div>
            <div class="search-card">
                <h2>Bogon Announcements</h2>
                <p class="card-figure"><a href="/bogons">{{ .BogonCount }}</a></p>
                <p>Routes that announce a reserved prefix, or that come from a reserved AS number</p>
            </div>
            <div class="search-card">
                <h2>Prefixes with Several Origins</h2>
                <p class="card-figure"><a href="/multiple-origins">{{ .MultipleOriginCount }}</a></p>
                <p>Prefixes announced by more than one origin AS</p>
            </div>
        </div>
        <div class="search-card" id="well-known">
            <h2>Well-Known Networks</h2>
            <table>
                <thead>
                    <tr>
                        <th>Network</th>
                        <th>Prefixes</th>
                        <th>Last Update</th>
                    </tr>
                </thead>
                <tbody>
                    {{ range .WellKnownNetworks }}
                    <tr>
                        <td><a href="/as/{{ .ASN }}">AS{{ .ASN }}</a> {{ .Name }}</td>
                        <td>{{ .Prefixes }}</td>
                        <td>{{ with .Newest }}{{ timeSince . }}{{ else }}no route{{ end }}</td>
                    </tr>
                    {{ end }}
                </tbody>
            </table>
        </div>
        {{ else }}
        <div class="search-card" id="well-known">
            <p>The figures of the routing table are being worked out. Reload the page in a minute.</p>
        </div>
        {{ end }}
        <div class="search-card" id="ip-api">
            <h2>IP Information API</h2>
            <p>The API answers what RouteWatch knows about an IP address, such as its AS number and country. <code>/ip/</code> with no address answers for the caller's own address.</p>
@@ -714,8 +565,7 @@
                });
        });
-        // IP lookup: show the whole JSON answer, its @meta and an error answer
+        // IP lookup
        // included, as the IP information API card does.
        document.getElementById('ip-form').addEventListener('submit', function(e) {
            e.preventDefault();
            const ip = document.getElementById('ip-input').value.trim();
@@ -731,11 +581,18 @@
            fetch('/ip/' + encodeURIComponent(ip))
                .then(response => response.json())
-                .then(answer => {
+                .then(response => {
                    contentEl.classList.remove('loading');
                    if (response.status === 'error') {
                        contentEl.className = 'error';
                        contentEl.textContent = 'Error: ' + response.error.msg;
                    } else {
                        contentEl.className = '';
-                    contentEl.textContent = JSON.stringify(answer, null, 2);
+                        contentEl.textContent = JSON.stringify(response.data, null, 2);
                    }
                })
                .catch(error => {
                    contentEl.classList.remove('loading');
                    contentEl.className = 'error';
                    contentEl.textContent = 'Error: ' + error.message;
                });
@@ -1,182 +0,0 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Prefixes with Several Origins - RouteWatch</title>
    <style nonce="{{.CSPNonce}}">
        * {
            box-sizing: border-box;
        }
        body {
            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
            margin: 0;
            padding: 0;
            background: #f5f5f5;
        }
        /* Navbar styles */
        .navbar {
            background: #2c3e50;
            padding: 0 20px;
            display: flex;
            align-items: center;
            justify-content: space-between;
            height: 56px;
            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
        }
        .navbar-brand {
            display: flex;
            align-items: center;
            gap: 8px;
            font-size: 18px;
            font-weight: 600;
        }
        .navbar-brand a {
            color: white;
            text-decoration: none;
        }
        .navbar-brand a:hover {
            color: #ecf0f1;
        }
        .navbar-brand .by {
            font-weight: normal;
            color: #95a5a6;
            font-size: 14px;
        }
        .navbar-brand .author {
            color: #3498db;
            font-weight: normal;
        }
        .navbar-brand .author:hover {
            text-decoration: underline;
        }
        .navbar-links {
            display: flex;
            gap: 20px;
        }
        .navbar-links a {
            color: #ecf0f1;
            text-decoration: none;
            font-size: 14px;
            padding: 8px 12px;
            border-radius: 4px;
            transition: background-color 0.2s;
        }
        .navbar-links a:hover {
            background: rgba(255,255,255,0.1);
        }
        /* Main content */
        .main-content {
            max-width: 1200px;
            margin: 0 auto;
            padding: 20px;
        }
        h1 {
            color: #333;
            margin-bottom: 10px;
        }
        .subtitle {
            color: #666;
            margin-bottom: 30px;
        }
        table {
            width: 100%;
            border-collapse: collapse;
            background: white;
            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
            border-radius: 8px;
            overflow: hidden;
        }
        th {
            background: #f8f9fa;
            padding: 12px;
            text-align: left;
            font-weight: 600;
            color: #333;
            border-bottom: 2px solid #dee2e6;
        }
        td {
            padding: 12px;
            border-bottom: 1px solid #eee;
            vertical-align: top;
        }
        tr:last-child td {
            border-bottom: none;
        }
        tr:hover {
            background: #f8f9fa;
        }
        a {
            color: #0066cc;
            text-decoration: none;
        }
        a:hover {
            text-decoration: underline;
        }
        .prefix-link {
            font-family: 'SF Mono', Monaco, 'Cascadia Mono', 'Roboto Mono', Consolas, 'Courier New', monospace;
        }
        .origins {
            list-style: none;
            margin: 0;
            padding: 0;
        }
        .peers {
            color: #666;
            font-size: 0.9em;
        }
    </style>
 </head>
 <body>
    <nav class="navbar">
        <div class="navbar-brand">
            <a href="/">routewatch</a>
            <span class="by">by</span>
            <a href="https://sneak.berlin" class="author">@sneak</a>
        </div>
        <div class="navbar-links">
            <a href="/">Home</a>
            <a href="/status">Status</a>
        </div>
    </nav>
    <main class="main-content">
    <h1>Prefixes with Several Origin ASes</h1>
    {{ with .Cards }}
    <p class="subtitle">
        Prefixes announced by more than one origin AS: {{ .MultipleOriginCount }}.
        Such a prefix can be a hijack.
        {{ if lt (len .MultipleOrigins) .MultipleOriginCount }}The first {{ len .MultipleOrigins }} are listed, in prefix order.{{ end }}
        The list is worked out once a minute.
    </p>
    <table>
        <thead>
            <tr>
                <th>Prefix</th>
                <th>Origin ASes</th>
            </tr>
        </thead>
        <tbody>
            {{ range .MultipleOrigins }}
            <tr>
                <td><a href="{{ prefixURL .Prefix.String }}" class="prefix-link">{{ .Prefix }}</a></td>
                <td>
                    <ul class="origins">
                        {{ range .Origins }}
                        <li>{{ if .ASN }}<a href="/as/{{ .ASN }}">AS{{ .ASN }}</a>{{ else }}No known origin{{ end }} <span class="peers">{{ .Peers }} {{ if eq .Peers 1 }}peer{{ else }}peers{{ end }}</span></li>
                        {{ end }}
                    </ul>
                </td>
            </tr>
            {{ end }}
        </tbody>
    </table>
    {{ else }}
    <p class="subtitle">The list is being worked out. Reload the page in a minute.</p>
    {{ end }}
    </main>
 </body>
 </html>
@@ -401,8 +401,6 @@
        const REFRESH_PERIOD_MS = 2000;
        const STALE_AFTER_REFRESHES = 3;
        const MS_PER_SECOND = 1000;
        const SECONDS_PER_MINUTE = 60;
        const SECONDS_PER_HOUR = 3600;
        const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
        const SPINNER_COLOURS = ['#e74c3c', '#e67e22', '#f1c40f', '#27ae60', '#3498db', '#9b59b6'];
@@ -446,17 +444,6 @@
            return num.toLocaleString();
        }
        // formatDuration writes a number of seconds in hours, minutes and
        // seconds, such as "1h 18m 34s" or "18.2s", with at most one decimal.
        function formatDuration(totalSeconds) {
            const hours = Math.floor(totalSeconds / SECONDS_PER_HOUR);
            const minutes = Math.floor(totalSeconds % SECONDS_PER_HOUR / SECONDS_PER_MINUTE);
            const seconds = parseFloat((totalSeconds % SECONDS_PER_MINUTE).toFixed(1));
            if (hours > 0) return hours + 'h ' + minutes + 'm ' + seconds + 's';
            if (minutes > 0) return minutes + 'm ' + seconds + 's';
            return seconds + 's';
        }
        function formatProcessingTime(ms) {
            if (ms < 0.001) {
                return (ms * 1000).toFixed(0) + ' µs';
@@ -541,10 +528,6 @@
                        <span class="metric-label">Dropped</span>
                        <span class="metric-value ${handler.dropped_count > 0 ? 'disconnected' : ''}">${formatNumber(handler.dropped_count)}</span>
                    </div>
                    <div class="metric">
                        <span class="metric-label">Held Back</span>
                        <span class="metric-value">${formatNumber(handler.held_back_count)}</span>
                    </div>
                    <div class="metric">
                        <span class="metric-label">Avg Time</span>
                        <span class="metric-value">${formatProcessingTime(handler.avg_process_time_ms)}</span>
@@ -636,13 +619,11 @@
                    noteMessageCount(data.total_messages);
                    // Update all metrics
-                    document.getElementById('uptime').textContent = formatDuration(data.uptime_seconds);
+                    document.getElementById('uptime').textContent = data.uptime;
                    document.getElementById('go_version').textContent = data.go_version;
                    document.getElementById('goroutines').textContent = formatNumber(data.goroutines);
-                    document.getElementById('memory_usage').textContent = formatBytes(data.memory_usage_bytes);
+                    document.getElementById('memory_usage').textContent = data.memory_usage;
-                    // connection_duration_seconds is null while the stream is not connected.
+                    document.getElementById('connection_duration').textContent = data.connection_duration;
                    document.getElementById('connection_duration').textContent =
                        data.connection_duration_seconds === null ? 'disconnected' : formatDuration(data.connection_duration_seconds);
                    document.getElementById('reconnect_count').textContent = formatNumber(data.reconnect_count);
                    document.getElementById('total_messages').textContent = formatNumber(data.total_messages);
                    document.getElementById('messages_per_sec').textContent = formatNumber(Math.round(data.messages_per_sec));
@@ -691,7 +672,7 @@
                        const errorsEl = document.getElementById('whois_errors');
                        errorsEl.textContent = formatNumber(data.whois_stats.errors_last_hour);
                        errorsEl.className = 'metric-value' + (data.whois_stats.errors_last_hour > 0 ? ' disconnected' : '');
-                        document.getElementById('whois_interval').textContent = formatDuration(data.whois_stats.current_interval_seconds);
+                        document.getElementById('whois_interval').textContent = data.whois_stats.current_interval;
                    }
                    // Update handler stats
@@ -27,12 +27,6 @@ var prefixDetailHTML string
 //go:embed prefix_length.html
 var prefixLengthHTML string
 //go:embed bogons.html
 var bogonsHTML string
 //go:embed multiple_origins.html
 var multipleOriginsHTML string
 // Templates contains all parsed templates
 type Templates struct {
 	// Index is the template for the home page
@@ -45,11 +39,6 @@ type Templates struct {
 	PrefixDetail *template.Template
 	// PrefixLength is the template for displaying prefixes by length
 	PrefixLength *template.Template
 	// Bogons is the template of the page that lists the bogon announcements
 	Bogons *template.Template
 	// MultipleOrigins is the template of the page that lists the prefixes
 	// announced by more than one origin AS
 	MultipleOrigins *template.Template
 }
 var (
@@ -127,18 +116,6 @@ func initTemplates() {
 	if err != nil {
 		panic("failed to parse prefix length template: " + err.Error())
 	}
 	defaultTemplates.Bogons, err = template.New("bogons").
 		Funcs(funcs).Parse(bogonsHTML)
 	if err != nil {
 		panic("failed to parse bogons template: " + err.Error())
 	}
 	defaultTemplates.MultipleOrigins, err = template.New("multipleOrigins").
 		Funcs(funcs).Parse(multipleOriginsHTML)
 	if err != nil {
 		panic("failed to parse multiple origins template: " + err.Error())
 	}
 }
 // Get returns the singleton Templates instance
@@ -172,14 +149,3 @@ func PrefixDetailTemplate() *template.Template {
 func PrefixLengthTemplate() *template.Template {
 	return Get().PrefixLength
 }
 // BogonsTemplate returns the parsed template of the bogon announcements page
 func BogonsTemplate() *template.Template {
 	return Get().Bogons
 }
 // MultipleOriginsTemplate returns the parsed template of the page of prefixes
 // announced by more than one origin AS
 func MultipleOriginsTemplate() *template.Template {
 	return Get().MultipleOrigins
 }
@@ -7,22 +7,17 @@ import (
 	"testing"
 	"git.eeqj.de/sneak/routewatch/internal/database"
 	"git.eeqj.de/sneak/routewatch/internal/server"
 	"git.eeqj.de/sneak/routewatch/internal/templates"
 )
 // renderPage renders a page with the data every page needs, and the visitor's
-// address and the routing table's cards, which the home page also needs. The
+// address, which the home page also needs.
 // cards are left out, as before the server first works them out.
 func renderPage(t *testing.T, tmpl *template.Template) string {
 	t.Helper()
 	var page bytes.Buffer
-	err := tmpl.Execute(&page, struct {
+	err := tmpl.Execute(&page, struct{ CSPNonce, ClientIP string }{})
 		CSPNonce, ClientIP string
 		Cards              any
 	}{})
 	if err != nil {
 		t.Fatalf("rendering the page: %v", err)
 	}
@@ -119,14 +114,14 @@ func TestASDetailPrefixListsFold(t *testing.T) {
 		prefixV6 = "2001:db8::/32"
 	)
-	ipv4 := []server.LiveRoute{{Prefix: prefixV4}}
+	ipv4 := []database.LiveRoute{{Prefix: prefixV4}}
-	ipv6 := []server.LiveRoute{{Prefix: prefixV6}}
+	ipv6 := []database.LiveRoute{{Prefix: prefixV6}}
 	// The fields the AS page handler gives the template.
 	data := struct {
 		ASN          *database.ASN
-		IPv4Prefixes []server.LiveRoute
+		IPv4Prefixes []database.LiveRoute
-		IPv6Prefixes []server.LiveRoute
+		IPv6Prefixes []database.LiveRoute
 		TotalCount   int
 		IPv4Count    int
 		IPv6Count    int
@@ -12,7 +12,6 @@ import (
 	"regexp"
 	"strings"
 	"sync"
 	"syscall"
 	"time"
 	"unicode/utf8"
@@ -71,12 +70,12 @@ const nicbrHeader = "% Copyright (c) Nic.br"
 // queries to stop the data being taken in bulk.
 const nicbrLimitReached = "Query rate limit exceeded"
-// PauseTime is how long the client sends an RIR's or NIC.br's server no
+// NICbrSkipTime is how long the client stops asking NIC.br after NIC.br
-// query after that server refuses a query. queryRegistry says what a
+// answers that the client is over its query limit. NIC.br publishes
-// refusal is. RIPE refuses an address for good when the address keeps
+// neither the limit nor how long it lasts. An hour outlasts a limit
-// passing RIPE's limit (see noPersonalFlag). An hour outlasts a limit
+// counted per minute or per hour. The ASes looked up meanwhile get
-// counted per minute or per hour.
+// NIC.br's fields when they are next refreshed.
-const PauseTime = time.Hour
+const NICbrSkipTime = time.Hour
 // RIR identifiers.
 const (
@@ -126,10 +125,6 @@ var (
 	errAnswerTooLarge = errors.New("WHOIS answer reached the size cap")
 )
 // ErrPaused is returned when a lookup needs a server that refused a query
 // less than PauseTime ago. The client sends that server nothing meanwhile.
 var ErrPaused = errors.New("WHOIS server paused after refusing a query")
 // ASNInfo contains parsed WHOIS information for an ASN.
 type ASNInfo struct {
 	ASN         int
@@ -161,12 +156,12 @@ type Client struct {
 	logger *slog.Logger
-	// mu guards pausedUntil.
+	// mu guards nicbrSkipUntil.
 	mu sync.Mutex
-	// pausedUntil maps a server, given as host:port, to the time the client
+	// nicbrSkipUntil is when the client next asks NIC.br, after NIC.br
-	// may ask it again.
+	// answered that the client is over its query limit.
-	pausedUntil map[string]time.Time
+	nicbrSkipUntil time.Time
 }
 // NewClient creates a new WHOIS client that logs to logger.
@@ -177,29 +172,23 @@ func NewClient(logger *slog.Logger) *Client {
 		DialContext: dialer.DialContext,
 		Now:         time.Now,
 		logger:      logger,
 		pausedUntil: make(map[string]time.Time),
 	}
 }
 // LookupASN asks IANA which RIR holds the given ASN, asks that RIR, and
 // returns what the RIR's answer says. When LACNIC's answer is NIC.br's, it
 // returns what NIC.br's own server says instead, unless that query fails or
-// NIC.br is paused, as askNICbr says.
+// is skipped, as askNICbr says.
 //
-// It returns ErrNoReferral when IANA refers the AS to no RIR. Its error
+// It returns ErrNoReferral when IANA refers the AS to no RIR, and another
-// wraps ErrPaused when the RIR is paused. It returns another error in each
+// error when the query to IANA or to the RIR fails, when the RIR refuses
-// of these cases:
+// it, when IANA's answer has neither a referral nor the AS's block, when
-//
+// IANA refers the AS to a server none of the five RIRs run, or when the
-//   - the query to IANA or to the RIR fails
+// answer carries none of ASNInfo's fields.
 //   - the RIR refuses the query
 //   - IANA's answer has neither a referral nor the AS's block
 //   - IANA refers the AS to a server none of the five RIRs run
 //   - the answer carries none of ASNInfo's fields
 func (c *Client) LookupASN(ctx context.Context, asn int) (*ASNInfo, error) {
 	// Query IANA first to find the authoritative RIR
 	query := fmt.Sprintf("AS%d", asn)
 	// IANA is never paused, because a pause of IANA would stop every lookup.
 	ianaResp, err := c.query(ctx, whoisServerIANA, query)
 	if err != nil {
 		return nil, fmt.Errorf("IANA query failed: %w", err)
@@ -222,7 +211,7 @@ func (c *Client) LookupASN(ctx context.Context, asn int) (*ASNInfo, error) {
 	}
 	// Query the authoritative RIR
-	rirResp, err := c.queryRegistry(ctx, whoisServer, rirQuery(rir, query))
+	rirResp, err := c.queryRIR(ctx, whoisServer, rirQuery(rir, query))
 	if err != nil {
 		return nil, fmt.Errorf("RIR query failed: %w", err)
 	}
@@ -252,19 +241,22 @@ func (c *Client) LookupASN(ctx context.Context, asn int) (*ASNInfo, error) {
 // askNICbr returns lacnicInfo, what LACNIC's answer says, and logs a
 // warning when the query fails, when NIC.br sends the reduced answer for a
 // client over its limit, or when NIC.br's answer carries none of ASNInfo's
-// fields. The reduced answer pauses NIC.br, as a refusal does. While NIC.br
+// fields. After the reduced answer, it returns lacnicInfo without asking
-// is paused, askNICbr returns lacnicInfo without a warning. The ASes looked
+// NIC.br until NICbrSkipTime has passed.
 // up meanwhile get NIC.br's fields when they are next refreshed.
 func (c *Client) askNICbr(
 	ctx context.Context, asQuery string, lacnicInfo *ASNInfo,
 ) *ASNInfo {
 	asn := lacnicInfo.ASN
-	answer, err := c.queryRegistry(ctx, whoisServerNICbr, asQuery)
+	c.mu.Lock()
-	if errors.Is(err, ErrPaused) {
+	skipping := c.Now().Before(c.nicbrSkipUntil)
 	c.mu.Unlock()
 	if skipping {
 		return lacnicInfo
 	}
 	answer, err := c.query(ctx, whoisServerNICbr, asQuery)
 	if err != nil {
 		c.logger.Warn("NIC.br query failed, keeping LACNIC's fields",
 			"asn", asn, "error", err)
@@ -273,11 +265,13 @@ func (c *Client) askNICbr(
 	}
 	if strings.Contains(answer, nicbrLimitReached) {
-		c.pause(whoisServerNICbr)
+		c.mu.Lock()
 		c.nicbrSkipUntil = c.Now().Add(NICbrSkipTime)
 		c.mu.Unlock()
 		c.logger.Warn("NIC.br answered that the client is over its query "+
-			"limit, keeping LACNIC's fields and pausing NIC.br",
+			"limit, keeping LACNIC's fields and skipping NIC.br",
-			"asn", asn, "pause_for", PauseTime)
+			"asn", asn, "skip_for", NICbrSkipTime)
 		return lacnicInfo
 	}
@@ -315,65 +309,25 @@ func rirQuery(rir, asQuery string) string {
 	}
 }
-// queryRegistry sends query to the server of an RIR or of NIC.br, and
+// queryRIR sends query to an RIR's server and returns the answer. An answer
-// returns the answer. The client pauses the server for PauseTime when the
+// holding an error line with which the server refuses the query is an
-// server refuses the query. Each of these is a refusal:
+// error, and the error holds that line.
-//
+func (c *Client) queryRIR(
 //   - a refused connection
 //   - a reset connection
 //   - an %ERROR:201: or %ERROR:202: line in the answer
 //
 // A refusal is returned as an error. While the server is paused,
 // queryRegistry sends it nothing and returns an error that wraps ErrPaused.
 func (c *Client) queryRegistry(
 	ctx context.Context, server, query string,
 ) (string, error) {
 	c.mu.Lock()
 	pausedUntil := c.pausedUntil[server]
 	c.mu.Unlock()
 	if c.Now().Before(pausedUntil) {
 		return "", fmt.Errorf("%w: %s until %s", ErrPaused, server,
 			pausedUntil.UTC().Format(time.RFC3339))
 	}
 	answer, err := c.query(ctx, server, query)
 	if err == nil {
 		err = checkRefusal(answer)
 	}
 	if errors.Is(err, errRefused) || errors.Is(err, syscall.ECONNREFUSED) ||
 		errors.Is(err, syscall.ECONNRESET) {
 		c.pause(server)
 	}
 	if err != nil {
 		return "", err
 	}
 	return answer, nil
 }
 // checkRefusal returns an error holding the first line of answer that
 // starts with accessDeniedError or accessLimitError. It returns nil when
 // answer has no such line.
 func checkRefusal(answer string) error {
 	for line := range strings.SplitSeq(answer, "\n") {
 		if strings.HasPrefix(line, accessDeniedError) ||
 			strings.HasPrefix(line, accessLimitError) {
-			return fmt.Errorf("%w: %s", errRefused, line)
+			return "", fmt.Errorf("%w: %s", errRefused, line)
 		}
 	}
-	return nil
+	return answer, nil
 }
 // pause stops queryRegistry from querying server until PauseTime has passed.
 func (c *Client) pause(server string) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	c.pausedUntil[server] = c.Now().Add(PauseTime)
 }
 // query performs a raw WHOIS query to the specified server and returns the
@@ -718,10 +718,9 @@ func TestLookupASNKeepsLACNICsAnswerWhenNICbrFails(t *testing.T) {
 // TestLookupASNSkipsNICbrAfterItsLimit looks up an AS that NIC.br
 // registers three times with one client, while NIC.br answers that the
-// client is over its query limit. The test sets the client's clock. The
+// client is over its query limit. The first lookup asks NIC.br. The
-// first lookup asks NIC.br. The next comes a second before PauseTime has
+// second, a second before NICbrSkipTime has passed, does not. The third,
-// passed, and does not ask NIC.br. The last comes at PauseTime and asks
+// once NICbrSkipTime has passed, asks again. Each keeps LACNIC's fields.
 // NIC.br again. Each keeps LACNIC's fields.
 func TestLookupASNSkipsNICbrAfterItsLimit(t *testing.T) {
 	t.Parallel()
@@ -741,8 +740,8 @@ func TestLookupASNSkipsNICbrAfterItsLimit(t *testing.T) {
 		wantAsks int
 	}{
 		{after: 0, wantAsks: 1},
-		{after: whois.PauseTime - time.Second, wantAsks: 1},
+		{after: whois.NICbrSkipTime - time.Second, wantAsks: 1},
-		{after: whois.PauseTime, wantAsks: 2},
+		{after: whois.NICbrSkipTime, wantAsks: 2},
 	} {
 		now = start.Add(step.after)
@@ -786,142 +785,6 @@ func TestLookupASNReportsARefusal(t *testing.T) {
 	}
 }
 // resetServer starts a TCP server on the loopback address and returns the
 // server's address. The server reads one query on each connection, then
 // resets the connection.
 func resetServer(t *testing.T) string {
 	t.Helper()
 	var listenConfig net.ListenConfig
 	listener, err := listenConfig.Listen(t.Context(), "tcp", "127.0.0.1:0")
 	if err != nil {
 		t.Fatalf("listen: %v", err)
 	}
 	t.Cleanup(func() { _ = listener.Close() })
 	go func() {
 		for {
 			conn, err := listener.Accept()
 			if err != nil {
 				return
 			}
 			_, _ = bufio.NewReader(conn).ReadString('\n')
 			// Closing a connection whose linger time is zero resets it.
 			if tcpConn, ok := conn.(*net.TCPConn); ok {
 				_ = tcpConn.SetLinger(0)
 			}
 			_ = conn.Close()
 		}
 	}()
 	return listener.Addr().String()
 }
 // newRIPEClient returns a client whose fake servers send answers. The
 // client adds one to *ripeAsks each time it connects to RIPE's server. When
 // reset is true, RIPE's server resets the connection instead of answering.
 func newRIPEClient(
 	t *testing.T, answers map[string]string, reset bool, ripeAsks *int,
 ) *whois.Client {
 	t.Helper()
 	dial := fakeServers(t, answers)
 	resetAddress := resetServer(t)
 	client := whois.NewClient(slog.New(slog.DiscardHandler))
 	client.DialContext = func(
 		ctx context.Context, network, address string,
 	) (net.Conn, error) {
 		if address == ripeServer {
 			*ripeAsks++
 		}
 		if address == ripeServer && reset {
 			var dialer net.Dialer
 			return dialer.DialContext(ctx, network, resetAddress)
 		}
 		return dial(ctx, network, address)
 	}
 	return client
 }
 // TestLookupASNPausesAServerThatRefuses looks up an AS at RIPE while RIPE
 // refuses the query, in each of the ways a server refuses. The test sets
 // the client's clock. A lookup a second before PauseTime has passed fails
 // with ErrPaused and asks RIPE nothing. A lookup of an AS at APNIC succeeds
 // during the pause. A lookup at PauseTime asks RIPE again.
 func TestLookupASNPausesAServerThatRefuses(t *testing.T) {
 	t.Parallel()
 	for name, test := range map[string]struct {
 		// ripeAnswer is RIPE's answer. With none, RIPE's server refuses
 		// the connection, or resets it when reset is true.
 		ripeAnswer string
 		reset      bool
 	}{
 		"access denied":      {ripeAnswer: ripeRefusal},
 		"limit reached":      {ripeAnswer: ripeLimitReached + "\n"},
 		"refused connection": {},
 		"reset connection":   {reset: true},
 	} {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			answers := map[string]string{
 				ianaQuery:      ianaReferral,
 				apnicIANAQuery: "refer:        whois.apnic.net\n",
 				apnicQuery:     apnicRecord,
 			}
 			if test.ripeAnswer != "" {
 				answers[ripeQuery] = test.ripeAnswer
 			}
 			ripeAsks := 0
 			client := newRIPEClient(t, answers, test.reset, &ripeAsks)
 			start := time.Date(2026, 11, 2, 0, 0, 0, 0, time.UTC)
 			now := start
 			client.Now = func() time.Time { return now }
 			_, err := client.LookupASN(t.Context(), testASN)
 			if err == nil || errors.Is(err, whois.ErrPaused) {
 				t.Fatalf("LookupASN while RIPE refuses: error %v, want a "+
 					"refusal", err)
 			}
 			now = start.Add(whois.PauseTime - time.Second)
 			_, err = client.LookupASN(t.Context(), testASN)
 			if !errors.Is(err, whois.ErrPaused) || ripeAsks != 1 {
 				t.Errorf("LookupASN during the pause: error %v after %d "+
 					"queries to RIPE, want ErrPaused after 1", err, ripeAsks)
 			}
 			_, err = client.LookupASN(t.Context(), apnicASN)
 			if err != nil {
 				t.Errorf("LookupASN of an AS at APNIC during RIPE's "+
 					"pause: %v", err)
 			}
 			now = start.Add(whois.PauseTime)
 			_, _ = client.LookupASN(t.Context(), testASN)
 			if ripeAsks != 2 {
 				t.Errorf("RIPE was asked %d times after the pause, want 2",
 					ripeAsks)
 			}
 		})
 	}
 }
 // TestLookupASNFailsWhenTheRIRGivesNoAnswer looks up an AS IANA refers to
 // RIPE when RIPE's server refuses the connection, and when it answers only
 // with an error. Neither is a lookup that found the AS.