Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/target
.idea
8 changes: 4 additions & 4 deletions src/dtls12/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,22 +235,22 @@ impl Client {
}

/// Initiate graceful shutdown by sending a `close_notify` alert.
pub fn close(&mut self) -> Result<(), Error> {
pub fn close(&mut self) -> Result<bool, Error> {
if self.state == State::Closed {
return Ok(());
return Ok(false);
}
if self.state != State::AwaitApplicationData {
self.engine.abort();
self.state = State::Closed;
return Ok(());
return Ok(false);
}
self.engine
.create_record(ContentType::Alert, 1, false, |body| {
body.push(1); // level: warning
body.push(0); // description: close_notify
})?;
self.state = State::Closed;
Ok(())
Ok(true)
}

fn make_progress(&mut self) -> Result<(), Error> {
Expand Down
8 changes: 4 additions & 4 deletions src/dtls12/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,22 +232,22 @@ impl Server {
}

/// Initiate graceful shutdown by sending a `close_notify` alert.
pub fn close(&mut self) -> Result<(), Error> {
pub fn close(&mut self) -> Result<bool, Error> {
if self.state == State::Closed {
return Ok(());
return Ok(false);
}
if self.state != State::AwaitApplicationData {
self.engine.abort();
self.state = State::Closed;
return Ok(());
return Ok(false);
}
self.engine
.create_record(ContentType::Alert, 1, false, |body| {
body.push(1); // level: warning
body.push(0); // description: close_notify
})?;
self.state = State::Closed;
Ok(())
Ok(true)
}

fn make_progress(&mut self) -> Result<(), Error> {
Expand Down
8 changes: 4 additions & 4 deletions src/dtls13/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,14 @@ impl Client {
}

/// Initiate graceful shutdown by sending a `close_notify` alert.
pub fn close(&mut self) -> Result<(), Error> {
pub fn close(&mut self) -> Result<bool, Error> {
if self.state == State::Closed || self.state == State::HalfClosedLocal {
return Ok(());
return Ok(false);
}
if self.state != State::AwaitApplicationData {
self.engine.abort();
self.state = State::Closed;
return Ok(());
return Ok(false);
}
let epoch = self.engine.app_send_epoch();
self.engine
Expand All @@ -288,7 +288,7 @@ impl Client {
})?;
self.engine.cancel_flights();
self.state = State::HalfClosedLocal;
Ok(())
Ok(true)
}

fn make_progress(&mut self) -> Result<(), Error> {
Expand Down
8 changes: 4 additions & 4 deletions src/dtls13/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -307,14 +307,14 @@ impl Server {
}

/// Initiate graceful shutdown by sending a `close_notify` alert.
pub fn close(&mut self) -> Result<(), Error> {
pub fn close(&mut self) -> Result<bool, Error> {
if self.state == State::Closed || self.state == State::HalfClosedLocal {
return Ok(());
return Ok(false);
}
if self.state != State::AwaitApplicationData {
self.engine.abort();
self.state = State::Closed;
return Ok(());
return Ok(false);
}
let epoch = self.engine.app_send_epoch();
self.engine
Expand All @@ -324,7 +324,7 @@ impl Server {
})?;
self.engine.cancel_flights();
self.state = State::HalfClosedLocal;
Ok(())
Ok(true)
}

fn make_progress(&mut self) -> Result<(), Error> {
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ impl Dtls {
/// connection can simply drop the [`Dtls`] value.
///
/// The alert is not retransmitted (per RFC 6347 §4.2.7 / RFC 9147 §5.10).
pub fn close(&mut self) -> Result<(), Error> {
pub fn close(&mut self) -> Result<bool, Error> {
let inner = self.inner.as_mut().unwrap();

if inner.is_pending() {
Expand Down
Loading