Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compiler warnings with Rust nightly #6216

Closed
wants to merge 1 commit into from
Closed

Fix compiler warnings with Rust nightly #6216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions rust/src/kerberos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,14 @@ fn parse_kerberos5_request_do(blob: &[u8]) -> IResult<&[u8], ApReq, SecBlobError
)?;
do_parse!(
blob,
base_o: parse_der_oid >>
tok_id: le_u16 >>
// marking those as potentially unused because they are only used in
// debug messages
_base_o: parse_der_oid >>
_tok_id: le_u16 >>
ap_req: parse_ap_req >>
({
SCLogDebug!("parse_kerberos5_request: base_o {:?}", base_o.as_oid());
SCLogDebug!("parse_kerberos5_request: tok_id {}", tok_id);
SCLogDebug!("parse_kerberos5_request: base_o {:?}", _base_o.as_oid());
SCLogDebug!("parse_kerberos5_request: tok_id {}", _tok_id);
ap_req
})
)
Expand Down
40 changes: 20 additions & 20 deletions rust/src/mqtt/mqtt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ impl MQTTState {
self.protocol_version = conn.protocol_version;
if self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::DoubleConnect);
MQTTState::set_event(&mut tx, MQTTEvent::DoubleConnect);
self.transactions.push(tx);
} else {
let mut tx = self.new_tx(msg, toclient);
Expand All @@ -200,7 +200,7 @@ impl MQTTState {
MQTTOperation::PUBLISH(ref publish) => {
if !self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
self.transactions.push(tx);
return;
}
Expand All @@ -219,21 +219,21 @@ impl MQTTState {
self.transactions.push(tx);
} else {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::MissingMsgId);
MQTTState::set_event(&mut tx, MQTTEvent::MissingMsgId);
self.transactions.push(tx);
}
},
_ => {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::InvalidQosLevel);
MQTTState::set_event(&mut tx, MQTTEvent::InvalidQosLevel);
self.transactions.push(tx);
}
}
},
MQTTOperation::SUBSCRIBE(ref subscribe) => {
if !self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
self.transactions.push(tx);
return;
}
Expand All @@ -253,15 +253,15 @@ impl MQTTState {
},
_ => {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::InvalidQosLevel);
MQTTState::set_event(&mut tx, MQTTEvent::InvalidQosLevel);
self.transactions.push(tx);
}
}
},
MQTTOperation::UNSUBSCRIBE(ref unsubscribe) => {
if !self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
self.transactions.push(tx);
return;
}
Expand All @@ -281,7 +281,7 @@ impl MQTTState {
},
_ => {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::InvalidQosLevel);
MQTTState::set_event(&mut tx, MQTTEvent::InvalidQosLevel);
self.transactions.push(tx);
}
}
Expand All @@ -294,31 +294,31 @@ impl MQTTState {
self.connected = true;
} else {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::MissingConnect);
MQTTState::set_event(&mut tx, MQTTEvent::MissingConnect);
self.transactions.push(tx);
}
},
MQTTOperation::PUBREC(ref v)
| MQTTOperation::PUBREL(ref v) => {
if !self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
self.transactions.push(tx);
return;
}
if let Some(tx) = self.get_tx_by_pkt_id(v.message_id as u32) {
(*tx).msg.push(msg);
} else {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::MissingPublish);
MQTTState::set_event(&mut tx, MQTTEvent::MissingPublish);
self.transactions.push(tx);
}
},
MQTTOperation::PUBACK(ref v)
| MQTTOperation::PUBCOMP(ref v) => {
if !self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
self.transactions.push(tx);
return;
}
Expand All @@ -328,14 +328,14 @@ impl MQTTState {
(*tx).pkt_id = None;
} else {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::MissingPublish);
MQTTState::set_event(&mut tx, MQTTEvent::MissingPublish);
self.transactions.push(tx);
}
},
MQTTOperation::SUBACK(ref suback) => {
if !self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
self.transactions.push(tx);
return;
}
Expand All @@ -345,14 +345,14 @@ impl MQTTState {
(*tx).pkt_id = None;
} else {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::MissingSubscribe);
MQTTState::set_event(&mut tx, MQTTEvent::MissingSubscribe);
self.transactions.push(tx);
}
},
MQTTOperation::UNSUBACK(ref unsuback) => {
if !self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
self.transactions.push(tx);
return;
}
Expand All @@ -362,14 +362,14 @@ impl MQTTState {
(*tx).pkt_id = None;
} else {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::MissingUnsubscribe);
MQTTState::set_event(&mut tx, MQTTEvent::MissingUnsubscribe);
self.transactions.push(tx);
}
},
MQTTOperation::UNASSIGNED => {
let mut tx = self.new_tx(msg, toclient);
tx.complete = true;
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnassignedMsgtype);
MQTTState::set_event(&mut tx, MQTTEvent::UnassignedMsgtype);
self.transactions.push(tx);
},
MQTTOperation::TRUNCATED(_) => {
Expand All @@ -381,7 +381,7 @@ impl MQTTState {
| MQTTOperation::DISCONNECT(_) => {
if !self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
self.transactions.push(tx);
return;
}
Expand All @@ -393,7 +393,7 @@ impl MQTTState {
| MQTTOperation::PINGRESP => {
if !self.connected {
let mut tx = self.new_tx(msg, toclient);
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
MQTTState::set_event(&mut tx, MQTTEvent::UnintroducedMessage);
self.transactions.push(tx);
return;
}
Expand Down