From 4861bcf05edbde1a6e3866ad253b0f665d65b944 Mon Sep 17 00:00:00 2001 From: Christian Dresel Date: Thu, 23 Aug 2018 15:52:50 +0200 Subject: [PATCH 1/8] first commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..387d383 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# Simpel-Babelweb-haserl From b341e23946e849acf18dea26cf7b4d09f0580bfd Mon Sep 17 00:00:00 2001 From: Christian Dresel Date: Thu, 23 Aug 2018 15:53:32 +0200 Subject: [PATCH 2/8] Initial 2 Signed-off-by: Christian Dresel --- babel.html | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 babel.html diff --git a/babel.html b/babel.html new file mode 100644 index 0000000..093f446 --- /dev/null +++ b/babel.html @@ -0,0 +1,83 @@ +#!/usr/bin/haserl + +<% +echo -en "Content-Type: text/html\r\n\r\n" +HOSTNAME="$(uci -q get "fff.system.hostname")" + +data=$(echo "dump" | nc ::1 33123) + +%> + + + + <%= ${HOSTNAME} %> + + + + + + + +

Simple Babelweb

+ +

Babel information

+ + + + + + + + + + + + + + +
<% echo "$data" | head -n 1 %>
<% echo "$data" | head -n 2 | tail -n 1 %>
<% echo "$data" | head -n 3 | tail -n 1 %>
<% echo "$data" | head -n 4 | tail -n 1 %>
+ +

Interfaces

+ + + + + + + + <% + echo "$data" | grep interface | while read line ; do + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + done +%> +
Interfaceupipv6ipv4
" + echo ${line#*interface} | cut -d " " -f 1 + echo "" + echo ${line#*up} | cut -d " " -f 1 + echo "" + echo ${line#*ipv6} | cut -d " " -f 1 + echo "" + echo ${line#*ipv4} | cut -d " " -f 1 + echo "
+ + + From 044f3d3702300e7fce68f84781a5dded2dfa1116 Mon Sep 17 00:00:00 2001 From: Christian Dresel Date: Thu, 23 Aug 2018 16:55:10 +0200 Subject: [PATCH 3/8] erste fertige Version mit kleinen Bugs Signed-off-by: Christian Dresel --- babel.html | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 185 insertions(+), 4 deletions(-) diff --git a/babel.html b/babel.html index 093f446..69f9bae 100644 --- a/babel.html +++ b/babel.html @@ -33,7 +33,14 @@ data=$(echo "dump" | nc ::1 33123)

Simple Babelweb

- +
+
+ + + + +
+

Babel information

@@ -50,6 +57,11 @@ data=$(echo "dump" | nc ::1 33123)
+
+ +<% +if ! [ ${GET_routes} ] && ! [ ${GET_v4table} ] && ! [ ${GET_v6table} ]; then +%>

Interfaces

@@ -63,7 +75,7 @@ data=$(echo "dump" | nc ::1 33123) echo "$data" | grep interface | while read line ; do echo "" echo "" echo "" echo "" done -%> + %> +
" - echo ${line#*interface} | cut -d " " -f 1 + echo ${line#*interface} | cut -d " " -f 1 echo "" echo ${line#*up} | cut -d " " -f 1 @@ -76,8 +88,177 @@ data=$(echo "dump" | nc ::1 33123) echo "
+
+

Neighbours

+ + + + + + + + + + + + <% + echo "$data" | grep neighbour | while read line ; do + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + done + %> +
addressinterfacereachrxcosttxcostrttrttcostcost
" + echo ${line#*address} | cut -d " " -f 1 + echo "" + echo ${line#*if} | cut -d " " -f 1 + echo "" + echo ${line#*reach} | cut -d " " -f 1 + echo "" + echo ${line#*rxcost} | cut -d " " -f 1 + echo "" + echo ${line#*txcost} | cut -d " " -f 1 + echo "" + echo ${line#*rtt} | cut -d " " -f 1 + echo "" + echo ${line#*rttcost} | cut -d " " -f 1 + echo "" + echo ${line#*cost} | cut -d " " -f 1 + echo "
+
+

Redistributed routes

