chiark / gitweb /
Ian Jackson [Sun, 8 Aug 2021 01:46:58 +0000 (02:46 +0100)]
config: bail on same quote in quotes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 01:45:09 +0000 (02:45 +0100)]
Revert "config: Deprecate quoted values"
Actually, let's not. We might want this later.
This reverts commit
994ef0004928a5fc4e1a00eec917ab8d88c8c55b.
Ian Jackson [Sun, 8 Aug 2021 01:44:39 +0000 (02:44 +0100)]
config: Deprecate quoted values
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 01:41:44 +0000 (02:41 +0100)]
client: rate limit when returned data contains only junk
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 01:41:13 +0000 (02:41 +0100)]
slip: Rename PacketError::Truncated
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 01:29:31 +0000 (02:29 +0100)]
slip: do not use zero padding when packet too short
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 01:11:08 +0000 (02:11 +0100)]
server: wip, httpd
Trivial clone and hack from hyper docs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:48:36 +0000 (01:48 +0100)]
Revert "ipif: Do not grumble about ipif getting sigpipe, if we are quitting"
This reverts commit
ceb9a34ac113484065b5bcbb1b6dccf263e1a42b.
Ian Jackson [Sun, 8 Aug 2021 00:48:22 +0000 (01:48 +0100)]
ipif: Drop things in the right order, to avoid child SIPIPE
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:33:03 +0000 (01:33 +0100)]
ipif: Do not grumble about ipif getting sigpipe, if we are quitting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:25:56 +0000 (01:25 +0100)]
server: wip, ipif
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:25:38 +0000 (01:25 +0100)]
test: exec ipif rather than wrapping it in the shell
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:21:07 +0000 (01:21 +0100)]
config: Provide a startup hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:14:57 +0000 (01:14 +0100)]
config: Actually get global config
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:12:04 +0000 (01:12 +0100)]
client: wrap a line
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:11:14 +0000 (01:11 +0100)]
ipif: Use OptionPrefixColon for quitting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:10:31 +0000 (01:10 +0100)]
ipif: Introduce OptionPrefixColon
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 8 Aug 2021 00:09:55 +0000 (01:09 +0100)]
client: fix an error report to not be debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 23:57:25 +0000 (00:57 +0100)]
ipif: wip break out, rename fields
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 23:54:56 +0000 (00:54 +0100)]
ipif: wip break out
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 23:54:44 +0000 (00:54 +0100)]
ipif: wip break out
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 23:52:44 +0000 (00:52 +0100)]
ipif: wip break out
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 21:50:39 +0000 (22:50 +0100)]
config: get global config, macro doc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 21:47:50 +0000 (22:47 +0100)]
config: get global config
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 21:28:45 +0000 (22:28 +0100)]
config macros: wip global
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 21:25:06 +0000 (22:25 +0100)]
config macros: wip global
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 21:15:32 +0000 (22:15 +0100)]
config: allow `special` to override, and set global for ipif
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 20:39:11 +0000 (21:39 +0100)]
startup: use in server
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 20:37:29 +0000 (21:37 +0100)]
startup: break out fn
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 20:29:02 +0000 (21:29 +0100)]
ini: use instead of configparser
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 20:28:49 +0000 (21:28 +0100)]
ini: fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 20:03:44 +0000 (21:03 +0100)]
ini: new module compiles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 19:55:02 +0000 (20:55 +0100)]
ini: wip new module
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 19:51:32 +0000 (20:51 +0100)]
ini: wip new module
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 19:40:37 +0000 (20:40 +0100)]
ini: wip new module
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 18:58:54 +0000 (19:58 +0100)]
config macros: Detect duplicate skl assignment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 18:58:44 +0000 (19:58 +0100)]
config macros: Tidy up a message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 17:50:40 +0000 (18:50 +0100)]
config: Tidy up ipif setting
We can and should just use `ordinary(..,Global)` directly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 17:50:47 +0000 (18:50 +0100)]
config: Set the SKL explicitly for `client` attribute
This removes the default SKL, so we will notice if we don't have
attributes that set one.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 17:46:08 +0000 (18:46 +0100)]
config: Apply per_client and global attrs
Now everything has an attribute which implyies (well, ought to appply)
an SKL setting.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 17:44:40 +0000 (18:44 +0100)]
config macros: Provide `per_client` and `global` attrs
These set the SKL explicitly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 17:42:19 +0000 (18:42 +0100)]
config macros: Make per-field skl variable an Option
So far, we never set it to None. But this will allow us to abolish
the default, after we have srranged to always set it to Some.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 18:40:07 +0000 (19:40 +0100)]
config: Tolerate Global settings in client sections on client
It is OK for these to be found in these sections on the client. This
may simplify writing config files intended to be used only on the
client.
On the server we must reject these to avoid horrendous confusion.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 18:08:41 +0000 (19:08 +0100)]
config: Provide end in Aggregate and pass to contains()
Nothing uses this yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 17:35:06 +0000 (18:35 +0100)]
config: Use SKL::None for `link` and fix `server=`
We don't want to allow `link=` in the actual config files at all, so we
should set its SKL to None.
Conversely, `server` needs to be tolerated in the special `ServerName`
section even though it doesn't appear in the InstanceConfig struct.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 17:33:34 +0000 (18:33 +0100)]
config: Introduce SKL::None, currently for `computed`
This isn't complete yet, because we need to use this in more places
and also arrange not to treat these as "allowed but in the wrong
section" but "not a known config key".
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 16:57:36 +0000 (17:57 +0100)]
config: Pass SKL to all the method functions, and document semantics
This will make it possible to use the same method for things with
different applicable sections.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 17:00:08 +0000 (18:00 +0100)]
config: Derive Eq for SectionKindList
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 18:11:34 +0000 (19:11 +0100)]
config: Rename ClientAgnostic to Global
NFC yet, but we are going to change this.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 16:56:08 +0000 (17:56 +0100)]
config: Rename PerClient from Ordinary
NFC. This was really quite confusing because the settings which
default to Ordinary are in fact supposed to be client-agnostic on the
server end. Right now this is broken.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 17:43:29 +0000 (18:43 +0100)]
config macros: Promote atspan variable
We're going to want to use this in the other branches.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 18:07:48 +0000 (19:07 +0100)]
config: Do not use Default for constructing Aggregate
We are going to want to add a non-Default field, in a bit.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 16:54:18 +0000 (17:54 +0100)]
config: Better printing of wrong section error
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 16:51:45 +0000 (17:51 +0100)]
client: Improve startup error handling
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 16:12:32 +0000 (17:12 +0100)]
config: ifnames in right sections
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 16:05:32 +0000 (17:05 +0100)]
eyre: note about a dep
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 16:03:40 +0000 (17:03 +0100)]
eyre: deup printing, yay
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 15:59:04 +0000 (16:59 +0100)]
eyre: code formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 15:58:11 +0000 (16:58 +0100)]
eyre: resolve the backtrace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 15:52:05 +0000 (16:52 +0100)]
eyre: wip backtrace, c&p from example
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 15:41:57 +0000 (16:41 +0100)]
eyre: wip backtrace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 15:31:26 +0000 (16:31 +0100)]
eyre: wip experiment, needs some work
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 15:19:07 +0000 (16:19 +0100)]
eyre: switch from anyhow to eyre
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 15:11:17 +0000 (16:11 +0100)]
test: copyright notices
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 15:07:50 +0000 (16:07 +0100)]
test: run-* scripts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 15:01:41 +0000 (16:01 +0100)]
test: netns setup
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 14:36:06 +0000 (15:36 +0100)]
test: fixes, tun
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 14:04:19 +0000 (15:04 +0100)]
error handling: note a todo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 12:54:09 +0000 (13:54 +0100)]
client: better logging of ipif failures
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 12:51:01 +0000 (13:51 +0100)]
client: better logging of ipif failures
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 12:50:36 +0000 (13:50 +0100)]
client: better logging of ipif failures
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 12:08:34 +0000 (13:08 +0100)]
test: add a test script
This currently crashes.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 12:04:53 +0000 (13:04 +0100)]
uml: change cwd links
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 12:00:16 +0000 (13:00 +0100)]
uml: add entropy, fix names
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 11:19:37 +0000 (12:19 +0100)]
uml: build rndaddtoentcnt
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 11:14:07 +0000 (12:14 +0100)]
Ian Jackson [Sat, 7 Aug 2021 11:13:06 +0000 (12:13 +0100)]
uml: plumbing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Aug 2021 11:03:36 +0000 (12:03 +0100)]
uml: move to subdir
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 20:10:14 +0000 (21:10 +0100)]
uml: provide -setup, -run
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 20:00:30 +0000 (21:00 +0100)]
uml: rename psusan-uml-psusan
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 19:54:05 +0000 (20:54 +0100)]
uml: tidy up a bit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 18:10:59 +0000 (19:10 +0100)]
uml: Run a shell session by default
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 18:07:42 +0000 (19:07 +0100)]
uml: Provide wrap script
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 18:04:29 +0000 (19:04 +0100)]
uml: script formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 17:58:18 +0000 (18:58 +0100)]
uml: set PATH (work around bash bug)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 17:57:51 +0000 (18:57 +0100)]
uml: remove redundant stderr redirect
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 17:56:50 +0000 (18:56 +0100)]
uml: work around uml console bug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 17:54:07 +0000 (18:54 +0100)]
uml: Use console not serial for comms
This seems less odd somehow. Doesn't seem to make any practical
difference.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 6 Aug 2021 14:41:43 +0000 (15:41 +0100)]
uml psusan: wip
More or less copied from the putty docs (putty has a permissive licence)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 5 Aug 2021 20:12:40 +0000 (21:12 +0100)]
rework and reformat docs, mark up in rst
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 5 Aug 2021 10:33:11 +0000 (11:33 +0100)]
docs wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 5 Aug 2021 10:26:47 +0000 (11:26 +0100)]
Makefile and docs framework
Much copied from Otter. (Where needed, I am hereby relicensing from
AGPLv3+ to GPLv3+.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 5 Aug 2021 00:09:42 +0000 (01:09 +0100)]
config: Add some commented-out dbgs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 5 Aug 2021 00:08:11 +0000 (01:08 +0100)]
config: Fix algorithm problem with instance enumration
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 5 Aug 2021 00:07:50 +0000 (01:07 +0100)]
config: Note a problem with ini
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 5 Aug 2021 00:07:34 +0000 (01:07 +0100)]
client: report ipif exit status if it fails
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 4 Aug 2021 23:36:10 +0000 (00:36 +0100)]
config: Actually parse SERVER
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 4 Aug 2021 23:33:47 +0000 (00:33 +0100)]
config: Do not think of COMMON as a server name
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 4 Aug 2021 23:32:56 +0000 (00:32 +0100)]
config: Drop mention of DEFAULT
This is a thing that was in the python config library, but COMMON
serves the same purpose.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 4 Aug 2021 23:30:26 +0000 (00:30 +0100)]
import test.cfg from python hippotat
Imported from the version in
dce21e00c38132b17ec973923f4f7d0cbf47049f
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ian / hippotat.git / log