rb-wartslib 0.9.11 → 0.9.12

data/ext/scext.c

@@ -19,7 +19,7 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** $Id: scext.c,v 1.19 2007/11/30 01:17:06 youngh Exp $
+** $Id: scext.c,v 1.22 2008/01/16 20:14:50 youngh Exp $
 **/
 
 #include "ruby.h"
@@ -41,7 +41,7 @@ void Init_wartslibext(void)
 {
   mWarts = rb_define_module("Warts");
 
-  rb_define_const(mWarts, "WARTS_LIB_VERSION", rb_str_new2("0.9.11"));
+  rb_define_const(mWarts, "WARTS_LIB_VERSION", rb_str_new2("0.9.12"));
   rb_define_const(mWarts, "SCAMPER_VERSION", rb_str_new2(SCAMPER_VERSION));
 
   Init_scaddr();

data/ext/scfile.c

@@ -18,7 +18,7 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** $Id: scfile.c,v 1.30 2007/11/29 01:42:07 youngh Exp $
+** $Id: scfile.c,v 1.32 2008/01/16 20:15:39 youngh Exp $
 **/
 
 #include <unistd.h>

data/ext/sctrace.c

@@ -27,7 +27,7 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 **
-** $Id: sctrace.c,v 1.45 2007/11/29 20:02:20 youngh Exp $
+** $Id: sctrace.c,v 1.46 2007/12/08 00:33:42 youngh Exp $
 **/
 
 #include "ruby.h"
@@ -122,17 +122,17 @@ NUM_ATTR_FUN(dport);
 /*-------------------------------------------------------------------------*/
 
 static scamper_trace_hop_t *find_trace_hop(scamper_trace_t *trace,
-					   int hop, int attempt)
+					   int hop, int response)
 {
   scamper_trace_hop_t *trace_hop;
 
-  if (hop < 0 || hop >= trace->hop_count || attempt < 0) {
+  if (hop < 0 || hop >= trace->hop_count || response < 0) {
     return NULL;
   }
 
   trace_hop = trace->hops[hop];
-  while (trace_hop && attempt > 0) {
-    --attempt;
+  while (trace_hop && response > 0) {
+    --response;
     trace_hop = trace_hop->hop_next;
   }
   return trace_hop;
@@ -145,9 +145,9 @@ static scamper_trace_hop_t *find_trace_hop(scamper_trace_t *trace,
 /* Because this declares variables, this macro must occur
    immediately after the variable declarations in a function. */
 #define PROCESS_HOP_PARAMS \
-  VALUE hop, attempt; \
-  if (rb_scan_args(argc, argv, "11", &hop, &attempt) == 1) { \
-    attempt = INT2FIX(0); \
+  VALUE hop, response; \
+  if (rb_scan_args(argc, argv, "11", &hop, &response) == 1) { \
+    response = INT2FIX(0); \
   }
 
 #define NUM_HOP_ATTR_FIELD_FUN(name,field)		  \
@@ -157,7 +157,7 @@ static scamper_trace_hop_t *find_trace_hop(scamper_trace_t *trace,
     scamper_trace_hop_t *trace_hop; \
     PROCESS_HOP_PARAMS; \
     Data_Get_Struct(self, scamper_trace_t, trace); \
-    trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(attempt));	\
+    trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(response));	\
     if (!trace_hop) { \
       return Qnil; \
     } \
@@ -174,7 +174,7 @@ static scamper_trace_hop_t *find_trace_hop(scamper_trace_t *trace,
     char *ptr; \
     PROCESS_HOP_PARAMS; \
     Data_Get_Struct(self, scamper_trace_t, trace); \
-    trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(attempt));	\
+    trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(response));	\
     if (!trace_hop) { \
       return Qnil; \
     } \
@@ -210,7 +210,7 @@ NUM_HOP_ATTR_FIELD_FUN(rtt_usec, rtt.tv_usec);
     scamper_trace_hop_t *trace_hop; \
     PROCESS_HOP_PARAMS; \
     Data_Get_Struct(self, scamper_trace_t, trace); \
-    trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(attempt));	\
+    trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(response));	\
     if (!trace_hop) { \
       return Qnil; \
     } \
@@ -247,7 +247,7 @@ static VALUE sctrace_init(VALUE self)
   ** with hop_count = 5 and hops == NULL, which triggers a segfault.
   *
   *  Program received signal SIGSEGV, Segmentation fault.
-  *  0x283f06cc in find_trace_hop (trace=0x8635e40, hop=4, attempt=0)
+  *  0x283f06cc in find_trace_hop (trace=0x8635e40, hop=4, response=0)
   *     at sctrace.c:109
   *  109       trace_hop = trace->hops[hop];
   *  (gdb) p trace
@@ -256,7 +256,7 @@ static VALUE sctrace_init(VALUE self)
   * $2 = {list = 0x829f2c0, cycle = 0x829f2e0, src = 0x82a7d50, dst = 0x86c39e0,
   * start = {tv_sec = 1189778005, tv_usec = 809855}, hops = 0x0, hop_count = 5,
   * stop_reason = 5 '\005', stop_data = 0 '\0', type = 2 '\002', flags = 0 '\0',
-  * attempts = 3 '\003', hoplimit = 0 '\0', gaplimit = 0 '\0',
+  * responses = 3 '\003', hoplimit = 0 '\0', gaplimit = 0 '\0',
   * firsthop = 1 '\001', tos = 0 '\0', wait = 5 '\005', loops = 1 '\001',
   * probe_size = 44, sport = 46235, dport = 33545, tlvs = 0x0, pmtud = 0x0}
   */
@@ -411,7 +411,7 @@ static VALUE sctrace_attr_hop_addr(int argc, VALUE *argv, VALUE self)
 
   PROCESS_HOP_PARAMS;
   Data_Get_Struct(self, scamper_trace_t, trace);
-  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(attempt));
+  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(response));
   if (!trace_hop) {
     return Qnil;
   }