+ + + + + + + <% + echo "$data" | grep xroute | while read line ; do + echo "" + echo "" + echo "" + echo "" + done + %> + +
prefixmetric
" + echo ${line#*prefix} | cut -d " " -f 1 + echo "" + echo ${line#*metric} | cut -d " " -f 1 + echo "
+<% +fi + +if [ ${GET_routes} ]; then +%> + + + + + + + + + +<% + echo "$data" | grep route | grep -v xroute | while read line ; do + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + done +fi +%> +
targetinstalledviadevicemetricDestination ID
" + echo ${line#*prefix} | cut -d " " -f 1 + echo "" + echo ${line#*installed} | cut -d " " -f 1 + echo "" + echo ${line#*via} | cut -d " " -f 1 + echo "" + echo ${line#*if} | cut -d " " -f 1 + echo "" + echo ${line#*metric} | cut -d " " -f 1 + echo "" + echo ${line#*id} | cut -d " " -f 1 + echo "
+<% +if [ ${GET_v4table} ]; then +%> + + + + + + +<% + v4routen=$(ip ro sh tab 10) + echo "$v4routen" | while read line ; do + echo "" + echo "" + echo "" + echo "" + echo "" + done +fi + +%> +
targetviadev
" + echo $line | cut -d " " -f 1 + echo "" + echo ${line#*via} | cut -d " " -f 1 + echo "" + echo ${line#*dev} | cut -d " " -f 1 + echo "
+<% + +if [ ${GET_v6table} ]; then +%> + + + + + + + + +<% + v6routen=$(ip -6 ro sh tab 10) + echo "$v6routen" | while read line ; do + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + echo "" + done +fi +%>
DestinationSource SpecificviaDeviceKernelmetric
" + echo $line | cut -d " " -f 1 + echo "" + echo ${line#*from} | cut -d " " -f 1 + echo "" + echo ${line#*via} | cut -d " " -f 1 + echo "" + echo ${line#*dev} | cut -d " " -f 1 + echo "" + echo ${line#*metric} | cut -d " " -f 1 + echo "
- From 4b3f815a48d588e205ec48ea8b32362dda3d090b Mon Sep 17 00:00:00 2001 From: Christian Dresel Date: Sat, 25 Aug 2018 18:13:19 +0200 Subject: [PATCH 4/8] remove table for faster load --- babel.html | 191 +++++++++-------------------------------------------- 1 file changed, 32 insertions(+), 159 deletions(-) diff --git a/babel.html b/babel.html index 69f9bae..d99e972 100644 --- a/babel.html +++ b/babel.html @@ -39,6 +39,8 @@ data=$(echo "dump" | nc ::1 33123) + +

Babel information

@@ -55,209 +57,80 @@ data=$(echo "dump" | nc ::1 33123) <% echo "$data" | head -n 4 | tail -n 1 %> -
<% -if ! [ ${GET_routes} ] && ! [ ${GET_v4table} ] && ! [ ${GET_v6table} ]; then +if ! [ ${GET_routes} ] && ! [ ${GET_v4table} ] && ! [ ${GET_v6table} ] && ! [ ${GET_weg} ] ; then %>

Interfaces

- - - - - - - - <% +<% echo "$data" | grep interface | while read line ; do - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" + echo "$line" + echo "
" done %> -
Interfaceupipv6ipv4
" - echo ${line#*interface} | cut -d " " -f 1 - echo "" - echo ${line#*up} | cut -d " " -f 1 - echo "" - echo ${line#*ipv6} | cut -d " " -f 1 - echo "" - echo ${line#*ipv4} | cut -d " " -f 1 - echo "

Neighbours

- - - - - - - - - - - <% echo "$data" | grep neighbour | while read line ; do - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" + echo $line + echo "
" done %> -
addressinterfacereachrxcosttxcostrttrttcostcost
" - echo ${line#*address} | cut -d " " -f 1 - echo "" - echo ${line#*if} | cut -d " " -f 1 - echo "" - echo ${line#*reach} | cut -d " " -f 1 - echo "" - echo ${line#*rxcost} | cut -d " " -f 1 - echo "" - echo ${line#*txcost} | cut -d " " -f 1 - echo "" - echo ${line#*rtt} | cut -d " " -f 1 - echo "" - echo ${line#*rttcost} | cut -d " " -f 1 - echo "" - echo ${line#*cost} | cut -d " " -f 1 - echo "

Redistributed routes

- - - - - - <% echo "$data" | grep xroute | while read line ; do - echo "" - echo "" - echo "" - echo "" + echo $line + echo "
" done %> -
prefixmetric
" - echo ${line#*prefix} | cut -d " " -f 1 - echo "" - echo ${line#*metric} | cut -d " " -f 1 - echo "
<% fi - if [ ${GET_routes} ]; then -%> - - - - - - - - - -<% +%> +

