X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Fcfgroot%2Fgeneral-functions.pl;h=41643d8d7451c25aebda2475600b0f9c170845a4;hb=3e862ce4f99059002b60994addc87a013d298b38;hp=9c6d460e66a5974d71882c9d147a3a5402fbe713;hpb=97f0fdd5f3a9fc93c01be9e48b16090bc4559191;p=ipfire-2.x.git

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 9c6d460e66..41643d8d74 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -858,7 +858,7 @@ sub FetchPublicIp {
         Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} );
     }
     my $user_agent = &MakeUserAgent();
-    my ($out, $response) = Net::SSLeay::get_http(  'checkip.dns.lightningwirelabs.com',
+    my ($out, $response) = Net::SSLeay::get_http(  'checkip4.dns.lightningwirelabs.com',
                 				    80,
         					    "/",
 						    Net::SSLeay::make_headers('User-Agent' => $user_agent )
@@ -920,9 +920,11 @@ sub GetDyndnsRedIP {
     close(IP);
     chomp $ip;
 
+    # 100.64.0.0/10 is reserved for dual-stack lite (http://tools.ietf.org/html/rfc6598).
     if (&General::IpInSubnet ($ip,'10.0.0.0','255.0.0.0') ||
         &General::IpInSubnet ($ip,'172.16.0.0.','255.240.0.0') ||
-        &General::IpInSubnet ($ip,'192.168.0.0','255.255.0.0'))
+        &General::IpInSubnet ($ip,'192.168.0.0','255.255.0.0') ||
+        &General::IpInSubnet ($ip,'100.64.0.0', '255.192.0.0'))
     {
 	if ($settings{'BEHINDROUTER'} eq 'FETCH_IP') {
     	    my $RealIP = &General::FetchPublicIp;
@@ -1006,4 +1008,49 @@ sub MakeUserAgent() {
 	return $user_agent;
 }
 
+sub RedIsWireless() {
+	# This function checks if a network device is a wireless device.
+
+	my %settings = ();
+	&readhash("${General::swroot}/ethernet/settings", \%settings);
+
+	# Find the name of the network device.
+	my $device = $settings{'RED_DEV'};
+
+	# Exit, if no device is configured.
+	return 0 if ($device eq "");
+
+	# Return 1 if the device is a wireless one.
+	my $path = "/sys/class/net/$device/wireless";
+	if (-d $path) {
+		return 1;
+	}
+
+	# Otherwise return zero.
+	return 0;
+}
+
+# Function to read a file with UTF-8 charset.
+sub read_file_utf8 ($) {
+	my ($file) = @_;
+
+	open my $in, '<:encoding(UTF-8)', $file or die "Could not open '$file' for reading $!";
+	local $/ = undef;
+	my $all = <$in>;
+	close $in;
+
+	return $all;
+}
+
+# Function to write a file with UTF-8 charset.
+sub write_file_utf8 ($) {
+	my ($file, $content) = @_;
+
+	open my $out, '>:encoding(UTF-8)', $file or die "Could not open '$file' for writing $!";;           
+	print $out $content;
+	close $out;
+
+	return; 
+}
+
 1;