@@ -426,7 +426,7 @@ static VALUE sctrace_attr_hop_rtt(int argc, VALUE *argv, VALUE self)
 
   PROCESS_HOP_PARAMS;
   Data_Get_Struct(self, scamper_trace_t, trace);
-  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(attempt));
+  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(response));
   if (!trace_hop) {
     return Qnil;
   }
@@ -445,7 +445,7 @@ static VALUE sctrace_attr_hop_rtt_str(int argc, VALUE *argv, VALUE self)
 
   PROCESS_HOP_PARAMS;
   Data_Get_Struct(self, scamper_trace_t, trace);
-  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(attempt));
+  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(response));
   if (!trace_hop) {
     return Qnil;
   }
@@ -464,7 +464,7 @@ static VALUE sctrace_hop_exists(int argc, VALUE *argv, VALUE self)
 
   PROCESS_HOP_PARAMS;
   Data_Get_Struct(self, scamper_trace_t, trace);
-  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(attempt));
+  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(response));
   return (trace_hop ? Qtrue : Qfalse);
 }
 
@@ -495,7 +495,7 @@ static VALUE sctrace_each_hop(VALUE self)
 }
 
 
-static VALUE sctrace_each_attempt(VALUE self, VALUE hop)
+static VALUE sctrace_each_response(VALUE self, VALUE hop)
 {
   scamper_trace_t *trace;
   scamper_trace_hop_t *trace_hop;
@@ -504,10 +504,10 @@ static VALUE sctrace_each_attempt(VALUE self, VALUE hop)
 
   trace_hop = find_trace_hop(trace, NUM2INT(hop), 0);
   if (trace_hop) {
-    int attempt = 0;
+    int response = 0;
     rb_yield(INT2FIX(0));
     while (trace_hop = trace_hop->hop_next) {
-      rb_yield(INT2FIX(++attempt));
+      rb_yield(INT2FIX(++response));
     }
   }
 
@@ -515,7 +515,7 @@ static VALUE sctrace_each_attempt(VALUE self, VALUE hop)
 }
 
 
