dandri/mycelium
1
0
Fork 0
mirror of https://github.com/threefoldtech/mycelium.git synced 2026-06-04 23:01:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only wrap updates when sending

Browse Source 
This avoids a needless match statement and allows proper type checking
for sending updates

Signed-off-by: Lee Smet <lee.smet@hotmail.com>
This commit is contained in:
Lee Smet
2023-08-31 17:23:17 +02:00
parent a253d9ddb3
commit 3e27fbd484
1 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/router.rs
+32 -37
View File
@@ -834,55 +834,49 @@ impl RouterInner {
matching_peer.map(Clone::clone)
}
fn send_update(&mut self, peer: &Peer, update_packet: ControlPacket) {
fn send_update(&mut self, peer: &Peer, update: babel::Update) {
// before sending an update, the source table might need to be updated
match update_packet {
babel::Tlv::Update(ref update) => {
let plen = update.plen();
let seqno = update.seqno();
let metric = update.metric();
let prefix = update.prefix();
let router_id = update.router_id();
let plen = update.plen();
let seqno = update.seqno();
let metric = update.metric();
let prefix = update.prefix();
let router_id = update.router_id();
let source_key = SourceKey::new(prefix, plen, router_id);
let source_key = SourceKey::new(prefix, plen, router_id);
if let Some(source_entry) = self.source_table.get(&source_key) {
// if seqno of the update is greater than the seqno in the source table, update the source table
if !seqno.lt(&source_entry.seqno()) {
self.source_table
.insert(source_key, FeasibilityDistance::new(metric, seqno));
}
// if seqno of the update is equal to the seqno in the source table, update the source table if the metric (of the update) is lower
else if seqno == source_entry.seqno() && source_entry.metric() > metric {
self.source_table.insert(
source_key,
FeasibilityDistance::new(metric, source_entry.seqno()),
);
}
}
// no entry for this source key, so insert it
else {
self.source_table
.insert(source_key, FeasibilityDistance::new(metric, seqno));
}
// send the update to the peer
if let Err(e) = peer.send_control_packet(update_packet) {
error!("Error sending update to peer: {:?}", e);
}
if let Some(source_entry) = self.source_table.get(&source_key) {
// if seqno of the update is greater than the seqno in the source table, update the source table
if !seqno.lt(&source_entry.seqno()) {
self.source_table
.insert(source_key, FeasibilityDistance::new(metric, seqno));
}
_ => {
panic!("Control packet is not a correct Update packet");
// if seqno of the update is equal to the seqno in the source table, update the source table if the metric (of the update) is lower
else if seqno == source_entry.seqno() && source_entry.metric() > metric {
self.source_table.insert(
source_key,
FeasibilityDistance::new(metric, source_entry.seqno()),
);
}
}
// no entry for this source key, so insert it
else {
self.source_table
.insert(source_key, FeasibilityDistance::new(metric, seqno));
}
// send the update to the peer
if let Err(e) = peer.send_control_packet(ControlPacket::Update(update)) {
error!("Error sending update to peer: {:?}", e);
}
}
fn propagate_static_route(&mut self, router_id: PublicKey) {
let mut updates = vec![];
for sr in self.static_routes.iter() {
for peer in self.peer_interfaces.iter() {
let update = ControlPacket::new_update(
let update = babel::Update::new(
sr.plen, // static routes have plen 32
0,
UPDATE_INTERVAL,
self.router_seqno, // updates receive the seqno of the router
peer.link_cost().into(), // direct connection to other peer, so the only cost is the cost towards the peer
@@ -912,8 +906,9 @@ impl RouterInner {
None => router_id,
};
let update = ControlPacket::new_update(
let update = babel::Update::new(
sr.0.plen(),
0,
UPDATE_INTERVAL,
self.router_seqno, // updates receive the seqno of the router
sr.1.metric() + Metric::from(peer_link_cost),