Changeset 507

Timestamp:

08/13/09 15:11:02 (4 years ago)

Author:

henri

Message:

Changed the way RecordTXT works.
Added support for domain display strings.

Location:

apps/iphone/superbook/trunk/DotTel_SDK/Classes

Files:

• DnsResolver.h (modified) (2 diffs)
• DnsResolver.m (modified) (4 diffs)
• RecordTxt.h (modified) (2 diffs)
• RecordTxt.m (modified) (8 diffs)

apps/iphone/superbook/trunk/DotTel_SDK/Classes/DnsResolver.h

@@ -77 +77 @@
 
 /**
- * Retrieves all keyword TXT records in a domain and adds them to the provided
- * array. Keyword TXT records are encapsulated in the RecordTxt class.
- * Header TXT records (not keywords) are concatenated and returned as a string.
- * Note that according to specs, there should only be a single Header TXT record
- * per sub/domain.
- * System messages are skipped.
+ * Retrieves all TXT records in a domain and adds them to the provided
+ * array. TXT records are encapsulated in the RecordTxt class.
  * Also note that TXT records are returned in random order.
  * 
@@ -88 +84 @@
  * @param txtArray   the array to add the txt records to
  * 
- * @return         the domain's TXT header string. If no header string is found,
- *                 returns the empty @"" string
+ * @return         the number of TXT records in the domain. 0 should mean error
+ *
  */
