From: miljenko <miljenko>
Date: Wed, 21 Sep 2005 09:43:28 +0000 (+0000)
Subject: View / Show IP Addresses is now replaced with "IPv4 Addresses" and "IPv6 addresssees... 
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=0298449904d7a7f393e519f1348393f035f7223b;p=imunes.git

View / Show IP Addresses is now replaced with "IPv4 Addresses" and "IPv6 addresssees". Variable showIfIPaddrs refers to IPv4 addresses, and new variable showIfIPv6addrs refers to IPv6 addresses.

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

diff --git a/cfgparse.tcl b/cfgparse.tcl
index 3aed419..61133a1 100755
--- a/cfgparse.tcl
+++ b/cfgparse.tcl
@@ -50,7 +50,8 @@ proc dumpputs {method dest string} {
 
 proc dumpCfg {method dest} {
     global nodes links canvass
-    global showIfNames showIfIPaddrs showNodeLabels showLinkLabels
+    global showIfNames showNodeLabels showLinkLabels
+    global showIfIPaddrs showIfIPv6addrs
 
     foreach node $nodes {
 	global $node
@@ -108,6 +109,10 @@ proc dumpCfg {method dest} {
         dumpputs $method $dest "    ip_addresses no" 
     } else {
         dumpputs $method $dest "    ip_addresses yes" }
+    if {$showIfIPv6addrs == 0} { 
+        dumpputs $method $dest "    ipv6_addresses no" 
+    } else {
+        dumpputs $method $dest "    ipv6_addresses yes" }
     if {$showNodeLabels == 0} { 
         dumpputs $method $dest "    node_labels no" 
     } else {
@@ -125,7 +130,8 @@ proc dumpCfg {method dest} {
 
 proc loadCfg { cfg } {
     global nodes links canvass
-    global showIfNames showIfIPaddrs showNodeLabels showLinkLabels
+    global showIfNames showNodeLabels showLinkLabels
+    global showIfIPaddrs showIfIPv6addrs
 
     # Cleanup first - this also automatically deletes all associated links
     # XXX remove this - Tk polution!
@@ -261,6 +267,13 @@ proc loadCfg { cfg } {
                                 set showIfIPaddrs 1
                             }
 		        }
+			ipv6_addresses {
+                            if { $value == "no" } {
+                                set showIfIPv6addrs 0
+                            } elseif { $value == "yes" } {
+                                set showIfIPv6addrs 1
+                            }
+		        }
 			node_labels {
                             if { $value == "no" } {
                                 set showNodeLabels 0
diff --git a/editor.tcl b/editor.tcl
index 9a314d3..946ad13 100755
--- a/editor.tcl
+++ b/editor.tcl
@@ -230,7 +230,7 @@ proc listLANnodes { l2node l2peers } {
 
 
 proc calcDxDy { lnode } {
-    global showIfIPaddrs
+    global showIfIPaddrs showIfIPv6addrs
     upvar dx x
     upvar dy y
 
@@ -252,7 +252,7 @@ proc calcDxDy { lnode } {
 	    set y 2
 	}
 	pc {
-	    if { $showIfIPaddrs } {
+	    if { $showIfIPaddrs || $showIfIPv6addrs } {
 		set x 1.1
 	    } else {
 		set x 1.4
@@ -260,7 +260,7 @@ proc calcDxDy { lnode } {
 	    set y 1.5
 	}
 	host {
-	    if { $showIfIPaddrs } {
+	    if { $showIfIPaddrs || $showIfIPv6addrs } {
 		set x 1.0
 	    } else {
 		set x 1.5
@@ -277,7 +277,7 @@ proc calcDxDy { lnode } {
 
 
 proc updateIfcLabel { lnode1 lnode2 } {
-    global showIfNames showIfIPaddrs
+    global showIfNames showIfIPaddrs showIfIPv6addrs
 
     set link [lindex [.c gettags "link && $lnode1 && $lnode2"] 1]
     set ifc [ifcByPeer $lnode1 $lnode2]
@@ -297,7 +297,7 @@ proc updateIfcLabel { lnode1 lnode2 } {
     if { $showIfIPaddrs && $ifipv4addr != "" } {
 	set labelstr "$labelstr$ifipv4addr
"
     }
-    if { $showIfIPaddrs && $ifipv6addr != "" } {
+    if { $showIfIPv6addrs && $ifipv6addr != "" } {
 	set labelstr "$labelstr$ifipv6addr
"
     }
     set labelstr \
diff --git a/imunes.tcl b/imunes.tcl
index c25171c..ce53a76 100755
--- a/imunes.tcl
+++ b/imunes.tcl
@@ -49,8 +49,8 @@ if {[lindex $argv 0] == "-b" || [lindex $argv 0] == "--batch"} {
 # value by the installation script.
 #
 
-set LIBDIR ""
-set ROOTDIR "."
+set LIBDIR lib/imunes
+set ROOTDIR /usr/local
 
 source "$ROOTDIR/$LIBDIR/linkcfg.tcl"
 source "$ROOTDIR/$LIBDIR/nodecfg.tcl"
@@ -112,6 +112,7 @@ set defSerBandwidth 2048000
 set defSerDelay 2500
 set showIfNames 1
 set showIfIPaddrs 1
+set showIfIPv6addrs 1
 set showNodeLabels 1
 set showLinkLabels 1
 
diff --git a/initgui.tcl b/initgui.tcl
index 637bde3..bfba130 100755
--- a/initgui.tcl
+++ b/initgui.tcl
@@ -138,9 +138,12 @@ menu .menubar.view.show -tearoff 0
 .menubar.view.show add checkbutton -label "Interface Names" \
     -underline 0 -variable showIfNames \
     -command { redrawAllLinks }
-.menubar.view.show add checkbutton -label "IP Addresses " \
+.menubar.view.show add checkbutton -label "IPv4 Addresses " \
     -underline 3 -variable showIfIPaddrs \
     -command { redrawAllLinks }
+.menubar.view.show add checkbutton -label "IPv6 Addresses " \
+    -underline 3 -variable showIfIPv6addrs \
+    -command { redrawAllLinks }
 .menubar.view.show add checkbutton -label "Node Labels" \
     -underline 0 -variable showNodeLabels -command {
     foreach object [.c find withtag nodelabel] {
@@ -166,6 +169,7 @@ menu .menubar.view.show -tearoff 0
     -command {
 	set showIfNames 1
 	set showIfIPaddrs 1
+	set showIfIPv6addrs 1
 	set showNodeLabels 1
 	set showLinkLabels 1
 	redrawAllLinks