projects
/
ldk-sample
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to LDK 0.0.117
[ldk-sample]
/
src
/
args.rs
diff --git
a/src/args.rs
b/src/args.rs
index b6ae379afb487452996b311e17b52b8e49e5f1dc..3778aa20d24d80395c1c988e80873b683c76d822 100644
(file)
--- a/
src/args.rs
+++ b/
src/args.rs
@@
-1,10
+1,9
@@
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
use crate::cli::LdkUserInfo;
use bitcoin::network::constants::Network;
-use lightning::ln::msgs::
N
etAddress;
+use lightning::ln::msgs::
Sock
etAddress;
use std::collections::HashMap;
use std::env;
use std::fs;
use std::collections::HashMap;
use std::env;
use std::fs;
-use std::net::IpAddr;
use std::path::{Path, PathBuf};
use std::str::FromStr;
use std::path::{Path, PathBuf};
use std::str::FromStr;
@@
-86,18
+85,12
@@
pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
let mut ldk_announced_listen_addr = Vec::new();
loop {
match env::args().skip(arg_idx + 1).next().as_ref() {
let mut ldk_announced_listen_addr = Vec::new();
loop {
match env::args().skip(arg_idx + 1).next().as_ref() {
- Some(s) => match IpAddr::from_str(s) {
- Ok(IpAddr::V4(a)) => {
- ldk_announced_listen_addr
- .push(NetAddress::IPv4 { addr: a.octets(), port: ldk_peer_listening_port });
+ Some(s) => match SocketAddress::from_str(s) {
+ Ok(sa) => {
+ ldk_announced_listen_addr.push(sa);
arg_idx += 1;
}
arg_idx += 1;
}
- Ok(IpAddr::V6(a)) => {
- ldk_announced_listen_addr
- .push(NetAddress::IPv6 { addr: a.octets(), port: ldk_peer_listening_port });
- arg_idx += 1;
- }
- Err(_) => panic!("Failed to parse announced-listen-addr into an IP address"),
+ Err(_) => panic!("Failed to parse announced-listen-addr into a socket address"),
},
None => break,
}
},
None => break,
}