Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-11-04 09:45:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix save connection settings according to the book of resetlib

Browse source
This commit is contained in:
takotori 2023-12-11 21:45:19 +01:00
parent e89de26b67
commit f95dca41a4
3 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -6,7 +6,7 @@ description = "A wip universal Linux settings application."
[dependencies] [dependencies]
reset_daemon = "0.4.6" reset_daemon = "0.4.6"
re_set-lib = "0.6.6" re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib", branch = "main" }
adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] } adw = { version = "0.5.3", package = "libadwaita", features = ["v1_4"] }
dbus = "0.9.7" dbus = "0.9.7"
gtk = { version = "0.7.3", package = "gtk4", features = ["v4_12"] } gtk = { version = "0.7.3", package = "gtk4", features = ["v4_12"] }

2
src/components/wifi/wifi_entry.rs
View file

@ -99,7 +99,7 @@ impl WifiEntry {
let self_imp = self.imp(); let self_imp = self.imp();
self_imp.reset_wifi_edit_button.borrow().connect_clicked(clone!(@ weak self_imp, @ weak wifi_box => move |_| { self_imp.reset_wifi_edit_button.borrow().connect_clicked(clone!(@ weak self_imp, @ weak wifi_box => move |_| {
let _option = get_connection_settings(self_imp.access_point.borrow().associated_connection.clone()); let _option = get_connection_settings(self_imp.access_point.borrow().associated_connection.clone());
wifi_box.reset_wifi_navigation.push(&*WifiOptions::new(_option, self_imp.access_point.borrow().dbus_path.clone())); wifi_box.reset_wifi_navigation.push(&*WifiOptions::new(_option, self_imp.access_point.borrow().associated_connection.clone()));
})); }));
} }
} }

72
src/components/wifi/wifi_options.rs
View file

@ -12,7 +12,7 @@ use dbus::arg::PropMap;
use dbus::{Error, Path}; use dbus::{Error, Path};
use glib::{clone, PropertySet}; use glib::{clone, PropertySet};
use gtk::prelude::{ButtonExt, EditableExt, WidgetExt}; use gtk::prelude::{ButtonExt, EditableExt, WidgetExt};
use re_set_lib::network::connection::{Connection, DNSMethod4, DNSMethod6, Enum, TypeSettings}; use re_set_lib::network::connection::{Connection, DNSMethod4, DNSMethod6, Enum, KeyManagement, TypeSettings};
use IpProtocol::{IPv4, IPv6}; use IpProtocol::{IPv4, IPv6};
use crate::components::wifi::utils::IpProtocol; use crate::components::wifi::utils::IpProtocol;
@ -30,11 +30,11 @@ unsafe impl Send for WifiOptions {}
unsafe impl Sync for WifiOptions {} unsafe impl Sync for WifiOptions {}
impl WifiOptions { impl WifiOptions {
pub fn new(connection: Connection, access_point: Path<'static>) -> Arc<Self> { pub fn new(connection: Connection, connection_path: Path<'static>) -> Arc<Self> {
let wifi_option: Arc<WifiOptions> = Arc::new(Object::builder().build()); let wifi_option: Arc<WifiOptions> = Arc::new(Object::builder().build());
wifi_option.imp().connection.set(connection); wifi_option.imp().connection.set(connection);
wifi_option.initialize_ui(); wifi_option.initialize_ui();
setup_callbacks(&wifi_option, access_point); setup_callbacks(&wifi_option, connection_path);
wifi_option wifi_option
} }
@ -59,7 +59,7 @@ impl WifiOptions {
.reset_wifi_metered .reset_wifi_metered
.set_active(conn.settings.metered != -1); .set_active(conn.settings.metered != -1);
match &conn.device { match &conn.device {
TypeSettings::WIFI(wifi) => { TypeSettings::WIFI(wifi, _) => {
self_imp.reset_wifi_link_speed.set_visible(false); self_imp.reset_wifi_link_speed.set_visible(false);
self_imp.reset_wifi_ip4_addr.set_visible(false); self_imp.reset_wifi_ip4_addr.set_visible(false);
self_imp.reset_wifi_ip6_addr.set_visible(false); self_imp.reset_wifi_ip6_addr.set_visible(false);
@ -93,27 +93,26 @@ impl WifiOptions {
// IPv4 // IPv4
self_imp self_imp
.reset_ip4_method .reset_ip4_method
.set_selected(conn.ipv4.dns_method.to_i32() as u32); .set_selected(conn.ipv4.method.to_i32() as u32);
self.set_ip4_visibility(conn.ipv4.dns_method.to_i32() as u32); self.set_ip4_visibility(conn.ipv4.method.to_i32() as u32);
let ipv4_dns: Vec<String> = conn let ipv4_dns: Vec<Ipv4Addr> = conn
.ipv4 .ipv4
.dns .dns
.iter() .iter()
.map(|addr| { .map(|addr| Ipv4Addr::from(*addr))
addr.iter()
.map(|octet| octet.to_string())
.collect::<Vec<String>>()
.join(".")
})
.collect(); .collect();
self_imp.reset_ip4_dns.set_text(&ipv4_dns.join(", "));
self_imp.reset_ip4_dns.set_text(&ipv4_dns.iter()
.map(|ip| ip.to_string())
.collect::<Vec<String>>()
.join(", "));
self_imp.reset_ip4_gateway.set_text(&conn.ipv4.gateway); self_imp.reset_ip4_gateway.set_text(&conn.ipv4.gateway);
// IPv6 // IPv6
self_imp self_imp
.reset_ip6_method .reset_ip6_method
.set_selected(conn.ipv6.dns_method.to_i32() as u32); .set_selected(conn.ipv6.method.to_i32() as u32);
self.set_ip6_visibility(conn.ipv6.dns_method.to_i32() as u32); self.set_ip6_visibility(conn.ipv6.method.to_i32() as u32);
let ipv6_dns: Vec<String> = conn let ipv6_dns: Vec<String> = conn
.ipv6 .ipv6
@ -126,23 +125,24 @@ impl WifiOptions {
.join(":") .join(":")
}) })
.collect(); .collect();
self_imp.reset_ip6_dns.set_text(&ipv6_dns.join(", ")); self_imp.reset_ip6_dns.set_text(&ipv6_dns.join(", "));
self_imp.reset_ip6_gateway.set_text(&conn.ipv6.gateway); self_imp.reset_ip6_gateway.set_text(&conn.ipv6.gateway);
// Security // Security
if let TypeSettings::WIFI(wifi) = &conn.device { if let TypeSettings::WIFI(wifi, wifi_security) = &conn.device {
match wifi.security_settings.key_management.as_str() { match wifi_security.key_management {
"none" => { KeyManagement::NONE => {
self_imp.reset_wifi_security_dropdown.set_selected(0); self_imp.reset_wifi_security_dropdown.set_selected(0);
self_imp.reset_wifi_password.set_visible(false); self_imp.reset_wifi_password.set_visible(false);
self_imp.reset_wifi_password.set_text(""); self_imp.reset_wifi_password.set_text("");
} }
"wpa-psk" => { KeyManagement::WPAPSK => {
self_imp.reset_wifi_security_dropdown.set_selected(1); self_imp.reset_wifi_security_dropdown.set_selected(1);
self_imp.reset_wifi_password.set_visible(true); self_imp.reset_wifi_password.set_visible(true);
self_imp self_imp
.reset_wifi_password .reset_wifi_password
.set_text(&wifi.security_settings.psk); .set_text(&wifi_security.psk);
} }
_ => {} _ => {}
} }
@ -242,6 +242,7 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
imp.wifi_options_apply_button imp.wifi_options_apply_button
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let prop = imp.connection.borrow().convert_to_propmap(); let prop = imp.connection.borrow().convert_to_propmap();
dbg!(&prop);
set_connection_settings(path.clone(), prop); set_connection_settings(path.clone(), prop);
})); }));
// IPv4 // IPv4
@ -250,7 +251,7 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
.connect_selected_notify(clone!(@weak imp => move |dropdown| { .connect_selected_notify(clone!(@weak imp => move |dropdown| {
let selected = dropdown.selected(); let selected = dropdown.selected();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
conn.ipv4.dns_method = DNSMethod4::from_i32(selected as i32); conn.ipv4.method = DNSMethod4::from_i32(selected as i32);
wifi_options_ip4.set_ip4_visibility(selected); wifi_options_ip4.set_ip4_visibility(selected);
})); }));
@ -266,7 +267,7 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
for dns_entry in dns_input.as_str().split(',').map(|s| s.trim()) { for dns_entry in dns_input.as_str().split(',').map(|s| s.trim()) {
if let Ok(addr) = Ipv4Addr::from_str(dns_entry) { if let Ok(addr) = Ipv4Addr::from_str(dns_entry) {
imp.reset_ip4_dns.remove_css_class("error"); imp.reset_ip4_dns.remove_css_class("error");
conn.ipv4.dns.push(addr.octets().to_vec()); conn.ipv4.dns.push(u32::from_be_bytes(addr.octets()));
} else { } else {
imp.reset_ip4_dns.add_css_class("error"); imp.reset_ip4_dns.add_css_class("error");
} }
@ -274,7 +275,7 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
})); }));
imp.reset_ip4_address_add_button imp.reset_ip4_address_add_button
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let address = &WifiAddressEntry::new(None, imp.connection.clone(), IpProtocol::IPv4); let address = &WifiAddressEntry::new(None, imp.connection.clone(), IPv4);
imp.reset_ip4_address_group.add(address); imp.reset_ip4_address_group.add(address);
})); }));
@ -300,7 +301,7 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
.connect_selected_notify(clone!(@weak imp => move |dropdown| { .connect_selected_notify(clone!(@weak imp => move |dropdown| {
let selected = dropdown.selected(); let selected = dropdown.selected();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
conn.ipv6.dns_method = DNSMethod6::from_i32(selected as i32); conn.ipv6.method = DNSMethod6::from_i32(selected as i32);
wifi_options_ip6.set_ip6_visibility(selected); wifi_options_ip6.set_ip6_visibility(selected);
})); }));
@ -324,7 +325,7 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
})); }));
imp.reset_ip6_address_add_button imp.reset_ip6_address_add_button
.connect_clicked(clone!(@weak imp => move |_| { .connect_clicked(clone!(@weak imp => move |_| {
let address = &WifiAddressEntry::new(None, imp.connection.clone(), IpProtocol::IPv4); let address = &WifiAddressEntry::new(None, imp.connection.clone(), IPv4);
imp.reset_ip6_address_group.add(address); imp.reset_ip6_address_group.add(address);
})); }));
@ -352,15 +353,15 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
match (selected, &mut conn.device) { match (selected, &mut conn.device) {
(0 , TypeSettings::WIFI(wifi)) => { // None (0 , TypeSettings::WIFI(wifi, wifi_security)) => { // None
imp.reset_wifi_password.set_visible(false); imp.reset_wifi_password.set_visible(false);
wifi.security_settings.key_management = String::from("none"); wifi_security.key_management = KeyManagement::NONE;
wifi.security_settings.authentication_algorithm = String::from("open"); wifi_security.authentication_algorithm = String::from("none");
}, },
(1 , TypeSettings::WIFI(wifi)) => { // WPA/WPA2 Personal (1 , TypeSettings::WIFI(wifi, wifi_security)) => { // WPA/WPA2 Personal
imp.reset_wifi_password.set_visible(true); imp.reset_wifi_password.set_visible(true);
wifi.security_settings.key_management = String::from("wpa-psk"); wifi_security.key_management = KeyManagement::WPAPSK;
wifi.security_settings.authentication_algorithm = String::from(""); wifi_security.authentication_algorithm = String::from("none");
}, },
(_, _) => {} (_, _) => {}
} }
@ -370,8 +371,8 @@ fn setup_callbacks(wifi_options: &Arc<WifiOptions>, path: Path<'static>) {
.connect_changed(clone!(@weak imp => move |entry| { .connect_changed(clone!(@weak imp => move |entry| {
let password_input = entry.text(); let password_input = entry.text();
let mut conn = imp.connection.borrow_mut(); let mut conn = imp.connection.borrow_mut();
if let TypeSettings::WIFI(wifi) = &mut conn.device { if let TypeSettings::WIFI(wifi, wifi_security) = &mut conn.device {
wifi.security_settings.psk = password_input.to_string(); wifi_security.psk = password_input.to_string();
} }
})); }));
} }
@ -384,10 +385,11 @@ fn set_connection_settings(path: Path<'static>, prop: HashMap<String, PropMap>)
"/org/Xetibo/ReSetDaemon", "/org/Xetibo/ReSetDaemon",
Duration::from_millis(1000), Duration::from_millis(1000),
); );
let _: Result<(bool,), Error> = proxy.method_call( let asdf: Result<(bool,), Error> = proxy.method_call(
"org.Xetibo.ReSetWireless", "org.Xetibo.ReSetWireless",
"SetConnectionSettings", "SetConnectionSettings",
(path, prop), (path, prop),
); );
dbg!(asdf);
}); });
} }