diff --git a/src/edu/nps/moves/dis7/examples/EspduReceiver.java b/src/edu/nps/moves/dis7/examples/EspduReceiver.java index 32c8d172fb0978536f09319d4f9d43ee880035a2..0507def195f071040c738b82f7635531f16a0663 100644 --- a/src/edu/nps/moves/dis7/examples/EspduReceiver.java +++ b/src/edu/nps/moves/dis7/examples/EspduReceiver.java @@ -43,7 +43,7 @@ public class EspduReceiver InetAddress maddr = InetAddress.getByName(DisThreadedNetIF.DEFAULT_MCAST_GROUP); InetSocketAddress group = new InetSocketAddress(maddr, DisThreadedNetIF.DEFAULT_DIS_PORT); - socket.joinGroup(group, DisThreadedNetIF.findIp4Interface()); + socket.joinGroup(group, DisThreadedNetIF.findIpv4Interface()); // Loop infinitely, receiving datagrams EntityID eid; diff --git a/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java b/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java index 864e73833f060bd042601961133800224c7f05ab..c286a4490e7a5275a1140da64ea0bd3e65eb2aa4 100644 --- a/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java +++ b/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java @@ -37,7 +37,7 @@ public class EspduReceiverNIO socket = new MulticastSocket(DisThreadedNetIF.DEFAULT_DIS_PORT); maddr = InetAddress.getByName(DisThreadedNetIF.DEFAULT_MCAST_GROUP); group = new InetSocketAddress(maddr, DisThreadedNetIF.DEFAULT_DIS_PORT); - socket.joinGroup(group, DisThreadedNetIF.findIp4Interface()); + socket.joinGroup(group, DisThreadedNetIF.findIpv4Interface()); // Loop infinitely, receiving datagrams while (true) { diff --git a/src/edu/nps/moves/dis7/examples/EspduSender.java b/src/edu/nps/moves/dis7/examples/EspduSender.java index 57c5a6a93e5cb2393c9997864dcb3b8f5a6e2906..da3de0fc93fc019f6b43bafbdfe44191a2142c7c 100644 --- a/src/edu/nps/moves/dis7/examples/EspduSender.java +++ b/src/edu/nps/moves/dis7/examples/EspduSender.java @@ -97,7 +97,7 @@ public class EspduSender } InetSocketAddress group = new InetSocketAddress(destinationIp, port); - socket.joinGroup(group, DisThreadedNetIF.findIp4Interface()); + socket.joinGroup(group, DisThreadedNetIF.findIpv4Interface()); } } // end networkModeString } diff --git a/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java b/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java index eee5fa998cd82ff92411f5ac041187f47040143a..283c6adc2c0dcc8b6679b3fd3789c0cbdc5c1701 100644 --- a/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java +++ b/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java @@ -45,7 +45,7 @@ public class EspduSenderNIO socket = new MulticastSocket(DisThreadedNetIF.DEFAULT_DIS_PORT); maddr = InetAddress.getByName(DisThreadedNetIF.DEFAULT_MCAST_GROUP); group = new InetSocketAddress(maddr, DisThreadedNetIF.DEFAULT_DIS_PORT); - socket.joinGroup(group, DisThreadedNetIF.findIp4Interface()); + socket.joinGroup(group, DisThreadedNetIF.findIpv4Interface()); Vector3Double location; EulerAngles orientation; diff --git a/src/edu/nps/moves/dis7/examples/PduSender.java b/src/edu/nps/moves/dis7/examples/PduSender.java index 7cebe11699348b8ee1c886e5ea43e78219fd023d..dfe38c47dd38708fc0c7efb93ceceff0433f3f63 100644 --- a/src/edu/nps/moves/dis7/examples/PduSender.java +++ b/src/edu/nps/moves/dis7/examples/PduSender.java @@ -292,7 +292,7 @@ public class PduSender InetAddress localMulticastAddress = InetAddress.getByName(DisThreadedNetIF.DEFAULT_MCAST_GROUP); MulticastSocket socket = new MulticastSocket(port); InetSocketAddress group = new InetSocketAddress(localMulticastAddress, port); - socket.joinGroup(group, DisThreadedNetIF.findIp4Interface()); + socket.joinGroup(group, DisThreadedNetIF.findIpv4Interface()); ByteArrayOutputStream baos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(baos); diff --git a/src/edu/nps/moves/dis7/utilities/DisNetworking.java b/src/edu/nps/moves/dis7/utilities/DisNetworking.java index e63c06987e8c98d90db71eb2fcdfe654b06c0372..fd01d7609338b951cb230e44cbf73c4989383f18 100644 --- a/src/edu/nps/moves/dis7/utilities/DisNetworking.java +++ b/src/edu/nps/moves/dis7/utilities/DisNetworking.java @@ -61,7 +61,7 @@ public class DisNetworking Logger.getLogger(DisNetworking.class.getName()).log(Level.SEVERE, null, ex); } group = new InetSocketAddress(maddr, DIS_PORT); - ni = DisThreadedNetIF.findIp4Interface(); + ni = DisThreadedNetIF.findIpv4Interface(); baos = new ByteArrayOutputStream(); dos = new DataOutputStream(baos); } diff --git a/src/edu/nps/moves/dis7/utilities/DisThreadedNetIF.java b/src/edu/nps/moves/dis7/utilities/DisThreadedNetIF.java index 1233f27c87c2dc163e39e5ff5db56da5da086f6f..81cf58fd21a0af57024b5fba398721385f1b4771 100644 --- a/src/edu/nps/moves/dis7/utilities/DisThreadedNetIF.java +++ b/src/edu/nps/moves/dis7/utilities/DisThreadedNetIF.java @@ -100,7 +100,7 @@ public class DisThreadedNetIF Logger.getLogger(DisThreadedNetIF.class.getName()).log(Level.SEVERE, null, ex); } group = new InetSocketAddress(maddr, disPort); - ni = findIp4Interface(); + ni = findIpv4Interface(); init(); } @@ -334,11 +334,11 @@ public class DisThreadedNetIF } /** - * Find proper interface + * Find proper IPV4 interface * * @return a network interface to use to join a multicast group */ - public static NetworkInterface findIp4Interface() { + public static NetworkInterface findIpv4Interface() { try { Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces(); NetworkInterface nif;