Browse Source

MakeCompatibleServerEntry is now public

Rod Hynes 11 years ago
parent
commit
c6507136e4
1 changed files with 3 additions and 3 deletions
  1. 3 3
      psiphon/dataStore.go

+ 3 - 3
psiphon/dataStore.go

@@ -410,7 +410,7 @@ func (iterator *ServerEntryIterator) Next() (serverEntry *ServerEntry, err error
 	if iterator.isTargetServerEntryIterator {
 	if iterator.isTargetServerEntryIterator {
 		if iterator.hasNextTargetServerEntry {
 		if iterator.hasNextTargetServerEntry {
 			iterator.hasNextTargetServerEntry = false
 			iterator.hasNextTargetServerEntry = false
-			return makeCompatibleServerEntry(iterator.targetServerEntry), nil
+			return MakeCompatibleServerEntry(iterator.targetServerEntry), nil
 		}
 		}
 		return nil, nil
 		return nil, nil
 	}
 	}
@@ -435,10 +435,10 @@ func (iterator *ServerEntryIterator) Next() (serverEntry *ServerEntry, err error
 		return nil, ContextError(err)
 		return nil, ContextError(err)
 	}
 	}
 
 
-	return makeCompatibleServerEntry(serverEntry), nil
+	return MakeCompatibleServerEntry(serverEntry), nil
 }
 }
 
 
-func makeCompatibleServerEntry(serverEntry *ServerEntry) *ServerEntry {
+func MakeCompatibleServerEntry(serverEntry *ServerEntry) *ServerEntry {
 
 
 	// Backwards compatibility: old server entries have a single meekFrontingDomain
 	// Backwards compatibility: old server entries have a single meekFrontingDomain
 	// and not a meekFrontingAddresses array. By copying this one meekFrontingDomain
 	// and not a meekFrontingAddresses array. By copying this one meekFrontingDomain