quagga: version bump 0.99.23 -> 1.2.4

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

11 files changed, 81 insertions, 30 deletions

diff --git a/projectroot/etc/babeld.conf b/projectroot/etc/babeld.conf
deleted file mode 100644
index a4924ec7b..000000000
--- a/projectroot/etc/babeld.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-debug babel common
-!debug babel kernel
-!debug babel filter
-!debug babel timeout
-!debug babel interface
-!debug babel route
-!debug babel all
-
-router babel
-! network wlan0
-! network eth0
-! redistribute kernel
-! no redistribute static
-
-! The defaults are fine for a wireless interface
-
-!interface wlan0
-
-! A few optimisation tweaks are optional but recommended on a wired interface
-! Disable link quality estimation, enable split horizon processing, and
-! increase the hello and update intervals.
-
-!interface eth0
-! babel wired
-! babel split-horizon
-! babel hello-interval 12000
-! babel update-interval 36000
-
-! log file /var/log/quagga/babeld.log
-log stdout
diff --git a/projectroot/etc/bgpd.conf b/projectroot/etc/quagga/bgpd.conf
index b6a8b6f10..b6a8b6f10 100644
--- a/projectroot/etc/bgpd.conf
+++ b/projectroot/etc/quagga/bgpd.conf
diff --git a/projectroot/etc/quagga/isisd.conf b/projectroot/etc/quagga/isisd.conf
new file mode 100644
index 000000000..47b15953f
--- /dev/null
+++ b/projectroot/etc/quagga/isisd.conf
@@ -0,0 +1,39 @@
+! -*- isis -*-
+!
+! ISISd sample configuration file
+!
+hostname isisd 
+password foo
+enable password foo
+log stdout 
+!log file /tmp/isisd.log
+! 
+! 
+router isis DEAD
+  net 47.0023.0000.0003.0300.0100.0102.0304.0506.00
+!  is-type level-1
+
+!  -- set the lifetime either for level-1, level-2 or both
+!  lsp-lifetime level-1 65535
+!  lsp-lifetime level-2 65535
+!  lsp-lifetime 65535
+
+!  hostname isisd-router
+!  area-password foobar
+!  domain-password foobar
+
+interface eth0
+ ip router isis DEAD
+! isis hello-interval 5
+! isis lsp-interval 1000
+
+! -- optional
+! isis circuit-type level-1
+! isis password lallaa level-1 
+! isis metric 1 level-1
+! isis csnp-interval 5 level-1
+! isis retransmit-interval 10
+! isis retransmit-throttle-interval
+! isis hello-multiplier 2 level-1
+! isis priority 64
+! 
diff --git a/projectroot/etc/quagga/nhrpd.conf b/projectroot/etc/quagga/nhrpd.conf
new file mode 100644
index 000000000..95ec5a515
--- /dev/null
+++ b/projectroot/etc/quagga/nhrpd.conf
@@ -0,0 +1 @@
+! sample configuration file
diff --git a/projectroot/etc/ospf6d.conf b/projectroot/etc/quagga/ospf6d.conf
index 0a6ddb713..0a6ddb713 100644
--- a/projectroot/etc/ospf6d.conf
+++ b/projectroot/etc/quagga/ospf6d.conf
diff --git a/projectroot/etc/ospfd.conf b/projectroot/etc/quagga/ospfd.conf
index 0e8ac67bb..0e8ac67bb 100644
--- a/projectroot/etc/ospfd.conf
+++ b/projectroot/etc/quagga/ospfd.conf
diff --git a/projectroot/etc/quagga/pimd.conf b/projectroot/etc/quagga/pimd.conf
new file mode 100644
index 000000000..67530856b
--- /dev/null
+++ b/projectroot/etc/quagga/pimd.conf
@@ -0,0 +1,41 @@
+!
+! pimd sample configuration file
+! $QuaggaId: $Format:%an, %ai, %h$ $
+!
+hostname quagga-pimd-router
+password zebra
+!enable password zebra
+!
+!log file pimd.log
+log stdout
+!
+line vty
+ exec-timeout 60
+!
+!debug igmp
+!debug pim
+!debug pim zebra
+!
+ip multicast-routing
+!
+! ! You may want to enable ssmpingd for troubleshooting
+! ! See http://www.venaas.no/multicast/ssmping/
+! !
+! ip ssmpingd 1.1.1.1
+! ip ssmpingd 2.2.2.2
+!
+! ! HINTS:
+! !  - Enable "ip pim ssm" on the interface directly attached to the
+! !    multicast source host (if this is the first-hop router)
+! !  - Enable "ip pim ssm" on pim-routers-facing interfaces
+! !  - Enable "ip igmp" on IGMPv3-hosts-facing interfaces
+! !  - In order to inject IGMPv3 local membership information in the
+! !    PIM protocol state, enable both "ip pim ssm" and "ip igmp" on
+! !    the same interface; otherwise PIM won't advertise
+! !    IGMPv3-learned membership to other PIM routers
+!
+interface eth0
+ ip pim ssm
+ ip igmp
+
+! -x-
diff --git a/projectroot/etc/ripd.conf b/projectroot/etc/quagga/ripd.conf
index 2902ff9cc..2902ff9cc 100644
--- a/projectroot/etc/ripd.conf
+++ b/projectroot/etc/quagga/ripd.conf
diff --git a/projectroot/etc/ripngd.conf b/projectroot/etc/quagga/ripngd.conf
index ad673e57e..ad673e57e 100644
--- a/projectroot/etc/ripngd.conf
+++ b/projectroot/etc/quagga/ripngd.conf
diff --git a/projectroot/etc/vtysh.conf b/projectroot/etc/quagga/vtysh.conf
index 4e0a2beb4..4e0a2beb4 100644
--- a/projectroot/etc/vtysh.conf
+++ b/projectroot/etc/quagga/vtysh.conf
diff --git a/projectroot/etc/zebra.conf b/projectroot/etc/quagga/zebra.conf
index a5d0732f6..a5d0732f6 100644
--- a/projectroot/etc/zebra.conf
+++ b/projectroot/etc/quagga/zebra.conf