Merge lp:~xnox/whoopsie/android-serial into lp:whoopsie

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

Hm, My dual boot is busted again (out of disk space). So I don't have a phone to try this on, at the moment.

[Dimitri John Ledkov (xnox)]

Hm, My dual boot is busted again (out of disk space). So I don't have a phone to try this on, at the moment.

[Evan (ev)]

Looks good. Landing.

review: Approve

=== modified file 'src/identifier.c'
--- src/identifier.c	2014-06-12 22:47:27 +0000
+++ src/identifier.c	2014-08-05 16:26:22 +0000
@@ -13,6 +13,7 @@
 static char* ofono_name = "org.ofono";
 static gint fail_next_get_mac = 0;
 static gint fail_next_get_uuid = 0;
+static gint fail_next_get_serial = 0;
 
 void whoopsie_identifier_set_ofono_name (char *name) {
     ofono_name = name;
@@ -113,35 +114,47 @@
     *res = g_strdup (data);
 }
 
-void
-whoopsie_identifier_get_system_uuid (char** res, GError** error)
+static void
+_get_serial (char** res, GError** error, const char* filename, int length, gint* fail_next_get)
 {
     int fp;
 
     g_return_if_fail (res);
 
-    if (g_atomic_int_compare_and_exchange (&fail_next_get_uuid, WHOOPSIE_FAIL_GENERIC, 0)) {
+    if (g_atomic_int_compare_and_exchange (fail_next_get, WHOOPSIE_FAIL_GENERIC, 0)) {
         g_set_error (error, g_quark_from_static_string ("whoopsie-quark"), WHOOPSIE_FAILED_BY_REQUEST,
                      "Failed by tester request");
         return;
     }
 
-    fp = open ("/sys/class/dmi/id/product_uuid", O_RDONLY);
+    fp = open (filename, O_RDONLY);
     if (fp < 0) {
         g_set_error (error, g_quark_from_static_string ("whoopsie-quark"), 0,
-                     "Could not open the product uuid file.");
+                     "Could not open the product uuid/serial file.");
         return;
     }
-    *res = g_malloc (37);
-    if (read (fp, *res, 36) == 36)
-        (*res)[36] = '\0';
+    *res = g_malloc (length+1);
+    if (read (fp, *res, length) == length)
+        (*res)[length] = '\0';
     else
         g_set_error (error, g_quark_from_static_string ("whoopsie-quark"), 0,
-                     "Got an unexpected length reading the product_uuid.");
+                     "Got an unexpected length reading the product uuid/serial.");
     close (fp);
 }
 
 void
+whoopsie_identifier_get_system_uuid (char** res, GError** error)
+{
+	_get_serial (res, error, "/sys/class/dmi/id/product_uuid", 36, &fail_next_get_uuid);
+}
+
+void
+whoopsie_identifier_get_android_serialno (char** res, GError** error)
+{
+	_get_serial (res, error, "/sys/class/android_usb/android0/iSerial", 16, &fail_next_get_serial);
+}
+
+void
 whoopsie_identifier_sha512 (char* source, char* res, GError** error)
 {
     int md_len;
@@ -259,6 +272,15 @@
         *error = NULL;
     }
 
+    whoopsie_identifier_get_android_serialno (&identifier, error);
+    if ((!error || !(*error)) && identifier)
+        goto out;
+
+    if (error && *error) {
+        g_error_free (*error);
+        *error = NULL;
+    }
+
     whoopsie_identifier_get_mac_address (&identifier, error);
     if ((!error || !(*error)) && identifier) {
         whoopsie_identifier_append_imei (&identifier, error);
@@ -287,3 +309,8 @@
 {
     g_atomic_int_set (&fail_next_get_uuid, 1);
 }
+
+void whoopsie_identifier_fail_next_get_serial ()
+{
+    g_atomic_int_set (&fail_next_get_serial, 1);
+}

=== modified file 'src/identifier.h'
--- src/identifier.h	2014-06-12 22:47:27 +0000
+++ src/identifier.h	2014-08-05 16:26:22 +0000
@@ -2,6 +2,7 @@
 void whoopsie_identifier_get_imei (char** res, GError** error);
 void whoopsie_identifier_get_mac_address (char** res, GError** error);
 void whoopsie_identifier_get_system_uuid (char** res, GError** error);
+void whoopsie_identifier_get_android_serialno (char** res, GError** error);
 void whoopsie_identifier_sha512 (char* source, char* res, GError** error);
 void whoopsie_hex_to_char (char* buf, const char *str, int len);
 #define HASHLEN 128
@@ -10,6 +11,7 @@
 void whoopsie_identifier_set_ofono_name (char* name) __attribute__ ((__warning__ ("Only for testing")));
 void whoopsie_identifier_fail_next_get_mac (gint how) __attribute__ ((__warning__ ("Only for testing")));
 void whoopsie_identifier_fail_next_get_uuid () __attribute__ ((__warning__ ("Only for testing")));
+void whoopsie_identifier_fail_next_get_serial () __attribute__ ((__warning__ ("Only for testing")));
 #define WHOOPSIE_FAIL_GENERIC 1
 #define WHOOPSIE_FAIL_NO_IFACES 2
 #define WHOOPSIE_FAILED_BY_REQUEST 42