Summaries

[vinegar-ip.git] / make-probes.tcl

diff --git a/make-probes.tcl b/make-probes.tcl
index ce215a8dbf6addb0346003588c515c9718b29600..b8b520f6475ba48b1616983aa35929944bfecc66 100755 (executable)
--- a/make-probes.tcl
+++ b/make-probes.tcl
@@ -49,7 +49,10 @@ proc packet-csum-ip {packet} {
        set cs [expr "\$cs + 0x$this"]
        debug 7 [format "0x%s 0x%08x" $this $cs]
     }
-    return [expr {(($cs & 0xffff) + (($cs >> 16) & 0xffff)) ^ 0xffff}]
+    while {$cs > 0xffff} {
+       set cs [expr {($cs & 0xffff) + (($cs >> 16) & 0xffff)}]
+    }
+    return [expr {$cs ^ 0xffff}]
 }
 
 proc packet-fromstring {s} {
@@ -163,6 +166,9 @@ proc get-config/v4addr {val} {
     }
     return [format 0x%02x%02x%02x%02x $a $b $c $d]
 }
+proc get-config/linkaddr {val} {
+    return $val
+}
 
 proc get-config {variable def kind args} {
     # args currently ignored
@@ -242,7 +248,8 @@ proc get/rand {s v minlen maxlen blockbytes} {
 }
 
 proc get/ip-timestamp {s v} {
-    set rv [expr {[clock seconds] | 0x80000000}]
+    set rv 0xbc000000
+    incr rv [choice-int 100 10000]
     getlog "$v=[format %x $rv]"
     return $rv
 }
@@ -727,7 +734,7 @@ define ip-proto 51 ah {mtu} {
     get next number 0 255
     get reserved hex 0 0xffff
     get spi hex32
-    get auth_data rand 0 [expr {$mtu-8}] 4
+    get auth_data rand 0 [expr {$mtu-8 > 50 ? 50 : $mtu-8}] 4
     set length [packet-len $auth_data]
     assemble ah {
      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -1173,7 +1180,7 @@ namespace import PCap::*
 
 proc emit {seed} {
     global getlog_log errorInfo mtu fake_time_t
-    global minframelen
+    global minframelen linktypename errors_continue
 
     get-for ip
     get-config source 127.0.0.1 v4addr
@@ -1186,6 +1193,9 @@ proc emit {seed} {
     } emsg]} {
        puts stderr "\nERROR\n$seed\n\n$emsg\n\n$errorInfo\n\n"
        puts stdout "[format %6s $seed] error"
+       if {!$errors_continue} {
+           error "internal error generating packet - consult author"
+       }
     } else {
        set ts_sec [incr fake_time_t]
        set ts_usec 0
@@ -1195,10 +1205,7 @@ proc emit {seed} {
            append packet [string repeat 00 [expr {$minframelen - $l}]]
        }
 
-       # RFC894
-       set llpkt [random-bytes 12]
-       append llpkt 0800
-       append llpkt $packet
+       set llpkt [link/$linktypename/linkencap $packet]
        
        set len [packet-len "$llpkt"]
        pcap_write {
@@ -1212,6 +1219,30 @@ proc emit {seed} {
 }
 
 
+# link/ether - RFC894
+proc link/ether/linkparams {} { return {1 46} }
+proc link/ether/defaddr {} { return 00:00:00:00:00:00 }
+proc link/ether/procaddr {input sd} {
+    set v [string tolower $input]
+    if {[regexp {^([0-9a-f]{1,2}\:){6}$} $v:]} {
+       set o {}
+       foreach b [split $v :] { append o [format %02x 0x$b] }
+       set v $o
+    }
+    if {![regexp -nocase {^[0-9a-f]{12}$} $v]} {
+       error "invalid $sd ethernet addr $input ($v)"
+    }
+    return $v
+}
+proc link/ether/linkencap {packet} {
+    global link_source link_dest
+    set llpkt {}
+    append llpkt $link_dest $link_source 0800
+    append llpkt $packet
+    return $llpkt
+}
+
+
 proc nextarg {} {
     global argv
     if {![llength $argv]} { error "need another arg" }
@@ -1221,11 +1252,20 @@ proc nextarg {} {
 }
 
 proc nextarg_num {} { return [expr {[nextarg] + 0}] }
+proc nextarg_il {} {
+    set a [nextarg]
+    if {![regexp -nocase {^([0-9.]+)/(.+)$} $a dummy i l]} {
+       error "--source/--dest needs <ip-addr>/<link-addr>"
+    }
+    return [list $i $l]
+}
 
 set debug_level 0
-set mtu 576
+set errors_continue 0
+set mtu 100
 set upto {}
 set xseed {}
+set linktypename ether
 while {[regexp {^\-\-} [lindex $argv 0]]} {
     set o [nextarg]
     switch -exact -- $o {
@@ -1235,12 +1275,26 @@ while {[regexp {^\-\-} [lindex $argv 0]]} {
        --write { pcap_open [nextarg] }
        --mtu { set mtu [nextarg_num] }
        --xseed { set xseed [nextarg] }
-       --source { set config/ip-source [nextarg] }
-       --dest { set config/ip-dest [nextarg] }
+       --errors-continue { set errors_continue 1 }
+       --linktype { set linktypename [nextarg] }
+       --source { manyset [nextarg_il] config/ip-source config/link-source }
+       --dest { manyset [nextarg_il] config/ip-dest config/link-dest }
        default { error "bad option $o" }
     }
 }
 
+proc process_linkaddr {sd} {
+    global linktypename
+    upvar #0 link_$sd l
+    get-for link
+    get-config $sd [link/$linktypename/defaddr] linkaddr
+    set l [link/$linktypename/procaddr [set $sd] $sd]
+}
+
+manyset [link/$linktypename/linkparams] linktype minframelen
+process_linkaddr source
+process_linkaddr dest
+
 set magic d4c3b2a1
 set version_major 2
 set version_minor 4
@@ -1248,10 +1302,6 @@ set thiszone 0
 set sigfigs 0
 set snaplen 131073
 
-# RFC894
-set linktype 1
-set minframelen 46
-
 pcap_write {
     x32 magic
     u16 version_major
@@ -1262,7 +1312,10 @@ pcap_write {
     s32 linktype
 }
 
-set fake_time_t [clock seconds]
+set fake_time_t 1000000000
+
+start_gen TEST
+random-bytes 100
 
 if {[llength $argv]} {
     foreach count $argv { emit "$xseed$count" }