libunbound resolver: changing preferences no longer needs a restart

Author: lieser

Diff for: CHANGELOG.txt

@@ -5,6 +5,7 @@
  - Authentication-Results header: continue verification if there is no DKIM result in the ARH header
  - Authentication-Results header: fixed bug if ARH header exists, but no message authentication was done
  - libunbound resolver: no longer blocks the UI of Thunderbird
+ - libunbound resolver: changing preferences no longer needs a restart
 
 1.3.6 [2015-09-13]
 ------------------

Diff for: modules/libunbound.jsm

@@ -4,7 +4,7 @@
  * Wrapper for the libunbound DNS library. The actual work is done in the
  * ChromeWorker libunboundWorker.jsm.
  *
- * Version: 2.0.0pre1 (22 January 2016)
+ * Version: 2.0.0pre2 (22 January 2016)
  * 
  * Copyright (c) 2013-2016 Philippe Lieser
  * 
@@ -188,6 +188,21 @@ let libunbound = {
 function init() {
 	"use strict";
 
+	load();
+	update_ctx();
+
+	// Register to receive notifications of preference changes
+	prefs.addObserver("", prefObserver, false);
+
+	log.debug("initialized");
+}
+
+/**
+ * load library
+ */
+function load() {
+	"use strict";
+
 	let path;
 	if (prefs.getBoolPref("libunbound.path.relToProfileDir")) {
 		path = OS.Path.join(OS.Constants.Path.profileDir,
@@ -201,10 +216,6 @@ function init() {
 		method: "load",
 		path: path,
 	});
-
-	update_ctx();
-
-	log.debug("initialized");
 }
 
 /**
@@ -314,6 +325,37 @@ libunboundWorker.onmessage = function(msg) {
 	}
 };
 
+var prefObserver = {
+	/*
+	 * gets called called whenever an event occurs on the preference
+	 */
+	observe: function Verifier_observe(subject, topic, data) {
+		"use strict";
+
+		// subject is the nsIPrefBranch we're observing (after appropriate QI)
+		// data is the name of the pref that's been changed (relative to aSubject)
+
+		if (topic !== "nsPref:changed") {
+			return;
+		}
+
+		switch(data) {
+			case "libunbound.path.relToProfileDir":
+			case "libunbound.path":
+				load();
+				update_ctx();
+				break;
+			case "libunbound.conf":
+			case "libunbound.debuglevel":
+			case "getNameserversFromOS":
+			case "nameserver":
+			case "dnssec.trustAnchor":
+				update_ctx();
+				break;
+		}
+	},
+};
+
 libunbound.Constants = Constants;
 
 init();

Diff for: modules/libunboundWorker.jsm

@@ -4,7 +4,7 @@
  * A ChromeWorker wrapper for the libunbound DNS library.
  * Currently only the TXT resource record is completely supported.
  *
- * Version: 1.0.0pre1 (22 January 2016)
+ * Version: 1.0.0pre2 (22 January 2016)
  * 
  * Copyright (c) 2016 Philippe Lieser
  * 
@@ -249,6 +249,15 @@ function resolve(name, rrtype=Constants.RR_TYPE_A) {
 function load(path) {
 	"use strict";
 
+	// if library was already loaded, do a cleanup first before reloading it
+	if (lib) {
+		// delete old context
+		ub_ctx_delete(ctx);
+		ctx = ctypes.voidptr_t();
+		// close library
+		lib.close();
+		lib = null;
+	}
 	lib = ctypes.open(path);
 
 	ub_ctx = new ctypes.StructType("ub_ctx");