Working DNS discovery (no longer 2nd class)

Author: lloydwatkin

pom.xml

@@ -11,9 +11,9 @@
     </scm>
     <dependencies>
         <dependency>
-	    <groupId>dnsjava</groupId>
+	    <groupId>org.xbill</groupId>
 	    <artifactId>dnsjava</artifactId>
-	    <version>2.1.1</version>
+	    <version>2.1.6</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -75,7 +75,7 @@
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>
             <version>1.3</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>xpp3</groupId>
             <artifactId>xpp3</artifactId>

repo/org/xbill/dnsjava/2.1.6/dnsjava-2.1.6.jar

@@ -60,7 +60,7 @@ public void process(IQ packet) throws Exception {
 		try {
 			processPacket(packet);
 		} catch (Exception e) {
-			if (true == packet.getType().toString().equals("result")) return;
+			if (packet.getType().equals(IQ.Type.result) || packet.getType().equals(IQ.Type.error)) return;
 			IQ reply = IQ.createResultIQ(packet);
 			reply.setChildElement(packet.getChildElement().createCopy());
 			reply.setType(Type.error);
@@ -101,7 +101,7 @@ private void processPacket(IQ packet) throws Exception,
 		}
 		logger.debug("Couldn't find processor for packet");
 
-		if (packet.getType() == IQ.Type.set || packet.getType() == IQ.Type.get) {
+		if (packet.getType().equals(IQ.Type.set) || packet.getType().equals(IQ.Type.get)) {
 
 			IQ reply = IQ.createResultIQ(packet);
 			reply.setChildElement(packet.getChildElement().createCopy());

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/IQProcessor.java

@@ -108,6 +108,7 @@ public void process(Packet packet) throws ComponentException {
 			waitingStanzas.get(to).add(packet);
 			logger.debug("Adding packet to waiting stanza list for " + to
 					+ " (size " + waitingStanzas.get(to).size() + ")");
+            attemptDnsDiscovery(to);
 		} catch (Exception e) {
 			logger.error(e);
 		}
@@ -209,12 +210,11 @@ public void processDiscoInfoResponse(JID from, String id,
 
 		if (remoteServerItemsToProcess.get(originatingServer) < 1) {
 			if (!discoveredServers.containsKey(originatingServer)) {
-                if (false == attemptDnsDiscovery(originatingServer)) {
-                    sendRemoteChannelServerNotFoundErrorResponses(originatingServer);
-                    remoteChannelDiscoveryStatus.put(originatingServer,
-                            NO_CHANNEL_SERVER);
-                    waitingStanzas.remove(originatingServer);
-                }
+
+                sendRemoteChannelServerNotFoundErrorResponses(originatingServer);
+                remoteChannelDiscoveryStatus.put(originatingServer,
+                        NO_CHANNEL_SERVER);
+                waitingStanzas.remove(originatingServer);
 			} else {
 				remoteChannelDiscoveryStatus.put(originatingServer, DISCOVERED);
 			}
@@ -226,14 +226,16 @@ private boolean attemptDnsDiscovery(String originatingServer) throws ComponentEx
             String query = SRV_PREFIX + originatingServer;
             Record[] records = new Lookup(query, Type.SRV).run();
             if ((null == records) || (0 == records.length)) {
+                logger.debug("No appropriate DNS entry found for " + originatingServer);
                 return false;
             }
             SRVRecord record = (SRVRecord) records[0];
-            setDiscoveredServer(originatingServer, record.getTarget().toString());
-            sendFederatedRequests(originatingServer);
-            logger.info("Used DNS fallback to discover buddycloud server for "
-                + originatingServer + " (" + record.getTarget().toString() + ")");
+            String targetServer = record.getTarget().toString(true);
+            setDiscoveredServer(originatingServer, targetServer);
+            logger.info("DNS discovery complete for buddycloud server @ "
+                + originatingServer + " (" + targetServer + ")");
             remoteChannelDiscoveryStatus.put(originatingServer, DISCOVERED);
+            sendFederatedRequests(originatingServer);
             return true;
         } catch (TextParseException e) {
             logger.error(e);
@@ -246,10 +248,13 @@ private void sendFederatedRequests(String originatingServer)
 		String remoteServer = discoveredServers.get(originatingServer);
 		List<Packet> packetsToSend = waitingStanzas.get(originatingServer);
 		if (packetsToSend == null) {
+            logger.trace("No queued federated packets to send");
 			return;
 		}
+        logger.debug("Catching up on federated packet sending");
 		for (Packet packet : packetsToSend) {
 			packet.setTo(remoteServer);
+            logger.trace(packet.toString());
 			sendPacket(packet.createCopy());
 		}
 		waitingStanzas.remove(originatingServer);
@@ -290,6 +295,10 @@ public void passResponseToRequester(IQ packet) throws Exception {
 							+ packet.getID() + ")");
 		}
 
+        if (packet.getType().equals(IQ.Type.error) && !remoteChannelDiscoveryStatus.get(packet.getFrom()).equals(DISCOVERED)) {
+            return;
+        }
+
 		String uniqueId = packet.getID();
 		packet.setID(idMap.get(uniqueId));
 		packet.setTo((JID) sentRemotePackets.get(uniqueId));