added 2 more eth nodes on each lisper and eth-lisper-eth test

src/program/lisper/dev-env/l2tp.app

@@ -4,13 +4,13 @@ p=$LISP_N
 [ "$p" ] || exit 1
 run() {
 ip netns exec node$n ./l2tp.lua t0 e0 \
-    00:00:00:00:01:0$n \
-    00:00:00:00:00:0$n \
-    fd80:000$n:0000:0000:0000:0000:0000:0002 \
-    fd80:000$p:0000:0000:0000:0000:0000:0002 \
-    0000000$n 0000000$n
+    00:00:00:00:01:$n \
+    00:00:00:00:00:$n \
+    fd80:00$n:0000:0000:0000:0000:0000:0002 \
+    fd80:00$p:0000:0000:0000:0000:0000:0002 \
+    000000$n 000000$n
 }
 start()   { run >/dev/null & }
-stop()    { pgrep -f "l2tp.lua .\*\?01:0$n " | xargs kill -9; }
+stop()    { pgrep -f "l2tp.lua .\*\?01:$n " | xargs kill -9; }
 restart() { stop; start; }
 if [ "$1" ]; then $1; else stop; run; fi

src/program/lisper/dev-env/l2tp.app01

@@ -0,0 +1 @@
+APP_N=01 LISP_N=04 ./l2tp.app "$@"

src/program/lisper/dev-env/l2tp.app02

@@ -0,0 +1,2 @@
+APP_N=02 LISP_N=04 ./l2tp.app "$@"
+

src/program/lisper/dev-env/l2tp.app05

@@ -0,0 +1,2 @@
+APP_N=05 LISP_N=08 ./l2tp.app "$@"
+

src/program/lisper/dev-env/l2tp.app06

@@ -0,0 +1 @@
+APP_N=06 LISP_N=08 ./l2tp.app "$@"

src/program/lisper/dev-env/lisp.lua

@@ -13,9 +13,9 @@ local ffi = require("ffi")
 local S   = require("syscall")
 local _   = string.format
 
-local N            = os.getenv("LISP_N") or ""
-local CONTROL_SOCK = "/var/tmp/lisp-ipc-map-cache"..N
-local PUNT_SOCK    = "/var/tmp/lispers.net-itr"..N
+local LISP_N       = os.getenv("LISP_N") or ""
+local CONTROL_SOCK = "/var/tmp/lisp-ipc-map-cache"..LISP_N
+local PUNT_SOCK    = "/var/tmp/lispers.net-itr"..LISP_N
 
 S.signal('pipe', 'ign') --I 💔 Linux
 
@@ -37,7 +37,7 @@ while true do
 	if assert(S.select({writefds = {sock}}, 0)).count == 1 then
 
 		local t = {}
-		for s in io.lines('lisp'..N..'.fib') do
+		for s in io.lines('lisp'..LISP_N..'.fib') do
 			table.insert(t, s)
 		end
 

src/program/lisper/dev-env/lisp04

@@ -0,0 +1 @@
+LISP_N=04 ./lisp "$@"

src/program/lisper/dev-env/lisp08

@@ -0,0 +1 @@
+LISP_N=08 ./lisp "$@"

src/program/lisper/dev-env/lisper04

@@ -0,0 +1 @@
+LISP_N=04 ./lisper "$@"

src/program/lisper/dev-env/lisper4.conf → src/program/lisper/dev-env/lisper04.conf

@@ -1,11 +1,12 @@
 {
-   "control_sock" : "/var/tmp/lisp-ipc-map-cache4",
-   "punt_sock"    : "/var/tmp/lispers.net-itr4",
+   "control_sock" : "/var/tmp/lisp-ipc-map-cache04",
+   "punt_sock"    : "/var/tmp/lispers.net-itr04",
    "arp_timeout"  : 60, // seconds
 
    "interfaces": [
-      { "name": "e0", "mac": "00:00:00:00:01:04" },
-      { "name": "e3", "mac": "00:00:00:00:01:03" }
+      { "name": "e0", "mac":  "00:00:00:00:01:04" },
+      { "name": "e03", "mac": "00:00:00:00:01:03" },
+      { "name": "e13", "mac": "00:00:00:00:01:13" }
    ],
 
    //"vlans": [
@@ -26,6 +27,7 @@
          "session_id": 1, "cookie": "" },
       { "iid": 1, "type": "L2TPv3", "ip": "fd80:2::2", "exit": "e0",
          "session_id": 2, "cookie": "" },
-      { "iid": 1, "interface": "e3" }
+      { "iid": 1, "interface": "e03" },
+      { "iid": 1, "interface": "e13" }
    ]
 }

src/program/lisper/dev-env/lisper08

@@ -0,0 +1 @@
+LISP_N=08 ./lisper "$@"

src/program/lisper/dev-env/lisper8.conf → src/program/lisper/dev-env/lisper08.conf

