Protocolary updates for release 1.6.0

diff --git a/README.md b/README.md
index f6d977ea86dd5b3159610203eeacb5a8c15989e0..6350e736c157c7b464f2a39a2349696a489a598d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,20 +1,14 @@
 # FORT Validator
 
-An RPKI Validator and RTR Server, part of the [FORT project](https://www.fortproject.net).
+An RPKI Relying Party and RTR Server.
 
 ## Documentation
 
-FORT Validator's documentation (installation, usage, etc.) can be found at [https://nicmx.github.io/FORT-validator/](https://nicmx.github.io/FORT-validator/).
-
-If you wish to generate the docs by yourself, visit the [docs directory](docs/).
+- [Home](https://nicmx.github.io/FORT-validator/index.html)
+- [Installation](https://nicmx.github.io/FORT-validator/installation.html)
+- [Usage](https://nicmx.github.io/FORT-validator/run.html)
+- [Arguments](https://nicmx.github.io/FORT-validator/usage.html)
 
 ## Docker image
 
-A Dockerfile to build the image is located at the [docker directory](docker/).
-
-## Quick start
-
-TL;DR all the docs, probably you just want to read:
-- How to install? Visit [Compilation and Installation](https://nicmx.github.io/FORT-validator/installation.html).
-- How to execute? Visit [Basic Usage](https://nicmx.github.io/FORT-validator/run.html) and [Program Arguments](https://nicmx.github.io/FORT-validator/usage.html).
-- How to configure the router(s)? Visit [Routers](https://nicmx.github.io/FORT-validator/routers.html).
+See the [docker/ directory](docker/).

diff --git a/docs/usage.md b/docs/usage.md
index 7cf753af2cccc9534dedf9f99a5420fbd634c337..f70fdcb641f6e2dc2f3176af12cf4d84b8b54624 100644 (file)
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -86,8 +86,6 @@ description: Guide to use arguments of FORT Validator.
        [--configuration-file=<file>]
        [--tal=<file>|<directory>]
        [--local-repository=<directory>]
-       [--sync-strategy=off|root|root-except-ta]
-       [--shuffle-uris=true|false]
        [--maximum-certificate-depth=<unsigned integer>]
        [--slurm=<file>|<directory>]
        [--mode=server|standalone]
@@ -102,19 +100,15 @@ description: Guide to use arguments of FORT Validator.
        [--server.interval.expire=<unsigned integer>]
        [--server.deltas.lifetime=<unsigned integer>]
        [--rsync.enabled=true|false]
-       [--rsync.priority=<32-bit unsigned integer>]
-       [--rsync.strategy=root|root-except-ta]
+       [--rsync.priority=<unsigned integer>]
        [--rsync.retry.count=<unsigned integer>]
        [--rsync.retry.interval=<unsigned integer>]
-       [--rrdp.enabled=true|false]
-       [--rrdp.priority=<32-bit unsigned integer>]
-       [--rrdp.retry.count=<unsigned integer>]
-       [--rrdp.retry.interval=<unsigned integer>]
        [--http.enabled=true|false]
-       [--http.priority=<32-bit unsigned integer>]
+       [--http.priority=<unsigned integer>]
        [--http.retry.count=<unsigned integer>]
        [--http.retry.interval=<unsigned integer>]
        [--http.user-agent=<string>]
+       [--http.max-redirs=<unsigned integer>]
        [--http.connect-timeout=<unsigned integer>]
        [--http.transfer-timeout=<unsigned integer>]
        [--http.low-speed-limit=<unsigned integer>]
@@ -139,11 +133,9 @@ description: Guide to use arguments of FORT Validator.
        [--output.bgpsec=<file>]
        [--output.format=csv|json]
        [--asn1-decode-max-stack=<unsigned integer>]
-       [--stale-repository-period=<unsigned integer>]
        [--init-tals=true|false]
        [--init-as0-tals=true|false]
        [--thread-pool.server.max=<unsigned integer>]
-       [--thread-pool.validation.max=<unsigned integer>]
 ```
 
 If an argument is specified more than once, the last one takes precedence:
@@ -942,13 +934,13 @@ The configuration options are mostly the same as the ones from the `argv` interf
 
 <pre><code>{
        "<a href="#--tal">tal</a>": "/tmp/fort/tal/",
-       "<a href="#--local-repository">local-repository</a>": "/tmp/fort/repository/",
+       "<a href="#--local-repository">local-repository</a>": "/tmp/fort/repository",
        "<a href="#--work-offline">work-offline</a>": false,
-       "<a href="#--shuffle-uris">shuffle-uris</a>": true,
        "<a href="#--maximum-certificate-depth">maximum-certificate-depth</a>": 32,
        "<a href="#--mode">mode</a>": "server",
        "<a href="#--daemon">daemon</a>": false,
        "<a href="#--slurm">slurm</a>": "/tmp/fort/test.slurm",
+       "<a href="#--asn1-decode-max-stack">asn1-decode-max-stack</a>": 4096,
 
        "server": {
                "<a href="#--serveraddress">address</a>": [
@@ -956,7 +948,7 @@ The configuration options are mostly the same as the ones from the `argv` interf
                        "2001:db8::1"
                ],
                "<a href="#--serverport">port</a>": "8323",
-               "<a href="#--serverbacklog">backlog</a>": 16,
+               "<a href="#--serverbacklog">backlog</a>": 4096,
                "interval": {
                        "<a href="#--serverintervalvalidation">validation</a>": 3600,
                        "<a href="#--serverintervalrefresh">refresh</a>": 3600,
@@ -964,69 +956,69 @@ The configuration options are mostly the same as the ones from the `argv` interf
                        "<a href="#--serverintervalexpire">expire</a>": 7200
                },
                "deltas": {
-                       "<a href="#--serverdeltaslifetime">lifetime</a>": 4
+                       "<a href="#--serverdeltaslifetime">lifetime</a>": 2
                }
        },
 
        "log": {
                "<a href="#--logenabled">enabled</a>": true,
-               "<a href="#--loglevel">level</a>": "warning",
                "<a href="#--logoutput">output</a>": "console",
-               "<a href="#--logcolor-output">color-output</a>": true,
-               "<a href="#--logfile-name-format">file-name-format</a>": "file-name",
+               "<a href="#--loglevel">level</a>": "info",
+               "<a href="#--logtag">tag</a>": "Operation",
                "<a href="#--logfacility">facility</a>": "daemon",
-               "<a href="#--logtag">tag</a>": "Operation"
+               "<a href="#--logfile-name-format">file-name-format</a>": "global-url",
+               "<a href="#--logcolor-output">color-output</a>": false
        },
 
        "validation-log": {
                "<a href="#--validation-logenabled">enabled</a>": false,
-               "<a href="#--validation-loglevel">level</a>": "warning",
                "<a href="#--validation-logoutput">output</a>": "console",
-               "<a href="#--validation-logcolor-output">color-output</a>": true,
-               "<a href="#--validation-logfile-name-format">file-name-format</a>": "global-url",
+               "<a href="#--validation-loglevel">level</a>": "warning",
+               "<a href="#--validation-logtag">tag</a>": "Validation",
                "<a href="#--validation-logfacility">facility</a>": "daemon",
-               "<a href="#--validation-logtag">tag</a>": "Validation"
+               "<a href="#--validation-logfile-name-format">file-name-format</a>": "global-url",
+               "<a href="#--validation-logcolor-output">color-output</a>": false
        },
 
        "http": {
                "<a href="#--httpenabled">enabled</a>": true,
                "<a href="#--httppriority">priority</a>": 60,
                "retry": {
-                       "<a href="#--httpretrycount">count</a>": 2,
-                       "<a href="#--httpretryinterval">interval</a>": 5
+                       "<a href="#--httpretrycount">count</a>": 1,
+                       "<a href="#--httpretryinterval">interval</a>": 4
                },
                "<a href="#--httpuser-agent">user-agent</a>": "{{ page.command }}/{{ site.fort-latest-version }}",
+               "<a href="#--httpconnect-timeout">max-redirs</a>": 10,
                "<a href="#--httpconnect-timeout">connect-timeout</a>": 30,
                "<a href="#--httptransfer-timeout">transfer-timeout</a>": 0,
-               "<a href="#--httplow-speed-limit">low-speed-limit</a>": 30,
+               "<a href="#--httplow-speed-limit">low-speed-limit</a>": 100000,
                "<a href="#--httplow-speed-time">low-speed-time</a>": 10,
-               "<a href="#--httpmax-file-size">max-file-size</a>": 10000000,
+               "<a href="#--httpmax-file-size">max-file-size</a>": 1000000000,
                "<a href="#--httpca-path">ca-path</a>": "/usr/local/ssl/certs"
        },
 
        "rsync": {
                "<a href="#--rsyncenabled">enabled</a>": true,
                "<a href="#--rsyncpriority">priority</a>": 50,
-               "<a href="#--rsyncstrategy">strategy</a>": "root-except-ta",
                "retry": {
-                       "<a href="#--rsyncretrycount">count</a>": 2,
-                       "<a href="#--rsyncretryinterval">interval</a>": 5
+                       "<a href="#--rsyncretrycount">count</a>": 1,
+                       "<a href="#--rsyncretryinterval">interval</a>": 4
                },
                "<a href="#rsyncprogram">program</a>": "rsync",
                "<a href="#rsyncarguments-recursive">arguments-recursive</a>": [
-                       "--recursive",
+                       "-rtz",
                        "--delete",
-                       "--times",
+                       "--omit-dir-times",
                        "--contimeout=20",
+                       "--max-size=20MB",
                        "--timeout=15",
-                       "$REMOTE",
-                       "$LOCAL"
-               ],
-               "<a href="#rsyncarguments-flat">arguments-flat</a>": [
-                       "--times",
-                       "--contimeout=20",
-                       "--timeout=15",
-                       "--dirs",
+                       "--include=*/",
+                       "--include=*.cer",
+                       "--include=*.crl",
+                       "--include=*.gbr",
+                       "--include=*.mft",
+                       "--include=*.roa",
+                       "--exclude=*",
                        "$REMOTE",
                        "$LOCAL"
                ]
@@ -1068,14 +1060,8 @@ The configuration options are mostly the same as the ones from the `argv` interf
        "thread-pool": {
                "server": {
                        "<a href="#--thread-poolservermax">max</a>": 20
-               },
-               "validation": {
-                       "<a href="#--thread-poolvalidationmax">max</a>": 5
                }
-       },
-
-       "<a href="#--asn1-decode-max-stack">asn1-decode-max-stack</a>": 4096,
-       "<a href="#--stale-repository-period">stale-repository-period</a>": 43200
+       }
 }
 </code></pre>
 

diff --git a/man/fort.8 b/man/fort.8
index 1b237436486a3a5ac449fdb4f569a01b1a3bfb18..83311beefd4131fa10e78eff715e2d75a1d3cf2a 100644 (file)
--- a/man/fort.8
+++ b/man/fort.8
@@ -1,4 +1,4 @@
-.TH fort 8 "2023-11-16" "v1.6.0" "FORT validator"
+.TH fort 8 "2023-11-30" "v1.6.0" "FORT validator"
 
 .SH NAME
 fort \- RPKI validator and RTR server
@@ -1187,23 +1187,23 @@ validating every 30 minutes, and printing the ROAs CSV in a file.
 This is an example of a valid JSON configuration file with all its members set
 to a specific value:
 .nf
-
 {
   "tal": "/tmp/fort/tal/",
-  "local-repository": "/tmp/fort/repository/",
+  "local-repository": "/tmp/fort/repository",
   "work-offline": false,
-  "shuffle-uris": true,
   "maximum-certificate-depth": 32,
   "mode": "server",
   "daemon": false,
   "slurm": "/tmp/fort/test.slurm",
+  "asn1-decode-max-stack": 4096,
+
   "server": {
     "address": [
       "192.0.2.1",
       "2001:db8::1"
     ],
     "port": "8323",
-    "backlog": 64,
+    "backlog": 4096,
     "interval": {
       "validation": 3600,
       "refresh": 3600,
@@ -1211,67 +1211,74 @@ to a specific value:
       "expire": 7200
     },
     "deltas": {
-      "lifetime": 4
+      "lifetime": 2
     }
   },
+
   "log": {
     "enabled": true,
-    "level": "warning",
     "output": "console",
-    "color-output": true,
-    "file-name-format": "local-path",
+    "level": "info",
+    "tag": "Operation",
     "facility": "daemon",
-    "tag": "Operation"
+    "file-name-format": "global-url",
+    "color-output": false
   },
+
   "validation-log": {
     "enabled": false,
-    "level": "warning",
     "output": "console",
-    "color-output": true,
-    "file-name-format": "local-path",
+    "level": "warning",
+    "tag": "Validation",
     "facility": "daemon",
-    "tag": "Validation"
+    "file-name-format": "global-url",
+    "color-output": false
   },
+
   "http": {
     "enabled": true,
     "priority": 60,
     "retry": {
-      "count": 2,
-      "interval": 5
+      "count": 1,
+      "interval": 4
     },
-    "user-agent": "fort/1.5.1",
+    "user-agent": "fort/1.6.0",
+    "max-redirs": 10,
     "connect-timeout": 30,
     "transfer-timeout": 0,
-    "idle-timeout": 15,
+    "low-speed-limit": 100000,
+    "low-speed-time": 10,
+    "max-file-size": 1000000000,
     "ca-path": "/usr/local/ssl/certs"
   },
+
   "rsync": {
     "enabled": true,
     "priority": 50,
-    "strategy": "root-except-ta",
     "retry": {
-      "count": 2,
-      "interval": 5
+      "count": 1,
+      "interval": 4
     },
     "program": "rsync",
     "arguments-recursive": [
-      "--recursive",
+      "-rtz",
       "--delete",
-      "--times",
-      "--contimeout=20",
-      "--timeout=15",
-      "$REMOTE",
-      "$LOCAL"
-    ],
-    "arguments-flat": [
-      "--times",
+      "--omit-dir-times",
       "--contimeout=20",
+      "--max-size=20MB",
       "--timeout=15",
-      "--dirs",
+      "--include=*/",
+      "--include=*.cer",
+      "--include=*.crl",
+      "--include=*.gbr",
+      "--include=*.mft",
+      "--include=*.roa",
+      "--exclude=*",
       "$REMOTE",
       "$LOCAL"
     ]
   },
+
   "incidences": [
     {
       "name": "incid-hashalg-has-params",
@@ -1298,20 +1305,18 @@ to a specific value:
       "action": "error"
     }
   ],
+
   "output": {
     "roa": "/tmp/fort/roas.csv",
     "bgpsec": "/tmp/fort/bgpsec.csv",
     "format": "csv"
   },
+
   "thread-pool": {
     "server": {
       "max": 20
-    },
-    "validation": {
-      "max": 5
     }
-  },
-  "asn1-decode-max-stack": 4096
+  }
 }
 .fi
 .RE

diff --git a/test/Makefile.am b/test/Makefile.am
index f37255812473e7895f3780aa3b5b470e99d4b55a..6b528020f3d29d7141a146c523d54d07d57e6491 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -92,7 +92,7 @@ vrps_test_LDADD = ${MY_LDADD} ${JANSSON_LIBS}
 xml_test_SOURCES = xml_test.c
 xml_test_LDADD = ${MY_LDADD} ${XML2_LIBS}
 
-EXTRA_DIST  = mock.c
+EXTRA_DIST  = mock.c mock.h
 EXTRA_DIST += line_file/core.txt
 EXTRA_DIST += line_file/empty.txt
 EXTRA_DIST += line_file/error.txt

diff --git a/test/cache/local_cache_test.c b/test/cache/local_cache_test.c
index 2ba8fe5dfdf0a1b0863bb0ad6a50ebc06c2a7990..00751c63488e458d3632847c846bf6dd27f86fae 100644 (file)
--- a/test/cache/local_cache_test.c
+++ b/test/cache/local_cache_test.c
@@ -17,7 +17,7 @@
 
 #define TAL_FILE "test.tal"
 
-struct rpki_cache *cache;
+static struct rpki_cache *cache;
 
 static bool dl_error; /* Download should return error? */
 
@@ -30,8 +30,8 @@ struct downloaded_path {
 /* Paths downloaded during the test */
 static SLIST_HEAD(downloaded_paths, downloaded_path) downloaded;
 
-unsigned int rsync_counter; /* Times the rsync function was called */
-unsigned int https_counter; /* Times the https function was called */
+static unsigned int rsync_counter; /* Times the rsync function was called */
+static unsigned int https_counter; /* Times the https function was called */
 
 int
 file_exists(char const *file)
@@ -294,7 +294,7 @@ new_iteration(bool outdate)
                node->attempt.ts = epoch;
 }
 
-void
+static void
 cache_reset(struct rpki_cache *cache)
 {
        struct cache_node *node, *tmp;
@@ -903,7 +903,7 @@ END_TEST
 
 /* Boilerplate */
 
-Suite *thread_pool_suite(void)
+static Suite *thread_pool_suite(void)
 {
        Suite *suite;
        TCase *rsync , *https, *dot, *meta, *recover;

diff --git a/test/data_structure/path_builder_test.c b/test/data_structure/path_builder_test.c
index a8017d6bbc66181ac24fd9cbb5f5367c0f16d7f3..f6a822f1cb9416942830b183869a763438af7905 100644 (file)
--- a/test/data_structure/path_builder_test.c
+++ b/test/data_structure/path_builder_test.c
@@ -299,7 +299,7 @@ START_TEST(test_reverse)
 }
 END_TEST
 
-Suite *
+static Suite *
 pdu_suite(void)
 {
        Suite *suite;

diff --git a/test/data_structure/uthash_test.c b/test/data_structure/uthash_test.c
index 90ee0badd615ddb05cb1a6e34c3527c4c23d61fa..98eec082deaa44f304a4e1c12509eb8c971fb7b5 100644 (file)
--- a/test/data_structure/uthash_test.c
+++ b/test/data_structure/uthash_test.c
@@ -190,7 +190,7 @@ START_TEST(test_uri)
 }
 END_TEST
 
-Suite *pdu_suite(void)
+static Suite *pdu_suite(void)
 {
        Suite *suite;
        TCase *core, *uri;

diff --git a/test/line_file_test.c b/test/line_file_test.c
index 9a374da92f8ba1889381a448844c4e49cfaafe00..21a8f047290a871b57ef67e83982c70c08a92419 100644 (file)
--- a/test/line_file_test.c
+++ b/test/line_file_test.c
@@ -86,7 +86,7 @@ START_TEST(file_line_null_chara)
 }
 END_TEST
 
-Suite *ghostbusters_suite(void)
+static Suite *ghostbusters_suite(void)
 {
        Suite *suite;
        TCase *core, *limits, *errors;

diff --git a/test/mock.c b/test/mock.c
index aafba65fb6d43ea12ab1aa5d4197a2475e7af8fc..195ebaaba6888730e4c101a207f21b6cb99880bf 100644 (file)
--- a/test/mock.c
+++ b/test/mock.c
@@ -2,7 +2,9 @@
 
 #include <errno.h>
 #include <arpa/inet.h>
+#include "config.h"
 #include "state.h"
+#include "thread_var.h"
 #include "config/filename_format.h"
 #include "config/mode.h"
 #include "incidence/incidence.h"
@@ -113,6 +115,5 @@ MOCK_TRUE(config_get_http_enabled, void)
 MOCK_UINT(config_get_http_priority, 60, void)
 MOCK_NULL(config_get_output_roa, char const *, void)
 MOCK_NULL(config_get_output_bgpsec, char const *, void)
-MOCK_UINT(config_get_thread_pool_validation_max, 10, void)
 MOCK(config_get_op_log_filename_format, enum filename_format, FNF_NAME, void)
 MOCK(config_get_val_log_filename_format, enum filename_format, FNF_NAME, void)

diff --git a/test/rrdp_test.c b/test/rrdp_test.c
index 787e5cdb184c4b4996153a6f1f215b62c5df3184..40b7f79a3ed3cc6b84dd73c2b653d8e16a367a5d 100644 (file)
--- a/test/rrdp_test.c
+++ b/test/rrdp_test.c
@@ -140,7 +140,7 @@ START_TEST(test_sort_deltas)
 }
 END_TEST
 
-Suite *xml_load_suite(void)
+static Suite *xml_load_suite(void)
 {
        Suite *suite;
        TCase *validate;

diff --git a/test/rtr/db/db_table_test.c b/test/rtr/db/db_table_test.c
index 16fa0b3ad9aabd5eb15acd059798933e88c2475f..fefb4ccb2240e47e8af8393692061a677b5244ce 100644 (file)
--- a/test/rtr/db/db_table_test.c
+++ b/test/rtr/db/db_table_test.c
@@ -164,7 +164,7 @@ START_TEST(test_basic)
 }
 END_TEST
 
-Suite *pdu_suite(void)
+static Suite *pdu_suite(void)
 {
        Suite *suite;
        TCase *core;

diff --git a/test/rtr/db/deltas_array_test.c b/test/rtr/db/deltas_array_test.c
index 50bafe25a1c03544ab653922a15da6601ced9e6e..562df338a515c41d0110d97757441bc2ca165c2e 100644 (file)
--- a/test/rtr/db/deltas_array_test.c
+++ b/test/rtr/db/deltas_array_test.c
@@ -11,7 +11,7 @@
 #include "rtr/db/deltas_array.c"
 
 #define TOTAL_CREATED 15
-struct deltas *created[TOTAL_CREATED];
+static struct deltas *created[TOTAL_CREATED];
 
 unsigned int
 config_get_deltas_lifetime(void)
@@ -82,7 +82,7 @@ START_TEST(add_only)
 }
 END_TEST
 
-Suite *address_load_suite(void)
+static Suite *address_load_suite(void)
 {
        Suite *suite;
        TCase *core;

diff --git a/test/rtr/db/rtr_db_mock.c b/test/rtr/db/rtr_db_mock.c
index 700bbbc35112cc3e09de8583a85858fc992474d4..491f5956ce4c9c9d0b1c0056277709a3e41303c4 100644 (file)
--- a/test/rtr/db/rtr_db_mock.c
+++ b/test/rtr/db/rtr_db_mock.c
@@ -49,21 +49,21 @@ add_rk(struct validation_handler *handler, uint32_t as)
            db_imp_spk, handler->arg));
 }
 
-int
+static int
 __handle_roa_v4(uint32_t as, struct ipv4_prefix const *prefix,
     uint8_t max_length, void *arg)
 {
        return rtrhandler_handle_roa_v4(arg, as, prefix, max_length);
 }
 
-int
+static int
 __handle_roa_v6(uint32_t as, struct ipv6_prefix const *prefix,
     uint8_t max_length, void *arg)
 {
        return rtrhandler_handle_roa_v6(arg, as, prefix, max_length);
 }
 
-int
+static int
 __handle_router_key(unsigned char const *ski, struct asn_range const *range,
     unsigned char const *spk, void *arg)
 {

diff --git a/test/rtr/db/vrps_test.c b/test/rtr/db/vrps_test.c
index 745092089a939c44f1b171f093e3d7af796fcf7c..ef8b727f237c0028e86ea91037bfa9b50921a29a 100644 (file)
--- a/test/rtr/db/vrps_test.c
+++ b/test/rtr/db/vrps_test.c
@@ -66,7 +66,7 @@ static const bool deltas_4to4[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
 
 /* Mocks */
 
-unsigned int deltas_lifetime = 5;
+static unsigned int deltas_lifetime = 5;
 
 MOCK_UINT(config_get_deltas_lifetime, deltas_lifetime, void)
 MOCK_ABORT_ENUM(config_get_output_format, output_format, void)
@@ -416,7 +416,7 @@ START_TEST(test_delta_ovrd)
 }
 END_TEST
 
-Suite *pdu_suite(void)
+static Suite *pdu_suite(void)
 {
        Suite *suite;
        TCase *core;

diff --git a/test/rtr/pdu_handler_test.c b/test/rtr/pdu_handler_test.c
index 3f68c510e0fbdecf9a7fc0b6297dd386ecb0ac35..20e277f647fd231cdead172df3da1406145ebabb 100644 (file)
--- a/test/rtr/pdu_handler_test.c
+++ b/test/rtr/pdu_handler_test.c
@@ -21,23 +21,6 @@
 
 /* Mocks */
 
-struct rtr_buffer const *
-pdustream_last_pdu_raw(struct pdu_stream *s)
-{
-       static unsigned char bytes[] = {
-               /* header */
-               1, 1, 7, 8, 0, 0, 0, 12,
-               /* serial number */
-               14, 15, 16, 17,
-       };
-       static struct rtr_buffer buf = {
-               .bytes = bytes,
-               .bytes_len = sizeof(bytes),
-       };
-
-       return &buf;
-}
-
 MOCK_INT(slurm_apply, 0, struct db_table *base, struct db_slurm **slurm)
 MOCK_ABORT_VOID(db_slurm_destroy, struct db_slurm *db)
 
@@ -136,14 +119,6 @@ init_serial_query(struct rtr_request *request, uint32_t serial)
 
 MOCK_UINT(config_get_deltas_lifetime, 5, void)
 
-int
-clients_get_rtr_version_set(int fd, bool *is_set, uint8_t *rtr_version)
-{
-       (*is_set) = true;
-       (*rtr_version) = RTR_V1;
-       return 0;
-}
-
 int
 send_cache_reset_pdu(int fd, uint8_t version)
 {
@@ -413,7 +388,7 @@ START_TEST(test_bad_session_id)
 }
 END_TEST
 
-Suite *pdu_suite(void)
+static Suite *pdu_suite(void)
 {
        Suite *suite;
        TCase *core, *error;

diff --git a/test/rtr/pdu_stream_test.c b/test/rtr/pdu_stream_test.c
index 073479f1c025dc5955ca98b3890cf345df024932..9c7631939d58986392850f935b8174fdf1fc0882 100644 (file)
--- a/test/rtr/pdu_stream_test.c
+++ b/test/rtr/pdu_stream_test.c
@@ -381,7 +381,7 @@ START_TEST(read_string_unicode_mix)
 }
 END_TEST
 
-Suite *pdu_suite(void)
+static Suite *pdu_suite(void)
 {
        Suite *suite;
        TCase *core, *errors, *string;

diff --git a/test/tal_test.c b/test/tal_test.c
index 635eefb3ac20471d4302487ff97d40a8b0c0b3c3..b461ac4223617dc45a05ff17a3a52ac172e7a488 100644 (file)
--- a/test/tal_test.c
+++ b/test/tal_test.c
@@ -43,8 +43,6 @@ MOCK_ABORT_INT(rrdp_update, struct rpki_uri *uri)
 MOCK(state_retrieve, struct validation *, NULL, void)
 MOCK_ABORT_PTR(validation_certstack, cert_stack, struct validation *state)
 MOCK_ABORT_VOID(validation_destroy, struct validation *state)
-MOCK_ABORT_PTR(validation_get_notification_uri, rpki_uri,
-    struct validation *state)
 MOCK_ABORT_INT(validation_prepare, struct validation **out, struct tal *tal,
     struct validation_handler *validation_handler)
 MOCK_ABORT_ENUM(validation_pubkey_state, pubkey_state, struct validation *state)
@@ -103,7 +101,7 @@ START_TEST(tal_load_normal)
 }
 END_TEST
 
-Suite *tal_load_suite(void)
+static Suite *tal_load_suite(void)
 {
        Suite *suite;
        TCase *core;

diff --git a/test/thread_pool_test.c b/test/thread_pool_test.c
index 12ce0222e0443a5b3c5eaa68309836d895c41e00..071d08cc0d0abcb089e71241c88683ce469f760d 100644 (file)
--- a/test/thread_pool_test.c
+++ b/test/thread_pool_test.c
@@ -61,7 +61,7 @@ START_TEST(tpool_multiple_work)
 }
 END_TEST
 
-Suite *thread_pool_suite(void)
+static Suite *thread_pool_suite(void)
 {
        Suite *suite;
        TCase *single, *multiple;

diff --git a/test/types/address_test.c b/test/types/address_test.c
index 8f1cfbfc09dee612da5320e915a9b05bc7fef10d..dfc6adae725fdb3c6f9aa26b4aa11ea8c07bda65 100644 (file)
--- a/test/types/address_test.c
+++ b/test/types/address_test.c
@@ -161,7 +161,7 @@ START_TEST(check_encoding6_test)
 }
 END_TEST
 
-Suite *address_load_suite(void)
+static Suite *address_load_suite(void)
 {
        Suite *suite;
        TCase *core;

diff --git a/test/types/serial_test.c b/test/types/serial_test.c
index 494e8db9ad60b53873caf2551dfe9496b4ef21c1..c4ea20c7a265af2d28da1b9f3b777c8a213bb953 100644 (file)
--- a/test/types/serial_test.c
+++ b/test/types/serial_test.c
@@ -120,7 +120,7 @@ START_TEST(rfc1982_section_5_2)
 }
 END_TEST
 
-Suite *serial_suite(void)
+static Suite *serial_suite(void)
 {
        Suite *suite;
        TCase *core;

diff --git a/test/types/uri_test.c b/test/types/uri_test.c
index 6ad5a0015718075142217b682921ede1072f5972..7385866717f70482b37f78109dbe4adbb68b0098 100644 (file)
--- a/test/types/uri_test.c
+++ b/test/types/uri_test.c
@@ -10,18 +10,13 @@
 
 /* Mocks */
 
-struct rpki_uri *notif;
+static struct rpki_uri *notif;
 
 MOCK(state_retrieve, struct validation *, NULL, void)
 MOCK(validation_tal, struct tal *, NULL, struct validation *state)
 MOCK(tal_get_file_name, char const *, "test.tal", struct tal *tal)
-MOCK(validation_get_notification_uri, struct rpki_uri *, notif,
-    struct validation *state)
 
-MOCK_ABORT_INT(cache_download, struct rpki_uri *uri, bool *changed)
 MOCK_ABORT_INT(rrdp_update, struct rpki_uri *uri)
-MOCK_ABORT_PTR(cache_recover, rpki_uri, struct uri_list *uris,
-    bool use_rrdp)
 
 /* Tests */
 
@@ -166,7 +161,7 @@ START_TEST(check_caged)
 }
 END_TEST
 
-Suite *address_load_suite(void)
+static Suite *address_load_suite(void)
 {
        Suite *suite;
        TCase *core;

diff --git a/test/vcard_test.c b/test/vcard_test.c
index e4086e76c3fed34c49a17ce00d7bcb084b610dd1..1f079edc44e9ed7eba171af0b8382b82aaa4fc54 100644 (file)
--- a/test/vcard_test.c
+++ b/test/vcard_test.c
@@ -99,7 +99,7 @@ START_TEST(vcard_normal)
 }
 END_TEST
 
-Suite *ghostbusters_suite(void)
+static Suite *ghostbusters_suite(void)
 {
        Suite *suite;
        TCase *hgv;

diff --git a/test/xml_test.c b/test/xml_test.c
index c5de4f6c8afa079a3646d7c9cd0e67e4028facaa..9e57057582c81147726ec6a4875902907cdb43a2 100644 (file)
--- a/test/xml_test.c
+++ b/test/xml_test.c
@@ -73,7 +73,7 @@ START_TEST(relax_ng_valid)
 }
 END_TEST
 
-Suite *xml_load_suite(void)
+static Suite *xml_load_suite(void)
 {
        Suite *suite;
        TCase *validate;