From b37c6407fb88d0880497c81b0bae10ccb0770e8e Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Tue, 11 Jul 2023 21:34:47 +1000
Subject: [PATCH] Fix for incorrectly batching up more mail after EOB, if
 MULTIBATCH is not agreed

---
 app/Classes/FTN/Packet.php     | 2 +-
 app/Classes/Protocol/Binkp.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Classes/FTN/Packet.php b/app/Classes/FTN/Packet.php
index 838b27a..5cd53f8 100644
--- a/app/Classes/FTN/Packet.php
+++ b/app/Classes/FTN/Packet.php
@@ -371,7 +371,7 @@ class Packet extends FTNBase implements \Iterator, \Countable
 	 */
 	public function addressHeader(Address $oo,Address $o): void
 	{
-		Log::debug(sprintf('%s:Creating packet [%s]',self::LOGKEY,$this->name));
+		Log::debug(sprintf('%s:+ Creating packet for [%s]',self::LOGKEY,$o->ftn));
 
 		$date = Carbon::now();
 
diff --git a/app/Classes/Protocol/Binkp.php b/app/Classes/Protocol/Binkp.php
index 84d473c..0dd1ac1 100644
--- a/app/Classes/Protocol/Binkp.php
+++ b/app/Classes/Protocol/Binkp.php
@@ -797,8 +797,7 @@ final class Binkp extends BaseProtocol
 		$this->sessionSet(self::SE_RECVEOB);
 		$this->sessionClear(self::SE_DELAYEOB);
 
-		// @todo Is this multibatch mode, if so we should check that MB hasn been agreed.
-		if (! $this->send->total_count && $this->sessionGet(self::SE_NOFILES)) {
+		if (! $this->send->total_count && $this->sessionGet(self::SE_NOFILES) && $this->capGet(self::F_MULTIBATCH,self::O_WE)) {
 			// Add our mail to the queue if we have authenticated
 			if ($this->node->aka_authed)
 				foreach ($this->node->aka_remote_authed as $ao) {