- tor-commits - lists.torproject.org

r24311: {website} Undo a bit more of the damage done by css/reset.css, this ti (website/trunk/css)
by Robert Ransom 07 Mar '11

07 Mar '11

Author: rransom Date: 2011-03-07 23:26:15 +0000 (Mon, 07 Mar 2011) New Revision: 24311 Modified: website/trunk/css/typography.css Log: Undo a bit more of the damage done by css/reset.css, this time to sup/sub This won't fix the font size, but I can't test a change to two properties at once with Firebug. Modified: website/trunk/css/typography.css =================================================================== --- website/trunk/css/typography.css 2011-03-07 23:10:28 UTC (rev 24310) +++ website/trunk/css/typography.css 2011-03-07 23:26:15 UTC (rev 24311) @@ -95,6 +95,13 @@ font-family: Inconsolata, "Lucida Console", "Droid Sans Mono", Cousine, monospace; } +sup { + vertical-align: top; +} +sub { + vertical-align: bottom; +} + /* NAVIGATION ------------*/ #nav ul { font-size: 1.167em; }

1 0

r24310: {website} Remove wiki markup accidentally pasted in FAQ page (website/trunk/docs/en)
by Robert Ransom 07 Mar '11

07 Mar '11

Author: rransom Date: 2011-03-07 23:10:28 +0000 (Mon, 07 Mar 2011) New Revision: 24310 Modified: website/trunk/docs/en/faq.wml Log: Remove wiki markup accidentally pasted in FAQ page Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-03-07 16:18:22 UTC (rev 24309) +++ website/trunk/docs/en/faq.wml 2011-03-07 23:10:28 UTC (rev 24310) @@ -1415,8 +1415,6 @@ <hr> -[https://www.torproject.org/docs/faq#EntryGuards Answer moved to our new FAQ page] - <a id="EntryGuards"></a> <h3><a class="anchor" href="#EntryGuards">What are Entry Guards?</a></h3>

1 0

[tor/master] Merge remote branch 'sebastian/bug2660' into maint-0.2.2
by nickm＠torproject.org 07 Mar '11

07 Mar '11

commit 3bd83b8fb64c070210c589f65ed8cc023dd47077 Merge: 35fcec3 f83debb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 7 17:09:23 2011 -0500 Merge remote branch 'sebastian/bug2660' into maint-0.2.2 changes/bug2660 | 7 +++++++ src/common/address.c | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-)

1 0

[tor/master] Merge remote branch 'origin/maint-0.2.2'
by nickm＠torproject.org 07 Mar '11

07 Mar '11

