summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2026-07-10 17:09:58 +0200
committerSander Vrijders <sander@ouroboros.rocks>2026-07-19 11:44:35 +0200
commit17263ccd93ba07fb32de12cfd540bd531f23bef2 (patch)
tree21cca6dcd60502eb3c4c75801ffc1da530fad504 /src/lib
parent8228212b0c4e1fe313d0a171f61fd103554bf5ab (diff)
downloadouroboros-17263ccd93ba07fb32de12cfd540bd531f23bef2.tar.gz
ouroboros-17263ccd93ba07fb32de12cfd540bd531f23bef2.zip
lib: Whitespace cleanup in dev and frct
Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/dev.c16
-rw-r--r--src/lib/frct.c16
2 files changed, 21 insertions, 11 deletions
diff --git a/src/lib/dev.c b/src/lib/dev.c
index 166aba5c..b791c78f 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -98,14 +98,14 @@ struct flow {
ssize_t part_idx;
struct crypt_ctx * crypt;
- int headsz; /* Selector */
- int tailsz; /* Tag + CRC */
-
- struct timespec rk_grace; /* TX-promote deadline (0 = none) */
- struct timespec rk_attempt; /* Last re-key attempt (backoff) */
- bool rk_wm_inflight; /* Re-key trigger in flight */
- uint32_t rk_wm_ctr; /* Throttles the consult */
- bool rk_initiator; /* OAP initiator this re-key */
+ int headsz; /* Selector */
+ int tailsz; /* Tag + CRC */
+
+ struct timespec rk_grace; /* TX-promote deadline */
+ struct timespec rk_attempt; /* Last re-key attempt */
+ bool rk_wm_inflight; /* Re-key trigger in flight */
+ uint32_t rk_wm_ctr; /* Throttles the consult */
+ bool rk_initiator; /* OAP initiator this re-key */
struct timespec snd_act;
struct timespec rcv_act;
diff --git a/src/lib/frct.c b/src/lib/frct.c
index c055433d..8eabfc67 100644
--- a/src/lib/frct.c
+++ b/src/lib/frct.c
@@ -1857,6 +1857,7 @@ struct frcti * frcti_create(int fd,
/ SACK_BLOCK_SIZE;
if (bb > SACK_MAX_BLOCKS)
bb = SACK_MAX_BLOCKS;
+
frcti->sack_n_max = (uint16_t) bb;
frcti->max_rcv_sdu = FRCT_MAX_SDU;
@@ -2062,6 +2063,7 @@ int frcti_set_rcv_ring_sz(struct frcti * frcti,
if (!frcti->stream)
return -ENOTSUP;
+
if (!stream_ring_sz_ok(frcti, n))
return -EINVAL;
@@ -2998,8 +3000,10 @@ static int tlp_arm(struct frcti * frcti)
/* §7.3: one outstanding probe, MAX_TLP_PER_EP per recovery ep. */
if (LOAD_RELAXED(&frcti->tlp_high_seq) != 0)
return 0;
+
if (LOAD_RELAXED(&frcti->tlp_count) >= MAX_TLP_PER_EP)
return 0;
+
if (__atomic_test_and_set(&frcti->tlp_pending, __ATOMIC_RELAXED))
return 0;
@@ -3082,15 +3086,20 @@ static bool rtt_sample_eligible(struct frcti * frcti,
{
if (flags & FRCT_RXM)
return false;
+
if (frcti->snd_slots[p].flags & (SND_RTX | SND_TLP))
return false;
+
if (LOAD_ACQUIRE(&frcti->snd_slots[p].rxm) == NULL)
return false;
+
if (before(lwe, frcti->rtt_lwe))
return false;
+
/* Don't seed srtt from a cum-ACK; let probes seed. */
if (frcti->srtt == 0)
return false;
+
return true;
}
@@ -3584,6 +3593,7 @@ static bool sack_check(struct frcti * frcti,
n = dsack_consume(frcti, out->blocks);
if (n == 1)
out->dsack = true;
+
n += sack_blocks_build(frcti, out->blocks + n,
frcti->sack_n_max - n);
@@ -3646,6 +3656,7 @@ static void seqno_rotate(struct frcti * frcti,
if (!ts_aged_ns(now_ns, snd_cr->act, snd_cr->inact))
return;
+
/* Idle-on-wire ≠ idle e2e: don't orphan in-flight rxm. */
if (snd_cr->seqno != snd_cr->lwe)
return;
@@ -3709,9 +3720,6 @@ static int frcti_snd(struct frcti * frcti,
memset(pci, 0, FRCT_PCILEN);
- if (frcti->stream)
- spci = FRCT_SPCI(pci);
-
clock_gettime(PTHREAD_COND_CLOCK, &now);
now_ns = TS_TO_UINT64(now);
@@ -3727,6 +3735,8 @@ static int frcti_snd(struct frcti * frcti,
STAT_BUMP(frcti, frag_snd);
if (frcti->stream) {
+ spci = FRCT_SPCI(pci);
+
if (flags & FRCT_FIN)
pci_flags |= FRCT_FIN;