}
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
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]{2}\:){5}[0-9a-f]{2}$} $v]} {
- set v [string map {: {}} $v]
+ 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-9]{12}$} $v]} {
+ 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_source $link_dest 0800
+ append llpkt $link_dest $link_source 0800
append llpkt $packet
return $llpkt
}
proc nextarg_num {} { return [expr {[nextarg] + 0}] }
proc nextarg_il {} {
set a [nextarg]
- if {![regexp -nocase {^([0-9.]+)/([0-9a-f:]+)$} $a dummy i l]} {
+ if {![regexp -nocase {^([0-9.]+)/(.+)$} $a dummy i l]} {
error "--source/--dest needs <ip-addr>/<link-addr>"
}
- return [list $i [string map {: {}} $l]]
+ return [list $i $l]
}
set debug_level 0
-set mtu 576
+set mtu 100
set upto {}
set xseed {}
set linktypename ether
--mtu { set mtu [nextarg_num] }
--xseed { set xseed [nextarg] }
--linktype { set linktypename [nextarg] }
- --source { manyset [nextarg_ih] config/ip-source config/link-source }
- --dest { manyset [nextarg_ih] config/ip-dest config/link-dest }
+ --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
- link/$linktypename/linktype
get-for link
get-config $sd [link/$linktypename/defaddr] linkaddr
set l [link/$linktypename/procaddr [set $sd] $sd]