From 8651ed6acdb2b0ecac65775d25ff781b8b984c85 Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Tue, 10 Jun 2014 09:20:15 +0000 Subject: Forgotten update to use MGCopyAnswer for X-Unique-ID. git-svn-id: http://svn.telesphoreo.org/trunk@786 514c082c-b64e-11dc-b46d-3d985efe055d --- data/_apt7/cfnetwork.diff | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/data/_apt7/cfnetwork.diff b/data/_apt7/cfnetwork.diff index 7fe04f454..1a9e10f8d 100644 --- a/data/_apt7/cfnetwork.diff +++ b/data/_apt7/cfnetwork.diff @@ -9,7 +9,7 @@ diff -ru apt-0.7.25.3/methods/http.cc apt-0.7.25.3+iPhone/methods/http.cc #include #include #include -@@ -41,11 +42,18 @@ +@@ -41,11 +42,19 @@ #include #include #include @@ -21,6 +21,7 @@ diff -ru apt-0.7.25.3/methods/http.cc apt-0.7.25.3+iPhone/methods/http.cc #include +#include + ++#include +#include +#include +#include @@ -645,7 +646,7 @@ diff -ru apt-0.7.25.3/methods/http.cc apt-0.7.25.3+iPhone/methods/http.cc FailCounter = 0; } -@@ -1330,6 +1530,35 @@ +@@ -1330,6 +1530,41 @@ signal(SIGPIPE, SIG_IGN); HttpMethod Mth; @@ -673,6 +674,12 @@ diff -ru apt-0.7.25.3/methods/http.cc apt-0.7.25.3+iPhone/methods/http.cc + CFRelease(plist); + } + ++ if (UniqueID_ == NULL) ++ if (void *libMobileGestalt = dlopen("/usr/lib/libMobileGestalt.dylib", RTLD_GLOBAL | RTLD_LAZY)) ++ if (CFStringRef (*$MGCopyAnswer)(CFStringRef) = (CFStringRef (*)(CFStringRef)) dlsym(libMobileGestalt, "MGCopyAnswer")) ++ UniqueID_ = $MGCopyAnswer(CFSTR("UniqueDeviceID")); ++ ++ if (UniqueID_ == NULL) + if (void *lockdown = lockdown_connect()) { + UniqueID_ = lockdown_copy_value(lockdown, NULL, kLockdownUniqueDeviceIDKey); + lockdown_disconnect(lockdown); -- cgit v1.2.3