react-native-zeroconf 0.17.1 → 0.17.3

package/README.md

@@ -2,6 +2,14 @@
   <a href="https://zeroconf.balthazar.dev"><img src=".github/banner.png" alt="react-native-zeroconf: Bonjour / mDNS discovery and publishing for React Native, on iOS, Android, Windows, macOS, tvOS and Expo" width="100%"></a>
 </p>
 
+<p align="center">
+  <a href="https://www.npmjs.com/package/react-native-zeroconf"><img src="https://img.shields.io/npm/v/react-native-zeroconf?style=flat" alt="npm version"></a>
+  <a href="https://www.npmjs.com/package/react-native-zeroconf"><img src="https://img.shields.io/npm/dm/react-native-zeroconf?style=flat" alt="npm downloads"></a>
+  <a href="https://github.com/balthazar/react-native-zeroconf/actions/workflows/ci.yml"><img src="https://img.shields.io/github/actions/workflow/status/balthazar/react-native-zeroconf/ci.yml?branch=master&label=tests&style=flat" alt="tests"></a>
+  <a href="https://github.com/balthazar/react-native-zeroconf/actions/workflows/windows.yml"><img src="https://img.shields.io/github/actions/workflow/status/balthazar/react-native-zeroconf/windows.yml?branch=master&label=windows&style=flat" alt="windows"></a>
+  <a href="LICENSE"><img src="https://img.shields.io/npm/l/react-native-zeroconf?style=flat" alt="license"></a>
+</p>
+
 Find the services other devices advertise on the local network (printers, speakers, cameras, your own servers) and advertise your own, on iOS, Android, macOS, tvOS and Windows.
 
 **[Read the documentation](https://zeroconf.balthazar.dev)**

package/android/build.gradle

@@ -13,6 +13,8 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 34)
         versionCode 1
         versionName "1.0"
+        // Instrumented tests (android/src/androidTest), see docs/Contributing.md
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
@@ -42,4 +44,6 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
+    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
 }

package/android/src/main/java/com/balthazargronon/RCTZeroconf/nsd/NsdServiceImpl.java

@@ -532,6 +532,21 @@ public class NsdServiceImpl implements Zeroconf {
         return mNsdManager;
     }
 
+    // Before Android 14 each NsdManager client resolves one service at a time and a resolve can't be cancelled:
+    // a service that never answers would block every later resolve. After a timeout the queue moves on to a
+    // client of its own, an NsdManager from a new Context (system services are cached per Context)
+    @Nullable private volatile NsdManager mResolveManager;
+
+    private NsdManager getResolveManager() {
+        return mResolveManager != null ? mResolveManager : getNsdManager();
+    }
+
+    private void replaceResolveManager() {
+        Context context = getReactApplicationContext();
+        Context fresh = context.createConfigurationContext(context.getResources().getConfiguration());
+        mResolveManager = (NsdManager) fresh.getSystemService(Context.NSD_SERVICE);
+    }
+
     private ReactApplicationContext getReactApplicationContext() {
         return reactApplicationContext;
     }
