[Pyxida-cvs-commits] Pyxida/src/edu/harvard/syrah/pyxida/ping TCPSynPinger.java, 1.6, 1.7 ICMPPinger.java, 1.7, 1.8

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

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

Modified Files:
	TCPSynPinger.java ICMPPinger.java 
Log Message:
Added cmd line switch (-d) to turn on debugging output.

Index: ICMPPinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/ICMPPinger.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ICMPPinger.java	24 Nov 2006 12:06:22 -0000	1.7
--- ICMPPinger.java	24 Nov 2006 13:58:57 -0000	1.8
***************
*** 7,10 ****
--- 7,11 ----
  import edu.harvard.syrah.prp.ANSI;
  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.EventLoop;
***************
*** 117,123 ****
  	}
  
! 	public static void main(final String[] args) {
  		ANSI.use(true);
! 		//Log.setPackageRoot(ICMPPinger.class);
  		
  		EventLoop.set(new EventLoop());
--- 118,131 ----
  	}
  
! 	public static void main(String[] args) {
  		ANSI.use(true);
! 		
! 		if (args.length > 0 && args[0].equals("-d")) {
! 			Log.setPackageRoot(Pyxida.class);
! 			String[] newArgs = new String[args.length - 1];
! 			for (int i = 0; i < newArgs.length; i++)
! 				newArgs[i] = args[i + 1];
! 			args = newArgs;
! 		}
  		
  		EventLoop.set(new EventLoop());
***************
*** 130,133 ****
--- 138,143 ----
  		final PingerIF pinger = new ICMPPinger();
  				
+ 		final String hostname = args[0];
+ 		
  		EventLoop.get().registerTimerCB(new CB0() {
  			protected void cb(CBResult resultOK) {
***************
*** 138,142 ****
  								pinger.init(defaultAddr, new CB0() {
  									protected void cb(CBResult arg0) {
! 										AddressFactory.createResolved(args[0], new CB1<AddressIF>() {
  											protected void cb(CBResult result, AddressIF addr) {
  												switch (result.state) {
--- 148,152 ----
  								pinger.init(defaultAddr, new CB0() {
  									protected void cb(CBResult arg0) {
! 										AddressFactory.createResolved(hostname, new CB1<AddressIF>() {
  											protected void cb(CBResult result, AddressIF addr) {
  												switch (result.state) {

Index: TCPSynPinger.java
===================================================================
RCS file: /cvsroot/pyxida/Pyxida/src/edu/harvard/syrah/pyxida/ping/TCPSynPinger.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TCPSynPinger.java	24 Nov 2006 13:48:06 -0000	1.6
--- TCPSynPinger.java	24 Nov 2006 13:58:57 -0000	1.7
***************
*** 8,11 ****
--- 8,12 ----
  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;
  import edu.harvard.syrah.sbon.async.EventLoop;
***************
*** 121,127 ****
  	}
  	
! 	public static void main(final String[] args) {
  		ANSI.use(true);
! 		Log.setPackageRoot(TCPSynPinger.class);
  		
  		EventLoop.set(new EventLoop());
--- 122,135 ----
  	}
  	
! 	public static void main(String[] args) {
  		ANSI.use(true);
! 		
! 		if (args.length > 0 && args[0].equals("-d")) {
! 			Log.setPackageRoot(Pyxida.class);
! 			String[] newArgs = new String[args.length - 1];
! 			for (int i = 0; i < newArgs.length; i++)
! 				newArgs[i] = args[i + 1];
! 			args = newArgs;
! 		}
  		
  		EventLoop.set(new EventLoop());
***************
*** 132,135 ****
--- 140,145 ----
  		}
  
+ 		final String hostname = args[0];
+ 		
  		final PingerIF pinger = new TCPSynPinger();
  				
***************
*** 142,146 ****
  								pinger.init(defaultAddr, new CB0() {
  									protected void cb(CBResult arg0) {
! 										AddressFactory.createResolved(args[0], new CB1<AddressIF>() {
  											protected void cb(CBResult result, AddressIF addr) {
  												switch (result.state) {
--- 152,156 ----
  								pinger.init(defaultAddr, new CB0() {
  									protected void cb(CBResult arg0) {
! 										AddressFactory.createResolved(hostname, new CB1<AddressIF>() {
  											protected void cb(CBResult result, AddressIF addr) {
  												switch (result.state) {