Skip to content
Snippets Groups Projects

improvements in java abstract_socket

1 file
+ 13
1
Compare changes
  • Side-by-side
  • Inline
@@ -12,8 +12,10 @@ import java.net.Inet4Address;
@@ -12,8 +12,10 @@ import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.InetSocketAddress;
 
import java.net.MalformedURLException;
import java.net.SocketException;
import java.net.SocketException;
import java.net.StandardSocketOptions;
import java.net.StandardSocketOptions;
 
import java.net.URL;
import java.net.UnknownHostException;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.nio.ByteBuffer;
import java.nio.channels.SelectableChannel;
import java.nio.channels.SelectableChannel;
@@ -697,6 +699,16 @@ public abstract class Abstract_Socket {
@@ -697,6 +699,16 @@ public abstract class Abstract_Socket {
log_debug("Abstract_Socket.open_client_connection(remoteAddr: %s/%s, localAddr: %s/%s) called", remoteHostname, remoteService, (localHostname != null) ? localHostname : "UNSPEC", (localService != null) ? localService : "UNSPEC");
log_debug("Abstract_Socket.open_client_connection(remoteAddr: %s/%s, localAddr: %s/%s) called", remoteHostname, remoteService, (localHostname != null) ? localHostname : "UNSPEC", (localService != null) ? localService : "UNSPEC");
InetSocketAddress new_remote_addr = new InetSocketAddress(remoteHostname, Integer.valueOf(remoteService));
InetSocketAddress new_remote_addr = new InetSocketAddress(remoteHostname, Integer.valueOf(remoteService));
 
if (new_remote_addr.isUnresolved()) {
 
try {
 
new_remote_addr = new InetSocketAddress(new URL(remoteHostname).getHost(), Integer.valueOf(remoteService));
 
} catch (NumberFormatException e) {
 
log_error("Error on remote port: %s", e.getMessage());
 
} catch (MalformedURLException e) {
 
log_error("Error on remote host: %s", e.getMessage());
 
}
 
}
 
InetSocketAddress new_local_addr = null;
InetSocketAddress new_local_addr = null;
log_debug("Remote address: %s:%d", new_remote_addr.getAddress(), new_remote_addr.getPort());
log_debug("Remote address: %s:%d", new_remote_addr.getAddress(), new_remote_addr.getPort());
@@ -1040,7 +1052,7 @@ public abstract class Abstract_Socket {
@@ -1040,7 +1052,7 @@ public abstract class Abstract_Socket {
while (!peer_list_root.isEmpty()) {
while (!peer_list_root.isEmpty()) {
SocketChannel client_id = peer_list_get_first_peer();
SocketChannel client_id = peer_list_get_first_peer();
if (client_id != null) {
if (client_id != null) {
log_warning("Client %d has not been removed, programming error", client_id);
log_warning("Client %s has not been removed, programming error", client_id.toString());
} else {
} else {
log_error("Number of clients<>0 but cannot get first client, programming error");
log_error("Number of clients<>0 but cannot get first client, programming error");
}
}
Loading