All routes

+<% echo "$data" | grep route | grep -v xroute | while read line ; do - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" + echo $line + echo "
" done fi -%> -
targetinstalledviadevicemetricDestination ID
" - echo ${line#*prefix} | cut -d " " -f 1 - echo "" - echo ${line#*installed} | cut -d " " -f 1 - echo "" - echo ${line#*via} | cut -d " " -f 1 - echo "" - echo ${line#*if} | cut -d " " -f 1 - echo "" - echo ${line#*metric} | cut -d " " -f 1 - echo "" - echo ${line#*id} | cut -d " " -f 1 - echo "
-<% if [ ${GET_v4table} ]; then %> - - - - - - +

Show IPv6 Routing Tabele

" - echo "" - echo "" - echo "" - echo "" + echo $line + echo "
" done fi -%> -
targetviadev
" - echo $line | cut -d " " -f 1 - echo "" - echo ${line#*via} | cut -d " " -f 1 - echo "" - echo ${line#*dev} | cut -d " " -f 1 - echo "
-<% - if [ ${GET_v6table} ]; then %> - - - - - - - - +

Show IPv6 Routing Tabele

<% v6routen=$(ip -6 ro sh tab 10) echo "$v6routen" | while read line ; do - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" - echo "" + echo $line + echo "
" done fi + +if [ ${GET_weg} ]; then +%> +

Wege zu <%# echo ${GET_ip} %>

+<% + v6routen=$(ip -6 ro sh tab 10) + echo "$v6routen" | while read line ; do + echo $line + echo "
" + done +fi %>
DestinationSource SpecificviaDeviceKernelmetric
" - echo $line | cut -d " " -f 1 - echo "" - echo ${line#*from} | cut -d " " -f 1 - echo "" - echo ${line#*via} | cut -d " " -f 1 - echo "" - echo ${line#*dev} | cut -d " " -f 1 - echo "" - echo ${line#*metric} | cut -d " " -f 1 - echo "
From 1d0e47bd6571d2be68b32cd4aaef5c82111dbfc3 Mon Sep 17 00:00:00 2001 From: Christian Dresel Date: Mon, 8 Oct 2018 17:32:52 +0200 Subject: [PATCH 5/8] Fix h2 --- babel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.html b/babel.html index d99e972..b94c597 100644 --- a/babel.html +++ b/babel.html @@ -101,7 +101,7 @@ if [ ${GET_routes} ]; then fi if [ ${GET_v4table} ]; then %> -

Show IPv6 Routing Tabele

Show IPv6 Routing Tabele <% v4routen=$(ip ro sh tab 10) echo "$v4routen" | while read line ; do From 73c7ba82506e95418206cd862b25bc65629d0948 Mon Sep 17 00:00:00 2001 From: Robert Langhammer Date: Thu, 25 Oct 2018 23:33:01 +0200 Subject: [PATCH 6/8] IP Suche mit regex bei weg. Etwas aufgeraeumt und die Millionen Leerzeichen raus. Space -> Tab --- babel.html | 134 ++++++++++++++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/babel.html b/babel.html index b94c597..9df409a 100644 --- a/babel.html +++ b/babel.html @@ -40,7 +40,7 @@ data=$(echo "dump" | nc ::1 33123) - +

Babel information

@@ -48,88 +48,88 @@ data=$(echo "dump" | nc ::1 33123) <% echo "$data" | head -n 1 %> - - <% echo "$data" | head -n 2 | tail -n 1 %> - - - <% echo "$data" | head -n 3 | tail -n 1 %> - - - <% echo "$data" | head -n 4 | tail -n 1 %> - + + <% echo "$data" | head -n 2 | tail -n 1 %> + + + <% echo "$data" | head -n 3 | tail -n 1 %> + + + <% echo "$data" | head -n 4 | tail -n 1 %> +
<% if ! [ ${GET_routes} ] && ! [ ${GET_v4table} ] && ! [ ${GET_v6table} ] && ! [ ${GET_weg} ] ; then -%> - -

Interfaces

-<% - echo "$data" | grep interface | while read line ; do - echo "$line" - echo "
" - done %> -
-

Neighbours

- <% - echo "$data" | grep neighbour | while read line ; do - echo $line - echo "
" - done - %> -
-

Redistributed routes

- <% - echo "$data" | grep xroute | while read line ; do - echo $line - echo "
" - done - %> +

Interfaces

+ <% + echo "$data" | grep interface | while read line ; do + echo "$line" + echo "
" + done + %> +
+