@@ -560,8 +575,8 @@ public class NsdServiceImpl implements Zeroconf {
         }
         final ZeroResolveListener listener = new ZeroResolveListener(next);
         try {
-            getNsdManager().resolveService(next.serviceInfo, listener);
-            // The system keeps the resolve until it answers or fails, the queue waits for it
+            getResolveManager().resolveService(next.serviceInfo, listener);
+            // The queue waits for the answer, or moves on to another client after the timeout
             mHandler.postDelayed(listener::timedOut, (long) (next.timeoutSeconds * 1000));
         } catch (Throwable e) {
             Log.e(TAG, "resolveService failed", e);
@@ -582,7 +597,7 @@ public class NsdServiceImpl implements Zeroconf {
         private final PendingResolve pending;
         @Nullable private final String scanId;
         @Nullable private final Promise promise;
-        // Settled: answered, failed or timed out. A late answer after the timeout only frees the queue
+        // Settled: answered, failed or timed out. A late answer after the timeout is ignored
         private boolean settled = false;
 
         ZeroResolveListener(PendingResolve pending) {
@@ -609,6 +624,8 @@ public class NsdServiceImpl implements Zeroconf {
             } else if (mScans.containsKey(scanId)) {
                 sendResolveTimeout(serviceName, scanId);
             }
+            replaceResolveManager();
+            onResolveDone();
         }
 
         @Override
@@ -616,7 +633,6 @@ public class NsdServiceImpl implements Zeroconf {
             if (errorCode == NsdManager.FAILURE_ALREADY_ACTIVE) {
                 // Another resolve (possibly from another app or listener) is in flight: retry shortly
                 if (!settle()) {
-                    onResolveDone();
                     return;
                 }
                 synchronized (mResolveQueue) {
@@ -627,7 +643,7 @@ public class NsdServiceImpl implements Zeroconf {
                 return;
             }
             if (!settle()) {
-                onResolveDone();
+                // Timed out: the queue already moved on to another client
                 return;
             }
             String message = "Resolving service " + serviceInfo.getServiceName() + " failed: " + ZeroconfModule.describeNsdError(errorCode);
@@ -642,7 +658,7 @@ public class NsdServiceImpl implements Zeroconf {
         @Override
         public void onServiceResolved(NsdServiceInfo serviceInfo) {
             if (!settle()) {
-                onResolveDone();
+                // Timed out: the queue already moved on to another client
                 return;
             }
             if (promise != null) {

package/android/src/main/java/com/github/druk/dnssd/DNSSD.java

@@ -106,6 +106,37 @@ public abstract class DNSSD implements InternalDNSSDService.DnssdServiceListener
         this.serviceTimeout = serviceTimeout;
     }
 
+    // The embedded responder can answer before the call that starts an operation has returned, from its
+    // own thread or from inside the call. The operation is assigned under the monitor of its array while
+    // that call runs, and the callbacks posted to the main thread take the monitor first, so they wait for
+    // the call to return. If it threw, there is no operation and the callback is dropped.
+
+    private interface Start<T> {
+        T start() throws DNSSDException;
+    }
+
+    private interface OperationCallback<T> {
+        void run(T operation);
+    }
+
+    private static <T> void start(T[] operation, Start<T> start) throws DNSSDException {
+        synchronized (operation) {
+            operation[0] = start.start();
+        }
+    }
+
+    private <T> void postWith(final T[] operation, final OperationCallback<T> callback) {
+        handler.post(() -> {
+            T started;
+            synchronized (operation) {
+                started = operation[0];
+            }
+            if (started != null) {
+                callback.run(started);
+            }
+        });
+    }
+
     /** Browse for instances of a service.<P>
 
      Note: browsing consumes network bandwidth. Call {@link InternalDNSSDService#stop} when you have finished browsing.<P>
@@ -139,13 +170,13 @@ public abstract class DNSSD implements InternalDNSSDService.DnssdServiceListener
     public DNSSDService browse(int flags, int ifIndex, String regType, String domain, final BrowseListener listener) throws DNSSDException {
         onServiceStarting();
         final InternalDNSSDService[] services = new InternalDNSSDService[1];
-        services[0] = new InternalDNSSDService(this, InternalDNSSD.browse(flags, ifIndex, regType, domain, new InternalBrowseListener() {
+        start(services, () -> new InternalDNSSDService(this, InternalDNSSD.browse(flags, ifIndex, regType, domain, new InternalBrowseListener() {
             @Override
             public void serviceFound(final DNSSDService browser, final int flags, final int ifIndex, final byte[] serviceName, final byte[] regType, final byte[] domain) {
                 final String serviceNameStr = new String(serviceName, UTF_8);
                 final String regTypeStr = new String(regType, UTF_8);
                 final String domainStr = new String(domain, UTF_8);
-                handler.post(() -> listener.serviceFound(services[0], flags, ifIndex, serviceNameStr, regTypeStr, domainStr));
+                postWith(services, operation -> listener.serviceFound(operation, flags, ifIndex, serviceNameStr, regTypeStr, domainStr));
             }
 
             @Override
@@ -153,14 +184,14 @@ public abstract class DNSSD implements InternalDNSSDService.DnssdServiceListener
                 final String serviceNameStr = new String(serviceName, UTF_8);
                 final String regTypeStr = new String(regType, UTF_8);
                 final String domainStr = new String(domain, UTF_8);
-                handler.post(() -> listener.serviceLost(services[0], flags, ifIndex, serviceNameStr, regTypeStr, domainStr));
+                postWith(services, operation -> listener.serviceLost(operation, flags, ifIndex, serviceNameStr, regTypeStr, domainStr));
             }
 
             @Override
             public void operationFailed(final DNSSDService service, final int errorCode) {
-                handler.post(() -> listener.operationFailed(services[0], errorCode));
+                postWith(services, operation -> listener.operationFailed(operation, errorCode));
             }
-        }));
+        })));
         return services[0];
 
     }
@@ -229,28 +260,28 @@ public abstract class DNSSD implements InternalDNSSDService.DnssdServiceListener
 
         final Runnable timeoutRunnable = () -> services[0].stop();
 
-        services[0] = new InternalDNSSDService(this, InternalDNSSD.resolve(flags, ifIndex, serviceName, regType, domain, new InternalResolveListener() {
+        start(services, () -> new InternalDNSSDService(this, InternalDNSSD.resolve(flags, ifIndex, serviceName, regType, domain, new InternalResolveListener() {
             @Override
             public void serviceResolved(final DNSSDService resolver, final int flags, final int ifIndex, byte[] fullName, byte[] hostName, final int port, TXTRecord txtRecord) {
                 final String fullNameStr =  new String(fullName, UTF_8);
                 final String hostNameStr =  new String(hostName, UTF_8);
                 final Map<String, String> record = parseTXTRecords(txtRecord);
                 handler.removeCallbacks(timeoutRunnable);
-                handler.post(() -> {
-                    listener.serviceResolved(services[0], flags, ifIndex, fullNameStr, hostNameStr, port, record);
-                    services[0].stop();
+                postWith(services, operation -> {
+                    listener.serviceResolved(operation, flags, ifIndex, fullNameStr, hostNameStr, port, record);
+                    operation.stop();
                 });
             }
 
             @Override
             public void operationFailed(final DNSSDService service, final int errorCode) {
                 handler.removeCallbacks(timeoutRunnable);
-                handler.post(() -> {
-                    listener.operationFailed(services[0], errorCode);
-                    services[0].stop();
+                postWith(services, operation -> {
+                    listener.operationFailed(operation, errorCode);
+                    operation.stop();
                 });
             }
-        }));
+        })));
 
         handler.postDelayed(timeoutRunnable, serviceTimeout);
         return services[0];
@@ -313,7 +344,7 @@ public abstract class DNSSD implements InternalDNSSDService.DnssdServiceListener
                                       final RegisterListener listener) throws DNSSDException {
         onServiceStarting();
         final DNSSDRegistration[] services = new DNSSDRegistration[1];
-        services[0] = new InternalDNSSDRegistration(this, InternalDNSSD.register(flags, ifIndex, serviceName, regType, domain, host, port, txtRecord,
+        start(services, () -> new InternalDNSSDRegistration(this, InternalDNSSD.register(flags, ifIndex, serviceName, regType, domain, host, port, txtRecord,
                 new InternalRegisterListener() {
 
             @Override
@@ -321,14 +352,14 @@ public abstract class DNSSD implements InternalDNSSDService.DnssdServiceListener
                 final String serviceNameStr =  new String(serviceName, UTF_8);
                 final String regTypeStr = new String(regType, UTF_8);
                 final String domainStr = new String(domain, UTF_8);
-                handler.post(() -> listener.serviceRegistered(services[0], flags, serviceNameStr, regTypeStr, domainStr));
+                postWith(services, operation -> listener.serviceRegistered(operation, flags, serviceNameStr, regTypeStr, domainStr));
             }
 
             @Override
             public void operationFailed(DNSSDService service, final int errorCode) {
-                handler.post(() -> listener.operationFailed(services[0], errorCode));
+                postWith(services, operation -> listener.operationFailed(operation, errorCode));
             }
-        }));
+        })));
         return services[0];
     }
 
@@ -447,15 +478,15 @@ public abstract class DNSSD implements InternalDNSSDService.DnssdServiceListener
 
         final Runnable timeoutRunnable = () -> services[0].stop();
 
-        services[0] = new InternalDNSSDService(this, InternalDNSSD.queryRecord(flags, ifIndex, serviceName, rrtype, rrclass, new InternalQueryListener() {
+        start(services, () -> new InternalDNSSDService(this, InternalDNSSD.queryRecord(flags, ifIndex, serviceName, rrtype, rrclass, new InternalQueryListener() {
             @Override
             public void queryAnswered(DNSSDService query, final int flags, final int ifIndex, byte[] fullName, final int rrtype, final int rrclass, byte[] rdata, final int ttl) {
                 final String fullNameStr = new String(fullName, UTF_8);
                 handler.removeCallbacks(timeoutRunnable);
-                handler.post(() -> {
-                    listener.queryAnswered(services[0], flags, ifIndex, fullNameStr, rrtype, rrclass, rdata, ttl);
+                postWith(services, operation -> {
+                    listener.queryAnswered(operation, flags, ifIndex, fullNameStr, rrtype, rrclass, rdata, ttl);
                     if (autoStop) {
-                        services[0].stop();
+                        operation.stop();
                     }
                 });
             }
@@ -463,12 +494,12 @@ public abstract class DNSSD implements InternalDNSSDService.DnssdServiceListener
             @Override
             public void operationFailed(DNSSDService service, final int errorCode) {
                 handler.removeCallbacks(timeoutRunnable);
-                handler.post(() -> {
-                    listener.operationFailed(services[0], errorCode);
-                    services[0].stop();
+                postWith(services, operation -> {
+                    listener.operationFailed(operation, errorCode);
+                    operation.stop();
                 });
             }
-        }));
+        })));
 
         if (autoStop) {
             handler.postDelayed(timeoutRunnable, serviceTimeout);
@@ -503,24 +534,24 @@ public abstract class DNSSD implements InternalDNSSDService.DnssdServiceListener
     public DNSSDService enumerateDomains(int flags, int ifIndex, final DomainListener listener) throws DNSSDException {
         onServiceStarting();
         final DNSSDService[] services = new DNSSDService[1];
-        services[0] = new InternalDNSSDService(this, InternalDNSSD.enumerateDomains(flags, ifIndex, new InternalDomainListener() {
+        start(services, () -> new InternalDNSSDService(this, InternalDNSSD.enumerateDomains(flags, ifIndex, new InternalDomainListener() {
             @Override
             public void domainFound(DNSSDService domainEnum, final int flags, final int ifIndex, byte[] domain) {
                 final String domainStr = new String(domain, UTF_8);
-                handler.post(() -> listener.domainFound(services[0], flags, ifIndex, domainStr));
+                postWith(services, operation -> listener.domainFound(operation, flags, ifIndex, domainStr));
             }
 
             @Override
             public void domainLost(DNSSDService domainEnum, final int flags, final int ifIndex, byte[] domain) {
                 final String domainStr = new String(domain, UTF_8);
-                handler.post(() -> listener.domainLost(services[0], flags, ifIndex, domainStr));
+                postWith(services, operation -> listener.domainLost(operation, flags, ifIndex, domainStr));
             }
 
             @Override
             public void operationFailed(final DNSSDService service, final int errorCode) {
-                handler.post(() -> listener.operationFailed(services[0], errorCode));
+                postWith(services, operation -> listener.operationFailed(operation, errorCode));
             }
-        }));
+        })));
         return services[0];
     }
 

package/android/src/main/java/com/github/druk/dnssd/DNSSDEmbedded.java

@@ -23,6 +23,10 @@ import android.util.Log;
 
 /**
  * DNSSD implementation running the embedded mDNSResponder  {@link InternalDNSSD}
+ *
+ * The responder's event loop runs on its own thread, started by the first operation and stopped
+ * a while after the last one ended. Operations start and stop on arbitrary threads, so the
+ * lifecycle state below is guarded by the class monitor.
  */
 public class DNSSDEmbedded extends DNSSD {
 
@@ -31,9 +35,11 @@ public class DNSSDEmbedded extends DNSSD {
     private static final String TAG = "DNSSDEmbedded";
     private final long mStopTimerDelay;
     private final Handler handler = new Handler(Looper.getMainLooper());
-    private Thread mThread;
-    private volatile boolean isStarted = false;
-    private int serviceCount = 0;
+    private final ExitTimer exitTimer;
+    private Thread mThread;                       // guarded by DNSSDEmbedded.class
+    private volatile boolean isStarted = false;   // the loop is running (set by the loop thread)
+    private volatile boolean isExiting = false;   // nativeExit() was called, the thread is on its way out
+    private int serviceCount = 0;                 // guarded by DNSSDEmbedded.class
 
     public DNSSDEmbedded(Context context) {
         this(context, DEFAULT_STOP_TIMER_DELAY);
@@ -42,6 +48,35 @@ public class DNSSDEmbedded extends DNSSD {
     public DNSSDEmbedded(Context context, long stopTimerDelay) {
         super(context, "jdns_sd_embedded");
         mStopTimerDelay = stopTimerDelay;
+        exitTimer = new ExitTimer(handler, stopTimerDelay, this::exitIfIdle);
+    }
+
+    /**
+     * Stops the responder a while after the last operation ended, unless another one starts first.
+     * The same Runnable is posted and removed: evaluating a method reference at two call sites
+     * gives two objects, so posting one and removing the other would never cancel anything.
+     */
+    static final class ExitTimer {
+        private final Handler handler;
+        private final long delayMillis;
+        private final Runnable exit;
+
+        ExitTimer(Handler handler, long delayMillis, Runnable exit) {
+            this.handler = handler;
+            this.delayMillis = delayMillis;
+            this.exit = exit;
+        }
+
+        /** The last operation stopped: exit after the delay. */
+        void schedule() {
+            handler.removeCallbacks(exit);
+            handler.postDelayed(exit, delayMillis);
+        }
+
+        /** An operation is starting: the responder stays up. */
+        void cancel() {
+            handler.removeCallbacks(exit);
+        }
     }
 
     static native int nativeInit();
@@ -57,40 +92,52 @@ public class DNSSDEmbedded extends DNSSD {
      * Note: This method will block thread until DNS-SD initialization finish.
      */
     public void init() {
-        handler.removeCallbacks(DNSSDEmbedded::nativeExit);
-
-        if (mThread != null && mThread.isAlive()) {
-            Log.i(TAG, "already started");
-            waitUntilStarted();
-            return;
-        }
-
-        isStarted = false;
+        synchronized (DNSSDEmbedded.class) {
+            exitTimer.cancel();
 
-        InternalDNSSD.getInstance();
-        mThread = new Thread() {
-            public void run() {
-                Log.i(TAG, "init");
-                int err = nativeInit();
-                synchronized (DNSSDEmbedded.class) {
-                    isStarted = true;
-                    DNSSDEmbedded.class.notifyAll();
-                }
-                if (err != 0) {
-                    Log.e(TAG, "error: " + err);
+            if (mThread != null && mThread.isAlive()) {
+                if (!isExiting) {
+                    Log.i(TAG, "already started");
+                    waitUntilStarted();
                     return;
                 }
-                Log.i(TAG, "start");
-                int ret = nativeLoop();
-                isStarted = false;
-                Log.i(TAG, "finish with code: " + ret);
+                // The exit timer fired just before this operation: let the thread finish, then start afresh
+                Log.i(TAG, "restarting");
+                try {
+                    mThread.join();
+                } catch (InterruptedException e) {
+                    Log.e(TAG, "init interrupted while waiting for the previous loop: ", e);
+                }
             }
-        };
-        mThread.setPriority(Thread.MAX_PRIORITY);
-        mThread.setName("DNS-SDEmbedded");
-        mThread.start();
 
-        waitUntilStarted();
+            isStarted = false;
+            isExiting = false;
+
+            InternalDNSSD.getInstance();
+            mThread = new Thread() {
+                public void run() {
+                    Log.i(TAG, "init");
+                    int err = nativeInit();
+                    synchronized (DNSSDEmbedded.class) {
+                        isStarted = true;
+                        DNSSDEmbedded.class.notifyAll();
+                    }
+                    if (err != 0) {
+                        Log.e(TAG, "error: " + err);
+                        return;
+                    }
+                    Log.i(TAG, "start");
+                    int ret = nativeLoop();
+                    isStarted = false;
+                    Log.i(TAG, "finish with code: " + ret);
+                }
+            };
+            mThread.setPriority(Thread.MAX_PRIORITY);
+            mThread.setName("DNS-SDEmbedded");
+            mThread.start();
+
+            waitUntilStarted();
+        }
     }
 
     /**
@@ -101,7 +148,19 @@ public class DNSSDEmbedded extends DNSSD {
     public void exit() {
         synchronized (DNSSDEmbedded.class) {
             Log.i(TAG, "post exit");
-            handler.postDelayed(DNSSDEmbedded::nativeExit, mStopTimerDelay);
+            exitTimer.schedule();
+        }
+    }
+
+    // Runs on the main thread when the timer fires; an operation may have started since it was scheduled
+    private void exitIfIdle() {
+        synchronized (DNSSDEmbedded.class) {
+            if (serviceCount != 0 || isExiting || mThread == null || !mThread.isAlive()) {
+                return;
+            }
+            Log.i(TAG, "exit");
+            isExiting = true;
+            nativeExit();
         }
     }
 
@@ -119,17 +178,21 @@ public class DNSSDEmbedded extends DNSSD {
 
     @Override
     public void onServiceStarting() {
-        super.onServiceStarting();
-        this.init();
-        serviceCount++;
+        synchronized (DNSSDEmbedded.class) {
+            super.onServiceStarting();
+            this.init();
+            serviceCount++;
+        }
     }
 
     @Override
     public void onServiceStopped() {
-        super.onServiceStopped();
-        serviceCount--;
-        if (serviceCount == 0) {
-            this.exit();
+        synchronized (DNSSDEmbedded.class) {
+            super.onServiceStopped();
+            serviceCount--;
+            if (serviceCount == 0) {
+                this.exit();
+            }
         }
     }
 }

package/android/src/main/jni/JNISupport.c

@@ -107,14 +107,26 @@ struct	OpContext
 
 //For AUTO_CALLBACKS, we must attach the callback thread to the Java VM prior to upcall.
 #if AUTO_CALLBACKS
-	JNIEnv *pLoopEnv = NULL;
+	JNIEnv *pLoopEnv = NULL;	// The event loop thread's env, the fallback when the current thread's is unavailable
+	static JavaVM *gJavaVM = NULL;
 #endif
 
 #ifdef EMBEDDED
 int init();
 int loop();
 void stopLoop();
+void lockCore();
+void unlockCore();
+// The embedded shim reads core state (the interface list, the host name) before mDNS core
+// takes its own lock, so every call into it is made under the core lock. It is recursive.
+#define LOCK_CORE()		lockCore()
+#define UNLOCK_CORE()	unlockCore()
+#else
+#define LOCK_CORE()		do { } while (0)
+#define UNLOCK_CORE()	do { } while (0)
+#endif
 
+#ifdef EMBEDDED
 JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_DNSSDEmbedded_nativeInit( JNIEnv *pEnv, jclass cls)
 {
 	pLoopEnv = pEnv;
@@ -140,12 +152,8 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleDNSSD_InitLibrary( JNIEnv
 		return kDNSServiceErr_Incompatible;
 
 #if AUTO_CALLBACKS
-	// {
-	// 	jsize	numVMs;
-	
-	// 	if ( 0 != JNI_GetCreatedJavaVMs( &gJavaVM, 1, &numVMs))
-	// 		return kDNSServiceErr_BadState;
-	// }
+	if ( gJavaVM == NULL && 0 != (*pEnv)->GetJavaVM( pEnv, &gJavaVM))
+		return kDNSServiceErr_BadState;
 #endif
 
 	// Set AppleDNSSD.hasAutoCallbacks
@@ -180,13 +188,18 @@ static void			SafeReleaseUTFChars( JNIEnv *pEnv, jstring str, const char *buff)
 #if AUTO_CALLBACKS
 static void	SetupCallbackState( JNIEnv **ppEnv)
 {
-	(*ppEnv) = pLoopEnv;
-	//(*gJavaVM)->AttachCurrentThread( gJavaVM, (void**) ppEnv, NULL);
+	// Callbacks usually come from the event loop thread, but mDNS core also calls back from inside
+	// an API call, on the client's thread: a local-only registration is acknowledged inside
+	// DNSServiceRegister(). A JNIEnv belongs to one thread, so use the current thread's.
+	JNIEnv	*pEnv = NULL;
+	if ( gJavaVM != NULL && JNI_OK == (*gJavaVM)->GetEnv( gJavaVM, (void**) &pEnv, JNI_VERSION_1_6) && pEnv != NULL)
+		(*ppEnv) = pEnv;
+	else
+		(*ppEnv) = pLoopEnv;
 }
 
 static void	TeardownCallbackState( void )
 {
-	//(*gJavaVM)->DetachCurrentThread( gJavaVM);
 }
 
 #else	// AUTO_CALLBACKS
@@ -248,6 +261,13 @@ JNIEXPORT void JNICALL Java_com_github_druk_dnssd_AppleService_HaltOperation( JN
 		OpContext	*pContext = (OpContext*) (long) (*pEnv)->GetLongField(pEnv, pThis, contextField);
 		if ( pContext != NULL)
 		{
+			// The embedded responder delivers callbacks from its own thread and may be in
+			// the middle of one for this very operation (an answer with several records
+			// invokes the callback once per record). DNSServiceRefDeallocate() takes the
+			// core lock itself; holding it here too keeps the weak refs and the free() in
+			// the same critical section. Consequently a Java callback running on the loop
+			// thread must never block on a thread that may be in here (the main thread).
+			LOCK_CORE();
 			// MUST clear fNativeContext first, BEFORE calling DNSServiceRefDeallocate()
 			(*pEnv)->SetLongField(pEnv, pThis, contextField, 0);
 			if ( pContext->ServiceRef != NULL)
@@ -256,6 +276,7 @@ JNIEXPORT void JNICALL Java_com_github_druk_dnssd_AppleService_HaltOperation( JN
 			(*pEnv)->DeleteWeakGlobalRef( pEnv, pContext->JavaObj);
 			(*pEnv)->DeleteWeakGlobalRef( pEnv, pContext->ClientObj);
 			free( pContext);
+			UNLOCK_CORE();
 		}
 	}
 }
@@ -355,29 +376,36 @@ static void DNSSD_API	ServiceBrowseReply( DNSServiceRef sdRef _UNUSED, DNSServic
 
 	SetupCallbackState( &pContext->Env);
 
-	jobject clientObj = (*pContext->Env)->NewLocalRef(pContext->Env, pContext->ClientObj);
+	// Copies: the Java callback may stop this operation, after which pContext is freed.
+	JNIEnv		*env = pContext->Env;
+	jobject		javaObj = pContext->JavaObj;
+	jobject		clientRef = pContext->ClientObj;
+	jmethodID	callback = pContext->Callback;
+	jmethodID	callback2 = pContext->Callback2;
+
+	jobject clientObj = (*env)->NewLocalRef(env, clientRef);
 
-	if ( clientObj != NULL && pContext->Callback != NULL)
+	if ( clientObj != NULL && callback != NULL)
 	{
 		if ( errorCode == kDNSServiceErr_NoError)
 		{
-			jbyteArray jServiceName = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(serviceName));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jServiceName, 0, (jsize)strlen(serviceName), (const jbyte *) serviceName);
-			jbyteArray jRegType = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(regtype));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jRegType, 0, (jsize)strlen(regtype), (const jbyte *) regtype);
-			jbyteArray jReplyDomain = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(replyDomain));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jReplyDomain, 0, (jsize)strlen(replyDomain), (const jbyte *) replyDomain);
-			(*pContext->Env)->CallVoidMethod( pContext->Env, clientObj,
-								( flags & kDNSServiceFlagsAdd) != 0 ? pContext->Callback : pContext->Callback2,
-								pContext->JavaObj, flags, interfaceIndex, jServiceName, jRegType, jReplyDomain);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jServiceName);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jRegType);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jReplyDomain);
+			jbyteArray jServiceName = (*env)->NewByteArray(env, (jsize)strlen(serviceName));
+			(*env)->SetByteArrayRegion (env, jServiceName, 0, (jsize)strlen(serviceName), (const jbyte *) serviceName);
+			jbyteArray jRegType = (*env)->NewByteArray(env, (jsize)strlen(regtype));
+			(*env)->SetByteArrayRegion (env, jRegType, 0, (jsize)strlen(regtype), (const jbyte *) regtype);
+			jbyteArray jReplyDomain = (*env)->NewByteArray(env, (jsize)strlen(replyDomain));
+			(*env)->SetByteArrayRegion (env, jReplyDomain, 0, (jsize)strlen(replyDomain), (const jbyte *) replyDomain);
+			(*env)->CallVoidMethod( env, clientObj,
+								( flags & kDNSServiceFlagsAdd) != 0 ? callback : callback2,
+								javaObj, flags, interfaceIndex, jServiceName, jRegType, jReplyDomain);
+			(*env)->DeleteLocalRef( env, jServiceName);
+			(*env)->DeleteLocalRef( env, jRegType);
+			(*env)->DeleteLocalRef( env, jReplyDomain);
 		}
 		else
-			ReportError( pContext->Env, clientObj, pContext->JavaObj, errorCode);
+			ReportError( env, clientObj, javaObj, errorCode);
 
-		(*pContext->Env)->DeleteLocalRef(pContext->Env, clientObj);
+		(*env)->DeleteLocalRef(env, clientObj);
 	}
 
 	TeardownCallbackState();
@@ -406,7 +434,9 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleBrowser_CreateBrowser( JN
 								(*pEnv)->GetObjectClass( pEnv, pContext->ClientObj),
 								"serviceLost", "(Lcom/github/druk/dnssd/DNSSDService;II[B[B[B)V");
 
+		LOCK_CORE();
 		err = DNSServiceBrowse( &pContext->ServiceRef, flags, ifIndex, regStr, domainStr, ServiceBrowseReply, pContext);
+		UNLOCK_CORE();
 		if ( err == kDNSServiceErr_NoError)
 		{
 			(*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
@@ -435,11 +465,17 @@ static void DNSSD_API	ServiceResolveReply( DNSServiceRef sdRef _UNUSED, DNSServi
 
 	SetupCallbackState( &pContext->Env);
 
-	txtCls = (*pContext->Env)->FindClass( pContext->Env, "com/github/druk/dnssd/TXTRecord");
-	txtCtor = (*pContext->Env)->GetMethodID( pContext->Env, txtCls, "<init>", "([B)V");
+	// Copies: the Java callback may stop this operation, after which pContext is freed.
+	JNIEnv		*env = pContext->Env;
+	jobject		javaObj = pContext->JavaObj;
+	jobject		clientRef = pContext->ClientObj;
+	jmethodID	callback = pContext->Callback;
 
-	if ( pContext->ClientObj != NULL && pContext->Callback != NULL && txtCtor != NULL &&
-		 NULL != ( txtBytes = (*pContext->Env)->NewByteArray( pContext->Env, txtLen)))
+	txtCls = (*env)->FindClass( env, "com/github/druk/dnssd/TXTRecord");
+	txtCtor = (*env)->GetMethodID( env, txtCls, "<init>", "([B)V");
+
+	if ( clientRef != NULL && callback != NULL && txtCtor != NULL &&
+		 NULL != ( txtBytes = (*env)->NewByteArray( env, txtLen)))
 	{
 		if ( errorCode == kDNSServiceErr_NoError)
 		{
@@ -448,26 +484,26 @@ static void DNSSD_API	ServiceResolveReply( DNSServiceRef sdRef _UNUSED, DNSServi
 			port = ( ((unsigned char*) &port)[0] << 8) | ((unsigned char*) &port)[1];
 	
 			// Initialize txtBytes with contents of txtRecord
-			pBytes = (*pContext->Env)->GetByteArrayElements( pContext->Env, txtBytes, NULL);
+			pBytes = (*env)->GetByteArrayElements( env, txtBytes, NULL);
 			memcpy( pBytes, txtRecord, txtLen);
-			(*pContext->Env)->ReleaseByteArrayElements( pContext->Env, txtBytes, pBytes, JNI_COMMIT);
+			(*env)->ReleaseByteArrayElements( env, txtBytes, pBytes, JNI_COMMIT);
 	
 			// Construct txtObj with txtBytes
-			txtObj = (*pContext->Env)->NewObject( pContext->Env, txtCls, txtCtor, txtBytes);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, txtBytes);
-
-			jbyteArray jFullName = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(fullname));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jFullName, 0, (jsize)strlen(fullname), (const jbyte *) fullname);
-			jbyteArray jHostTarget = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(hosttarget));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jHostTarget, 0, (jsize)strlen(hosttarget), (const jbyte *) hosttarget);
-			(*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj, pContext->Callback,
-								pContext->JavaObj, flags, interfaceIndex, jFullName, jHostTarget, port, txtObj);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jFullName);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jHostTarget);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, txtObj);
+			txtObj = (*env)->NewObject( env, txtCls, txtCtor, txtBytes);
+			(*env)->DeleteLocalRef( env, txtBytes);
+
+			jbyteArray jFullName = (*env)->NewByteArray(env, (jsize)strlen(fullname));
+			(*env)->SetByteArrayRegion (env, jFullName, 0, (jsize)strlen(fullname), (const jbyte *) fullname);
+			jbyteArray jHostTarget = (*env)->NewByteArray(env, (jsize)strlen(hosttarget));
+			(*env)->SetByteArrayRegion (env, jHostTarget, 0, (jsize)strlen(hosttarget), (const jbyte *) hosttarget);
+			(*env)->CallVoidMethod( env, clientRef, callback,
+								javaObj, flags, interfaceIndex, jFullName, jHostTarget, port, txtObj);
+			(*env)->DeleteLocalRef( env, jFullName);
+			(*env)->DeleteLocalRef( env, jHostTarget);
+			(*env)->DeleteLocalRef( env, txtObj);
 		}
 		else
-			ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+			ReportError( env, clientRef, javaObj, errorCode);
 	}
 
 	TeardownCallbackState();
@@ -493,8 +529,10 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleResolver_CreateResolver(
 		const char	*regStr = SafeGetUTFChars( pEnv, regType);
 		const char	*domainStr = SafeGetUTFChars( pEnv, domain);
 
+		LOCK_CORE();
 		err = DNSServiceResolve( &pContext->ServiceRef, flags, ifIndex,
 								servStr, regStr, domainStr, ServiceResolveReply, pContext);
+		UNLOCK_CORE();
 		if ( err == kDNSServiceErr_NoError)
 		{
 			(*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
@@ -519,25 +557,31 @@ static void DNSSD_API	ServiceRegisterReply( DNSServiceRef sdRef _UNUSED, DNSServ
 
 	SetupCallbackState( &pContext->Env);
 
-	if ( pContext->ClientObj != NULL && pContext->Callback != NULL)
+	// Copies: the Java callback may stop this operation, after which pContext is freed.
+	JNIEnv		*env = pContext->Env;
+	jobject		javaObj = pContext->JavaObj;
+	jobject		clientRef = pContext->ClientObj;
+	jmethodID	callback = pContext->Callback;
+
+	if ( clientRef != NULL && callback != NULL)
 	{
 		if ( errorCode == kDNSServiceErr_NoError)
 		{
-			jbyteArray jServiceName = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(serviceName));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jServiceName, 0, (jsize)strlen(serviceName), (const jbyte *) serviceName);
-			jbyteArray jRegType = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(regType));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jRegType, 0, (jsize)strlen(regType), (const jbyte *) regType);
-			jbyteArray jDomain = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(domain));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jDomain, 0, (jsize)strlen(domain), (const jbyte *) domain);
-
-			(*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj, pContext->Callback,
-								pContext->JavaObj, flags,jServiceName, jRegType, jDomain);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jServiceName);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jRegType);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jDomain);
+			jbyteArray jServiceName = (*env)->NewByteArray(env, (jsize)strlen(serviceName));
+			(*env)->SetByteArrayRegion (env, jServiceName, 0, (jsize)strlen(serviceName), (const jbyte *) serviceName);
+			jbyteArray jRegType = (*env)->NewByteArray(env, (jsize)strlen(regType));
+			(*env)->SetByteArrayRegion (env, jRegType, 0, (jsize)strlen(regType), (const jbyte *) regType);
+			jbyteArray jDomain = (*env)->NewByteArray(env, (jsize)strlen(domain));
+			(*env)->SetByteArrayRegion (env, jDomain, 0, (jsize)strlen(domain), (const jbyte *) domain);
+
+			(*env)->CallVoidMethod( env, clientRef, callback,
+								javaObj, flags,jServiceName, jRegType, jDomain);
+			(*env)->DeleteLocalRef( env, jServiceName);
+			(*env)->DeleteLocalRef( env, jRegType);
+			(*env)->DeleteLocalRef( env, jDomain);
 		}
 		else
-			ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+			ReportError( env, clientRef, javaObj, errorCode);
 	}
 	TeardownCallbackState();
 }
@@ -579,9 +623,11 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleRegistration_BeginRegiste
 		pBytes = txtRecord ? (*pEnv)->GetByteArrayElements( pEnv, txtRecord, NULL) : NULL;
 		numBytes = txtRecord ? (*pEnv)->GetArrayLength( pEnv, txtRecord) : 0;
 
+		LOCK_CORE();
 		err = DNSServiceRegister( &pContext->ServiceRef, flags, ifIndex, servStr, regStr,  
 								domainStr, hostStr, portBits,
 								numBytes, pBytes, ServiceRegisterReply, pContext);
+		UNLOCK_CORE();
 		if ( err == kDNSServiceErr_NoError)
 		{
 			(*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
@@ -622,7 +668,9 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleRegistration_AddRecord( J
 	pBytes = (*pEnv)->GetByteArrayElements( pEnv, rData, NULL);
 	numBytes = (*pEnv)->GetArrayLength( pEnv, rData);
 
+	LOCK_CORE();
 	err = DNSServiceAddRecord( pContext->ServiceRef, &recRef, flags, rrType, numBytes, pBytes, ttl);
+	UNLOCK_CORE();
 	if ( err == kDNSServiceErr_NoError)
 	{
 		(*pEnv)->SetLongField(pEnv, destObj, recField, (long) recRef);
@@ -662,7 +710,9 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleDNSRecord_Update( JNIEnv
 	pBytes = (*pEnv)->GetByteArrayElements( pEnv, rData, NULL);
 	numBytes = (*pEnv)->GetArrayLength( pEnv, rData);
 
+	LOCK_CORE();
 	err = DNSServiceUpdateRecord( pContext->ServiceRef, recRef, flags, numBytes, pBytes, ttl);
+	UNLOCK_CORE();
 
 	if ( pBytes != NULL)
 		(*pEnv)->ReleaseByteArrayElements( pEnv, rData, pBytes, 0);
@@ -692,7 +742,9 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleDNSRecord_Remove( JNIEnv
 	if ( pContext == NULL || pContext->ServiceRef == NULL)
 		return kDNSServiceErr_BadParam;
 
+	LOCK_CORE();
 	err = DNSServiceRemoveRecord( pContext->ServiceRef, recRef, 0);
+	UNLOCK_CORE();
 
 	return err;
 }
@@ -712,7 +764,9 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleRecordRegistrar_CreateCon
 
 	if ( pContext != NULL)
 	{
+		LOCK_CORE();
 		err = DNSServiceCreateConnection( &pContext->ServiceRef);
+		UNLOCK_CORE();
 		if ( err == kDNSServiceErr_NoError)
 		{
 			(*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
@@ -740,18 +794,24 @@ static void DNSSD_API	RegisterRecordReply( DNSServiceRef sdRef _UNUSED,
 
 	SetupCallbackState( &pContext->Env);
 
-	if ( pContext->ClientObj != NULL && pContext->Callback != NULL)
+	// Copies: the Java callback may stop this operation, after which pContext is freed.
+	JNIEnv		*env = pContext->Env;
+	jobject		javaObj = pContext->JavaObj;
+	jobject		clientRef = pContext->ClientObj;
+	jmethodID	callback = pContext->Callback;
+
+	if ( clientRef != NULL && callback != NULL)
 	{	
 		if ( errorCode == kDNSServiceErr_NoError)
 		{	
-			(*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj, pContext->Callback, 
+			(*env)->CallVoidMethod( env, clientRef, callback, 
 												regEnvelope->RecordObj, flags);
 		}
 		else
-			ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+			ReportError( env, clientRef, javaObj, errorCode);
 	}
 
-	(*pContext->Env)->DeleteWeakGlobalRef( pContext->Env, regEnvelope->RecordObj);
+	(*env)->DeleteWeakGlobalRef( env, regEnvelope->RecordObj);
 	free( regEnvelope);
 
 	TeardownCallbackState();
@@ -787,9 +847,11 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleRecordRegistrar_RegisterR
 	pBytes = (*pEnv)->GetByteArrayElements( pEnv, rData, NULL);
 	numBytes = (*pEnv)->GetArrayLength( pEnv, rData);
 
+	LOCK_CORE();
 	err = DNSServiceRegisterRecord( pContext->ServiceRef, &recRef, flags, ifIndex, 
 									nameStr, rrType, rrClass, numBytes, pBytes, ttl,
 									RegisterRecordReply, regEnvelope);
+	UNLOCK_CORE();
 
 	if ( err == kDNSServiceErr_NoError)
 	{
@@ -822,25 +884,31 @@ static void DNSSD_API	ServiceQueryReply( DNSServiceRef sdRef _UNUSED, DNSService
 
 	SetupCallbackState( &pContext->Env);
 
-	if ( pContext->ClientObj != NULL && pContext->Callback != NULL && 
-		 NULL != ( rDataObj = (*pContext->Env)->NewByteArray( pContext->Env, rdlen)))
+	// Copies: the Java callback may stop this operation, after which pContext is freed.
+	JNIEnv		*env = pContext->Env;
+	jobject		javaObj = pContext->JavaObj;
+	jobject		clientRef = pContext->ClientObj;
+	jmethodID	callback = pContext->Callback;
+
+	if ( clientRef != NULL && callback != NULL && 
+		 NULL != ( rDataObj = (*env)->NewByteArray( env, rdlen)))
 	{	
 		if ( errorCode == kDNSServiceErr_NoError)
 		{
 			// Initialize rDataObj with contents of rdata
-			pBytes = (*pContext->Env)->GetByteArrayElements( pContext->Env, rDataObj, NULL);
+			pBytes = (*env)->GetByteArrayElements( env, rDataObj, NULL);
 			memcpy( pBytes, rdata, rdlen);
-			(*pContext->Env)->ReleaseByteArrayElements( pContext->Env, rDataObj, pBytes, JNI_COMMIT);
-
-			jbyteArray jServiceName = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(serviceName));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jServiceName, 0, (jsize)strlen(serviceName), (const jbyte *) serviceName);
-			(*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj, pContext->Callback,
-								pContext->JavaObj, flags, interfaceIndex, jServiceName, rrtype, rrclass, rDataObj, ttl);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jServiceName);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, rDataObj);
+			(*env)->ReleaseByteArrayElements( env, rDataObj, pBytes, JNI_COMMIT);
+
+			jbyteArray jServiceName = (*env)->NewByteArray(env, (jsize)strlen(serviceName));
+			(*env)->SetByteArrayRegion (env, jServiceName, 0, (jsize)strlen(serviceName), (const jbyte *) serviceName);
+			(*env)->CallVoidMethod( env, clientRef, callback,
+								javaObj, flags, interfaceIndex, jServiceName, rrtype, rrclass, rDataObj, ttl);
+			(*env)->DeleteLocalRef( env, jServiceName);
+			(*env)->DeleteLocalRef( env, rDataObj);
 		}
 		else
-			ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+			ReportError( env, clientRef, javaObj, errorCode);
 	}
 	TeardownCallbackState();
 }
@@ -863,8 +931,10 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleQuery_CreateQuery( JNIEnv
 	{
 		const char	*servStr = SafeGetUTFChars( pEnv, serviceName);
 
+		LOCK_CORE();
 		err = DNSServiceQueryRecord( &pContext->ServiceRef, flags, ifIndex, servStr,
 									rrtype, rrclass, ServiceQueryReply, pContext);
+		UNLOCK_CORE();
 		if ( err == kDNSServiceErr_NoError)
 		{
 			(*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
@@ -886,19 +956,26 @@ static void DNSSD_API	DomainEnumReply( DNSServiceRef sdRef _UNUSED, DNSServiceFl
 
 	SetupCallbackState( &pContext->Env);
 
-	if ( pContext->ClientObj != NULL && pContext->Callback != NULL)
+	// Copies: the Java callback may stop this operation, after which pContext is freed.
+	JNIEnv		*env = pContext->Env;
+	jobject		javaObj = pContext->JavaObj;
+	jobject		clientRef = pContext->ClientObj;
+	jmethodID	callback = pContext->Callback;
+	jmethodID	callback2 = pContext->Callback2;
+
+	if ( clientRef != NULL && callback != NULL)
 	{
 		if ( errorCode == kDNSServiceErr_NoError)
 		{
-			jbyteArray jReplyDomain = (*pContext->Env)->NewByteArray(pContext->Env, (jsize)strlen(replyDomain));
-			(*pContext->Env)->SetByteArrayRegion (pContext->Env, jReplyDomain, 0, (jsize)strlen(replyDomain), (const jbyte *) replyDomain);
-			(*pContext->Env)->CallVoidMethod( pContext->Env, pContext->ClientObj,
-								( flags & kDNSServiceFlagsAdd) != 0 ? pContext->Callback : pContext->Callback2,
-								pContext->JavaObj, flags, interfaceIndex, jReplyDomain);
-			(*pContext->Env)->DeleteLocalRef( pContext->Env, jReplyDomain);
+			jbyteArray jReplyDomain = (*env)->NewByteArray(env, (jsize)strlen(replyDomain));
+			(*env)->SetByteArrayRegion (env, jReplyDomain, 0, (jsize)strlen(replyDomain), (const jbyte *) replyDomain);
+			(*env)->CallVoidMethod( env, clientRef,
+								( flags & kDNSServiceFlagsAdd) != 0 ? callback : callback2,
+								javaObj, flags, interfaceIndex, jReplyDomain);
+			(*env)->DeleteLocalRef( env, jReplyDomain);
 		}
 		else
-			ReportError( pContext->Env, pContext->ClientObj, pContext->JavaObj, errorCode);
+			ReportError( env, clientRef, javaObj, errorCode);
 	}
 	TeardownCallbackState();
 }
@@ -923,8 +1000,10 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleDomainEnum_BeginEnum( JNI
 								(*pEnv)->GetObjectClass( pEnv, pContext->ClientObj),
 								"domainLost", "(Lcom/github/druk/dnssd/DNSSDService;II[B)V");
 
+		LOCK_CORE();
 		err = DNSServiceEnumerateDomains( &pContext->ServiceRef, flags, ifIndex,
 											DomainEnumReply, pContext);
+		UNLOCK_CORE();
 		if ( err == kDNSServiceErr_NoError)
 		{
 			(*pEnv)->SetLongField(pEnv, pThis, contextField, (long) pContext);
@@ -973,7 +1052,9 @@ JNIEXPORT jint JNICALL Java_com_github_druk_dnssd_AppleDNSSD_ReconfirmRecord( JN
 	pBytes = (*pEnv)->GetByteArrayElements( pEnv, rdata, NULL);
 	numBytes = (*pEnv)->GetArrayLength( pEnv, rdata);
 
+	LOCK_CORE();
 	err = DNSServiceReconfirmRecord( flags, ifIndex, nameStr, rrtype, rrclass, numBytes, pBytes);
+	UNLOCK_CORE();
 
 	if ( pBytes != NULL)
 		(*pEnv)->ReleaseByteArrayElements( pEnv, rdata, pBytes, 0);

package/android/src/main/jni/mdnsresponder/mDNSPosix/PosixDaemon.c

@@ -51,6 +51,7 @@ extern int daemon(int, int);
 
 #include "mDNSEmbeddedAPI.h"
 #include "mDNSPosix.h"
+#include "DNSCommon.h"				// mDNS_Lock / mDNS_Unlock, for Reconfigure()
 #include "mDNSUNP.h"		// For daemon()
 #include "uds_daemon.h"
 #include "PlatformCommon.h"
@@ -67,7 +68,7 @@ static domainname DynDNSHostname;
 static CacheEntity gRRCache[RR_CACHE_SIZE];
 static mDNS_PlatformSupport PlatformStorage;
 
-int stopNow = 0;
+volatile sig_atomic_t stopNow = 0;	// Set from another thread by stopLoop()
 
 mDNSlocal void mDNS_StatusCallback(mDNS *const m, mStatus result)
 	{
@@ -101,8 +102,10 @@ static void Reconfigure(mDNS *m)
 	mDNSAddr DynDNSIP;
 	const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 1, 1, 1, 1 } } } };;
 	mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL);
+	mDNS_Lock(m);	// mDNS_AddDNSServer() expects the lock to be held
 	if (ParseDNSServers(m, uDNS_SERVERS_FILE) < 0)
 		LogMsg("Unable to parse DNS server list. Unicast DNS-SD unavailable");
+	mDNS_Unlock(m);
 	ReadDDNSSettingsFromConfFile(m, CONFIG_FILE, &DynDNSHostname, &DynDNSZone, NULL);
 	mDNSPlatformSourceAddrForDest(&DynDNSIP, &dummy);
 	if (DynDNSHostname.c[0]) mDNS_AddDynDNSHostName(m, &DynDNSHostname, NULL, NULL);
@@ -263,7 +266,9 @@ int loop(){
 	mStatus					err;
 	Reconfigure(&mDNSStorage);
 
+	mDNSPosixEmbeddedLoopStarting();
 	err = MainLoop(&mDNSStorage);
+	mDNSPosixEmbeddedLoopStopping();
  
 	LogMsg("%s stopping", mDNSResponderVersionString);
 
@@ -279,6 +284,19 @@ int loop(){
 void stopLoop()
 {
 	stopNow = 1;
+	mDNSPosixEmbeddedWakeLoop();	// It may be sleeping in select() until its next timer
+}
+
+// For JNISupport.c: hold the core lock around work on an operation's data structures
+// that must not interleave with the event loop thread (callbacks run on that thread).
+void lockCore()
+{
+	mDNSPlatformLock(&mDNSStorage);
+}
+
+void unlockCore()
+{
+	mDNSPlatformUnlock(&mDNSStorage);
 }
 #endif
 

package/android/src/main/jni/mdnsresponder/mDNSPosix/mDNSPosix.c

@@ -505,7 +505,7 @@ mDNSexport int ParseDNSServers(mDNS *m, const char *filePath)
 	{
 	char line[256];
 	char nameserver[16];
-	char keyword[10];
+	char keyword[11];	// "%10s" writes up to 10 characters and the terminator
 	int  numOfServers = 0;
 	FILE *fp = fopen(filePath, "r");
 	if (fp == NULL) return -1;
@@ -1333,6 +1333,107 @@ mDNSexport mStatus mDNSPlatformPosixRefreshInterfaceList(mDNS *const m)
 #pragma mark ***** Locking
 #endif
 
+#ifdef EMBEDDED
+
+// The embedded build enters mDNS core from several threads: the DNS-SDEmbedded thread
+// runs mDNS_Execute() and delivers the callbacks, while the DNSService* calls, and in
+// particular DNSServiceRefDeallocate(), arrive on whatever thread the client uses.
+// mDNS core relies on mDNSPlatformLock() for mutual exclusion between those, so here it
+// is a real lock. It is recursive because the core holds it while it calls back into the
+// client, and the client may call back into the core from there (see mDNS_DropLockBeforeCallback).
+
+#include <pthread.h>
+
+static pthread_mutex_t gCoreLock;
+static pthread_once_t  gCoreLockOnce = PTHREAD_ONCE_INIT;
+
+// The event loop sleeps in select() until the core's next scheduled event. A DNSService* call
+// from another thread changes that schedule (a new question has to be answered now), so when
+// such a call releases the lock, the loop is woken through a pipe it listens to. Otherwise the
+// call would wait for the next timer or the next packet from the network.
+// The pipe is created together with the lock and lives as long as the process, so that the
+// write in mDNSPlatformUnlock() can never hit a descriptor another thread has closed and reused.
+static pthread_t gLoopThread;
+static int       gLoopThreadSet = 0;
+static int       gWakePipe[2]   = { -1, -1 };
+
+static void WakeCallback(int fd, short filter, void *context)
+	{
+	char buffer[64];
+	(void) filter;	// Unused
+	(void) context;	// Unused
+	while (read(fd, buffer, sizeof(buffer)) > 0) { }
+	}
+
+static void InitCoreLockAndWakePipe(void)
+	{
+	pthread_mutexattr_t attr;
+	pthread_mutexattr_init(&attr);
+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+	pthread_mutex_init(&gCoreLock, &attr);
+	pthread_mutexattr_destroy(&attr);
+	if (pipe(gWakePipe) == 0)
+		{
+		fcntl(gWakePipe[0], F_SETFL, fcntl(gWakePipe[0], F_GETFL, 0) | O_NONBLOCK);
+		fcntl(gWakePipe[1], F_SETFL, fcntl(gWakePipe[1], F_GETFL, 0) | O_NONBLOCK);
+		}
+	else
+		{
+		gWakePipe[0] = gWakePipe[1] = -1;
+		LogMsg("mDNSPosix: pipe() failed (%d), other threads will not wake the event loop", errno);
+		}
+	}
+
+mDNSexport void mDNSPosixEmbeddedLoopStarting(void)
+	{
+	mDNSPlatformLock(mDNSNULL);
+	gLoopThread = pthread_self();
+	gLoopThreadSet = 1;
+	if (gWakePipe[0] >= 0)
+		{
+		mStatus err = mDNSPosixAddFDToEventLoop(gWakePipe[0], WakeCallback, mDNSNULL);
+		if (err) LogMsg("mDNSPosix: cannot listen to the wake-up pipe (%d), other threads will not wake the event loop", err);
+		}
+	mDNSPlatformUnlock(mDNSNULL);
+	}
+
+mDNSexport void mDNSPosixEmbeddedLoopStopping(void)
+	{
+	mDNSPlatformLock(mDNSNULL);
+	if (gWakePipe[0] >= 0)
+		{
+		mDNSPosixRemoveFDFromEventLoop(gWakePipe[0]);
+		WakeCallback(gWakePipe[0], 0, mDNSNULL);	// Drain, for the next loop
+		}
+	gLoopThreadSet = 0;
+	mDNSPlatformUnlock(mDNSNULL);
+	}
+
+mDNSexport void mDNSPosixEmbeddedWakeLoop(void)
+	{
+	if (gWakePipe[1] >= 0)
+		{
+		if (write(gWakePipe[1], "", 1) < 0) { }	// A full pipe means the loop is about to wake anyway
+		}
+	}
+
+mDNSexport void    mDNSPlatformLock   (const mDNS *const m)
+	{
+	(void) m;	// Unused
+	pthread_once(&gCoreLockOnce, InitCoreLockAndWakePipe);
+	pthread_mutex_lock(&gCoreLock);
+	}
+
+mDNSexport void    mDNSPlatformUnlock (const mDNS *const m)
+	{
+	(void) m;	// Unused
+	int fromLoopThread = gLoopThreadSet && pthread_equal(pthread_self(), gLoopThread);
+	pthread_mutex_unlock(&gCoreLock);
+	if (!fromLoopThread) mDNSPosixEmbeddedWakeLoop();
+	}
+
+#else
+
 // On the Posix platform, locking is a no-op because we only ever enter
 // mDNS core on the main thread.
 
@@ -1350,6 +1451,8 @@ mDNSexport void    mDNSPlatformUnlock (const mDNS *const m)
 	(void) m;	// Unused
 	}
 
+#endif // EMBEDDED
+
 #if COMPILER_LIKES_PRAGMA_MARK
 #pragma mark ***** Strings
 #endif

package/android/src/main/jni/mdnsresponder/mDNSPosix/mDNSPosix.h

@@ -81,6 +81,13 @@ extern mStatus mDNSPosixListenForSignalInEventLoop( int signum);
 extern mStatus mDNSPosixIgnoreSignalInEventLoop( int signum);
 extern mStatus mDNSPosixRunEventLoopOnce( mDNS *m, const struct timeval *pTimeout, sigset_t *pSignalsReceived, mDNSBool *pDataDispatched);
 
+#ifdef EMBEDDED
+// The embedded build is driven from several threads, see the locking section of mDNSPosix.c.
+extern void mDNSPosixEmbeddedLoopStarting(void);	// Call on the event loop thread, before running the loop
+extern void mDNSPosixEmbeddedLoopStopping(void);	// Call on the event loop thread, after the loop returned
+extern void mDNSPosixEmbeddedWakeLoop(void);		// Make the loop re-read the schedule and stop flags
+#endif
+
 #ifdef  __cplusplus
     }
 #endif

package/android/src/main/jni/mdnsresponder/mDNSShared/dnssd_clientshim.c

@@ -701,10 +701,10 @@ DNSServiceErrorType DNSServiceQueryRecord
 	x->callback  = callback;
 	x->context   = context;
 
-	x->q.ThisQInterval       = -1;		// So that DNSServiceResolveDispose() knows whether to cancel this question
+	x->q.ThisQInterval       = -1;		// So that DNSServiceQueryRecordDispose() knows whether to cancel this question
 	x->q.InterfaceID         = mDNSPlatformInterfaceIDfromInterfaceIndex(&mDNSStorage, interfaceIndex);
 	x->q.Target              = zeroAddr;
-	MakeDomainNameFromDNSNameString(&x->q.qname, fullname);
+	if (!MakeDomainNameFromDNSNameString(&x->q.qname, fullname)) { mDNSPlatformMemFree(x); err = mStatus_BadParamErr; errormsg = "MakeDomainNameFromDNSNameString"; goto fail; }
 	x->q.qtype               = rrtype;
 	x->q.qclass              = rrclass;
 	x->q.LongLived           = (flags & kDNSServiceFlagsLongLivedQuery) != 0;
@@ -721,7 +721,7 @@ DNSServiceErrorType DNSServiceQueryRecord
 	x->q.QuestionContext     = x;
 
 	err = mDNS_StartQuery(&mDNSStorage, &x->q);
-	if (err) { DNSServiceResolveDispose((mDNS_DirectOP*)x); errormsg = "mDNS_StartQuery"; goto fail; }
+	if (err) { DNSServiceQueryRecordDispose((mDNS_DirectOP*)x); errormsg = "mDNS_StartQuery"; goto fail; }
 
 	// Succeeded: Wrap up and return
 	*sdRef = (DNSServiceRef)x;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-zeroconf",
-  "version": "0.17.1",
+  "version": "0.17.3",
   "description": "A Zeroconf discovery utility for react-native",
   "main": "dist",
   "types": "index.d.ts",
@@ -57,6 +57,7 @@
     "!android/src/main/jni/mdnsresponder/mDNSShared/mDNSResponder.8",
     "!android/build",
     "!android/.gradle",
+    "!android/src/androidTest",
     "windows",
     "!windows/**/*.user",
     "!windows/**/obj",