Changeset 567

Timestamp:

11/09/09 11:07:04 (4 years ago)

Author:

jonmaycock

Message:

New lookup structure.

Location:

apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry/lookup

Files:

• LookupResult.java (modified) (4 diffs)
• LookupTelname.java (modified) (19 diffs)
• LookupWorker.java (modified) (9 diffs)

apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry/lookup/LookupResult.java

@@ -32 +32 @@
  *
  * @author Ben Dowling, Jonathan Maycock
- * @version $Id: LookupResult.java,v 1.12 2009/03/05 11:41:48 jm2 Exp $
+ * @version $Id: LookupResult.java,v 1.13 2009/11/06 11:54:52 jm2 Exp $
  */
 public class LookupResult implements Persistable
@@ -72 +72 @@
     private Vector locRecords;
     
-    /**
-     * The nInfo records.
-     */
-    private Vector nInfoRecords;
-
     // stores the time (in seconds) that this record was last updated
     /**
@@ -159 +154 @@
         return locRecords;
     }
-
-
-    /**
-     * Sets the nInfo records.
-     *
-     * @param nInfoRecords the nInfoRecords
-     */
-    public synchronized void setNInfoRecords (final Vector nInfoRecords)
-    {
-        this.nInfoRecords = nInfoRecords;
-
-        updated = System.currentTimeMillis() / THOUSAND;
-
-        setMinTtl( this.nInfoRecords );
-    }
     
-    /**
-     * Gets the NINFO records.
-     *
-     * @return the ninfo records
-     */
-    public synchronized Vector getNInfoRecords ()
-    {
-        return nInfoRecords;
-    }
-
-
     /**
      * Sets the loc records.
@@ -233 +202 @@
     public long validFor ()
     {
-        if (txtRecords == null && naptrRecords == null && locRecords == null && nInfoRecords == null)
+        if (txtRecords == null && naptrRecords == null && locRecords == null)
         {
             ttl = 0;
         }
-        else if (txtRecords.isEmpty() && naptrRecords.isEmpty() && locRecords.isEmpty() && nInfoRecords.isEmpty())
+        else if (txtRecords.isEmpty() && naptrRecords.isEmpty() && locRecords.isEmpty())
         {
             ttl = 0;

apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry/lookup/LookupTelname.java

@@ -27 +27 @@
 import org.telnic.blackberry.TelnameApp;
 import org.telnic.blackberry.dns.DNS;
+import org.telnic.blackberry.dns.DNSTxtDDSResourceRecord;
+import org.telnic.blackberry.dns.DNSTxtHeaderResourceRecord;
+import org.telnic.blackberry.dns.DNSTxtKeywordResourceRecord;
+import org.telnic.blackberry.dns.DNSTxtLongLabelResourceRecord;
+import org.telnic.blackberry.dns.DNSTxtPDDXResourceRecord;
 import org.telnic.blackberry.dns.LookupCompleteActionListener;
 import org.telnic.blackberry.dns.LookupWorkerCompletedListener;
@@ -38 +43 @@
  *
  * @author Ben Dowling, Jonathan Maycock
- * @version $Id: LookupTelname.java,v 1.21 2009/01/29 16:47:04 jm2 Exp $
+ * @version $Id: LookupTelname.java,v 1.22 2009/11/06 11:55:17 jm2 Exp $
  */
 public class LookupTelname implements LookupWorkerCompletedListener, Cancellable
@@ -72 +77 @@
      */
     public static final int STATUS_TIMEOUT = 5;
-
-    /**
-     * The telname.
-     */
-    private String telname;
-
-    /**
-     * The top level telname for LOC/TXT.
-     */
-    private String telnameTop;
+    
+    /**
+     * The Keyword Prefix.
+     */
+    public static final String KEYWORD_PREFIX = "_kw";
+
+    /**
+     * The private domain..
+     */
+    private String privateDomain;
+
+    /**
+     * The public domain.
+     */
+    private String publicDomain;
 
     /**
@@ -133 +143 @@
     private int type = 0;
     
+    /**
+     * The version of the domain being looked up.
+     */
+    private boolean isVersionOne = false;
+    
+    /**
+     * The availability of keywords for this domain.
+     */
+    private boolean keywordsAvailable = false;
+    
+    /**
+     * The private availability for this domain.
+     */
+    private boolean privateDataAvailable = false;
 
     /**
@@ -144 +168 @@
     private int parentStatus;
     
-    private boolean naptrDone = false;
-    private boolean txtDone = false;
-    private boolean locDone = false;
-    private boolean nInfoDone = false;
+    /**
+     * Boolean indicating whether this is a version lookup.
+     */
+    private boolean versionLookup = false;
 
     ConnectionManager cm;
