Author: atagar Date: 2011-03-13 21:24:23 +0000 (Sun, 13 Mar 2011) New Revision: 24351

Modified: arm/trunk/src/interface/connections/connEntry.py Log: Inbound connections are only private if it doesn't match any relays (not if it can't be resolved due to duplicates)

Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-03-13 19:11:09 UTC (rev 24350) +++ arm/trunk/src/interface/connections/connEntry.py 2011-03-13 21:24:23 UTC (rev 24351) @@ -299,7 +299,9 @@ # if the connection doesn't belong to a known relay then it might be # client traffic

- return self.foreign.getFingerprint() == "UNKNOWN" + conn = torTools.getConn() + allMatches = conn.getRelayFingerprint(self.foreign.getIpAddr(), getAllMatches = True) + return allMatches == [] elif myType == Category.EXIT: # DNS connections exiting us aren't private (since they're hitting our # resolvers). Everything else, however, is.