Fix initial next outgoing id value

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [1.2.0] - 2024-03-12
+
+* Fix initial next outgoing id value
+
 ## [1.0.1] - 2024-01-18
 
 * Fix SenderLink closed state, if link is closed remotely

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-amqp"
-version = "1.0.1"
+version = "1.2.0"
 authors = ["ntex contributors <[email protected]>"]
 description = "AMQP 1.0 Client/Server framework"
 documentation = "https://docs.rs/ntex-amqp"
@@ -35,7 +35,7 @@ slab = "0.4"
 uuid = { version = "1", features = ["v4"] }
 
 [dev-dependencies]
-env_logger = "0.10"
+env_logger = "0.11"
 ntex = { version = "1.0", features = ["tokio"] }
 
 [patch.crates-io]

src/connection.rs

@@ -7,7 +7,7 @@ use ntex::util::{HashMap, PoolRef, Ready};
 use crate::codec::protocol::{self as codec, Begin, Close, End, Error, Frame, Role};
 use crate::codec::{AmqpCodec, AmqpFrame};
 use crate::dispatcher::ControlQueue;
-use crate::session::{Session, SessionInner};
+use crate::session::{Session, SessionInner, INITIAL_NEXT_OUTGOING_ID};
 use crate::sndlink::{SenderLink, SenderLinkInner};
 use crate::{cell::Cell, error::AmqpProtocolError, types::Action, Configuration};
 
@@ -194,7 +194,7 @@ impl ConnectionRef {
 
                     let begin = Begin(Box::new(codec::BeginInner {
                         remote_channel: None,
-                        next_outgoing_id: 1,
+                        next_outgoing_id: INITIAL_NEXT_OUTGOING_ID,
                         incoming_window: std::u32::MAX,
                         outgoing_window: std::u32::MAX,
                         handle_max: std::u32::MAX,

src/session.rs

@@ -16,7 +16,7 @@ use crate::rcvlink::{ReceiverLink, ReceiverLinkBuilder, ReceiverLinkInner};
 use crate::sndlink::{DeliveryPromise, SenderLink, SenderLinkBuilder, SenderLinkInner};
 use crate::{cell::Cell, types::Action, ConnectionRef, ControlFrame};
 
-const INITIAL_OUTGOING_ID: TransferNumber = 0;
+pub(crate) const INITIAL_NEXT_OUTGOING_ID: TransferNumber = 1;
 
 #[derive(Clone)]
 pub struct Session {
@@ -316,7 +316,7 @@ impl SessionInner {
             remote_incoming_window,
             remote_outgoing_window,
             flags: if local { Flags::LOCAL } else { Flags::empty() },
-            next_outgoing_id: INITIAL_OUTGOING_ID,
+            next_outgoing_id: INITIAL_NEXT_OUTGOING_ID,
             unsettled_deliveries: HashMap::default(),
             links: Slab::new(),
             links_by_name: HashMap::default(),
@@ -1145,7 +1145,7 @@ impl SessionInner {
 
         self.remote_incoming_window = flow
             .next_incoming_id()
-            .unwrap_or(INITIAL_OUTGOING_ID)
+            .unwrap_or(0)
             .wrapping_add(flow.incoming_window())
             .wrapping_sub(self.next_outgoing_id);