Made advertised configuration index configurable

Author: andylintner

src/main/java/com/beowulfe/hap/HomekitRoot.java

@@ -32,6 +32,7 @@ public class HomekitRoot {
 	private final HomekitRegistry registry;
 	private final SubscriptionManager subscriptions = new SubscriptionManager();
 	private boolean started = false;
+	private int configurationIndex = 1;
 
 	HomekitRoot(String label, HomekitWebHandler webHandler, InetAddress localhost, 
 			HomekitAuthInfo authInfo) throws IOException {
@@ -101,7 +102,7 @@ public void start() {
 				registry, subscriptions, advertiser)).thenAccept(port -> {
 					try {
 						refreshAuthInfo();
-						advertiser.advertise(label, authInfo.getMac(), port);
+						advertiser.advertise(label, authInfo.getMac(), port, configurationIndex);
 					} catch (Exception e) {
 						throw new RuntimeException(e);
 					}
@@ -120,7 +121,7 @@ public void stop() {
 	/**
 	 * Refreshes auth info after it has been changed outside this library
 	 * 
-	 * @throws IOException if the info cannot be read
+	 * @throws IOException if there is an error in the underlying protocol, such as a TCP error
 	 */
 	public void refreshAuthInfo() throws IOException {
 		advertiser.setDiscoverable(!authInfo.hasUser());
@@ -136,6 +137,27 @@ public void allowUnauthenticatedRequests(boolean allow) {
 		registry.setAllowUnauthenticatedRequests(allow);
 	}
 
+	
+	/**
+	 * By default, the bridge advertises itself at revision 1. If you make changes to the accessories you're
+	 * including in the bridge after your first call to {@link start()}, you should increment this number. The 
+	 * behavior of the client if the configuration index were to decrement is undefined, so this implementation will
+	 * not manage the configuration index by automatically incrementing - preserving this state across invocations should
+	 * be handled externally.
+	 * 
+	 * @param revision an integer, greater than or equal to one, indicating the revision of the accessory information
+	 * @throws IOException if there is an error in the underlying protocol, such as a TCP error
+	 */
+	public void setConfigurationIndex(int revision) throws IOException {
+		if (revision < 1) {
+			throw new IllegalArgumentException("revision must be greater than or equal to 1");
+		}
+		this.configurationIndex = revision;
+		if (this.started) {
+			advertiser.setConfigurationIndex(revision);
+		}
+	}
+	
 	HomekitRegistry getRegistry() {
 		return registry;
 	}

src/main/java/com/beowulfe/hap/impl/jmdns/JmdnsHomekitAdvertiser.java

@@ -24,18 +24,20 @@ public class JmdnsHomekitAdvertiser {
 	private String label;
 	private String mac;
 	private int port;
+	private int configurationIndex;
 
 	public JmdnsHomekitAdvertiser(InetAddress localAddress) throws UnknownHostException, IOException {
 		jmdns = JmDNS.create(localAddress);
 	}
 
-	public synchronized void advertise(String label, String mac, int port) throws Exception {
+	public synchronized void advertise(String label, String mac, int port, int configurationIndex) throws Exception {
 		if (isAdvertising) {
 			throw new IllegalStateException("Homekit advertiser is already running");
 		}
 		this.label = label;
 		this.mac = mac;
 		this.port = port;
+		this.configurationIndex = configurationIndex;
 
 		logger.info("Advertising accessory "+label);
 
@@ -48,11 +50,11 @@ public synchronized void advertise(String label, String mac, int port) throws Ex
 		isAdvertising = true;
 	}
 
-	public void stop() {
+	public synchronized void stop() {
 		jmdns.unregisterAllServices();
 	}
 
-	public void setDiscoverable(boolean discoverable) throws IOException {
+	public synchronized void setDiscoverable(boolean discoverable) throws IOException {
 		if (this.discoverable != discoverable) {
 			this.discoverable = discoverable;
 			if (isAdvertising) {
@@ -63,13 +65,24 @@ public void setDiscoverable(boolean discoverable) throws IOException {
 		}
 	}
 
+	public synchronized void setConfigurationIndex(int revision) throws IOException {
+		if (this.configurationIndex != revision) {
+			this.configurationIndex = revision;
+			if (isAdvertising) {
+				logger.info("Re-creating service due to change in configuration index to "+revision);
+				jmdns.unregisterAllServices();
+				registerService();
+			}
+		}
+	}
+	
 	private void registerService() throws IOException {
 		logger.info("Registering "+SERVICE_TYPE+" on port "+port);
 		Map<String, String> props = new HashMap<>();
 		props.put("sf", discoverable ? "1" : "0");
 		props.put("id", mac);
 		props.put("md", label);
-		props.put("c#", "1");
+		props.put("c#", Integer.toString(configurationIndex));
 		props.put("s#", "1");
 		props.put("ff", "0");
 		props.put("ci", "1");

src/test/java/com/beowulfe/hap/HomekitRootTest.java

@@ -65,7 +65,7 @@ public void testAdvertiserStarts() throws Exception {
 		String mac = "00:00:00:00:00:00";
 		when(authInfo.getMac()).thenReturn(mac);
 		root.start();
-		verify(advertiser).advertise(eq(LABEL), eq(mac), eq(PORT));
+		verify(advertiser).advertise(eq(LABEL), eq(mac), eq(PORT), eq(1));
 	}
 
 	@Test