-- (NSString *)getTXTForTel:(NSString *)domain inArray:(NSMutableArray *)txtArray withError:(NSError **)error;
+- (NSUInteger)getTXTForTel:(NSString *)domain inArray:(NSMutableArray *)txtArray withError:(NSError **)error;
 
 /**

apps/iphone/superbook/trunk/DotTel_SDK/Classes/DnsResolver.m

@@ -79 +79 @@
 }
 
-// This method returns a header text as it parses the txt records
-- (NSString *)getTXTForTel:(NSString *)domain inArray:(NSMutableArray *)txtArray withError:(NSError **)error {
-        
-        NSMutableString *_headerText = nil;     
-        
+// TODO: header will be made obsolete by NINFO
+- (NSUInteger)getTXTForTel:(NSString *)domain inArray:(NSMutableArray *)txtArray withError:(NSError **)error {
+                
 #ifdef DEBUG
         NSLog(@"Domain %@: Retrieving TXT Records", domain);
@@ -89 +87 @@
         ldns_rr_list *txts = [self retrieveResourceRecordsOfType:LDNS_RR_TYPE_TXT fromDomain:domain withError:error];
         if (!txts) {
-                return _headerText;
+                return 0;
         }
         
@@ -99 +97 @@
                 RecordTxt *theRec = [RecordTxt recordWithRr:ldns_rr_list_rr(txts, i) date:lookupDate];
                 if (theRec.isValid) {
-                        if ([theRec isHeader]) {
-                                if (!_headerText) {
-                                        _headerText = [NSMutableString stringWithString:theRec.textValue];
-                                } else {
-                                        //NSLog(theRec.textValue);
-                                        [_headerText appendFormat:@"\n %@", theRec.textValue];
-                                }
-                        } else {
-                                [txtArray addObject:theRec];
-                        }
+                        [txtArray addObject:theRec];
                 }
         }
@@ -115 +104 @@
         [lookupDate release];
         
-        return _headerText;
+        return count;
         
 }

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordTxt.h

@@ -33 +33 @@
 #define LocTelStr(key) [[NSBundle mainBundle] localizedStringForKey:(key) value:@"" table:@"DotTel"]
 
+enum RecordTxtSubTypes {
+        RecordTxtSubTypeString                  = 0,    // string header (will be made obsolete by NINFO)
+        RecordTxtSubTypeDDS                             = 1,    // domain display string
+        RecordTxtSubTypeKeyword                 = 2,    // keyword
+        RecordTxtSubTypeOtherTSM                = 3,    // other .tel system message
+        RecordTxtSubTypeAdvert                  = 4,    // .tad advert
+};
+
 @interface RecordTxt : NSObject {
         
         BOOL isValid;
-
-        BOOL isHeader;                  // Non-keyword header text string
-        BOOL isKeyword;                 // Structured Keyword (.tkw)
-        BOOL isSystemMessage;   // System Message (.tsm)
+        NSUInteger subType;                                     // RecordTxtSubTypes value
         
         // Derived attributes
@@ -77 +82 @@
 
 @property (readonly) BOOL isValid;
-
-@property (readonly) BOOL isHeader;
-@property (readonly) BOOL isKeyword;
-@property (readonly) BOOL isSystemMessage;
+@property (readonly) NSUInteger subType;
 
 @property (readonly, nonatomic, retain) NSString *primaryDescription;

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordTxt.m

@@ -33 +33 @@
 @interface RecordTxt (PrivateMethods)
 
+- (BOOL)parseDisplayStringFromRecord:(const ldns_rr *)rr;
 - (BOOL)parseKeywordsFromRecord:(const ldns_rr *)rr;
 
@@ -42 +43 @@
 
 @synthesize isValid;
-@synthesize isHeader;
-@synthesize isKeyword;
-@synthesize isSystemMessage;
+@synthesize subType;
 @synthesize expiryDate;
 
@@ -68 +67 @@
         self = [super init];
         isValid = NO;
+        subType = RecordTxtSubTypeString;
         return self;
 }
@@ -75 +75 @@
         trimCharacterSet = [[NSCharacterSet whitespaceCharacterSet] retain];
         isValid = NO;
-        isKeyword = NO;
 
         if (ldns_rr_get_type(rr) != LDNS_RR_TYPE_TXT)
@@ -86 +85 @@
         if ([firstString isEqualToString:@".tkw"]) {
                 // parse keywords
-                isKeyword = YES;
+                subType = RecordTxtSubTypeKeyword;
                 isValid = [self parseKeywordsFromRecord:rr];
         } else if ([firstString isEqualToString:@".tsm"]) {
-                // system message, do nothing
+                // system message
+                // let's see if it's something we know
+                NSString *smType = [self stringFromStringRdf:ldns_rr_rdf(rr,2)];
+                if (smType != nil) {
+                        if ([smType isEqualToString:@"dds"]) {
+                                // Domain display string
+                                subType = RecordTxtSubTypeDDS;
+                                isValid = [self parseDisplayStringFromRecord:rr];
+                                return self;
+                        }
+                }
+                subType = RecordTxtSubTypeOtherTSM;
                 return self;
         } else if ([firstString isEqualToString:@".tad"]) {
                 // advert, do nothing for now
+                subType = RecordTxtSubTypeAdvert;
                 return self;
         } else {
                 // header
-                isHeader = YES;
+                subType = RecordTxtSubTypeString;
                 primaryDescription = [@"" retain];
                 primaryValue = NULL;
@@ -110 +121 @@
         
         return self;
+}
+
+- (BOOL)parseDisplayStringFromRecord:(const ldns_rr *)rr {
+        // That's the domain display string, which should replace the regular domain name
+        // ".tsm " "1" "dds" "John W. Smith"
+        
+        // Check version
+        if ([[self stringFromStringRdf:ldns_rr_rdf(rr,1)] isEqualToString:@"1"]) {
+                // Version 1
+                textValue = [[self stringFromStringRdf:ldns_rr_rdf(rr,3)] retain];
+                return TRUE;
+        }
+        textValue = nil;
+        return FALSE;
 }
 
@@ -167 +192 @@
 
 - (NSMutableString *)stringFromStringRdf:(const ldns_rdf *)rdf {
+        if (rdf == NULL) {
+                return nil;
+        }
         NSMutableString *res;
         const uint8_t *data = ldns_rdf_data(rdf);
@@ -180 +208 @@
 - (void)dealloc {
         [trimCharacterSet release];
+//      [primaryDescription release];
+//      [primaryValue release];
+//      [textValue release];
+//      [keysAndValues release];
+//      [expiryDate release];
         [super dealloc];
 }