package: olsr: AREDN upgrade to 0.9.6.2

configs/common.config

@@ -23,7 +23,6 @@ CONFIG_PACKAGE_olsrd=y
 CONFIG_PACKAGE_perl=y
 CONFIG_PACKAGE_olsrd-mod-arprefresh=y
 CONFIG_PACKAGE_olsrd-mod-dyn-gw=y
-CONFIG_PACKAGE_olsrd-mod-httpinfo=y
 CONFIG_PACKAGE_olsrd-mod-nameservice=y
 CONFIG_PACKAGE_olsrd-mod-txtinfo=y
 CONFIG_PACKAGE_olsrd-mod-jsoninfo=y

files/etc/config.mesh/firewall

@@ -117,12 +117,6 @@ config rule
        option proto    udp
        option target   ACCEPT
 
-config rule
-       option src              wifi
-       option dest_port        1978
-       option proto    tcp
-       option target   ACCEPT
-
 config rule
        option src              wifi
        option dest_port        23
@@ -147,13 +141,6 @@ config rule
        option proto    udp
        option target   ACCEPT
 
-config rule
-       option src              dtdlink
-       option dest_port        1978
-       option proto    tcp
-       option target   ACCEPT
-
-
 config rule
        option src              dtdlink
        option dest_port        23

files/etc/config.mesh/olsrd

@@ -13,17 +13,11 @@ config LoadPlugin
 	option library 'olsrd_arprefresh.so.0.1'
 
 config LoadPlugin
-	option library 'olsrd_httpinfo.so.0.1'
-	option port '1978'
-	list Net '0.0.0.0 0.0.0.0'
-	option Resolve 'true'
-
-config LoadPlugin
-	option library 'olsrd_txtinfo.so.0.1'
+	option library 'olsrd_txtinfo.so.1.1'
 	option accept '0.0.0.0'
 
 config LoadPlugin
-	option library 'olsrd_jsoninfo.so.0.0'
+	option library 'olsrd_jsoninfo.so.1.1'
 	option accept '0.0.0.0'
 
 #config LoadPlugin 

files/etc/config/firewall

@@ -73,9 +73,3 @@ config rule
        option dest_port        698
        option proto    udp
        option target   ACCEPT
-
-config rule
-       option src              wifi
-       option dest_port        1978
-       option proto    tcp
-       option target   ACCEPT

files/usr/local/bin/linkled

@@ -53,7 +53,7 @@ link_state() {
 
 		while true; do
 			sleep 5;
-			if echo /neighbors | nc 127.0.0.1 2006 2>/dev/null | grep -q YES; then
+			if echo /nei | nc 127.0.0.1 2006 2>/dev/null | grep -q YES; then
 				echo 1 > "$LINK1LED/brightness"
 			else
 				echo 0 > "$LINK1LED/brightness"

files/usr/local/bin/olsrd-config

@@ -123,7 +123,7 @@ foreach (@tunnelnames)
 
 
 # add the nameservice plugin
-push @file, qq(\nLoadPlugin "olsrd_nameservice.so.0.3"\n);
+push @file, qq(\nLoadPlugin "olsrd_nameservice.so.0.4"\n);
 push @file, qq({\n);
 push @file, qq(    PlParam "sighup-pid-file" "/var/run/dnsmasq/dnsmasq.pid"\n);
 push @file, qq(    PlParam "interval" "30"\n);

files/usr/local/bin/olsrd-namechange

@@ -54,7 +54,7 @@ foreach(`cat /var/run/hosts_olsr 2>/dev/null`)
 }
 
 # find the current neighbors
-foreach(`echo /links | nc 127.0.0.1 2006 2>/dev/null`)
+foreach(`echo /lin | nc 127.0.0.1 2006 2>/dev/null`)
 {
     next unless /^\d/;
     ($my_ip, $ip) = split /\s+/, $_;

files/www/cgi-bin/mesh

@@ -174,8 +174,8 @@ foreach(`echo /all | nc 127.0.0.1 2006 2>$tmperr`)
     }
     elsif($table eq "MID")
     {
-	($ip, $junk) = split /\s+/, $_;
-	foreach $aip ( split /;/, $junk ) { $ipalias{$aip} = $ip }
+	($ip, $junk) = $_ =~ /^(\S+)\s+(.*)$/;
+	foreach $aip ( split /\s+/, $junk ) { $ipalias{$aip} = $ip }
     }
     elsif($table eq "Routes")
     {

files/www/cgi-bin/status

@@ -81,10 +81,6 @@ if($config eq "mesh")
     print "   ";
     print "<button type=button onClick='window.location=\"mesh\"' title='See what is on the mesh'>Mesh Status</button>\n";
     print "&nbsp;&nbsp;&nbsp;";
-    print "<button type=button onClick='window.location=\"http://${node}.local.mesh:1978/\"' title='See the OLSR routing details'";
-    #print " disabled" unless -f "/var/run/hosts_olsr";
-    print ">OLSR Status</button>\n";
-    print "&nbsp;&nbsp;&nbsp;";
     print "<button type=button onClick='window.location=\"scan\"' title='See what wireless networks are nearby'>WiFi Scan</button>\n";
 }