From d2289353ed3094e0e73a9c46b599a07e29be7692 Mon Sep 17 00:00:00 2001
From: "Norbraten, Terry" <tdnorbra@nps.edu>
Date: Thu, 4 Jun 2020 16:09:23 -0700
Subject: [PATCH] use new joinGroup
---
.../nps/moves/dis7/examples/EspduReceiverNIO.java | 14 +++++++++-----
.../nps/moves/dis7/examples/EspduSenderNIO.java | 12 ++++++++----
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java b/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java
index 5fa310440a..6fecef94c5 100644
--- a/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java
+++ b/src/edu/nps/moves/dis7/examples/EspduReceiverNIO.java
@@ -5,10 +5,12 @@
package edu.nps.moves.dis7.examples;
import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.utilities.DisThreadedNetIF;
import edu.nps.moves.dis7.utilities.PduFactory;
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.MulticastSocket;
import java.nio.ByteBuffer;
@@ -31,7 +33,8 @@ public class EspduReceiverNIO
public static void main(String args[])
{
MulticastSocket socket;
- InetAddress address;
+ InetAddress maddr;
+ InetSocketAddress group;
PduFactory pduFactory = new PduFactory();
byte buffer[] = new byte[MAX_PDU_SIZE];
DatagramPacket packet = new DatagramPacket(buffer, buffer.length);
@@ -39,11 +42,12 @@ public class EspduReceiverNIO
Pdu pdu;
try {
+
// Specify the socket to receive data
- socket = new MulticastSocket(EspduSender.DIS_DESTINATION_PORT);
- address = InetAddress.getByName(EspduSender.DEFAULT_MULTICAST_GROUP);
- // TODO fix deprecation by adding NetworkInterface (hopefully DisThreadedNetworkInterface)
- socket.joinGroup(address);
+ socket = new MulticastSocket(EspduSenderNIO.PORT);
+ maddr = InetAddress.getByName(EspduSenderNIO.MULTICAST_GROUP);
+ group = new InetSocketAddress(maddr, EspduSenderNIO.PORT);
+ socket.joinGroup(group, DisThreadedNetIF.findIp4Interface());
// Loop infinitely, receiving datagrams
while (true) {
diff --git a/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java b/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java
index 2a293d0214..9fea77c50f 100644
--- a/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java
+++ b/src/edu/nps/moves/dis7/examples/EspduSenderNIO.java
@@ -8,8 +8,10 @@ import edu.nps.moves.dis7.EntityID;
import edu.nps.moves.dis7.EntityStatePdu;
import edu.nps.moves.dis7.EulerAngles;
import edu.nps.moves.dis7.Vector3Double;
+import edu.nps.moves.dis7.utilities.DisThreadedNetIF;
import java.net.DatagramPacket;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.net.MulticastSocket;
/**
@@ -35,7 +37,8 @@ public class EspduSenderNIO
public static void main(String args[])
{
MulticastSocket socket;
- InetAddress address;
+ InetAddress maddr;
+ InetSocketAddress group;
EntityStatePdu espdu = new EntityStatePdu();
espdu.setExerciseID((byte) 0);
@@ -50,14 +53,15 @@ public class EspduSenderNIO
try {
socket = new MulticastSocket(PORT);
- address = InetAddress.getByName(MULTICAST_GROUP);
- socket.joinGroup(address);
+ maddr = InetAddress.getByName(MULTICAST_GROUP);
+ group = new InetSocketAddress(maddr, PORT);
+ socket.joinGroup(group, DisThreadedNetIF.findIp4Interface());
Vector3Double location;
EulerAngles orientation;
float psi;
byte[] data = new byte[144];
- DatagramPacket packet = new DatagramPacket(data, data.length, address, PORT);
+ DatagramPacket packet = new DatagramPacket(data, data.length, maddr, PORT);
while (true) {
for (int idx = 0; idx < 100; idx++) {
--
GitLab