From 73c7ba82506e95418206cd862b25bc65629d0948 Mon Sep 17 00:00:00 2001 From: Robert Langhammer Date: Thu, 25 Oct 2018 23:33:01 +0200 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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