Neighbours

+ <% + echo "$data" | grep neighbour | while read line ; do + echo $line + echo "
" + done + %> +
+

Redistributed routes

+ <% + echo "$data" | grep xroute | while read line ; do + echo $line + echo "
" + done + %> <% fi + if [ ${GET_routes} ]; then -%> -

All routes

-<% - echo "$data" | grep route | grep -v xroute | while read line ; do - echo $line - echo "
" - done + %> +

All routes

+ <% + echo "$data" | grep -w route | while read line ; do + echo $line + echo "
" + done fi -if [ ${GET_v4table} ]; then -%> + +if [ ${GET_v4table} ]; then + %>

Show IPv6 Routing Tabele

-<% - v4routen=$(ip ro sh tab 10) - echo "$v4routen" | while read line ; do - echo $line - echo "
" - done + <% + v4routen=$(ip ro sh tab 10) + echo "$v4routen" | while read line ; do + echo $line + echo "
" + done fi -if [ ${GET_v6table} ]; then -%> -

Show IPv6 Routing Tabele

-<% - v6routen=$(ip -6 ro sh tab 10) - echo "$v6routen" | while read line ; do - echo $line - echo "
" - done +if [ ${GET_v6table} ]; then + %> +

Show IPv6 Routing Tabele

+ <% + v6routen=$(ip -6 ro sh tab 10) + echo "$v6routen" | while read line ; do + echo $line + echo "
" + done fi -if [ ${GET_weg} ]; then -%> -

Wege zu <%# echo ${GET_ip} %>

-<% - v6routen=$(ip -6 ro sh tab 10) - echo "$v6routen" | while read line ; do - echo $line - echo "
" - done +if [ ${GET_weg} ]; then + %> +

Wege zu <%# echo ${GET_ip} %>

+ <% + echo "$data" | grep -w route | grep "${GET_ip}" | while read line ; do + echo $line + echo "
" + done fi %> From 5badee1b9f8626fd3de77dd07b8f9cb1fe1244f6 Mon Sep 17 00:00:00 2001 From: Robert Langhammer Date: Thu, 25 Oct 2018 23:39:13 +0200 Subject: [PATCH 7/8] Tippfehler --- babel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/babel.html b/babel.html index 9df409a..fd52418 100644 --- a/babel.html +++ b/babel.html @@ -102,7 +102,7 @@ fi if [ ${GET_v4table} ]; then %> -

Show IPv6 Routing Tabele

+

Show IPv4 Routing Tabele

<% v4routen=$(ip ro sh tab 10) echo "$v4routen" | while read line ; do From 2bf707441cf3c5378360b044dae68c9f8128db4d Mon Sep 17 00:00:00 2001 From: Robert Langhammer Date: Fri, 26 Oct 2018 00:03:26 +0200 Subject: [PATCH 8/8] Ausgabe in Tabelle. Besser lesbar. --- babel.html | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/babel.html b/babel.html index fd52418..087b773 100644 --- a/babel.html +++ b/babel.html @@ -65,7 +65,7 @@ if ! [ ${GET_routes} ] && ! [ ${GET_v4table} ] && ! [ ${GET_v6table} ] && ! [ ${ %>

Interfaces

- <% + <% echo "$data" | grep interface | while read line ; do echo "$line" echo "
" @@ -90,24 +90,23 @@ if ! [ ${GET_routes} ] && ! [ ${GET_v4table} ] && ! [ ${GET_v6table} ] && ! [ ${ <% fi +echo "" if [ ${GET_routes} ]; then %>

All routes

<% echo "$data" | grep -w route | while read line ; do - echo $line - echo "
" + echo "" done fi if [ ${GET_v4table} ]; then %> -

Show IPv4 Routing Tabele

+

Show IPv6 Routing Tabele

<% v4routen=$(ip ro sh tab 10) echo "$v4routen" | while read line ; do - echo $line - echo "
" + echo "" done fi @@ -117,8 +116,7 @@ if [ ${GET_v6table} ]; then <% v6routen=$(ip -6 ro sh tab 10) echo "$v6routen" | while read line ; do - echo $line - echo "
" + echo "" done fi @@ -127,8 +125,7 @@ if [ ${GET_weg} ]; then

Wege zu <%# echo ${GET_ip} %>

<% echo "$data" | grep -w route | grep "${GET_ip}" | while read line ; do - echo $line - echo "
" + echo "" done fi %>
$line
$line
$line
$line