-static VALUE sctrace_each_hop_and_attempt(VALUE self)
+static VALUE sctrace_each_hop_and_response(VALUE self)
 {
   scamper_trace_t *trace;
   scamper_trace_hop_t *trace_hop;
@@ -526,7 +526,7 @@ static VALUE sctrace_each_hop_and_attempt(VALUE self)
 
   yield_args = rb_ary_new();
   for (hop = 0; hop < trace->hop_count; hop++) {
-    int attempt = 0;
+    int response = 0;
     trace_hop = find_trace_hop(trace, hop, 0);
 
     rb_ary_store(yield_args, 0, INT2FIX(hop));
@@ -537,7 +537,7 @@ static VALUE sctrace_each_hop_and_attempt(VALUE self)
     if (trace_hop) {
       rb_ary_store(yield_args, 2, Qtrue);
       while (trace_hop = trace_hop->hop_next) {
-	rb_ary_store(yield_args, 1, INT2FIX(++attempt));
+	rb_ary_store(yield_args, 1, INT2FIX(++response));
 	rb_yield(yield_args);
       }
     }
@@ -594,7 +594,7 @@ static VALUE sctrace_hop_dest_response(int argc, VALUE *argv, VALUE self)
 
   PROCESS_HOP_PARAMS;
   Data_Get_Struct(self, scamper_trace_t, trace);
-  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(attempt));
+  trace_hop = find_trace_hop(trace, NUM2INT(hop), NUM2INT(response));
   if (!trace_hop) {
     return Qnil;
   }
@@ -613,7 +613,7 @@ static VALUE sctrace_find_dest_response(VALUE self)
 {
   scamper_trace_t *trace;
   scamper_trace_hop_t *trace_hop;
-  int hop, attempt;
+  int hop, response;
   VALUE retval;
 
   retval = rb_ivar_get(self, iv_dest_response);
@@ -633,16 +633,16 @@ static VALUE sctrace_find_dest_response(VALUE self)
   }
 
   for (hop = trace->hop_count - 1; hop >= 0; hop--) {
-    attempt = 0;
+    response = 0;
     trace_hop = find_trace_hop(trace, hop, 0);
     while (trace_hop) {
       if (hop_is_dest_response(trace, trace_hop)) {
 	rb_ary_push(retval, INT2FIX(hop));
-	rb_ary_push(retval, INT2FIX(attempt));
+	rb_ary_push(retval, INT2FIX(response));
 	return retval;
       }
 
-      ++attempt;
+      ++response;
       trace_hop = trace_hop->hop_next;
     }
   }
@@ -656,7 +656,7 @@ static VALUE sctrace_dest_rtt(VALUE self)
   scamper_trace_t *trace;
   scamper_trace_hop_t *trace_hop;
   VALUE dest_response;
-  int hop, attempt;
+  int hop, response;
 
   dest_response = sctrace_find_dest_response(self);
   if (NIL_P(dest_response)) {
@@ -664,10 +664,10 @@ static VALUE sctrace_dest_rtt(VALUE self)
   }
 
   hop = FIX2INT(rb_ary_entry(dest_response, 0));
-  attempt = FIX2INT(rb_ary_entry(dest_response, 1));
+  response = FIX2INT(rb_ary_entry(dest_response, 1));
 
   Data_Get_Struct(self, scamper_trace_t, trace);
-  trace_hop = find_trace_hop(trace, hop, attempt);
+  trace_hop = find_trace_hop(trace, hop, response);
   return rb_float_new(1000.0 * trace_hop->hop_rtt.tv_sec
 		      + trace_hop->hop_rtt.tv_usec / 1000.0);
 }
@@ -680,7 +680,7 @@ static VALUE sctrace_dest_rtt_str(VALUE self)
   scamper_trace_hop_t *trace_hop;
   VALUE dest_response;
   char buf[128];
-  int hop, attempt;
+  int hop, response;
 
   dest_response = sctrace_find_dest_response(self);
   if (NIL_P(dest_response)) {
@@ -688,10 +688,10 @@ static VALUE sctrace_dest_rtt_str(VALUE self)
   }
 
   hop = FIX2INT(rb_ary_entry(dest_response, 0));
