perfsonar development work

Author: fernandes
Date: 2007-02-06 15:43:09 -0500 (Tue, 06 Feb 2007)
New Revision: 2033

Added:
   branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP Interface 
Specification 1.2.doc
Removed:
   branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP Interface 
Specification 1.1.doc
Modified:
   
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java
   
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
Log:
Corrected a BWCTL bug.
Added timeout estimation for Traceroute.
Corrected RNCs in the Interface Spec. document.



Deleted: branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP Interface 
Specification 1.1.doc

Added: branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP Interface 
Specification 1.2.doc


Property changes on: branches/CL-MP-STABLE/perfsonar/doc/mp/cliTypeMP/CLMP 
Interface Specification 1.2.doc
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java
===================================================================
--- 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java
     2007-02-05 19:22:11 UTC (rev 2032)
+++ 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Bwctl.java
     2007-02-06 20:43:09 UTC (rev 2033)
@@ -249,18 +249,17 @@
          * TODO: convert from string response into data elements
          */
                
-        return parseResultMessage(datums, mdArr);
+        return parseResultMessage(datums, mdArr, subject);
     }
 
-    private Message parseResultMessage(Datum[][] datums, Metadata[] 
metadata) {
-       Message respMess = null;
+    private Message parseResultMessage(Datum[][] datums, Metadata[] 
metadata, Metadata subject) {
+       Message respMess = new Message();
         
-        respMess = new Message();
-        respMess.setType("MeasurementResponse");
-        
         Parameters params = null;
         Parameter p = null;
         
+        respMess.addChild(subject);
+        
         for (int j = 0; j < metadata.length; j++) {
             
             if (metadata[j].getSubject() != null)
@@ -280,7 +279,7 @@
                        }
                }
         }
-        
+        respMess.setType("MeasurementResponse");
         return respMess;
     }
     

Modified: 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
===================================================================
--- 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
        2007-02-05 19:22:11 UTC (rev 2032)
+++ 
branches/CL-MP-STABLE/perfsonar/src/org/perfsonar/service/measurementPoint/commandLine/tools/Traceroute.java
        2007-02-06 20:43:09 UTC (rev 2033)
@@ -133,6 +133,8 @@
                else{
                    cmd.add(dst.getValue());
                }
+
+            int maxTtl = 30;
                if (params != null) {
                        p = params.getParameterByName("packetSize");
                    if(p != null){
@@ -144,6 +146,10 @@
                    } else {
                        this.numQueries = 3;
                    }
+                   p = params.getParameterByName("maxTtl");
+                   if(p != null){
+                       maxTtl = Integer.parseInt(p.getParameterValue());
+                   }
                }
        
                // Now execute
@@ -154,7 +160,7 @@
                
             // TODO: make timeout an option somehow
             // timeout - 30 seconds
-               protector.run(cl, 60000, parametersList);           
+               protector.run(cl, numQueries*1000*maxTtl, parametersList);    
       
             datums = parseResults(cl);
             
         }