public inbox for b.a.t.m.a.n@lists.open-mesh.org
 help / color / mirror / Atom feed
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 3/7] alfred: Remove checks for committed/dropped transaction
Date: Sat, 12 Nov 2016 10:25:20 +0100	[thread overview]
Message-ID: <20161112092524.13170-3-sven@narfation.org> (raw)
In-Reply-To: <4404358.R7R4S15M79@sven-edge>

Transactions will be removed from the transaction has when they were
committed. Thus is is not necessary to check in the push_data/txend packet
processing functions for committed/dropped transactions.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 recv.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/recv.c b/recv.c
index 6878e5e..21ea539 100644
--- a/recv.c
+++ b/recv.c
@@ -167,10 +167,6 @@ static int finish_alfred_transaction(struct globals *globals,
 {
 	struct transaction_packet *transaction_packet, *safe;
 
-	/* this transaction was already finished/dropped */
-	if (head->finished != 0)
-		return -1;
-
 	/* missing packets -> cleanup everything */
 	if (head->num_packet == num_packets)
 		head->finished = -1;
@@ -233,10 +229,6 @@ static int process_alfred_push_data(struct globals *globals,
 	}
 	clock_gettime(CLOCK_MONOTONIC, &head->last_rx_time);
 
-	/* this transaction was already finished/dropped */
-	if (head->finished != 0)
-		return -1;
-
 	found = 0;
 	list_for_each_entry(transaction_packet, &head->packet_list, list) {
 		if (transaction_packet->push->tx.seqno == push->tx.seqno) {
-- 
2.10.2


  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 ` Sven Eckelmann [this message]
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 ` [B.A.T.M.A.N.] [PATCH 7/7] alfred: Allow TXEND to start new transaction Sven Eckelmann
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-3-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