Restore support for "serial" links, which were used by default

for connecting router nodes in the old days.  This will only work
with the most recent kernel code from P4.

Note however that with such "serial" links (ng_iface nodes in
reality) our dear friend quagga has some issues and refuses to
open multicast sockets there, resulting in RIP / OSPF not working
in default configurations.  Interesting that running routed -P ripv2
works without a glitch on those interfaces.

Bug found by:
Submitted by:
Reviewed by:
Approved by:
Obtained from:

diff --git a/exec.tcl b/exec.tcl
index 100933432a14c5cc4cbb2377485f3aab83f82f1c..f7eef5495b78565d01daa00785b0e4d944590ce2 100755 (executable)
--- a/exec.tcl
+++ b/exec.tcl
@@ -1,4 +1,4 @@
-# $Id: exec.tcl,v 1.64 2007/11/02 00:21:04 marko Exp $
+# $Id: exec.tcl,v 1.65 2007/12/01 00:56:46 marko Exp $
 
 # Copyright 2004, 2005 University of Zagreb, Croatia.  All rights reserved.
 #
@@ -228,7 +228,7 @@ proc statline {line} {
 #   * name -- the name of the new interface
 #****
 proc createIfc { eid type hook } {
-    catch { exec printf "mkpeer eiface ether ether \n show .ether" | vimage $eid ngctl -f - } nglist
+    catch { exec printf "mkpeer $type $hook $hook \n show .$hook" | vimage $eid ngctl -f - } nglist
     return [lindex $nglist 1]
 }
 
@@ -284,10 +284,9 @@ proc l3node.instantiate { eid node } {
                nexec vimage $eid ngctl mkpeer $ifid: cisco inet inet
                nexec vimage $eid ngctl connect $ifid: $ifid:inet inet6 inet6
                nexec vimage $eid ngctl msg $ifid: broadcast
-               nexec vimage $eid ngctl name $ifid:inet hdlc$ifnum\@$node_id
+               nexec vimage $eid ngctl name $ifid:inet hdlc$ifnum\@$node
                nexec vimage $eid vimage -i $node $ifid $ifc
-               nexec vimage $node_id ifconfig $ifid name $ifc
-               set ngnodemap($ifc@$node_id) $ifid
+               set ngnodemap(hdlc$ifnum@$node_id) hdlc$ifnum\@$node
            }
        }
     }
@@ -520,6 +519,7 @@ proc deployCfg {} {
     catch { nexec kldload ng_ether }
     catch { nexec kldload ng_iface }
     catch { nexec kldload ng_eiface }
+    catch { nexec kldload ng_cisco }
     catch { nexec kldload ng_pipe }
     catch { nexec kldload ng_hub }
     catch { nexec kldload ng_bridge }