Put the links and the crypto they use in link/, a part of their own

libpure-link.a holds them; pure-serve and the M5 harness link it instead
of naming its source files.

2 files changed, 8 insertions, 7 deletions

diff --git a/research/experiments/019-idle-links/links.c b/research/experiments/019-idle-links/links.c
index 732429a..666ac29 100644
--- a/research/experiments/019-idle-links/links.c
+++ b/research/experiments/019-idle-links/links.c
@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 /* Many senders to one Pure node over links without connections
  * (docs/design/011-pure-transport.md, M1). Written from the packet format in
- * serve/link.h alone, with OpenSSL: a second implementation of it.
+ * link/link.h alone, with OpenSSL: a second implementation of it.
  *
  *   links keys N FILE
  *       N X25519 keys into FILE (each a private then a public half, 32 bytes
@@ -111,7 +111,7 @@ static int keys(size_t n, const char *path) {
     return 0;
 }
 
-/* ---- Keys of a link (serve/link.h): X25519, HKDF-SHA256, AES-128-GCM */
+/* ---- Keys of a link (link/link.h): X25519, HKDF-SHA256, AES-128-GCM */
 
 static bool secret_of(const unsigned char own[2 * KEY], const unsigned char peer[KEY], unsigned char out[32]) {
     EVP_PKEY *mine = EVP_PKEY_new_raw_private_key(EVP_PKEY_X25519, NULL, own, KEY);
diff --git a/research/experiments/019-idle-links/run.py b/research/experiments/019-idle-links/run.py
index 96a0cbc..d10cb3f 100644
--- a/research/experiments/019-idle-links/run.py
+++ b/research/experiments/019-idle-links/run.py
@@ -552,11 +552,12 @@ def main():
     args = parser.parse_args()
     counts = [int(c) for c in args.counts.split(',')]
     if args.transport:
-        subprocess.run(['make', '-s', '-C', str(ROOT), 'build/libpure.a', 'build/pure-crypto.so'], check=True)
-        subprocess.run(['cc', '-O2', '-g', '-std=c17', '-Wall', '-Wextra', '-Werror', f'-I{ROOT}/core', f'-I{ROOT}/serve',
-                        '-DPURE_ASYNC_EFFECTS', str(Path(__file__).parent / 'transport.c'), str(ROOT / 'serve/link.c'),
-                        str(ROOT / 'serve/crypto.c'), str(ROOT / 'build/libpure.a'), '-lm', '-pthread', '-ldl', '-o',
-                        str(ROOT / 'build/link-transport')], check=True)
+        subprocess.run(['make', '-s', '-C', str(ROOT), 'build/libpure.a', 'build/libpure-link.a', 'build/pure-crypto.so'],
+                       check=True)
+        subprocess.run(['cc', '-O2', '-g', '-std=c17', '-Wall', '-Wextra', '-Werror', f'-I{ROOT}/core', f'-I{ROOT}/link',
+                        str(Path(__file__).parent / 'transport.c'), str(ROOT / 'build/libpure-link.a'),
+                        str(ROOT / 'build/libpure.a'), '-lm', '-pthread', '-ldl', '-o', str(ROOT / 'build/link-transport')],
+                       check=True)
         subprocess.run(['cargo', 'build', '--release', '--offline', '--quiet'], cwd=Path(__file__).parent / 'quic', check=True)
         with tempfile.TemporaryDirectory(prefix='pure-m5-', dir=args.store) as directory:
             work = Path(directory)