X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-sample;a=blobdiff_plain;f=src%2Fargs.rs;fp=src%2Fargs.rs;h=3778aa20d24d80395c1c988e80873b683c76d822;hp=b6ae379afb487452996b311e17b52b8e49e5f1dc;hb=da2cd163e859532afedf32719ae7e19ae852680d;hpb=828df536e27155d23d08a99d3edb59ca313ceb3f

diff --git a/src/args.rs b/src/args.rs
index b6ae379..3778aa2 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -1,10 +1,9 @@
 use crate::cli::LdkUserInfo;
 use bitcoin::network::constants::Network;
-use lightning::ln::msgs::NetAddress;
+use lightning::ln::msgs::SocketAddress;
 use std::collections::HashMap;
 use std::env;
 use std::fs;
-use std::net::IpAddr;
 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() {
-			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;
 				}
-				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,
 		}