# HG changeset patch
# User lex <lex@lynx.ano>
# Date 1302897713 0
# Node ID ef1284b74bfcde5077d3f144a30076d73f5ea828
# Parent  da7f5407c53b949be02d2ac27603d6282b09db6b# Parent  4086e24de7979d839f528ef058102557413a7c61
Merge git://1.22.187.1

diff -r 4086e24de797 -r ef1284b74bfc db/as/6/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/6/owner	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,1 @@
+Obee
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/ano2wiki/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano
--- a/db/dom/ano/ano2wiki/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano	Fri Apr 15 21:58:55 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/ano2wiki/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano
--- a/db/dom/ano/ano2wiki/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano	Fri Apr 15 21:58:55 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/ano2wiki/owner
--- a/db/dom/ano/ano2wiki/owner	Fri Apr 15 21:58:55 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-sevilNatas
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/lynx/ns/ns2.ucis.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/lynx/ns/ns2.ucis.ano	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,1 @@
+
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/obee/ns/uz5dvkq2xshp85cs9wk6n1n0twt6b3cxuung8j0sztt92cxykuc9ql.ns.somerandomnick.ano
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/obee/ns/uz5z6spsd4jsd2k984wuzknr13gwjc630gmvtcv4bmpsrb04c179h1.ns.somerandomnick.ano
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/obee/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/obee/owner	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,1 @@
+Obee
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/sn/ns/ns0.sevilnatas.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/sn/ns/ns0.sevilnatas.ano	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,1 @@
+1.0.49.5
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/sn/ns0.sevilnatas.ano
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/sn/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/sn/owner	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,1 @@
+sevilNatas
diff -r 4086e24de797 -r ef1284b74bfc db/dom/ano/ucis/ns/ns.lynx.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/ucis/ns/ns.lynx.ano	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,1 @@
+
diff -r 4086e24de797 -r ef1284b74bfc db/ip/01/01/06/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/06/cidr	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,1 @@
+1.1.6.0/24
diff -r 4086e24de797 -r ef1284b74bfc db/ip/01/01/06/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/06/owner	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,1 @@
+Obee
diff -r 4086e24de797 -r ef1284b74bfc db/usr/Obee/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/Obee/git	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,1 @@
+git://git.obee.ano/
diff -r 4086e24de797 -r ef1284b74bfc doc/ucis.ano/bgp_graph/readme.txt
--- a/doc/ucis.ano/bgp_graph/readme.txt	Fri Apr 15 21:58:55 2011 +0200
+++ b/doc/ucis.ano/bgp_graph/readme.txt	Fri Apr 15 20:01:53 2011 +0000
@@ -3,7 +3,7 @@
 Some of the scripts will communicate with the BGP software, another script can be used to export the obtained information to a .dot file, which can then be converted to a graph file using graphviz. The scripts can run on different machines, and it is recommended to use routing information from multiple routes, to obtain an accurate view of the network.
 
 Depending on the BGP software, one of the following scripts must be used to acquire the data:
-- bgp_path_list_birg.sh (or .php) for the bird routing daemon
+- bgp_path_list_bird.sh (or .php) for the bird routing daemon
 - bgp_path_list_quagga.sh (or .php) for the quagga/zebra routing daemon
 - bgp_path_list_xml.php to convert existing dn42/diac42 .xml data
 
@@ -43,4 +43,4 @@
 You can also use inetd/xinetd on the server side for a more permanent solution.
 
 
-Be creative!
\ No newline at end of file
+Be creative!
diff -r 4086e24de797 -r ef1284b74bfc scripts/iface.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/iface.php	Fri Apr 15 20:01:53 2011 +0000
@@ -0,0 +1,5 @@
+<?php
+
+echo exec('/sbin/ifconfig');
+
+?>