Merge commit '88037845309b311901a590ca2a2b91adbd79bfc0' into tunnel_mainline

files/etc/config.mesh/firewall

@@ -156,3 +156,16 @@ config rule
        option dest_port        23
        option proto    tcp
        option target   ACCEPT
+
+#SNMPD
+config rule
+       option src              wifi
+       option dest_port        161
+       option proto    udp
+       option target   ACCEPT
+
+config rule
+       option src              dtdlink
+       option dest_port        161
+       option proto    udp
+       option target   ACCEPT

files/etc/config.mesh/snmpd

@@ -0,0 +1,42 @@
+config agent
+	option agentaddress UDP:161
+
+config com2sec public
+	option secname ro
+	option source default
+	option community public
+
+config group public_v1
+	option group public
+	option version v1
+	option secname ro
+
+config group public_v2c
+	option group public
+	option version v2c
+	option secname ro
+
+config group public_usm
+	option group public
+	option version usm
+	option secname ro
+
+config view all
+	option viewname all
+	option type included
+	option oid .1
+
+config access public_access
+	option group public
+	option context none
+	option version any
+	option level noauth
+	option prefix exact
+	option read all
+	option write none
+	option notify none
+
+config system
+	option sysLocation	'Deployed'
+	option sysContact	'<NODE>'
+	option sysName		'<NODE>.local.mesh'

files/etc/config/snmpd

@@ -0,0 +1,42 @@
+config agent
+	option agentaddress UDP:161
+
+config com2sec public
+	option secname ro
+	option source default
+	option community public
+
+config group public_v1
+	option group public
+	option version v1
+	option secname ro
+
+config group public_v2c
+	option group public
+	option version v2c
+	option secname ro
+
+config group public_usm
+	option group public
+	option version usm
+	option secname ro
+
+config view all
+	option viewname all
+	option type included
+	option oid .1
+
+config access public_access
+	option group public
+	option context none
+	option version any
+	option level noauth
+	option prefix exact
+	option read all
+	option write none
+	option notify none
+
+config system
+	option sysLocation	'Deployed'
+	option sysContact	'N0CALL'
+	option sysName		'N0CALL'

files/usr/local/bin/olsrd-config

@@ -42,6 +42,19 @@
 
 use perlfunc;
 
+#Check what config file we are building for
+if ( !$ARGV[0] ) {
+    $UCI_CONF_FILE="olsrd";
+} else {
+    $UCI_CONF_FILE=$ARGV[0];
+}
+
+if ( $UCI_CONF_FILE eq "olsrd6" ) {
+    # We only generate entries for IPv4 at moment"
+    exit 0;
+}
+
+
 @names = @hosts = @services = ();
 
 # canonical names for this node