Added recovery app to use raw socket to burn known ip addr.

Fixed up fw so the device can reply after new addrs are set.

4 files changed, 54 insertions, 3 deletions

diff --git a/host/apps/usrp2_burner.cpp b/host/apps/usrp2_burner.cpp
index 08ec8daf9..941e71d0c 100644
--- a/host/apps/usrp2_burner.cpp
+++ b/host/apps/usrp2_burner.cpp
@@ -79,5 +79,6 @@ int main(int argc, char *argv[]){
         std::cout << "  Done" << std::endl;
     }
 
+    std::cout << "Power-cycle the usrp2 for the changes to take effect." << std::endl;
     return 0;
 }
diff --git a/host/apps/usrp2_recovery.py b/host/apps/usrp2_recovery.py
new file mode 100755
index 000000000..00d231cdb
--- /dev/null
+++ b/host/apps/usrp2_recovery.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+"""
+The usrp2 recovery app:
+
+When the usrp2 has an unknown or bad ip address in its eeprom,
+it may not be possible to communicate with the usrp2 over ip/udp.
+
+This app will send a raw ethernet packet to bypass the ip layer.
+The packet will contain a known ip address to burn into eeprom.
+Because the recovery packet is sent with a broadcast mac address,
+only one usrp2 should be present on the interface upon execution.
+
+This app requires super-user privileges and only works on linux. 
+"""
+
+import socket
+import struct
+import optparse
+
+BCAST_MAC_ADDR = 'ff:ff:ff:ff:ff:ff'
+RECOVERY_ETHERTYPE = 0xbeee
+IP_RECOVERY_CODE = 'addr'
+
+def mac_addr_repr_to_binary_string(mac_addr):
+    return ''.join(map(lambda x: chr(int(x, 16)), mac_addr.split(':')))
+
+if __name__ == '__main__':
+    parser = optparse.OptionParser()
+    parser.add_option('--ifc', type='string', help='ethernet interface name [default=%default]', default='eth0')
+    parser.add_option('--new-ip', type='string', help='ip address to set [default=%default]', default='192.168.10.2')
+    (options, args) = parser.parse_args()
+
+    #create the raw socket
+    print "Opening raw socket on interface: ", options.ifc
+    soc = socket.socket(socket.PF_PACKET, socket.SOCK_RAW)
+    soc.bind((options.ifc, RECOVERY_ETHERTYPE))
+
+    #create the recovery packet
+    print "Loading packet with new ip address: ", options.new_ip
+    packet = struct.pack(
+        '!6s6sH4s4s',
+        mac_addr_repr_to_binary_string(BCAST_MAC_ADDR),
+        mac_addr_repr_to_binary_string(BCAST_MAC_ADDR),
+        RECOVERY_ETHERTYPE,
+        IP_RECOVERY_CODE,
+        socket.inet_aton(options.new_ip),
+    )
+    soc.send(packet)
+    print "Done"
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index a87ba83eb..897084427 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -109,14 +109,14 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
     //check that we found any devices
     if (dev_addr_makers.size() == 0){
         throw std::runtime_error(str(
-            boost::format("No devices found for %s") % device_addr::to_string(hint)
+            boost::format("No devices found for ----->\n%s") % device_addr::to_string(hint)
         ));
     }
 
     //check that the which index is valid
     if (dev_addr_makers.size() <= which){
         throw std::runtime_error(str(
-            boost::format("No device at index %d for %s") % which % device_addr::to_string(hint)
+            boost::format("No device at index %d for ----->\n%s") % which % device_addr::to_string(hint)
         ));
     }
 
diff --git a/host/lib/transport/udp_simple.cpp b/host/lib/transport/udp_simple.cpp
index 7004bdfdf..3c8ecb70d 100644
--- a/host/lib/transport/udp_simple.cpp
+++ b/host/lib/transport/udp_simple.cpp
@@ -38,7 +38,7 @@ static void reasonable_recv_timeout(
     boost::asio::ip::udp::socket &socket
 ){
     boost::asio::deadline_timer timer(socket.get_io_service());
-    timer.expires_from_now(boost::posix_time::milliseconds(50));
+    timer.expires_from_now(boost::posix_time::milliseconds(100));
     while (not (socket.available() or timer.expires_from_now().is_negative())){
         boost::this_thread::sleep(boost::posix_time::milliseconds(1));
     }