Skip to content
Permalink
Browse files

Merge branch 'oikuda-master'

This pull request enables usage of different docker images instead of
the default imunes/template one.
  • Loading branch information
denisSal
denisSal committed Jan 13, 2020
2 parents c33add8 + 4e04d53 commit db36ce475803ef025fb6b7078a4577dbb19e3470
Showing with 521 additions and 417 deletions.
  1. +41 −0 config/nodecfg.tcl
  2. +0 −4 gui/debug.tcl
  3. +2 −2 gui/mouse.tcl
  4. +327 −333 gui/nodecfgGUI.tcl
  5. +11 −9 nodes/genericrouter.tcl
  6. +16 −14 nodes/host.tcl
  7. +1 −0 nodes/nat64.tcl
  8. +16 −14 nodes/pc.tcl
  9. +3 −0 runtime/cfgparse.tcl
  10. +58 −39 runtime/linux.tcl
  11. +30 −0 scripts/apk_imunes
  12. +16 −2 scripts/apt-get_imunes
@@ -2688,6 +2688,47 @@ proc setNodeServices { node services } {
}
}

#****f* nodecfg.tcl/getNodeDockerImage
# NAME
# getNodeDockerImage -- get node docker image.
# SYNOPSIS
# set value [getNodeDockerImage $node]
# FUNCTION
# Returns node docker image setting.
# INPUTS
# * node -- node id
# RESULT
# * status -- docker image identifier
#****
proc getNodeDockerImage { node } {
upvar 0 ::cf::[set ::curcfg]::$node $node

return [lindex [lsearch -inline [set $node] "docker-image *"] 1]
}

#****f* nodecfg.tcl/setNodeDockerImage
# NAME
# setNodeDockerImage -- set node docker image.
# SYNOPSIS
# setNodeDockerImage $node $img
# FUNCTION
# Sets node docker image.
# INPUTS
# * node -- node id
# * img -- image identifier
#****
proc setNodeDockerImage { node img } {
upvar 0 ::cf::[set ::curcfg]::$node $node

set i [lsearch [set $node] "docker-image *"]
if { $i >= 0 } {
set $node [lreplace [set $node] $i $i]
}
if { $img != "" } {
lappend $node [list docker-image $img]
}
}

#****f* nodecfg.tcl/getNodeDockerAttach
# NAME
# getNodeDockerAttach -- get node docker ext ifc attach.
@@ -104,10 +104,6 @@ proc registerModule { module } {
}
}

proc allSnapshotsAvailable {} {
return 1
}

proc logCaller {} {
set r [catch {info level [expr [info level] - 1]} e]
set r2 [catch {info level [expr [info level] - 2]} e2]
@@ -1336,8 +1336,8 @@ proc button1-release { c x y } {
# if there is an object beneath the cursor and an object was
# selected by the button1 procedure create a link between nodes
if {$destobj != "" && $curobj != "" && $destobj != $curobj} {
set lnode1 [lindex [$c gettags $curobj] 1]
set lnode2 [lindex [$c gettags $destobj] 1]
set lnode1 [lindex [$c gettags $destobj] 1]
set lnode2 [lindex [$c gettags $curobj] 1]
if { [ifcByLogicalPeer $lnode1 $lnode2] == "" } {
set link [newLink $lnode1 $lnode2]
if { $link != "" } {

0 comments on commit db36ce4

Please sign in to comment.
You can’t perform that action at this time.