aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--content/en/blog/news/20200216-ecmp.md18
-rw-r--r--content/en/docs/Tutorials/tutorial-1.md2
-rw-r--r--content/en/docs/Tutorials/tutorial-2.md12
-rw-r--r--content/en/docs/Tutorials/tutorial-4.md8
4 files changed, 20 insertions, 20 deletions
diff --git a/content/en/blog/news/20200216-ecmp.md b/content/en/blog/news/20200216-ecmp.md
index 0a37552..ce632c9 100644
--- a/content/en/blog/news/20200216-ecmp.md
+++ b/content/en/blog/news/20200216-ecmp.md
@@ -28,24 +28,24 @@ irm b i uni.a n net
irm b i uni.a n uni.a
#register these 2 names in the local IPCP
-irm r n net l local
-irm r n uni.a l local
+irm n r net l local
+irm n r uni.a l local
#create 3 more unicast IPCPs, and enroll them with the first
irm i e t unicast n uni.b l net
irm b i uni.b n net
irm b i uni.b n uni.b
-irm r n uni.b l local
+irm n r uni.b l local
irm i e t unicast n uni.c l net
irm b i uni.c n net
irm b i uni.c n uni.c
-irm r n uni.c l local
+irm n r uni.c l local
irm i e t unicast n uni.d l net
irm b i uni.d n net
irm b i uni.d n uni.d
-irm r n uni.d l local
+irm n r uni.d l local
#connect uni.b to uni.a this creates a DT flow and a mgmt flow
irm i conn name uni.b dst uni.a
@@ -57,10 +57,10 @@ irm i conn name uni.d dst uni.a
#register the oping application at 4 different locations
#this allows us to check the multipath implementation
-irm r n oping.a i uni.a
-irm r n oping.b i uni.b
-irm r n oping.c i uni.c
-irm r n oping.d i uni.d
+irm n r oping.a i uni.a
+irm n r oping.b i uni.b
+irm n r oping.c i uni.c
+irm n r oping.d i uni.d
#bind oping program to oping names
irm b prog oping n oping.a
diff --git a/content/en/docs/Tutorials/tutorial-1.md b/content/en/docs/Tutorials/tutorial-1.md
index 1da58eb..d3d24c0 100644
--- a/content/en/docs/Tutorials/tutorial-1.md
+++ b/content/en/docs/Tutorials/tutorial-1.md
@@ -79,7 +79,7 @@ take "oping_server". In the second terminal window, execute:
```bash
$ irm bind proc 2337 name oping_server
-$ irm register name oping_server layer local_layer
+$ irm name register oping_server layer local_layer
```
The IRMd and IPCPd in terminal one will now acknowledge that the name is
diff --git a/content/en/docs/Tutorials/tutorial-2.md b/content/en/docs/Tutorials/tutorial-2.md
index b59247a..5f52a5a 100644
--- a/content/en/docs/Tutorials/tutorial-2.md
+++ b/content/en/docs/Tutorials/tutorial-2.md
@@ -17,11 +17,11 @@ like this:
{{<figure width="40%" src="/docs/tutorials/tut-2-1.jpg">}}
Let's start adding the unicast layer. We will first bootstrap a
-unicast IPCP, with name "U1" into the layer "U" (using
-default options). In terminal 2, type:
+unicast IPCP, with name "normal_1" into the layer "normal_layer"
+(using default options). In terminal 2, type:
```bash
-$ irm ipcp bootstrap type unicast name U1 layer U
+$ irm ipcp bootstrap type unicast name normal_1 layer normal_layer
```
The IRMd and IPCP will report the bootstrap:
@@ -53,8 +53,8 @@ in the local_layer:
```bash
$ irm bind ipcp normal_1 name normal_1
$ irm bind ipcp normal_1 name normal_layer
-$ irm register name normal_1 layer local_layer
-$ irm register name normal_layer layer local_layer
+$ irm name register normal_1 layer local_layer
+$ irm name register normal_layer layer local_layer
```
The "irm bind ipcp" call is a shorthand for the "irm bind proc" call
@@ -284,7 +284,7 @@ name from the local layer, the client will connect over the normal
layer:
```bash
-$ irm unregister name oping_server layer local_layer
+$ irm name unregister oping_server layer local_layer
$ oping -n oping_server -c 5
```
diff --git a/content/en/docs/Tutorials/tutorial-4.md b/content/en/docs/Tutorials/tutorial-4.md
index 1e2dde5..10116de 100644
--- a/content/en/docs/Tutorials/tutorial-4.md
+++ b/content/en/docs/Tutorials/tutorial-4.md
@@ -104,12 +104,12 @@ node0:
$ irm ipcp bootstrap type normal name normal_0 layer normal_layer
$ irm bind ipcp normal_0 name normal_0
$ irm b i normal_0 n normal_layer
-$ irm register name normal_layer layer eth
-$ irm r n normal_0 l eth
+$ irm name register normal_layer layer eth
+$ irm n r normal_0 l eth
node1:
$ irm ipcp enroll name normal_1 layer normal_layer autobind
-$ irm r n normal_layer l eth
-$ irm r n normal_1 l eth
+$ irm n r normal_layer l eth
+$ irm n r normal_1 l eth
```
The IPCPs should acknowledge the enrollment in their logs: