Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Sep 2013 09:14:54 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r1348 - in trunk: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files
Message-ID:  <201309120914.r8C9Es4A004832@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Sep 12 09:14:53 2013
New Revision: 1348

Log:
unbreak AP logging with DEBUG

Suggested by:	jhb

Modified:
   trunk/mail/thunderbird/files/patch-bug893397
   trunk/www/firefox-nightly/files/patch-bug893397
   trunk/www/firefox/files/patch-bug893397
   trunk/www/seamonkey/files/patch-bug893397

Modified: trunk/mail/thunderbird/files/patch-bug893397
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug893397	Sat Aug 31 21:10:42 2013	(r1347)
+++ trunk/mail/thunderbird/files/patch-bug893397	Thu Sep 12 09:14:53 2013	(r1348)
@@ -31,7 +31,7 @@
 index 0000000..80d4cb6
 --- /dev/null
 +++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,172 @@
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -156,14 +156,13 @@
 +      accessPoints.AppendObject(ap);
 +      res = true;
 +
-+#if 0
 +      // log the data
 +      LOG(( "FreeBSD access point: "
-+            << "SSID: " << ssid << ", "
-+            << "MAC: " << isr->isr_bssid << ", "
-+            << "Strength: " << isr->isr_rssi ", "
-+            << "Channel: " << isr->isr_freq << "MHz" ));
-+#endif
++            "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, "
++            "Strength: %d, Channel: %dMHz\n",
++            ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2],
++            isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5],
++            isr->isr_rssi, isr->isr_freq));
 +
 +      // increment pointers
 +      len -= isr->isr_len;

Modified: trunk/www/firefox-nightly/files/patch-bug893397
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug893397	Sat Aug 31 21:10:42 2013	(r1347)
+++ trunk/www/firefox-nightly/files/patch-bug893397	Thu Sep 12 09:14:53 2013	(r1348)
@@ -31,7 +31,7 @@
 index 0000000..80d4cb6
 --- /dev/null
 +++ netwerk/wifi/nsWifiScannerFreeBSD.cpp
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,172 @@
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -156,14 +156,13 @@
 +      accessPoints.AppendObject(ap);
 +      res = true;
 +
-+#if 0
 +      // log the data
 +      LOG(( "FreeBSD access point: "
-+            << "SSID: " << ssid << ", "
-+            << "MAC: " << isr->isr_bssid << ", "
-+            << "Strength: " << isr->isr_rssi ", "
-+            << "Channel: " << isr->isr_freq << "MHz" ));
-+#endif
++            "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, "
++            "Strength: %d, Channel: %dMHz\n",
++            ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2],
++            isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5],
++            isr->isr_rssi, isr->isr_freq));
 +
 +      // increment pointers
 +      len -= isr->isr_len;

Modified: trunk/www/firefox/files/patch-bug893397
==============================================================================
--- trunk/www/firefox/files/patch-bug893397	Sat Aug 31 21:10:42 2013	(r1347)
+++ trunk/www/firefox/files/patch-bug893397	Thu Sep 12 09:14:53 2013	(r1348)
@@ -31,7 +31,7 @@
 index 0000000..80d4cb6
 --- /dev/null
 +++ netwerk/wifi/nsWifiScannerFreeBSD.cpp
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,172 @@
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -156,14 +156,13 @@
 +      accessPoints.AppendObject(ap);
 +      res = true;
 +
-+#if 0
 +      // log the data
 +      LOG(( "FreeBSD access point: "
-+            << "SSID: " << ssid << ", "
-+            << "MAC: " << isr->isr_bssid << ", "
-+            << "Strength: " << isr->isr_rssi ", "
-+            << "Channel: " << isr->isr_freq << "MHz" ));
-+#endif
++            "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, "
++            "Strength: %d, Channel: %dMHz\n",
++            ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2],
++            isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5],
++            isr->isr_rssi, isr->isr_freq));
 +
 +      // increment pointers
 +      len -= isr->isr_len;

Modified: trunk/www/seamonkey/files/patch-bug893397
==============================================================================
--- trunk/www/seamonkey/files/patch-bug893397	Sat Aug 31 21:10:42 2013	(r1347)
+++ trunk/www/seamonkey/files/patch-bug893397	Thu Sep 12 09:14:53 2013	(r1348)
@@ -31,7 +31,7 @@
 index 0000000..80d4cb6
 --- /dev/null
 +++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
-@@ -0,0 +1,173 @@
+@@ -0,0 +1,172 @@
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -156,14 +156,13 @@
 +      accessPoints.AppendObject(ap);
 +      res = true;
 +
-+#if 0
 +      // log the data
 +      LOG(( "FreeBSD access point: "
-+            << "SSID: " << ssid << ", "
-+            << "MAC: " << isr->isr_bssid << ", "
-+            << "Strength: " << isr->isr_rssi ", "
-+            << "Channel: " << isr->isr_freq << "MHz" ));
-+#endif
++            "SSID: %s, MAC: %02x-%02x-%02x-%02x-%02x-%02x, "
++            "Strength: %d, Channel: %dMHz\n",
++            ssid, isr->isr_bssid[0], isr->isr_bssid[1], isr->isr_bssid[2],
++            isr->isr_bssid[3], isr->isr_bssid[4], isr->isr_bssid[5],
++            isr->isr_rssi, isr->isr_freq));
 +
 +      // increment pointers
 +      len -= isr->isr_len;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309120914.r8C9Es4A004832>