diff options
| author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2025-07-17 21:31:39 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander@ouroboros.rocks> | 2025-07-23 15:07:57 +0200 |
| commit | 4ed5f4527ba034b399386beea2949bccf69ce65a (patch) | |
| tree | 8161790c795805b94b0756c621c4d83c83a254d8 /src | |
| parent | 3af9d041343a4799247aa4d61fb91b706bd6c58f (diff) | |
| download | ouroboros-4ed5f4527ba034b399386beea2949bccf69ce65a.tar.gz ouroboros-4ed5f4527ba034b399386beea2949bccf69ce65a.zip | |
irmd: Fix timestamp check
The timestamp check was not correcly updated when changing MPL from
seconds to milliseconds. IRMd now also warns if the allocation was
sent from the future.
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src')
| -rw-r--r-- | src/irmd/main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c index 5cda9559..3a1a7225 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -73,6 +73,7 @@ #define SHM_SAN_HOLDOFF 1000 /* ms */ #define IPCP_HASH_LEN(p) hash_len((p)->dir_hash_algo) #define BIND_TIMEOUT 10 /* ms */ +#define TIMESYNC_SLACK 100 /* ms */ #define DEALLOC_TIME 300 /* s */ enum irm_state { @@ -770,6 +771,7 @@ static int flow_accept(struct flow_info * flow, struct oap_hdr r_oap_hdr; /* outgoing response */ uint8_t buf[MSGBUFSZ]; /* buffer for local ephkey */ buffer_t lpk = BUF_INIT; /* local ephemeral pubkey */ + ssize_t delta; /* allocation time difference */ int err; struct timespec now; @@ -824,9 +826,12 @@ static int flow_accept(struct flow_info * flow, clock_gettime(CLOCK_REALTIME, &now); - if (now.tv_sec - (time_t) (oap_hdr.timestamp / MILLION) > flow->mpl) - log_warn("Flow alloc time exceeds MPL by %zu ms.", - now.tv_sec - oap_hdr.timestamp / MILLION); + delta = (ssize_t)(TS_TO_UINT64(now) - oap_hdr.timestamp); + if (delta > flow->mpl) + log_warn("Flow alloc time exceeds MPL (%zd ms).", delta); + + if (delta < -TIMESYNC_SLACK) + log_warn("Flow alloc sent from the future (%zd ms).", -delta); if (flow->qs.cypher_s != 0) { /* crypto requested */ uint8_t * s; /* symmetric encryption key */ |