@@ -168 +192 @@
         completeListener = l;
     }
-
+    
+    /**
+     * Perform a lookup for a version check.
+     * 
+     * @param telnameVal the version domain.
+     */
+    public void performVersionLookup (final String telnameVal)
+    {
+        this.versionLookup = true;
+        performLookup( telnameVal );
+    }
+    
+    /**
+     * Perform a lookup of a public domain.
+     * 
+     * @param telnameVal the public domain.
+     */
+    public void performLookup (final String telnameVal)
+    {
+        performLookup( telnameVal, telnameVal );
+    }
 
     /**
@@ -174 +218 @@
      *
      * @param telnameVal the telnameVal
-     */
-    public void performLookup (final String telnameVal)
+     * @param telnameTopVal the top level domain
+     */
+    public void performLookup (final String telnameVal, final String telnameTopVal)
     {
         Logger.logMessage( "Performing lookup of " + telnameVal, Options.KEY_LOG_APPLICATION );
@@ -183 +228 @@
             return;
         }
-        
-        naptrDone = false;
-        txtDone = false;
-        locDone = false;
-        nInfoDone = false;
-
-        this.telname = telnameVal;
-        this.telnameTop = telnameVal;
+
+        this.privateDomain = telnameVal;
+        this.publicDomain = telnameTopVal;
 
         cancelled = false;
