From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 7/7] alfred: Allow TXEND to start new transaction
Date: Sat, 12 Nov 2016 10:25:24 +0100 [thread overview]
Message-ID: <20161112092524.13170-7-sven@narfation.org> (raw)
In-Reply-To: <4404358.R7R4S15M79@sven-edge>
A TXEND which comes before all other PUSH_DATA packets also has to create
its own transaction. Otherwise it cannot store the number of expected
packets for this transaction.
The PUSH_DATA packets can then trigger the finish of the transaction. Or
the transaction will timeout automatically.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
recv.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/recv.c b/recv.c
index 9fabfa4..bd208fd 100644
--- a/recv.c
+++ b/recv.c
@@ -359,13 +359,28 @@ static int process_alfred_status_txend(struct globals *globals,
search.id = ntohs(request->tx.id);
head = hash_find(globals->transaction_hash, &search);
- if (!head)
- return -1;
+ if (!head) {
+ /* slave must create the transactions to be able to correctly
+ * wait for it */
+ if (globals->opmode != OPMODE_MASTER)
+ goto err;
+
+ /* 0-packet txend for unknown transaction */
+ if (ntohs(request->tx.seqno) == 0)
+ goto err;
+
+ head = transaction_add(globals, mac, ntohs(request->tx.id));
+ if (!head)
+ goto err;
+ }
+ clock_gettime(CLOCK_MONOTONIC, &head->last_rx_time);
head->txend_packets = ntohs(request->tx.seqno);
finish_alfred_transaction(globals, head, mac);
return 0;
+err:
+ return -1;
}
int recv_alfred_packet(struct globals *globals, struct interface *interface,
--
2.10.2
next prev parent reply other threads:[~2016-11-12 9:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-12 9:24 [B.A.T.M.A.N.] [PATCH 0/7] alfred: Allow out-of-order TXEND Sven Eckelmann
2016-11-12 9:25 ` [B.A.T.M.A.N.] [PATCH 1/7] alfred: Avoid hash search for transaction cleanup Sven Eckelmann
2016-11-12 9:25 ` [B.A.T.M.A.N.] [PATCH 2/7] alfred: Move tx finish functionality in extra function Sven Eckelmann
2016-11-12 9:25 ` [B.A.T.M.A.N.] [PATCH 3/7] alfred: Remove checks for committed/dropped transaction Sven Eckelmann
2016-11-12 9:25 ` [B.A.T.M.A.N.] [PATCH 4/7] alfred: Don't force cleanup of transaction on TXEND Sven Eckelmann
2016-11-12 9:25 ` [B.A.T.M.A.N.] [PATCH 5/7] alfred: Use expected packet count to finished transactions Sven Eckelmann
2016-11-12 9:25 ` [B.A.T.M.A.N.] [PATCH 6/7] alfred: Allow PUSH_DATA to finish transactions Sven Eckelmann
2016-11-12 9:25 ` Sven Eckelmann [this message]
2016-11-17 16:06 ` [B.A.T.M.A.N.] [PATCH 0/7] alfred: Allow out-of-order TXEND Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161112092524.13170-7-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox