Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-12-24 06:49:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

ipc works

Browse Source
This commit is contained in:
John Smith 2023-12-14 21:28:02 -05:00 committed by Christien Rioux
parent 37979277b5
commit caa2746110
6 changed files with 100 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
veilid-cli/src/main.rs
View File

@ -31,7 +31,7 @@ struct CmdlineArgs {
/// IPC socket to connect to
#[arg(long, short = 'p')]
ipc_path: Option<PathBuf>,
/// IPC socket to connect to
/// Subnode index to use when connecting
#[arg(long, short = 'i', default_value = "0")]
subnode_index: usize,
/// Address to connect to

10
veilid-cli/src/settings.rs
View File

@ -8,7 +8,7 @@ use std::path::{Path, PathBuf};
pub fn load_default_config() -> Result<config::Config, config::ConfigError> {
let default_config = r#"---
enable_ipc: true
local_socket_path: '%LOCAL_SOCKET_DIRECTORY%'
ipc_path: '%IPC_DIRECTORY%'
enable_network: true
address: "localhost:5959"
autoconnect: true
@ -49,8 +49,8 @@ interface:
error : "light red"
"#
.replace(
"%LOCAL_SOCKET_DIRECTORY%",
&Settings::get_default_local_socket_path().to_string_lossy(),
"%IPC_DIRECTORY%",
&Settings::get_default_ipc_directory().to_string_lossy(),
)
.replace(
"%LOGGING_FILE_DIRECTORY%",
@ -248,8 +248,8 @@ impl Settings {
ts_path
}
pub fn get_default_local_socket_path() -> PathBuf {
Self::get_server_default_directory("local_sockets")
pub fn get_default_ipc_directory() -> PathBuf {
Self::get_server_default_directory("ipc")
}
pub fn get_default_config_path() -> PathBuf {

153
veilid-cli/src/ui.rs
View File

@ -27,18 +27,24 @@ use thiserror::Error;
//////////////////////////////////////////////////////////////
///
struct Dirty<T> {
struct Dirty<T>
where
T: PartialEq,
{
value: T,
dirty: bool,
}
impl<T> Dirty<T> {
impl<T> Dirty<T>
where
T: PartialEq,
{
pub fn new(value: T) -> Self {
Self { value, dirty: true }
}
pub fn set(&mut self, value: T) {
self.dirty = self.value != value;
self.value = value;
self.dirty = true;
}
pub fn get(&self) -> &T {
&self.value
@ -266,6 +272,9 @@ impl UI {
fn ipc_path_radio(s: &mut Cursive) -> ViewRef<RadioButton<u32>> {
s.find_name("ipc-path-radio").unwrap()
}
fn connecting_text(s: &mut Cursive) -> ViewRef<TextView> {
s.find_name("connecting-text").unwrap()
}
fn network_address(s: &mut Cursive) -> ViewRef<EditView> {
s.find_name("network-address").unwrap()
}
@ -618,7 +627,7 @@ impl UI {
EventResult::Ignored
}
fn show_connection_dialog(s: &mut Cursive, state: ConnectionState) -> bool {
fn draw_connection_dialog(s: &mut Cursive, state: ConnectionState) -> bool {
let is_ipc = Self::command_processor(s).get_ipc_path().is_some();
let mut inner = Self::inner_mut(s);
@ -634,7 +643,7 @@ impl UI {
let mut show: bool = false;
let mut hide: bool = false;
let mut reset: bool = false;
let mut connecting: bool = false;
match state {
ConnectionState::Disconnected => {
if inner.connection_dialog_state.is_none()
@ -651,7 +660,8 @@ impl UI {
.unwrap()
.is_retrying()
{
reset = true;
hide = true;
show = true
}
}
ConnectionState::ConnectedTCP(_, _) | ConnectionState::ConnectedIPC(_, _) => {
@ -680,8 +690,10 @@ impl UI {
.unwrap()
.is_disconnected()
{
reset = true;
hide = true;
show = true;
}
connecting = true;
}
}
inner.connection_dialog_state = Some(state);
@ -689,7 +701,6 @@ impl UI {
if hide {
s.pop_layer();
s.pop_layer();
return true;
}
if show {
s.add_fullscreen_layer(Layer::with_color(
@ -698,56 +709,68 @@ impl UI {
));
s.add_layer(
Dialog::around(
LinearLayout::vertical().child(
LinearLayout::horizontal()
.child(
if is_ipc {
connection_type_group.button(0, "IPC Path").selected()
} else {
connection_type_group.button(0, "IPC Path")
}
.with_name("ipc-path-radio"),
)
.child(
EditView::new()
.with_enabled(is_ipc)
.on_submit(|s, _| Self::submit_ipc_path(s))
.with_name("ipc-path")
.fixed_height(1)
.min_width(40),
)
.child(
if is_ipc {
connection_type_group.button(1, "Network Address")
} else {
connection_type_group
.button(1, "Network Address")
.selected()
}
.with_name("network-address-radio"),
)
.child(
EditView::new()
.with_enabled(!is_ipc)
.on_submit(|s, _| Self::submit_network_address(s))
.with_name("network-address")
.fixed_height(1)
.min_width(40),
),
),
)
.title("Connect to server")
Dialog::around(if connecting {
LinearLayout::vertical()
.child(TextView::new(" "))
.child(
TextView::new(if is_ipc {
"Connecting to IPC:"
} else {
"Connecting to TCP:"
})
.min_width(40),
)
.child(TextView::new("").with_name("connecting-text"))
} else {
LinearLayout::vertical()
.child(TextView::new(" "))
.child(
if is_ipc {
connection_type_group.button(0, "IPC Path").selected()
} else {
connection_type_group.button(0, "IPC Path")
}
.with_name("ipc-path-radio"),
)
.child(
EditView::new()
.with_enabled(is_ipc)
.on_submit(|s, _| Self::submit_ipc_path(s))
.with_name("ipc-path")
.fixed_height(1)
.min_width(40),
)
.child(TextView::new(" "))
.child(
if is_ipc {
connection_type_group.button(1, "Network Address")
} else {
connection_type_group
.button(1, "Network Address")
.selected()
}
.with_name("network-address-radio"),
)
.child(
EditView::new()
.with_enabled(!is_ipc)
.on_submit(|s, _| Self::submit_network_address(s))
.with_name("network-address")
.fixed_height(1)
.min_width(40),
)
.child(TextView::new(" "))
})
.title(if connecting {
"Connecting to server..."
} else {
"Connect to server"
})
.with_name("connection-dialog"),
);
return true;
}
if reset {
let mut dlg = Self::connection_dialog(s);
dlg.clear_buttons();
return true;
}
false
}
@ -755,7 +778,7 @@ impl UI {
fn refresh_connection_dialog(s: &mut Cursive) {
let new_state = Self::inner(s).ui_state.connection_state.get().clone();
if !Self::show_connection_dialog(s, new_state.clone()) {
if !Self::draw_connection_dialog(s, new_state.clone()) {
return;
}
@ -786,15 +809,8 @@ impl UI {
}
ConnectionState::ConnectedTCP(_, _) | ConnectionState::ConnectedIPC(_, _) => {}
ConnectionState::RetryingTCP(addr, _) => {
Self::ipc_path_radio(s).set_enabled(false);
Self::network_address_radio(s).set_enabled(false);
//
let mut edit = Self::network_address(s);
edit.set_content(addr.to_string());
edit.set_enabled(false);
Self::ipc_path(s).set_enabled(false);
let mut text = Self::connecting_text(s);
text.set_content(addr.to_string());
let mut dlg = Self::connection_dialog(s);
dlg.add_button("Cancel", |s| {
@ -802,15 +818,8 @@ impl UI {
});
}
ConnectionState::RetryingIPC(ipc_path, _) => {
Self::ipc_path_radio(s).set_enabled(false);
Self::network_address_radio(s).set_enabled(false);
//
let mut edit = Self::ipc_path(s);
edit.set_content(ipc_path.to_string_lossy().to_string());
edit.set_enabled(false);
Self::network_address(s).set_enabled(false);
let mut text = Self::connecting_text(s);
text.set_content(ipc_path.to_string_lossy().to_string());
let mut dlg = Self::connection_dialog(s);
dlg.add_button("Cancel", |s| {

12
veilid-server/src/client_api.rs
View File

@ -110,6 +110,12 @@ impl ClientApi {
}
async fn handle_ipc_incoming(self, ipc_path: PathBuf) -> std::io::Result<()> {
if ipc_path.exists() {
if let Err(e) = std::fs::remove_file(&ipc_path) {
error!("Binding failed because IPC path is in use: {}\nAnother copy of this application may be using the same IPC path.", e);
return Err(e);
}
}
let listener = IpcListener::bind(ipc_path.clone()).await?;
debug!("IPC Client API listening on: {:?}", ipc_path);
@ -137,6 +143,12 @@ impl ClientApi {
// Wait for all connections to terminate
awg.wait().await;
// Clean up IPC path
if let Err(e) = std::fs::remove_file(&ipc_path) {
warn!("Unable to remove IPC socket: {}", e);
return Err(e);
}
Ok(())
}

3
veilid-server/src/main.rs
View File

@ -180,9 +180,6 @@ fn main() -> EyreResult<()> {
settingsrw.daemon.enabled = false;
}
if let Some(subnode_index) = args.subnode_index {
if subnode_index == 0 {
bail!("value of subnode_index should be between 1 and 65535");
}
settingsrw.testing.subnode_index = subnode_index;
};

2
veilid-server/src/settings.rs
View File

@ -18,7 +18,7 @@ pub fn load_default_config() -> EyreResult<config::Config> {
daemon:
enabled: false
client_api:
ipc_enabled: false
ipc_enabled: true
ipc_directory: '%IPC_DIRECTORY%'
network_enabled: false
listen_address: 'localhost:5959'