Fixes delays associated with discovery when adding a new discovery po…

…rtal or enabling discovery after having added a new portal
iscsi-osx · Dec 20, 2016 · c8df7c6 · c8df7c6
1 parent d1ad33f
commit c8df7c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Distribution/package.sh b/Distribution/package.sh
@@ -1,7 +1,7 @@
 # Package parameters
 NAME="iSCSI Initiator for macOS"
 BUNDLE_ID="com.github.iscsi-osx.iSCSIInitiator"
-VERSION="1.0.0-beta4"
+VERSION="1.0.0-beta5"
 
 # Output of final DMG
 RELEASE="../Release"

diff --git a/Source/User/iscsictl/iSCSICtl.m b/Source/User/iscsictl/iSCSICtl.m
@@ -1966,6 +1966,10 @@ errno_t iSCSICtlAddDiscoveryPortal(AuthorizationRef authorization,CFDictionaryRe
 
     if(portal)
         iSCSIPortalRelease(portal);
+
+    if(!error)
+        iSCSIDaemonUpdateDiscovery(handle);
+
     if(preferences)
         iSCSIPreferencesRelease(preferences);
     iSCSICtlDisconnectFromDaemon(handle);

diff --git a/Source/User/iscsid/iSCSIDaemon.c b/Source/User/iscsid/iSCSIDaemon.c
@@ -1387,8 +1387,9 @@ errno_t iSCSIDUpdateDiscovery(int fd,
     // Add new timer with updated interval, if discovery is enabled
     if(discoveryEnabled)
     {
+        CFTimeInterval delay = 2;
         discoveryTimer = CFRunLoopTimerCreate(kCFAllocatorDefault,
-                                              CFAbsoluteTimeGetCurrent(),
+                                              CFAbsoluteTimeGetCurrent()+delay,
                                               interval,0,0,callout,NULL);
 
         CFRunLoopAddTimer(CFRunLoopGetCurrent(),discoveryTimer,kCFRunLoopDefaultMode);
@@ -1400,10 +1401,6 @@ errno_t iSCSIDUpdateDiscovery(int fd,
 
     if(send(fd,&rsp,sizeof(rsp),0) != sizeof(rsp))
         error = EAGAIN;
-
-    // If discovery was enabled do it now...
-//    if(discoveryEnabled)
-//        iSCSIDisco
 
     return error;
 }
@@ -1843,7 +1840,6 @@ void iSCSIDPrepareForSystemSleep()
 
         DASessionScheduleWithRunLoop(diskSession,CFRunLoopGetMain(),kCFRunLoopDefaultMode);
         iSCSIDAUnmountForTarget(diskSession,kDADiskUnmountOptionWhole,target,&iSCSIDPrepareForSystemSleepComplete,(void*)sessionId);
-//        iSCSITargetRelease(target);
     }
 
     CFRetain(diskSession);