-  attempt = FIX2INT(rb_ary_entry(dest_response, 1));
+  response = FIX2INT(rb_ary_entry(dest_response, 1));
 
   Data_Get_Struct(self, scamper_trace_t, trace);
-  trace_hop = find_trace_hop(trace, hop, attempt);
+  trace_hop = find_trace_hop(trace, hop, response);
 
   sprintf(buf, "%d.%03d",
 	  1000 * trace_hop->hop_rtt.tv_sec + trace_hop->hop_rtt.tv_usec / 1000,
@@ -707,7 +707,7 @@ static VALUE sctrace_complete(VALUE self)
   scamper_trace_hop_t *trace_hop;
   VALUE dest_response;
   int dest_hop;
-  int hop, attempt;
+  int hop, response;
 
   dest_response = sctrace_find_dest_response(self);
   if (NIL_P(dest_response)) {
@@ -847,12 +847,16 @@ void Init_sctrace(void)
   rb_define_method(cTrace, "dest_rtt", sctrace_dest_rtt, 0);
   rb_define_method(cTrace, "dest_rtt_str", sctrace_dest_rtt_str, 0);
   rb_define_method(cTrace, "each_hop", sctrace_each_hop, 0);
-  rb_define_method(cTrace, "each_attempt", sctrace_each_attempt, 1);
-  rb_define_method(cTrace, "each_hop_and_attempt",
-		   sctrace_each_hop_and_attempt, 0);
+  rb_define_method(cTrace, "each_response", sctrace_each_response, 1);
+  rb_define_method(cTrace, "each_hop_and_response",
+		   sctrace_each_hop_and_response, 0);
 
   rb_define_alias(cTrace, "dest_responded?", "find_dest_response");
-  rb_define_alias(cTrace, "each", "each_hop_and_attempt");
+  rb_define_alias(cTrace, "each", "each_hop_and_response");
+
+  /* deprecated methods as of v0.9.12 */
+  rb_define_alias(cTrace, "each_attempt", "each_response");
+  rb_define_alias(cTrace, "each_hop_and_attempt", "each_hop_and_response");
 
   DEF_HOP_ICMP_QUERY(ttl_exp);
   DEF_HOP_ICMP_QUERY(ttl_exp_trans);

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: rb-wartslib
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
-date: 2007-11-29 00:00:00 -08:00
+  version: 0.9.12
+date: 2008-01-18 00:00:00 -08:00
 summary: Ruby extension for reading/writing warts files
 require_paths: 
 - lib
@@ -43,10 +43,9 @@ files:
 - bin/w2tr
 - bin/wcat
 - bin/wdump
-- lib/wartslib
-- lib/wartslib.rb
 - lib/wartslib/wl-file.rb
 - lib/wartslib/wl-trace.rb
+- lib/wartslib.rb
 - ext/extconf.rb
 - ext/scaddr.c
 - ext/scaddr.h
@@ -57,6 +56,34 @@ files:
 - ext/sclist.h
 - ext/sctrace.c
 - ext/sctrace.h
+- docs/index.html
+- docs/reference.html
+- docs/samples.html
+- docs/tutorial.html
+- docs/layout.css
+- docs/ruby.css
+- docs/style.css
+- docs/tut-1-count.rb
+- docs/tut-10-list2.rb
+- docs/tut-11-cycle.rb
+- docs/tut-12-cycle2.rb
+- docs/tut-13-write.rb
+- docs/tut-14-write2.rb
+- docs/tut-15-write3.rb
+- docs/tut-16-write4.rb
+- docs/tut-17-modify.rb
+- docs/tut-18-modify2.rb
+- docs/tut-2-count-block.rb
+- docs/tut-3-count-resp.rb
+- docs/tut-4-path-length.rb
+- docs/tut-5-hop-addr.rb
+- docs/tut-6-hop-addr2.rb
+- docs/tut-7-hop-addr3.rb
+- docs/tut-8-hop-addr4.rb
+- docs/tut-9-list.rb
+- docs/gen-code-html
+- docs/gen-output-html
+- docs/gen-tut-html
 - README
 - CHANGES
 - COPYING