@@ -212 +252 @@
             UiApplication.getUiApplication().invokeLater( new Runnable()
             {
+
                 public void run ()
                 {
@@ -230 +271 @@
                     lookupResult = new LookupResult( telnameVal );
                     cm = TelnameApp.getDnsConnectionManager();
-                    performNaptrLookup( telnameVal );                    
-                }
-            } );
-        }
-        // if we don't have network coverage return the
-        // cachedResult which could be expired or null
-        else if (!cancelled)
-        {
-            Logger.logMessage( "No network - returning cache", Options.KEY_LOG_NETWORK );
-            // there is no cached result - but no network coverage
-            // either so no point trying to do a lookup
-
-            status = LookupTelname.STATUS_NO_NETWORK;
-
-            UiApplication.getUiApplication().invokeLater( new Runnable()
-            {
-                public void run ()
-                {                    
-                    completeListener.lookupTelnameComplete( cachedResult );
-                }
-            } );
-        }
-    }
-
-    /**
-     * Perform lookup.
-     *
-     * @param telnameVal the telnameVal
-     * @param telnameTopVal the top level domain
-     */
-    public void performLookup (final String telnameVal, final String telnameTopVal)
-    {
-        Logger.logMessage( "Performing lookup of " + telnameVal, Options.KEY_LOG_APPLICATION );
-        if (completeListener == null)
-        {
-            // no point doing any work if nobody wants to know the result!
-            return;
-        }
-
-        this.telname = telnameVal;
-        this.telnameTop = telnameTopVal;
-
-        cancelled = false;
-
-        // check if we have sufficient network coverage to open a connection
-        final boolean hasCoverage = (RadioInfo.getState() == RadioInfo.STATE_ON)
-            && (RadioInfo.getSignalLevel() != RadioInfo.LEVEL_NO_COVERAGE);
-
-        // check the cache for lookup results
-        if (!cancelled)
-        {
-            Logger.logMessage( "Checking for cached result: " + LookupResultDataStore.numResults(),
-                Options.KEY_LOG_APPLICATION );
-            cachedResult = LookupResultDataStore.getLookupResult( telnameVal );
-        }
-
-        // if we have a valid cache result return it
-        if (!cancelled && cachedResult != null && cachedResult.isValid())
-        {
-            Logger.logMessage( "Valid cached result found", Options.KEY_LOG_APPLICATION );
-            UiApplication.getUiApplication().invokeLater( new Runnable()
-            {
-
-                public void run ()
-                {
-                    Logger.logMessage( "Returning Cached Result", Options.KEY_LOG_APPLICATION );                    
-                    completeListener.lookupTelnameComplete( cachedResult );
-                }
-            } );
-        }
-        // otherwise try and lookup a new result
-        else if (!cancelled && hasCoverage)
-        {
-            Logger.logMessage( "Trying lookup", Options.KEY_LOG_APPLICATION );
-
-            UiApplication.getUiApplication().invokeLater( new Runnable()
-            {
-                public void run ()
-                {
-                    lookupResult = new LookupResult( telnameVal );
-                    cm = TelnameApp.getDnsConnectionManager();
-                    performNaptrLookup( telname );
+                    
+                    //lookup public tst domain first, to retrieve .tsm and check version
+                    performTxtLookup( publicDomain );
                 }
             } );
@@ -506 +468 @@
      *      java.util.Vector)
      */
-    public void lookupWorkerCompleted (final int statusVal, final int type, final Vector answers)
-    {
+    public void lookupWorkerCompleted (final int statusVal, final int type, final Vector answers, String domain)
+    {        
         Logger.logMessage( "Lookup Worker Completed: " + type, Options.KEY_LOG_NETWORK );
+        if (answers != null)
+        {
+            Logger.logMessage( "Returned Answer Set: " + answers.size(), Options.KEY_LOG_NETWORK );
+        }
         
         switch (statusVal)
         {
-
             case LookupCompleteActionListener.LOOKUP_COMPLETE_OK: {
                 this.status = LookupTelname.STATUS_OK;
@@ -549 +514 @@
 
             if (statusVal == LookupCompleteActionListener.LOOKUP_COMPLETE_OK && !cancelled)
-            {                 
-                Logger.logMessage( "Txt Lookup Complete", Options.KEY_LOG_APPLICATION );
-                lookupResult.setTxtRecords( answers );
-                txtDone = true;
-                
-                Logger.logMessage( "Checking Complete Status: NAPTR(" + naptrDone + ") TXT(" + txtDone + ") LOC(" + locDone +") NINFO(" + nInfoDone +")", Options.KEY_LOG_APPLICATION );                
+            {              
+                if (!cancelled)
                 {
-                    if (naptrDone && txtDone &&  locDone && nInfoDone)
+                    if (domain.equals( publicDomain ))
                     {
-                        //done, so finish;
-                        finish(); 
+                        
+                        if (versionLookup)
+                        {
+                            //if we've done a version lookup, just fetch the txt records, removing any non plain text records
+                            Vector processedAnswers = new Vector();
+                            for (int i = 0; i < answers.size(); i++)
+                            {
+                                if (answers.elementAt( i ) instanceof DNSTxtHeaderResourceRecord)
+                                {
+                                    processedAnswers.addElement( answers.elementAt( i ) );
+                                }
+                            }
+                            lookupResult.setTxtRecords( processedAnswers );
+                            
+                            //then perform a naptr lookup of the public domain.
+                            performNaptrLookup( publicDomain );
+                            return;
+                        }
+                        
+                        //looked up public domain.  check version to determine following lookups.
+                        //text lookup done.  check for DDS.
+                        for (int i = 0; i < answers.size(); i++)
+                        {
+                            if (answers.elementAt( i ) instanceof DNSTxtPDDXResourceRecord)
+                            {
+                                //check the version.
+                                DNSTxtPDDXResourceRecord sysRecord = (DNSTxtPDDXResourceRecord) answers.elementAt( i );                           
+                                isVersionOne = sysRecord.isVersionOne();
+                                keywordsAvailable = sysRecord.isKeyWordsAvailable();
+                                privateDataAvailable = sysRecord.isPrivateDataAvailable();
+                                break;
+                            }
+                        }
+                        
+                        if (isVersionOne)
+                        {
+                            Vector processedAnswers = new Vector();
+                            for (int i = 0; i < answers.size(); i++)
+                            {
+                                //for a version 1 domain, take the txt header and keywords from the public domain
+                                if (answers.elementAt( i ) instanceof DNSTxtHeaderResourceRecord || answers.elementAt( i ) instanceof DNSTxtKeywordResourceRecord )
+                                {
+                                    processedAnswers.addElement( answers.elementAt( i ) );
+                                }
+                                
+                                //if its also a public lookup, take the DDS and long labels.
+                                if (publicDomain.equals( privateDomain ) 
+                                       && (answers.elementAt( i ) instanceof DNSTxtLongLabelResourceRecord 
+                                       || answers.elementAt( i ) instanceof DNSTxtDDSResourceRecord))
+                                {
+                                    processedAnswers.addElement( answers.elementAt( i ) );
+                                }
+                            }
+                            lookupResult.setTxtRecords( processedAnswers );
+                        }
+                        else
+                        {
+                            Vector processedAnswers = new Vector();
+                            for (int i = 0; i < answers.size(); i++)
+                            {
+                                //for any other version, we don't want any info if it is a private lookup.  if it is a public, we copy the long labels and dds.
+                                if (publicDomain.equals( privateDomain ) 
+                                                && (answers.elementAt( i ) instanceof DNSTxtLongLabelResourceRecord 
+                                                || answers.elementAt( i ) instanceof DNSTxtDDSResourceRecord))
+                                {
+                                    processedAnswers.addElement( answers.elementAt( i ) );
+                                }
+                            }
+                            lookupResult.setTxtRecords( processedAnswers );
+                        }
+                        Logger.logMessage( "Public Txt Lookup Complete", Options.KEY_LOG_APPLICATION );
+                        
+                        if (privateDomain.equals( publicDomain ))
+                        {
+                            if (isVersionOne)
+                            {
+                                //in version one domains, when doing a public lookup, go and do NAPTRs next
+                                performNaptrLookup( publicDomain );
+                            }
+                            else
+                            {
+                              //in version one+ domains, when doing a public lookup, go and do NINFO next
+                                performNinfoLookup( publicDomain );
+                            }
+                        }
+                        else
+                        {
+                            //for private domains, lookup the private txt records next, regardless of version.
+                            performTxtLookup( privateDomain );                        
+                        }
+                    }
+                    else if (domain.equals( privateDomain ))
+                    {
+                        //looked up private domain.  Obtain DDS and log labels and add to already obtained text records.
+                        Vector processedAnswers = lookupResult.getTxtRecords();
+                        if (processedAnswers == null)
+                        {
+                            processedAnswers = new Vector();
+                        }
+                        for (int i = 0; i < answers.size(); i++)
+                        {
+                            //for any private lookup, we get the DDS and LL from the private domain, and add to any from the public lookup.
+                            if ((answers.elementAt( i ) instanceof DNSTxtLongLabelResourceRecord 
+                                            || answers.elementAt( i ) instanceof DNSTxtDDSResourceRecord))
+                            {
+                                processedAnswers.addElement( answers.elementAt( i ) );
+                            }                            
+                        }           
+                        lookupResult.setTxtRecords( processedAnswers );
+                        
+                        Logger.logMessage( "Private Txt Lookup Complete", Options.KEY_LOG_APPLICATION );
+                                            
+                        if (isVersionOne)
+                        {
+                            //in version one domains, when doing a public lookup, go and do NAPTRs next
+                            performNaptrLookup( privateDomain );
+                        }
+                        else
+                        {
+                            //in version one+ domains, when doing a public lookup, go and do NINFO next
+                            performNinfoLookup( privateDomain );
+                        }
+                    }
+                    else if (domain.equals( KEYWORD_PREFIX + "." + publicDomain ))
+                    {
+                        //keyword lookup complete.  get keywords, and add to text records.
+                        Vector processedAnswers = lookupResult.getTxtRecords();
+                        if (processedAnswers == null)
+                        {
+                            processedAnswers = new Vector();
+                        }
+                        for (int i = 0; i < answers.size(); i++)
+                        {
+                            //for any private lookup, we get the DDS and LL from the private domain, and add to any from the public lookup.
+                            if (answers.elementAt( i ) instanceof DNSTxtKeywordResourceRecord )
+                            {
+                                processedAnswers.addElement( answers.elementAt( i ) );
+                            }                            
+                        }       
+                        lookupResult.setTxtRecords( processedAnswers );                        
+                        
+                        Logger.logMessage( "Private Txt Lookup Complete", Options.KEY_LOG_APPLICATION );
+                        
+                        finish();
                     }
                 }
@@ -570 +673 @@
                 }
             }
-        }
+        }        
+        
         else if (type == DNS.TYPE_LOC)
         {            
@@ -578 +682 @@
             {             
                 Logger.logMessage( "Loc Lookup Complete", Options.KEY_LOG_APPLICATION );
-                lookupResult.setLocRecords( answers );
-                locDone = true;
+                lookupResult.setLocRecords( answers );                
                 
                 if (!cancelled)
                 {
-                    performNinfoLookup( telnameTop );
+                    if (isVersionOne)
+                    {
+                        //the LOC lookup is the last one, so finish.
+                        finish();
+                    }
+                    else
+                    {
+                        //for v1+ domains, might need to look keywords up in _kw domains.  Check value of kwa.
+                        if (keywordsAvailable)
+                        {
+                            performTxtLookup( KEYWORD_PREFIX + "." + publicDomain );
+                        }
+                        else
+                        {
+                            //no keywords available, so finish
+                            finish();
+                        }
+                    }
                 }
             }
@@ -599 +719 @@
 
             if (statusVal == LookupCompleteActionListener.LOOKUP_COMPLETE_OK && !cancelled)
-            {             
+            {    
                 Logger.logMessage( "NInfo Lookup Complete", Options.KEY_LOG_APPLICATION );
-                lookupResult.setNInfoRecords( answers );
-                nInfoDone = true;
+                //if returning from a NINFO lookup, add the value as a text header to the text records.
+                //NINFO lookups only occur on V1+ domains.
+                
+                Vector processedAnswers = lookupResult.getTxtRecords();     
+                if (processedAnswers == null)
+                {
+                    processedAnswers = new Vector();
+                }
+                for (int i = 0; i < answers.size(); i++)
+                {
+                    if (answers.elementAt( i ) instanceof DNSTxtHeaderResourceRecord)
+                    {
+                        processedAnswers.addElement( answers.elementAt( i ) );
+                    }
+                }
+                lookupResult.setTxtRecords( processedAnswers );
                 
                 if (!cancelled)
                 {
-                    performTxtLookup( telnameTop );
-                }
-            }
+                    performNaptrLookup( privateDomain );
+                }
+            }           
             else
             {
@@ -624 +758 @@
             {
                 Logger.logMessage( "Naptr Lookup Complete", Options.KEY_LOG_APPLICATION );
-                lookupResult.setNaptrRecords( answers );
-                naptrDone = true;
-
+                lookupResult.setNaptrRecords( answers );               
                 
                 if (!cancelled)
                 {
-                    performLocLookup( telnameTop );
+                    if (versionLookup)
+                    {
+                        //if version lookup, finish
+                        finish();
+                    }
+                    else
+                    {
+                        performLocLookup( privateDomain );
+                    }                    
                 }
             }
@@ -638 +778 @@
             }
         }
-    }
-    
+    
+    }
+    
+    public boolean isPrivateDataAvailable ()
+    {
+        return privateDataAvailable;
+    }
+
+
     private void finish()
     {
         if (!cancelled)
         {
-            Logger.logMessage( "Storing result in cache + " + telname,
+            Logger.logMessage( "Storing result in cache + " + privateDomain,
                 Options.KEY_LOG_APPLICATION );
-            LookupResultDataStore.setLookupResult( telname, lookupResult );
+            LookupResultDataStore.setLookupResult( privateDomain, lookupResult );
             
             Logger.logMessage( "Lookup complete", Options.KEY_LOG_APPLICATION );
@@ -700 +847 @@
     public String getTelname ()
     {
-        return telname;
+        return privateDomain;
     }
 
@@ -730 +877 @@
     }
 
+    public boolean isPrivateLookup()
+    {
+        return !(publicDomain.equals( privateDomain ));
+    }
 
     public void setAutomated (boolean automated)

apps/blackberry/branches/1.5/blackberry/src/org/telnic/blackberry/lookup/LookupWorker.java

@@ -42 +42 @@
  *
  * @author John Cundall, Ben Dowling
- * @version $Id: LookupWorker.java,v 1.11 2008/12/19 15:06:58 jm2 Exp $
+ * @version $Id: LookupWorker.java,v 1.12 2009/11/06 11:55:31 jm2 Exp $
  */
 
@@ -96 +96 @@
      */
     private boolean automated = false;
-
 
     /**
@@ -112 +111 @@
     }
 
-
     /**
      * setLookupWorkerCompletedListener.
@@ -122 +120 @@
         completionListener = l;
     }
-
 
     /**
@@ -145 +142 @@
             completeLookup( LookupCompleteActionListener.LOOKUP_COMPLETE_OK, queryType, answers );
         }
-
-    }
-
+    }
 
     /**
@@ -309 +304 @@
     }
 
-
     /**
      * doQuery.
@@ -323 +317 @@
     }
 
-
     /**
      * Complete lookup.
@@ -356 +349 @@
                 public void run ()
                 {
-                    completionListener.lookupWorkerCompleted( status, type, answers );
+                    completionListener.lookupWorkerCompleted( status, type, answers, telname );
                 }
-
             } );
         }
     }
 
-
     public boolean isAutomated ()
     {
@@ -369 +360 @@
     }
 
-
     public void setAutomated (boolean automated)
     {