[Guessnet-devel] [svn] r175 - in trunk: . debian src

[Enrico Zini]

Author: enrico
Date: Sat Sep 23 15:14:02 2006
New Revision: 175

Modified:
   trunk/   (props changed)
   trunk/debian/changelog
   trunk/src/IFace.cc
Log:
 r450 at viaza:  enrico | 2006-09-23 16:13:51 +0100
 Improved the warnings from bad link beat detection
 Should correctly set the value of has_mii


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Sat Sep 23 15:14:02 2006
@@ -15,9 +15,11 @@
       Closes: bug#387601.
     - Correctly prints wlan and priv link beat detection errors.
       Closes: bug#387603.
+    - Better output for link detection functions when they fail.
+      Closes: bug#387600.
   * Added X-Vcs-Svn tag to debian/control
 
- -- Enrico Zini <enrico at debian.org>  Sat, 23 Sep 2006 15:46:05 +0100
+ -- Enrico Zini <enrico at debian.org>  Sat, 23 Sep 2006 16:00:15 +0100
  
 
 guessnet (0.39-2) unstable; urgency=low

Modified: trunk/src/IFace.cc
==============================================================================
--- trunk/src/IFace.cc	(original)
+++ trunk/src/IFace.cc	Sat Sep 23 15:14:02 2006
@@ -264,7 +264,7 @@
 		try {
 			return cached_detect_beat_func(fd, iface);
 		} catch (wibble::exception::MII& e) {
-			warning("Link beat detection (cached) failed: %s\n", e.desc().c_str());
+			verbose("Link beat detection (cached) failed: %s\n", e.desc().c_str());
 		}
 
 	try {
@@ -272,7 +272,7 @@
 		cached_detect_beat_func = interface_detect_beat_mii;
 		return status;
 	} catch (wibble::exception::MII& e) {
-		warning("Link beat detection (mii) failed: %s\n", e.desc().c_str());
+		verbose("Link beat detection (mii) failed: %s\n", e.desc().c_str());
 	}
 
 	try {
@@ -280,7 +280,7 @@
 		cached_detect_beat_func = interface_detect_beat_ethtool;
 		return status;
 	} catch (wibble::exception::MII& e) {
-		warning("Link beat detection (ethtool) failed: %s\n", e.desc().c_str());
+		verbose("Link beat detection (ethtool) failed: %s\n", e.desc().c_str());
 	}
 
 	try {
@@ -288,7 +288,7 @@
 		cached_detect_beat_func = interface_detect_beat_wlan;
 		return status;
 	} catch (wibble::exception::MII& e) {
-		warning("Link beat detection (wlan) failed: %s\n", e.desc().c_str());
+		verbose("Link beat detection (wlan) failed: %s\n", e.desc().c_str());
 	}
 
 	try {
@@ -296,9 +296,10 @@
 		cached_detect_beat_func = interface_detect_beat_priv;
 		return status;
 	} catch (wibble::exception::MII& e) {
-		warning("Link beat detection (priv) failed: %s\n", e.desc().c_str());
+		verbose("Link beat detection (priv) failed: %s\n", e.desc().c_str());
 	}
 
+	verbose("No working link beat detection function available for interface %s\n", iface);
 	return IFSTATUS_ERR;
 }
 
@@ -423,9 +424,9 @@
 	
 			if (status == IFSTATUS_ERR)
 			{
-				_has_mii = true;
+				_has_mii = false;
 			} else {
-				_conn = status == IFSTATUS_UP;
+				_conn = (status == IFSTATUS_UP);
 			}
 
 			/*