Skip to content

Commit bb73e07

Browse files
authored
set all of decode_context in decoder (#394)
Signed-off-by: Somtochi Onyekwere <[email protected]>
1 parent e1c09bd commit bb73e07

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/messages/codec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ where
7070
{
7171
if let Some(msg_len) = get_length(buf, offset) {
7272
if msg_len > max_size {
73-
return Err(PgWireError::MessageTooLarge(msg_len, max_size));
73+
return Err(PgWireError::MessageTooLarge(max_size, msg_len));
7474
}
7575

7676
if buf.remaining() >= msg_len + offset {

src/messages/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ pub trait Message: Sized {
103103
let len = self.message_length();
104104
if len > Self::max_message_length() {
105105
return Err(PgWireError::MessageTooLarge(
106-
len,
107106
Self::max_message_length(),
107+
len,
108108
));
109109
}
110110

src/tokio/server.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,19 @@ impl<S> Decoder for PgWireMessageServerCodec<S> {
5050
self.decode_context.protocol_version = self.client_info.protocol_version;
5151

5252
match self.client_info.state() {
53-
PgWireConnectionState::AwaitingSslRequest => {}
53+
PgWireConnectionState::AwaitingSslRequest => {
54+
self.decode_context.awaiting_ssl = true;
55+
self.decode_context.awaiting_startup = true;
56+
}
5457

5558
PgWireConnectionState::AwaitingStartup => {
5659
self.decode_context.awaiting_ssl = false;
60+
self.decode_context.awaiting_startup = true;
5761
}
5862

5963
_ => {
6064
self.decode_context.awaiting_startup = false;
65+
self.decode_context.awaiting_ssl = false;
6166
}
6267
}
6368

0 commit comments

Comments
 (0)