Changes between Version 4 and Version 5 of Tutorials/oMF/tut1

Timestamp:

Oct 15, 2014, 4:29:41 PM (11 years ago)

Author:

wontoniii

Comment:

—

Tutorials/oMF/tut1

@@ -149 +149 @@
 #!ruby
 
+#Create router groups
 for i in 1..num_routers
+        #Create a topology with a single router in it
         defTopology("topo:router_#{i}") { |t|
                 aNode = routersTopo.getNodeByIndex(i-1)
@@ -156 +158 @@
         }
   
+        #Through the group definition we set up the applications to run
         defGroup("router_#{i}", "topo:router_#{i}") {|node|
                 node.addApplication('MF-Router') {|app|
@@ -171 +174 @@
                 }
 
-          #If is the first router add the GNRS
+          #If it is the first router add the GNRS
           if i == 1
-      aNode = routersTopo.getNodeByIndex(i-1)
-      info aNode, " will also host the GNRS server"
-                  node.addApplication('MF-GNRS') {|app|
-                    app.setProperty('log4j_config_file', GNRS_log_file)
-                    app.setProperty('jar_file', GNRS_jar_file)
-                    app.setProperty('config_file', GNRS_conf_file)
-                  }
+                aNode = routersTopo.getNodeByIndex(i-1)
+                info aNode, " will also host the GNRS server"
+                node.addApplication('MF-GNRS') {|app|
+                      app.setProperty('log4j_config_file', GNRS_log_file)
+                      app.setProperty('jar_file', GNRS_jar_file)
+                      app.setProperty('config_file', GNRS_conf_file)
+                }
           end
         
+          #Setup the node interfaces
+          #The first ethernet interface is used as the core interface
           node.net.e0.ip = "192.168.100.#{i}"
           node.net.e0.netmask = '255.255.255.0'
     
-    node.net.w0.mode = "adhoc"
-    node.net.w0.type = 'g'
-    node.net.w0.channel = "11"
-    node.net.w0.essid = "SSID_group_#{i}"
-    node.net.w0.ip = "192.168.#{i}.1"
+          #The first wireless interface is used to give access to clients
+          node.net.w0.mode = "adhoc"
+          node.net.w0.type = 'g'
+          node.net.w0.channel = "11"
+          node.net.w0.essid = "SSID_group_#{i}"
+          node.net.w0.ip = "192.168.#{i}.1"
         }
 end
@@ -195 +201 @@
 #Create host groups
 for i in 1..num_hosts
+        #Create a topology with a single router in it
         defTopology("topo:host_#{i}") { |t|
                 aNode = hostsTopo.getNodeByIndex(i-1)
@@ -201 +208 @@
         }
   
+        #Through the group definition we set up the applications to run
         defGroup("host_#{i}", "topo:host_#{i}") {|node|
                 node.addApplication('MF-HostStack') {|app|
@@ -206 +214 @@
                         app.setProperty('log_level', log_level)
                 }
-          
-    #node.net.e0.ip = "192.168.#{i}.#{i+100}"
-          #node.net.e0.netmask = '255.255.255.0'
-    
-    node.net.w0.mode = "adhoc"
-    node.net.w0.type = 'g'
-    node.net.w0.channel = "11"
-    node.net.w0.essid = "SSID_group_#{i}"
-    node.net.w0.ip = "192.168.#{i}.2"
-        }
+    
+          #The first wifi interface is used to connect to the Access Router
+          node.net.w0.mode = "adhoc"
+          node.net.w0.type = 'g'
+          node.net.w0.channel = "11"
+          node.net.w0.essid = "SSID_group_#{i}"
+          node.net.w0.ip = "192.168.#{i}.2"
+      }
 end
 }}}