Skip to content
Merged
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
2 changes: 1 addition & 1 deletion core/src/filter/ptree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ impl PTree {

impl fmt::Display for PTree {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "Tree {:?}\n,{}", &self.filter_layer, self.pprint())?;
write!(f, "Tree {:?}\n,{}", self.filter_layer, self.pprint())?;
Ok(())
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/multicore/channel_dispatcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ impl<T: Send + 'static> ChannelDispatcher<T> {

match &mut *channels {
Channels::PerCore(map) => {
for (_, (sender_result, _)) in map.iter_mut() {
for (sender_result, _) in map.values_mut() {
*sender_result = None;
}
}
Expand Down
12 changes: 11 additions & 1 deletion core/src/protocols/stream/tls/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,17 @@ impl Tls {
}

// update state machine
match tls_state_transition(self.state, msg, direction) {
//
// Note: `tls_state_transition` from the `tls-parser` crate
// doesn't handle the TLS 1.3 middlebox-compatibility ChangeCipherSpec
// transition (RFC 8446).
let transition =
if self.state == TlsState::ServerHello && matches!(msg, TlsMessage::ChangeCipherSpec) {
Ok(TlsState::ClientChangeCipherSpec)
} else {
tls_state_transition(self.state, msg, direction)
};
match transition {
Ok(s) => self.state = s,
Err(_) => {
self.state = TlsState::Invalid;
Expand Down
4 changes: 2 additions & 2 deletions core/src/runtime/online.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ where
log::info!("Initializing RX Cores...");
let mut rx_cores: BTreeMap<CoreId, RxCore<S>> = BTreeMap::new();
let mut core_map: BTreeMap<CoreId, Vec<RxQueue>> = BTreeMap::new();
for (_port_id, port) in ports.iter() {
for port in ports.values() {
for (rxqueue, core_id) in port.queue_map.iter() {
core_map.entry(*core_id).or_default().push(*rxqueue);
}
Expand Down Expand Up @@ -107,7 +107,7 @@ where
self.start_ports();

log::info!("Launching RX cores...");
for (core_id, _rx_core) in self.rx_cores.iter() {
for core_id in self.rx_cores.keys() {
let role = unsafe { dpdk::rte_eal_lcore_role(core_id.raw()) };
if role != dpdk::rte_lcore_role_t_ROLE_RTE {
log::error!("Attempted to launch non-DPDK core");
Expand Down
Loading