xnoe/rust-dhcpclient
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Identify links by their index rather than by their MAC address to cope with name and MAC addresses changes properly in the main thread.

Browse Source
This commit is contained in:
Xnoe 2022-10-31 22:38:55 +00:00
parent 27b8836f74
commit e40a511ee9
Signed by: xnoe
GPG Key ID: 45AC398F44F0DAFE
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.rs
View File

@ -588,7 +588,7 @@ fn zascii(slice: &[libc::c_char]) -> String {
} }
fn main() { fn main() {
let mut thread_map: HashMap<[u8; 6], libc::c_int> = HashMap::new(); let mut thread_map: HashMap<i32, libc::c_int> = HashMap::new();
let iterator = rtnetlink::new_interface_iterator().unwrap(); let iterator = rtnetlink::new_interface_iterator().unwrap();
for message in iterator { for message in iterator {
@ -600,7 +600,7 @@ fn main() {
let name = zascii(&interface.name); let name = zascii(&interface.name);
println!("New Link"); println!("New Link");
if let None = thread_map.get(&interface.hwaddr) { if let None = thread_map.get(&interface.index) {
println!("Starting DHCP on {}", name); println!("Starting DHCP on {}", name);
unsafe { unsafe {
match libc::fork() { match libc::fork() {
@ -608,7 +608,7 @@ fn main() {
0 => dhcp_client(name, interface.index, interface.hwaddr), 0 => dhcp_client(name, interface.index, interface.hwaddr),
pid => { pid => {
println!("Started DHCP on {} PID {}", name, pid); println!("Started DHCP on {} PID {}", name, pid);
thread_map.insert(interface.hwaddr, pid); thread_map.insert(interface.index, pid);
} }
} }
} }
@ -619,12 +619,12 @@ fn main() {
let name = zascii(&interface.name); let name = zascii(&interface.name);
println!("Del Link"); println!("Del Link");
if let Some(pid) = thread_map.get(&interface.hwaddr) { if let Some(pid) = thread_map.get(&interface.index) {
println!("Stopping DHCP on {}", name); println!("Stopping DHCP on {}", name);
unsafe { unsafe {
libc::kill(*pid, libc::SIGTERM); libc::kill(*pid, libc::SIGTERM);
} }
thread_map.remove(&interface.hwaddr); thread_map.remove(&interface.index);
} }
} }
} }