Skip to content

fix: Improve UDP port list handling, unnecessary .clone() #751

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Improve UDP port list handling, unnecessary .clone() #751

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
14 changes: 7 additions & 7 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,21 +119,22 @@ fn generate_code(port_payload_map: BTreeMap<Vec<u16>, Vec<u8>>) {
/// A BTreeMap where keys are line numbers and values are vectors of ports
fn ports_v(fp_map: &BTreeMap<i32, String>) -> BTreeMap<i32, Vec<u16>> {
let mut pb_linenr: BTreeMap<i32, Vec<u16>> = BTreeMap::new();
let mut port_list: Vec<u16> = Vec::new();

for (&line_nr, ports) in fp_map {
let mut port_list: Vec<u16> = Vec::new();

if ports.contains("udp ") {
let remain = &ports[4..];
let mut start = remain.split(' ');

let ports = start.next().unwrap();
let port_segments: Vec<&str> = ports.split(',').collect();
let port_segments = ports.split(',');

for segment in port_segments {
if segment.contains('-') {
let range: Vec<&str> = segment.trim().split('-').collect();
let start = range[0].parse::<u16>().unwrap();
let end = range[1].parse::<u16>().unwrap();
let mut range = segment.trim().split('-');
let start = range.next().unwrap().parse::<u16>().unwrap();
let end = range.next().unwrap().parse::<u16>().unwrap();

for port in start..end {
port_list.push(port);
Expand All @@ -147,8 +148,7 @@ fn ports_v(fp_map: &BTreeMap<i32, String>) -> BTreeMap<i32, Vec<u16>> {
}
}

pb_linenr.insert(line_nr, port_list.clone());
port_list.clear();
pb_linenr.insert(line_nr, port_list);
}

pb_linenr
Expand Down
5 changes: 2 additions & 3 deletions src/generated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2816,9 +2816,8 @@ fn generated_data() -> BTreeMap<Vec<u16>, Vec<u8>> {
map.insert(
vec![161, 260, 3401],
vec![
48, 58, 2, 1, 3, 48, 15, 2, 2, 74, 105, 2, 3, 0, 255, 227, 4, 1, 4, 2, 1, 3, 4, 16, 48,
14, 4, 0, 2, 1, 0, 2, 1, 0, 4, 0, 4, 0, 4, 0, 48, 18, 4, 0, 4, 0, 160, 12, 2, 2, 55,
240, 2, 1, 0, 2, 1, 0, 48, 0,
48, 31, 2, 1, 0, 4, 6, 188, 161, 18, 2, 1, 0, 2, 1, 0, 2, 1, 0, 48, 7, 48, 5, 6, 1, 0,
5, 0,
],
);
map.insert(vec![177], vec![0, 1, 0, 2, 0, 1, 0]);
Expand Down
Loading