deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added line to parse when receiving UDP packets

Browse source
This commit is contained in:
Joakim Eriksson 2011-06-02 21:31:03 +02:00 committed by Niclas Finne
parent 86169177c5
commit cfbcf8725c
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tools/collect-view/src/se/sics/contiki/collect/UDPConnection.java
View file

@ -40,7 +40,7 @@ import java.io.IOException;
import java.net.DatagramPacket; import java.net.DatagramPacket;
import java.net.DatagramSocket; import java.net.DatagramSocket;
import java.net.InetAddress; import java.net.InetAddress;
import java.io.*;
/** /**
* *
*/ */
@ -67,7 +67,7 @@ private DatagramSocket serverSocket;
isClosed = false; isClosed = false;
try { try {
serverSocket = new DatagramSocket(port); serverSocket = new DatagramSocket(port);
System.out.println("Opened UDP port: " + port);
/* Start thread listening on UDP */ /* Start thread listening on UDP */
Thread readInput = new Thread(new Runnable() { Thread readInput = new Thread(new Runnable() {
public void run() { public void run() {
@ -79,8 +79,31 @@ private DatagramSocket serverSocket;
InetAddress addr = packet.getAddress(); InetAddress addr = packet.getAddress();
System.out.println("UDP: received " + packet.getLength() + " bytes from " + addr.getHostAddress() + ":" + packet.getPort()); System.out.println("UDP: received " + packet.getLength() + " bytes from " + addr.getHostAddress() + ":" + packet.getPort());
// TODO handle data
// serialData(line); StringWriter strOut = new StringWriter();
PrintWriter out = new PrintWriter(strOut);
int payloadLen = packet.getLength() - 2;
out.printf("%d", 8 + payloadLen / 2);
/* Timestamp. Ignore time synch for now. */
long time = System.currentTimeMillis() / 1000;
out.printf(" %d %d 0",
((time >> 16) & 0xffff), time & 0xffff);
byte[] payload = packet.getData();
int seqno = payload[0] & 0xff;
int hops = 0; /* how to get TTL / hot limit in Java??? */
byte[] address = addr.getAddress();
/* Ignore latency for now */
out.printf(" %d %d %d %d",
(address[14] + (address[15] << 8))&0xffff,
seqno, hops, 0);
int d = 0;
for(int i = 0; i < payloadLen ; i += 2) {
d = payload[i + 2] + (payload[i + 3] << 8);
out.printf(" %d", d & 0xffff);
}
String line = strOut.toString();
serialData(line);
} }
System.out.println("SerialConnection UDP terminated."); System.out.println("SerialConnection UDP terminated.");
closeConnection(); closeConnection();