creating2morrow/neveko
1
0
Fork 0
mirror of https://github.com/creating2morrow/neveko.git synced 2025-01-18 08:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't use port on remote nodes

Browse source
This commit is contained in:
creating2morrow 2023-06-28 18:08:46 -04:00
parent 4459282284
commit 582154c72c
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
neveko-core/src/args.rs
View file

@ -162,4 +162,7 @@ pub struct Args {
default_value = "false" default_value = "false"
)] )]
pub i2p_normal: bool, pub i2p_normal: bool,
/// anonymous inbound port, must be localhost
#[arg(long, help = "Set app marketplace admin port", default_value = "38089")]
pub anon_inbound_port: u16,
} }

11
neveko-core/src/monero.rs
View file

@ -160,9 +160,9 @@ pub fn start_daemon() {
let bin_dir = get_monero_location(); let bin_dir = get_monero_location();
let release_env = utils::get_release_env(); let release_env = utils::get_release_env();
let tx_proxy = format!("i2p,{}", utils::get_i2p_http_proxy()); let tx_proxy = format!("i2p,{}", utils::get_i2p_http_proxy());
let port = get_daemon_port(); let port = get_anon_inbound_port();
let destination = i2p::get_destination(Some(port)); let destination = i2p::get_destination(Some(port));
let anon_inbound = format!("{},127.0.0.1:{},8", destination, port); let anon_inbound = format!("{},127.0.0.1:{}", destination, port);
if release_env == utils::ReleaseEnvironment::Development { if release_env == utils::ReleaseEnvironment::Development {
let args = ["--data-dir", &blockchain_dir, "--stagenet", "--detach"]; let args = ["--data-dir", &blockchain_dir, "--stagenet", "--detach"];
let output = Command::new(format!("{}/monerod", bin_dir)) let output = Command::new(format!("{}/monerod", bin_dir))
@ -275,7 +275,7 @@ pub fn get_daemon_port() -> u16 {
let rpc = String::from(args.monero_rpc_daemon); let rpc = String::from(args.monero_rpc_daemon);
let values = rpc.split(":"); let values = rpc.split(":");
let mut v: Vec<String> = values.map(|s| String::from(s)).collect(); let mut v: Vec<String> = values.map(|s| String::from(s)).collect();
let port = v.remove(2); let port = if !args.remote_node { v.remove(2) } else { String::from("0") };
debug!("monerod port: {}", port); debug!("monerod port: {}", port);
match port.parse::<u16>() { match port.parse::<u16>() {
Ok(p) => p, Ok(p) => p,
@ -283,6 +283,11 @@ pub fn get_daemon_port() -> u16 {
} }
} }
pub fn get_anon_inbound_port() -> u16 {
let args = args::Args::parse();
args.anon_inbound_port
}
/// Get monero rpc host from command line argument /// Get monero rpc host from command line argument
fn get_blockchain_dir() -> String { fn get_blockchain_dir() -> String {
let args = args::Args::parse(); let args = args::Args::parse();