pyxida-cvs-commits

[Peter P. <pr...@us...>]

Update of /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6667/src/edu/harvard/syrah/pyxida/ping

Modified Files:
	ICMPPinger.java PingManager.java TCPSynPinger.java 
	PingerIF.java UDPAppPinger.java Pinger.java JpcapPinger.java 
Log Message:
Refactored async lib

Index: Pinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/Pinger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Pinger.java	24 Nov 2006 12:06:22 -0000	1.4
--- Pinger.java	20 Mar 2007 12:27:53 -0000	1.5
***************
*** 6,10 ****
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.comm.AddressIF;
  
  abstract class Pinger implements PingerIF {
--- 6,10 ----
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.async.comm.AddressIF;
  
  abstract class Pinger implements PingerIF {

Index: UDPAppPinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/UDPAppPinger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UDPAppPinger.java	23 Nov 2006 16:46:10 -0000	1.4
--- UDPAppPinger.java	20 Mar 2007 12:27:53 -0000	1.5
***************
*** 4,8 ****
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.comm.AddressIF;
  
  class UDPAppPinger extends Pinger implements PingerIF {
--- 4,8 ----
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.async.comm.AddressIF;
  
  class UDPAppPinger extends Pinger implements PingerIF {

Index: PingManager.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/PingManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PingManager.java	30 Nov 2006 13:00:42 -0000	1.11
--- PingManager.java	20 Mar 2007 12:27:53 -0000	1.12
***************
*** 4,16 ****
  import java.util.List;
  
- import edu.harvard.syrah.pyxida.Pyxida;
  import edu.harvard.syrah.prp.Log;
  import edu.harvard.syrah.sbon.async.CBResult;
  import edu.harvard.syrah.sbon.async.LoopIt;
! import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
! import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.async.CallbacksIF.CB2;
! import edu.harvard.syrah.sbon.comm.AddressFactory;
! import edu.harvard.syrah.sbon.comm.AddressIF;
  
  
--- 4,14 ----
  import java.util.List;
  
  import edu.harvard.syrah.prp.Log;
+ import edu.harvard.syrah.pyxida.Pyxida;
  import edu.harvard.syrah.sbon.async.CBResult;
  import edu.harvard.syrah.sbon.async.LoopIt;
! import edu.harvard.syrah.sbon.async.CallbacksIF.*;
! import edu.harvard.syrah.sbon.async.comm.AddressFactory;
! import edu.harvard.syrah.sbon.async.comm.AddressIF;
  
  

Index: ICMPPinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/ICMPPinger.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ICMPPinger.java	7 Dec 2006 11:46:17 -0000	1.11
--- ICMPPinger.java	20 Mar 2007 12:27:53 -0000	1.12
***************
*** 1,8 ****
    package edu.harvard.syrah.pyxida.ping;
  
! import jpcap.packet.EthernetPacket;
! import jpcap.packet.ICMPPacket;
! import jpcap.packet.IPPacket;
! import jpcap.packet.Packet;
  import edu.harvard.syrah.prp.ANSI;
  import edu.harvard.syrah.prp.Log;
--- 1,5 ----
    package edu.harvard.syrah.pyxida.ping;
  
! import jpcap.packet.*;
  import edu.harvard.syrah.prp.ANSI;
  import edu.harvard.syrah.prp.Log;
***************
*** 12,17 ****
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.comm.AddressFactory;
! import edu.harvard.syrah.sbon.comm.AddressIF;
  
  class ICMPPinger extends JpcapPinger implements PingerIF {
--- 9,14 ----
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.async.comm.AddressFactory;
! import edu.harvard.syrah.sbon.async.comm.AddressIF;
  
  class ICMPPinger extends JpcapPinger implements PingerIF {

Index: JpcapPinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/JpcapPinger.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JpcapPinger.java	7 Dec 2006 11:46:17 -0000	1.6
--- JpcapPinger.java	20 Mar 2007 12:27:53 -0000	1.7
***************
*** 3,18 ****
  import java.io.IOException;
  import java.io.InputStream;
! import java.net.Inet4Address;
! import java.net.InetAddress;
! import java.net.MalformedURLException;
  import java.util.*;
  
! import jpcap.JpcapCaptor;
! import jpcap.JpcapSender;
  import jpcap.NetworkInterface;
! import jpcap.NetworkInterfaceAddress;
! import jpcap.packet.EthernetPacket;
! import jpcap.packet.IPPacket;
! import jpcap.packet.Packet;
  import edu.harvard.syrah.prp.Log;
  import edu.harvard.syrah.prp.POut;
--- 3,12 ----
  import java.io.IOException;
  import java.io.InputStream;
! import java.net.*;
  import java.util.*;
  
! import jpcap.*;
  import jpcap.NetworkInterface;
! import jpcap.packet.*;
  import edu.harvard.syrah.prp.Log;
  import edu.harvard.syrah.prp.POut;
***************
*** 21,26 ****
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.comm.AddressFactory;
! import edu.harvard.syrah.sbon.comm.AddressIF;
  
  
--- 15,20 ----
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.async.comm.AddressFactory;
! import edu.harvard.syrah.sbon.async.comm.AddressIF;
  
  

Index: PingerIF.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/PingerIF.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PingerIF.java	23 Nov 2006 16:46:10 -0000	1.3
--- PingerIF.java	20 Mar 2007 12:27:53 -0000	1.4
***************
*** 3,7 ****
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.comm.AddressIF;
  
  interface PingerIF extends Runnable {
--- 3,7 ----
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.async.comm.AddressIF;
  
  interface PingerIF extends Runnable {

Index: TCPSynPinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/TCPSynPinger.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TCPSynPinger.java	7 Dec 2006 11:46:17 -0000	1.8
--- TCPSynPinger.java	20 Mar 2007 12:27:53 -0000	1.9
***************
*** 2,8 ****
  
  import jpcap.packet.*;
! import edu.harvard.syrah.prp.ANSI;
! import edu.harvard.syrah.prp.Log;
! import edu.harvard.syrah.prp.PUtil;
  import edu.harvard.syrah.pyxida.Pyxida;
  import edu.harvard.syrah.sbon.async.CBResult;
--- 2,6 ----
  
  import jpcap.packet.*;
! import edu.harvard.syrah.prp.*;
  import edu.harvard.syrah.pyxida.Pyxida;
  import edu.harvard.syrah.sbon.async.CBResult;
***************
*** 10,15 ****
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.comm.AddressFactory;
! import edu.harvard.syrah.sbon.comm.AddressIF;
  
  class TCPSynPinger extends JpcapPinger implements PingerIF {
--- 8,13 ----
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB0;
  import edu.harvard.syrah.sbon.async.CallbacksIF.CB1;
! import edu.harvard.syrah.sbon.async.comm.AddressFactory;
! import edu.harvard.syrah.sbon.async.comm.AddressIF;
  
  class TCPSynPinger extends JpcapPinger implements PingerIF {