commit 26009a3ed06549b7d7def9b96b327b906db16bd8 Merge: 176e8a0 3bd83b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 7 17:12:08 2011 -0500 Merge remote branch 'origin/maint-0.2.2' changes/bug2660 | 7 +++++++ src/common/address.c | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --combined src/common/address.c index 1f94377,a2780fb..756abff --- a/src/common/address.c +++ b/src/common/address.c @@@ -53,7 -53,9 +53,7 @@@ * socklen object in *sa_out of object size len. If not enough * room is free, or on error, return -1. Else return the length of the * sockaddr. */ -/* XXXX021 This returns socklen_t. socklen_t is sometimes unsigned. This - * function claims to return -1 sometimes. Problematic! */ -socklen_t +int tor_addr_to_sockaddr(const tor_addr_t *a, uint16_t port, struct sockaddr *sa_out, @@@ -309,7 -311,7 +309,7 @@@ tor_addr_is_internal(const tor_addr_t * * brackets. */ const char * -tor_addr_to_str(char *dest, const tor_addr_t *addr, int len, int decorate) +tor_addr_to_str(char *dest, const tor_addr_t *addr, size_t len, int decorate) { const char *ptr; tor_assert(addr && dest); @@@ -925,19 -927,6 +925,19 @@@ fmt_addr(const tor_addr_t *addr return buf; } +/** Like fmt_addr(), but takes addr as a host-order IPv4 + * addresses. Also not thread-safe, also clobbers its return buffer on + * repeated calls. */ +const char * +fmt_addr32(uint32_t addr) +{ + static char buf[INET_NTOA_BUF_LEN]; + struct in_addr in; + in.s_addr = htonl(addr); + tor_inet_ntoa(&in, buf, sizeof(buf)); + return buf; +} + /** Convert the string in src to a tor_addr_t addr. The string * may be an IPv4 address, an IPv6 address, or an IPv6 address surrounded by * square brackets. @@@ -1036,27 -1025,28 +1036,28 @@@ get_interface_address6(int severity, sa { int sock=-1, r=-1; struct sockaddr_storage my_addr, target_addr; - socklen_t my_addr_len; + socklen_t addr_len; tor_assert(addr); memset(addr, 0, sizeof(tor_addr_t)); memset(&target_addr, 0, sizeof(target_addr)); - my_addr_len = (socklen_t)sizeof(my_addr); - /* Use the "discard" service port */ - ((struct sockaddr_in*)&target_addr)->sin_port = 9; /* Don't worry: no packets are sent. We just need to use a real address * on the actual Internet. */ if (family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&target_addr; + /* Use the "discard" service port */ + sin6->sin6_port = htons(9); sock = tor_open_socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP); - my_addr_len = (socklen_t)sizeof(struct sockaddr_in6); + addr_len = (socklen_t)sizeof(struct sockaddr_in6); sin6->sin6_family = AF_INET6; S6_ADDR16(sin6->sin6_addr)[0] = htons(0x2002); /* 2002:: */ } else if (family == AF_INET) { struct sockaddr_in *sin = (struct sockaddr_in*)&target_addr; + /* Use the "discard" service port */ + sin->sin_port = htons(9); sock = tor_open_socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP); - my_addr_len = (socklen_t)sizeof(struct sockaddr_in); + addr_len = (socklen_t)sizeof(struct sockaddr_in); sin->sin_family = AF_INET; sin->sin_addr.s_addr = htonl(0x12000001); /* 18.0.0.1 */ } else { @@@ -1069,14 -1059,13 +1070,13 @@@ goto err; } - if (connect(sock,(struct sockaddr *)&target_addr, - (socklen_t)sizeof(target_addr))<0) { + if (connect(sock,(struct sockaddr *)&target_addr, addr_len) < 0) { int e = tor_socket_errno(sock); log_fn(severity, LD_NET, "connect() failed: %s", tor_socket_strerror(e)); goto err; } - if (getsockname(sock,(struct sockaddr*)&my_addr, &my_addr_len)) { + if (getsockname(sock,(struct sockaddr*)&my_addr, &addr_len)) { int e = tor_socket_errno(sock); log_fn(severity, LD_NET, "getsockname() to determine interface failed: %s", tor_socket_strerror(e));

1 0

[tor/master] Fix connect() failures in get_interface_address6()
by nickm＠torproject.org 07 Mar '11

07 Mar '11

commit 865ea5d26361802d53c586d27f249e5c2e924538 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Mar 5 14:46:32 2011 +0100 Fix connect() failures in get_interface_address6() The third argument for connect should be dependent on the address family. Issue spotted by piebeer who also wrote the patch. --- changes/bug2660 | 3 +++ src/common/address.c | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/changes/bug2660 b/changes/bug2660 new file mode 100644 index 0000000..fe22956 --- /dev/null +++ b/changes/bug2660 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix connect() failures on some platforms (BSD, OS X). Bugfix on + 0.2.0.3-alpha; fixes bug 2660. Patch by piebeer. diff --git a/src/common/address.c b/src/common/address.c index 0e57528..90beae0 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1025,13 +1025,12 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) { int sock=-1, r=-1; struct sockaddr_storage my_addr, target_addr; - socklen_t my_addr_len; + socklen_t addr_len; tor_assert(addr); memset(addr, 0, sizeof(tor_addr_t)); memset(&target_addr, 0, sizeof(target_addr)); - my_addr_len = (socklen_t)sizeof(my_addr); /* Use the "discard" service port */ ((struct sockaddr_in*)&target_addr)->sin_port = 9; /* Don't worry: no packets are sent. We just need to use a real address @@ -1039,13 +1038,13 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) if (family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&target_addr; sock = tor_open_socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP); - my_addr_len = (socklen_t)sizeof(struct sockaddr_in6); + addr_len = (socklen_t)sizeof(struct sockaddr_in6); sin6->sin6_family = AF_INET6; S6_ADDR16(sin6->sin6_addr)[0] = htons(0x2002); /* 2002:: */ } else if (family == AF_INET) { struct sockaddr_in *sin = (struct sockaddr_in*)&target_addr; sock = tor_open_socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP); - my_addr_len = (socklen_t)sizeof(struct sockaddr_in); + addr_len = (socklen_t)sizeof(struct sockaddr_in); sin->sin_family = AF_INET; sin->sin_addr.s_addr = htonl(0x12000001); /* 18.0.0.1 */ } else { @@ -1058,14 +1057,13 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) goto err; } - if (connect(sock,(struct sockaddr *)&target_addr, - (socklen_t)sizeof(target_addr))<0) { + if (connect(sock,(struct sockaddr *)&target_addr, addr_len) < 0) { int e = tor_socket_errno(sock); log_fn(severity, LD_NET, "connect() failed: %s", tor_socket_strerror(e)); goto err; } - if (getsockname(sock,(struct sockaddr*)&my_addr, &my_addr_len)) { + if (getsockname(sock,(struct sockaddr*)&my_addr, &addr_len)) { int e = tor_socket_errno(sock); log_fn(severity, LD_NET, "getsockname() to determine interface failed: %s", tor_socket_strerror(e));

1 0

[tor/master] Fix setting target port in get_interface_address6
by nickm＠torproject.org 07 Mar '11

07 Mar '11

commit f83debb51d7fa4a1827967d8bea145636c855f89 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Mar 5 15:20:55 2011 +0100 Fix setting target port in get_interface_address6 We want to use the discard port correctly, so a htons() was missing. Also we need to set it correctly depending on address family. Review provided by danieldg --- changes/bug2660 | 6 +++++- src/common/address.c | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug2660 b/changes/bug2660 index fe22956..2aa06d3 100644 --- a/changes/bug2660 +++ b/changes/bug2660 @@ -1,3 +1,7 @@ o Minor bugfixes: - Fix connect() failures on some platforms (BSD, OS X). Bugfix on - 0.2.0.3-alpha; fixes bug 2660. Patch by piebeer. + 0.2.0.3-alpha; fixes first part of bug 2660. Patch by piebeer. + - Set target port in get_interface_address6() correctly. Bugfix + on 0.1.1.4-alpha and 0.2.0.3-alpha; fixes second part of bug + 2660. + diff --git a/src/common/address.c b/src/common/address.c index 90beae0..a2780fb 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1031,18 +1031,20 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) memset(addr, 0, sizeof(tor_addr_t)); memset(&target_addr, 0, sizeof(target_addr)); - /* Use the "discard" service port */ - ((struct sockaddr_in*)&target_addr)->sin_port = 9; /* Don't worry: no packets are sent. We just need to use a real address * on the actual Internet. */ if (family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&target_addr; + /* Use the "discard" service port */ + sin6->sin6_port = htons(9); sock = tor_open_socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP); addr_len = (socklen_t)sizeof(struct sockaddr_in6); sin6->sin6_family = AF_INET6; S6_ADDR16(sin6->sin6_addr)[0] = htons(0x2002); /* 2002:: */ } else if (family == AF_INET) { struct sockaddr_in *sin = (struct sockaddr_in*)&target_addr; + /* Use the "discard" service port */ + sin->sin_port = htons(9); sock = tor_open_socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP); addr_len = (socklen_t)sizeof(struct sockaddr_in); sin->sin_family = AF_INET;

1 0

[tor/maint-0.2.2] Merge remote branch 'sebastian/bug2660' into maint-0.2.2
by nickm＠torproject.org 07 Mar '11

07 Mar '11

commit 3bd83b8fb64c070210c589f65ed8cc023dd47077 Merge: 35fcec3 f83debb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 7 17:09:23 2011 -0500 Merge remote branch 'sebastian/bug2660' into maint-0.2.2 changes/bug2660 | 7 +++++++ src/common/address.c | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.2.2] Fix connect() failures in get_interface_address6()
by nickm＠torproject.org 07 Mar '11

07 Mar '11

commit 865ea5d26361802d53c586d27f249e5c2e924538 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Mar 5 14:46:32 2011 +0100 Fix connect() failures in get_interface_address6() The third argument for connect should be dependent on the address family. Issue spotted by piebeer who also wrote the patch. --- changes/bug2660 | 3 +++ src/common/address.c | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/changes/bug2660 b/changes/bug2660 new file mode 100644 index 0000000..fe22956 --- /dev/null +++ b/changes/bug2660 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix connect() failures on some platforms (BSD, OS X). Bugfix on + 0.2.0.3-alpha; fixes bug 2660. Patch by piebeer. diff --git a/src/common/address.c b/src/common/address.c index 0e57528..90beae0 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1025,13 +1025,12 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) { int sock=-1, r=-1; struct sockaddr_storage my_addr, target_addr; - socklen_t my_addr_len; + socklen_t addr_len; tor_assert(addr); memset(addr, 0, sizeof(tor_addr_t)); memset(&target_addr, 0, sizeof(target_addr)); - my_addr_len = (socklen_t)sizeof(my_addr); /* Use the "discard" service port */ ((struct sockaddr_in*)&target_addr)->sin_port = 9; /* Don't worry: no packets are sent. We just need to use a real address @@ -1039,13 +1038,13 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) if (family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&target_addr; sock = tor_open_socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP); - my_addr_len = (socklen_t)sizeof(struct sockaddr_in6); + addr_len = (socklen_t)sizeof(struct sockaddr_in6); sin6->sin6_family = AF_INET6; S6_ADDR16(sin6->sin6_addr)[0] = htons(0x2002); /* 2002:: */ } else if (family == AF_INET) { struct sockaddr_in *sin = (struct sockaddr_in*)&target_addr; sock = tor_open_socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP); - my_addr_len = (socklen_t)sizeof(struct sockaddr_in); + addr_len = (socklen_t)sizeof(struct sockaddr_in); sin->sin_family = AF_INET; sin->sin_addr.s_addr = htonl(0x12000001); /* 18.0.0.1 */ } else { @@ -1058,14 +1057,13 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) goto err; } - if (connect(sock,(struct sockaddr *)&target_addr, - (socklen_t)sizeof(target_addr))<0) { + if (connect(sock,(struct sockaddr *)&target_addr, addr_len) < 0) { int e = tor_socket_errno(sock); log_fn(severity, LD_NET, "connect() failed: %s", tor_socket_strerror(e)); goto err; } - if (getsockname(sock,(struct sockaddr*)&my_addr, &my_addr_len)) { + if (getsockname(sock,(struct sockaddr*)&my_addr, &addr_len)) { int e = tor_socket_errno(sock); log_fn(severity, LD_NET, "getsockname() to determine interface failed: %s", tor_socket_strerror(e));

1 0

[tor/maint-0.2.2] Fix setting target port in get_interface_address6
by nickm＠torproject.org 07 Mar '11

07 Mar '11

commit f83debb51d7fa4a1827967d8bea145636c855f89 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Mar 5 15:20:55 2011 +0100 Fix setting target port in get_interface_address6 We want to use the discard port correctly, so a htons() was missing. Also we need to set it correctly depending on address family. Review provided by danieldg --- changes/bug2660 | 6 +++++- src/common/address.c | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug2660 b/changes/bug2660 index fe22956..2aa06d3 100644 --- a/changes/bug2660 +++ b/changes/bug2660 @@ -1,3 +1,7 @@ o Minor bugfixes: - Fix connect() failures on some platforms (BSD, OS X). Bugfix on - 0.2.0.3-alpha; fixes bug 2660. Patch by piebeer. + 0.2.0.3-alpha; fixes first part of bug 2660. Patch by piebeer. + - Set target port in get_interface_address6() correctly. Bugfix + on 0.1.1.4-alpha and 0.2.0.3-alpha; fixes second part of bug + 2660. + diff --git a/src/common/address.c b/src/common/address.c index 90beae0..a2780fb 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1031,18 +1031,20 @@ get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) memset(addr, 0, sizeof(tor_addr_t)); memset(&target_addr, 0, sizeof(target_addr)); - /* Use the "discard" service port */ - ((struct sockaddr_in*)&target_addr)->sin_port = 9; /* Don't worry: no packets are sent. We just need to use a real address * on the actual Internet. */ if (family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6*)&target_addr; + /* Use the "discard" service port */ + sin6->sin6_port = htons(9); sock = tor_open_socket(PF_INET6,SOCK_DGRAM,IPPROTO_UDP); addr_len = (socklen_t)sizeof(struct sockaddr_in6); sin6->sin6_family = AF_INET6; S6_ADDR16(sin6->sin6_addr)[0] = htons(0x2002); /* 2002:: */ } else if (family == AF_INET) { struct sockaddr_in *sin = (struct sockaddr_in*)&target_addr; + /* Use the "discard" service port */ + sin->sin_port = htons(9); sock = tor_open_socket(PF_INET,SOCK_DGRAM,IPPROTO_UDP); addr_len = (socklen_t)sizeof(struct sockaddr_in); sin->sin_family = AF_INET;

1 0

[bridgedb/master] Fix #2557: Don't crash if a distributor gets disabled.
by nickm＠torproject.org 07 Mar '11

07 Mar '11

commit c518422f708e5d059f3d77e882e1da04b38d30c1 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Mar 6 14:19:27 2011 +0100 Fix #2557: Don't crash if a distributor gets disabled. --- lib/bridgedb/Bridges.py | 16 +++++++++++++--- lib/bridgedb/Bucket.py | 12 ------------ lib/bridgedb/Main.py | 4 ++++ lib/bridgedb/Storage.py | 17 +++++++++++------ lib/bridgedb/Tests.py | 11 ++++++----- 5 files changed, 34 insertions(+), 26 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index a06cf26..67db9af 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -401,6 +401,7 @@ class BridgeSplitter(BridgeHolder): self.totalP = 0 self.pValues = [] self.rings = [] + self.pseudoRings = [] self.statsHolders = [] def __len__(self): @@ -423,6 +424,11 @@ class BridgeSplitter(BridgeHolder): self.rings.append(ringname) self.totalP += p + def addPseudoRing(self, ringname): + """Add a pseudo ring to the list of pseudo rings. + """ + self.pseudoRings.append(bridgedb.Bucket.PSEUDO_DISTRI_PREFIX + ringname) + def addTracker(self, t): """Adds a statistics tracker that gets told about every bridge we see. """ @@ -451,11 +457,15 @@ class BridgeSplitter(BridgeHolder): assert 0 <= pos < len(self.rings) ringname = self.rings[pos] - ringname = db.insertBridgeAndGetRing(bridge, ringname, time.time()) + validRings = self.rings + self.pseudoRings + + ringname = db.insertBridgeAndGetRing(bridge, ringname, time.time(), + validRings) db.commit() - # Resolve pseudo distributor ring names - ringname = bridgedb.Bucket.getRealDistributorName(ringname) + # Pseudo distributors are always held in the "unallocated" ring + if ringname in self.pseudoRings: + ringname = "unallocated" ring = self.ringsByName.get(ringname) ring.insert(bridge) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 39edaea..1d5d753 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -28,18 +28,6 @@ import bridgedb.Storage # distinguish them from real distributors? PSEUDO_DISTRI_PREFIX = "pseudo_" -def getRealDistributorName(distributor): - """Return the *real* ring name for a given one. This is needed because - with pseudo distributors, we've got strings in the database that aren't - real distributors. - """ - - # If it starts with "pseudo_", its really "unallocated" - if distributor.startswith(PSEUDO_DISTRI_PREFIX): - distributor = "unallocated" - - return distributor - class BucketData: """A file bucket value class. name - Name of the bucket (From config) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 5959a41..82181b8 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -276,6 +276,10 @@ def startup(cfg): "unallocated", cfg.RESERVED_SHARE) + # Add pseudo distributors to splitter + for p in cfg.FILE_BUCKETS.keys(): + splitter.addPseudoRing(p) + # Make the parse-bridges function get re-called on SIGHUP. def reload(): logging.info("Caught SIGHUP") diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 2c64e83..ae48dde 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -176,9 +176,10 @@ class Database: self._cur.close() self._conn.close() - def insertBridgeAndGetRing(self, bridge, setRing, seenAt): + def insertBridgeAndGetRing(self, bridge, setRing, seenAt, validRings, + defaultPool="unallocated"): '''updates info about bridge, setting ring to setRing if none was set. - Returns the bridge's ring. + Returns the bridge's validated ring. ''' cur = self._cur @@ -190,11 +191,15 @@ class Database: "FROM Bridges WHERE hex_key = ?", (h,)) v = cur.fetchone() if v is not None: - idx, ring = v - # Update last_seen and address. + i, ring = v + # Check if this is currently a valid ring name. If not, move back + # into default pool. + if ring not in validRings: + ring = defaultPool + # Update last_seen, address, port and (possibly) distributor. cur.execute("UPDATE Bridges SET address = ?, or_port = ?, " - "last_seen = ? WHERE id = ?", - (bridge.ip, bridge.orport, timeToStr(seenAt), idx)) + "distributor = ?, last_seen = ? WHERE id = ?", + (bridge.ip, bridge.orport, ring, timeToStr(seenAt), i)) return ring else: # Insert it. diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index f5198c4..1353658 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -156,10 +156,11 @@ class SQLStorageTests(unittest.TestCase): b1_v2 = B("serv1", "1.2.3.5", 9099, fingerprint=k1) b2 = B("serv2", "2.3.4.5", 9990, fingerprint=k2) b3 = B("serv3", "2.3.4.6", 9008, fingerprint=k3) + validRings = ["ring1", "ring2", "ring3"] - r = db.insertBridgeAndGetRing(b1, "ring1", t) + r = db.insertBridgeAndGetRing(b1, "ring1", t, validRings) self.assertEquals(r, "ring1") - r = db.insertBridgeAndGetRing(b1, "ring10", t+500) + r = db.insertBridgeAndGetRing(b1, "ring10", t+500, validRings) self.assertEquals(r, "ring1") cur.execute("SELECT distributor, address, or_port, first_seen, " @@ -170,7 +171,7 @@ class SQLStorageTests(unittest.TestCase): bridgedb.Storage.timeToStr(t), bridgedb.Storage.timeToStr(t+500))) - r = db.insertBridgeAndGetRing(b1_v2, "ring99", t+800) + r = db.insertBridgeAndGetRing(b1_v2, "ring99", t+800, validRings) self.assertEquals(r, "ring1") cur.execute("SELECT distributor, address, or_port, first_seen, " "last_seen FROM Bridges WHERE hex_key = ?", (k1,)) @@ -180,8 +181,8 @@ class SQLStorageTests(unittest.TestCase): bridgedb.Storage.timeToStr(t), bridgedb.Storage.timeToStr(t+800))) - db.insertBridgeAndGetRing(b2, "ring2", t) - db.insertBridgeAndGetRing(b3, "ring3", t) + db.insertBridgeAndGetRing(b2, "ring2", t, validRings) + db.insertBridgeAndGetRing(b3, "ring3", t, validRings) cur.execute("SELECT COUNT(distributor) FROM Bridges") v = cur.fetchone()

1 0