aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rust: fix warnings with nightly

Browse Source
pull/6222/head
Sascha Steinbiss 5 years ago committed by Jason Ish
parent 9ef061dc62
commit b6fd5e0c2d
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File

10
rust/src/kerberos.rs
Unescape Escape View File

@ -62,12 +62,14 @@ fn parse_kerberos5_request_do(blob: &[u8]) -> IResult<&[u8], ApReq, SecBlobError
)?; )?;
do_parse!( do_parse!(
blob, blob,
base_o: parse_der_oid >> // marking those as potentially unused because they are only used in
tok_id: le_u16 >> // debug messages
_base_o: parse_der_oid >>
_tok_id: le_u16 >>
ap_req: parse_ap_req >> ap_req: parse_ap_req >>
({ ({
SCLogDebug!("parse_kerberos5_request: base_o {:?}", base_o.as_oid()); SCLogDebug!("parse_kerberos5_request: base_o {:?}", _base_o.as_oid());
SCLogDebug!("parse_kerberos5_request: tok_id {}", tok_id); SCLogDebug!("parse_kerberos5_request: tok_id {}", _tok_id);
ap_req ap_req
}) })
) )

40
rust/src/mqtt/mqtt.rs
Unescape Escape View File

@ -189,7 +189,7 @@ impl MQTTState {
self.protocol_version = conn.protocol_version; self.protocol_version = conn.protocol_version;
if self.connected { if self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} else { } else {
let mut tx = self.new_tx(msg, toclient); let mut tx = self.new_tx(msg, toclient);
@ -200,7 +200,7 @@ impl MQTTState {
MQTTOperation::PUBLISH(ref publish) => { MQTTOperation::PUBLISH(ref publish) => {
if !self.connected { if !self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
return; return;
} }
@ -219,13 +219,13 @@ impl MQTTState {
self.transactions.push(tx); self.transactions.push(tx);
} else { } else {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} }
}, },
_ => { _ => {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} }
} }
@ -233,7 +233,7 @@ impl MQTTState {
MQTTOperation::SUBSCRIBE(ref subscribe) => { MQTTOperation::SUBSCRIBE(ref subscribe) => {
if !self.connected { if !self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
return; return;
} }
@ -253,7 +253,7 @@ impl MQTTState {
}, },
_ => { _ => {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} }
} }
@ -261,7 +261,7 @@ impl MQTTState {
MQTTOperation::UNSUBSCRIBE(ref unsubscribe) => { MQTTOperation::UNSUBSCRIBE(ref unsubscribe) => {
if !self.connected { if !self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
return; return;
} }
@ -281,7 +281,7 @@ impl MQTTState {
}, },
_ => { _ => {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} }
} }
@ -294,7 +294,7 @@ impl MQTTState {
self.connected = true; self.connected = true;
} else { } else {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} }
}, },
@ -302,7 +302,7 @@ impl MQTTState {
| MQTTOperation::PUBREL(ref v) => { | MQTTOperation::PUBREL(ref v) => {
if !self.connected { if !self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
return; return;
} }
@ -310,7 +310,7 @@ impl MQTTState {
(*tx).msg.push(msg); (*tx).msg.push(msg);
} else { } else {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} }
}, },
@ -318,7 +318,7 @@ impl MQTTState {
| MQTTOperation::PUBCOMP(ref v) => { | MQTTOperation::PUBCOMP(ref v) => {
if !self.connected { if !self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
return; return;
} }
@ -328,14 +328,14 @@ impl MQTTState {
(*tx).pkt_id = None; (*tx).pkt_id = None;
} else { } else {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} }
}, },
MQTTOperation::SUBACK(ref suback) => { MQTTOperation::SUBACK(ref suback) => {
if !self.connected { if !self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
return; return;
} }
@ -345,14 +345,14 @@ impl MQTTState {
(*tx).pkt_id = None; (*tx).pkt_id = None;
} else { } else {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} }
}, },
MQTTOperation::UNSUBACK(ref unsuback) => { MQTTOperation::UNSUBACK(ref unsuback) => {
if !self.connected { if !self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
return; return;
} }
@ -362,14 +362,14 @@ impl MQTTState {
(*tx).pkt_id = None; (*tx).pkt_id = None;
} else { } else {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
} }
}, },
MQTTOperation::UNASSIGNED => { MQTTOperation::UNASSIGNED => {
let mut tx = self.new_tx(msg, toclient); let mut tx = self.new_tx(msg, toclient);
tx.complete = true; tx.complete = true;
&mut MQTTState::set_event(&mut tx, MQTTEvent::UnassignedMsgtype); MQTTState::set_event(&mut tx, MQTTEvent::UnassignedMsgtype);
self.transactions.push(tx); self.transactions.push(tx);
}, },
MQTTOperation::TRUNCATED(_) => { MQTTOperation::TRUNCATED(_) => {
@ -381,7 +381,7 @@ impl MQTTState {
| MQTTOperation::DISCONNECT(_) => { | MQTTOperation::DISCONNECT(_) => {
if !self.connected { if !self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
return; return;
} }
@ -393,7 +393,7 @@ impl MQTTState {
| MQTTOperation::PINGRESP => { | MQTTOperation::PINGRESP => {
if !self.connected { if !self.connected {
let mut tx = self.new_tx(msg, toclient); 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); self.transactions.push(tx);
return; return;
} }

Write Preview
Loading…
Cancel
Save