Changeset 1688

Timestamp:

21/07/10 14:56:15 (3 years ago)

Author:

matthijs

Message:

Use the right MAC address for retrieving configuration updates.

The MAC address asignment of the 2.0n has changed with the 2.3.6.0 release. To
make sure the Foneras keep identifying themselves with the same MAC address,
the 2.0n needs to get the address from a different interface.

This fixes configuration changes made through fon.com, as well as Family &
Friends. See #620 for details.

Files:

• trunk/fon/fonbase/files/bin/thinclient (modified) (1 diff)

trunk/fon/fonbase/files/bin/thinclient

@@ -13 +13 @@
         MODE=$1
         VOUCHER=$2
+        DEVICE="$(cat /etc/fon_device)"
         # gather the MAC addresses
         ETMAC=$( ifconfig $lan_ifname|grep HWaddr|sed -e "s/^.*HWaddr //" |sed -e "s/ //g" )
-        WLMAC=$( ifconfig $wifi_ifname|grep HWaddr|sed -e "s/^.*HWaddr //" |sed -e "s/ //g" )
+        if [ "${DEVICE}" == "fonera20n" ]; then
+                # The first few firmware versions had their MAC address
+                # assignments swapped. This was later corrected, but a lot of
+                # devices had been registered at fon with the "wrong" mac
+                # address already.
+                # To fix this, we send the eth0 (WAN) mac address instead of the
+                # real public wifi mac address (which used to be the public wifi
+                # mac address).
+                wl_if=eth0.1
+        else
+                wl_if=$wifi_ifname
+        fi
+        WLMAC=$( ifconfig $wl_if|grep HWaddr|sed -e "s/^.*HWaddr //" |sed -e "s/ //g" )
         FONREV="$(cat /etc/fon_revision)"
         FIRMWARE="$(cat /etc/fon_version)"
-        DEVICE="$(cat /etc/fon_device)"
         SERVER=fatserver.fon.com
         PORT=1938