@@ -1,11 +1,12 @@
 {
-   "control_sock" : "/var/tmp/lisp-ipc-map-cache8",
-   "punt_sock"    : "/var/tmp/lispers.net-itr8",
+   "control_sock" : "/var/tmp/lisp-ipc-map-cache08",
+   "punt_sock"    : "/var/tmp/lispers.net-itr08",
    "arp_timeout"  : 60, // seconds
 
    "interfaces": [
-      { "name": "e0", "mac": "00:00:00:00:01:08" },
-      { "name": "e7", "mac": "00:00:00:00:01:07" }
+      { "name": "e0",  "mac": "00:00:00:00:01:08" },
+      { "name": "e07", "mac": "00:00:00:00:01:07" },
+      { "name": "e17", "mac": "00:00:00:00:01:17" }
    ],
 
    //"vlans": [
@@ -26,6 +27,7 @@
          "session_id": 5, "cookie": "" },
       { "iid": 1, "type": "L2TPv3", "ip": "fd80:6::2", "exit": "e0",
          "session_id": 6, "cookie": "" },
-      { "iid": 1, "interface": "e7" }
+      { "iid": 1, "interface": "e07" },
+      { "iid": 1, "interface": "e17" }
    ]
 }

src/program/lisper/dev-env/net-bringup

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-appnodes="1 2 5 6"
-lispnodes="4 8"
+appnodes="01 02 05 06"
+lispnodes="04 08"
 nodes="$appnodes $lispnodes"
 
 bringup() {
@@ -11,7 +11,7 @@ ip netns exec r2 sysctl -wq net.ipv6.conf.all.forwarding=1
 
 for n in $nodes; do
     ip netns add node$n
-    ip link add netns node$n e0 address 00:00:00:00:01:0$n type veth peer name e$n netns r2 address 00:00:00:00:00:0$n
+    ip link add netns node$n e0 address 00:00:00:00:01:$n type veth peer name e$n netns r2 address 00:00:00:00:00:$n
     ip netns exec r2 ip addr add fd80:$n::1/56 dev e$n
     ip netns exec node$n ip addr add fd80:$n::2/56 dev e0
     ip netns exec node$n ip -6 route add default via fd80:$n::1
@@ -22,17 +22,19 @@ done
 eth() {
 local p="$1"
 local n="$2"
-ip link add netns node$p e$n address 00:00:00:00:01:0$n type veth peer name t$n netns node$p address 00:00:00:00:aa:0$n
+ip link add netns node$p e$n address 00:00:00:00:01:$n type veth peer name t$n netns node$p address 00:00:00:00:aa:$n
 ip netns exec node$p ip addr add 10.0.0.$n/24 dev t$n
 ip netns exec node$p ip link set e$n up
 ip netns exec node$p ip link set t$n up
 }
-eth 4 3
-eth 8 7
+eth 04 03
+eth 04 13
+eth 08 07
+eth 08 17
 
 for n in $appnodes; do
     ip netns exec node$n tunctl -t t0
-    ip netns exec node$n ip link set address 00:00:00:00:aa:0$n dev t0
+    ip netns exec node$n ip link set address 00:00:00:00:aa:$n dev t0
     ip netns exec node$n ifconfig t0 10.0.0.$n/24 mtu 1400 up
     ./l2tp.app$n start
 done

src/program/lisper/dev-env/ping-all

@@ -1,16 +1,16 @@
 o="-q -c2000 -i0 -s1000"
-{
-# l2tp-l2tp
-ip netns exec node1 ping $o 10.0.0.2
-ip netns exec node5 ping $o 10.0.0.6
-# l2tp-eth
-ip netns exec node1 ping $o 10.0.0.3
-ip netns exec node5 ping $o 10.0.0.7
-# eth-l2tp
-ip netns exec node4 ping $o 10.0.0.1
-ip netns exec node8 ping $o 10.0.0.5
-# l2tp-lisper-l2tp
-ip netns exec node5 ping $o 10.0.0.1
-ip netns exec node1 ping $o 10.0.0.5
-# TODO: eth-eth
-} | grep loss
+echo l2tp-l2tp
+ip netns exec node01 ping $o 10.0.0.2 | grep loss
+ip netns exec node05 ping $o 10.0.0.6 | grep loss
+echo l2tp-eth
+ip netns exec node01 ping $o 10.0.0.3 | grep loss
+ip netns exec node05 ping $o 10.0.0.7 | grep loss
+echo eth-l2tp
+ip netns exec node04 ping $o 10.0.0.1 | grep loss
+ip netns exec node08 ping $o 10.0.0.5 | grep loss
+echo l2tp-lisper-l2tp
+ip netns exec node05 ping $o 10.0.0.1 | grep loss
+ip netns exec node01 ping $o 10.0.0.5 | grep loss
+echo eth-lisper-eth
+ip netns exec node04 ping $o 10.0.0.7 | grep loss
+ip netns exec node08 ping $o 10.0.0.3 | grep loss