[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain DrainSniff.java, NONE, 1.1 DrainTest.java, 1.4, 1.5

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1577

Modified Files:
	DrainTest.java 
Added Files:
	DrainSniff.java 
Log Message:
added a basic packet sniffer for Drain messages and beacons. also changed the printing options for DrainTest.

--- NEW FILE: DrainSniff.java ---
package net.tinyos.drain;

import net.tinyos.message.*;
import net.tinyos.util.*;

import org.apache.log4j.*;

import java.io.*; 
import java.text.*;
import java.util.*;
import java.net.*;

public class DrainSniff {
  private MoteIF moteIF;

  public DrainSniff() {
    moteIF = new MoteIF();
    moteIF.registerListener(new DrainMsg(), new DrainMsgReceiver());
    moteIF.registerListener(new DrainBeaconMsg(), new DrainBeaconMsgReceiver());
  }

  private class DrainMsgReceiver implements MessageListener {
    synchronized public void messageReceived(int to, Message m) {
      
      DrainMsg mhMsg = (DrainMsg)m;
      
      System.out.println("incoming: " +
			 " source: " + mhMsg.get_source() + 
			 " dest: " + mhMsg.get_dest() + 
			 " local-dest: " + to +
			 " type: " + mhMsg.get_type() +
			 " hops: " + (16 - mhMsg.get_ttl()));
    }
  }

  private class DrainBeaconMsgReceiver implements MessageListener {
    synchronized public void messageReceived(int to, Message m) {
      
      DrainBeaconMsg mhMsg = (DrainBeaconMsg)m;
      System.out.println("beacon: " +
			 " treeInstance: " + mhMsg.get_treeInstance() + 
			 " root: " + mhMsg.get_source() +
			 " node: " + mhMsg.get_linkSource() +
			 " parent: " + mhMsg.get_parent() +
			 " cost: " + mhMsg.get_cost() +
			 " ttl: " + mhMsg.get_ttl());
    }
  }

  public static void main(String args[]) {
    DrainSniff ds = new DrainSniff();
  }
}

Index: DrainTest.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/tools/java/net/tinyos/drain/DrainTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DrainTest.java	22 Aug 2005 18:46:45 -0000	1.4
--- DrainTest.java	22 Aug 2005 21:51:07 -0000	1.5
***************
*** 67,71 ****
    private class PrintTask extends TimerTask {
      public void run() {
!       log.info("Status Report");
        double aggTrafficUnique = 0;
        double aggTraffic = 0;
--- 67,71 ----
    private class PrintTask extends TimerTask {
      public void run() {
!       System.out.println("Status Report");
        double aggTrafficUnique = 0;
        double aggTraffic = 0;
***************
*** 89,93 ****
  	rec.lastReceivedDup = rec.received + rec.receivedDup;
  
! 	log.info(addr + ": " + "sent= " + rec.sent + " received= " + rec.received + " success=" + 100*((float)rec.received / rec.sent) + " pps=" + receiveRate + " ppsUnique=" + receiveRateUnique);
  
  	if (receiveRateUnique > 0) {
--- 89,93 ----
  	rec.lastReceivedDup = rec.received + rec.receivedDup;
  
! 	System.out.println(addr + ": " + "sent= " + rec.sent + " received= " + rec.received + " success=" + 100*((float)rec.received / rec.sent) + " pps=" + receiveRate + " ppsUnique=" + receiveRateUnique);
  
  	if (receiveRateUnique > 0) {
***************
*** 96,103 ****
  
        }
!       log.info("Node count=" + count);
!       log.info("Active Nodes=" + activeCount);
!       log.info("Aggregate pps=" + aggTraffic);
!       log.info("Aggregate Unique pps=" + aggTrafficUnique);
      }
    }
--- 96,104 ----
  
        }
!       System.out.println("Node count=" + count);
!       System.out.println("Active Nodes=" + activeCount);
!       System.out.println("Aggregate pps=" + aggTraffic);
!       System.out.println("Aggregate Unique pps=" + aggTrafficUnique);
!       System.out.println("---");
      }
    }