Refactor port number use into service descriptor to enable SSL for services

This is a major change which breaks API but is required in order to support
SSL communication for services as used by network connections.

1 files changed, 8 insertions, 3 deletions

diff --git a/dev/housearresttest.c b/dev/housearresttest.c
index 951ebe4..2e24670 100644
--- a/dev/housearresttest.c
+++ b/dev/housearresttest.c
@@ -96,8 +96,8 @@ int main(int argc, char **argv)
                 goto leave_cleanup;
         }
 
-        uint16_t port = 0;
-        if (lockdownd_start_service(client, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS) {
+        lockdownd_service_descriptor_t service = NULL;
+        if (lockdownd_start_service(client, "com.apple.mobile.house_arrest", &service) != LOCKDOWN_E_SUCCESS) {
                 printf("could not start house_arrest service!\n");
                 goto leave_cleanup;
         }
@@ -107,11 +107,16 @@ int main(int argc, char **argv)
                 client = NULL;
         }
 
-        if (house_arrest_client_new(dev, port, &hac) != HOUSE_ARREST_E_SUCCESS) {
+        if (house_arrest_client_new(dev, service, &hac) != HOUSE_ARREST_E_SUCCESS) {
                 printf("could not connect to house_arrest service!\n");
                 goto leave_cleanup;
         }
 
+        if (service) {
+                lockdownd_service_descriptor_free(service);
+                service = NULL;
+        }
+
         res = house_arrest_send_command(hac, "VendDocuments", appid);
         if (res != HOUSE_ARREST_E_SUCCESS) {
                 printf("error %d when trying to get VendDocuments\n", res);