January 2012 - tor-commits - lists.torproject.org

[obfsproxy/master] pending_socks_cb: exit if getpeername() breaks.
by nickm＠torproject.org 17 Jan '12

17 Jan '12

commit a60c1b437e8e77eee14ea91c280a4503a437a622 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jan 17 02:09:09 2012 +0200 pending_socks_cb: exit if getpeername() breaks. Also, check the return value of socks_state_set_address(). --- src/network.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/network.c b/src/network.c index 4137cad..b9bcbb0 100644 --- a/src/network.c +++ b/src/network.c @@ -945,15 +945,18 @@ pending_socks_cb(struct bufferevent *bev, short what, void *arg) obfs_assert(!circ->is_flushing); - /* Figure out where we actually connected to, and tell the socks client */ - if (getpeername(bufferevent_getfd(bev), sa, &slen) == 0) { - char *peername = printable_address(sa, slen); - socks_state_set_address(socks, sa); + if (getpeername(bufferevent_getfd(bev), sa, &slen) < 0) { + log_warn("%s: getpeername() failed.", __func__); + conn_free(down); + return; + } + + { /* We have to update our connection's peername. If it was an + FQDN SOCKS request, the current peername contains the FQDN + string, and we want to replace it with the actual IP address we + connected to. */ - /* We have to update our connection's peername. If it was an - FQDN SOCKS request, the current peername contains the FQDN - string, and we want to replace it with the actual IP address - we connected to. */ + char *peername = printable_address(sa, slen); if (down->peername) { log_debug("We connected to our SOCKS destination! " "Replacing peername '%s' with '%s'", @@ -962,6 +965,13 @@ pending_socks_cb(struct bufferevent *bev, short what, void *arg) } down->peername = peername; } + + if (socks_state_set_address(socks, sa) < 0) { + log_warn("%s: socks_state_set_address() failed.", __func__); + conn_free(down); + return; + } + socks_send_reply(socks, bufferevent_get_output(up->buffer), 0); /* Switch to regular upstream behavior. */

1 0

[metrics-lib/master] Fix a problem with downloading relay descriptors.
by karsten＠torproject.org 17 Jan '12

17 Jan '12

commit d5ecb5a3428c9c5df7544967b1acd17ae061879b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 17 11:20:35 2012 +0100 Fix a problem with downloading relay descriptors. The consensus-health checker recently reported quite often that it couldn't download any consensuses. What happened was that the first directory authority immediately with an error. We decided that there's nothing to download anymore, because a) we requested the consensus from all authorities and didn't know about any votes yet that we could download. However, what we need to do is wait until all running consensus downloads finish. --- .../descriptor/impl/DownloadCoordinator.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinator.java b/src/org/torproject/descriptor/impl/DownloadCoordinator.java index c706415..49654d1 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinator.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinator.java @@ -102,6 +102,10 @@ public class DownloadCoordinator { * hasn't tried downloading it before attempt to download it? */ private boolean missingConsensus = false; + /* Which directories are currently attempting to download the + * consensus? */ + private Set<String> requestingConsensuses = new HashSet<String>(); + /* Which directories have attempted to download the consensus so far, * including those directories that are currently attempting it? */ private Set<String> requestedConsensuses = new HashSet<String>(); @@ -136,6 +140,7 @@ public class DownloadCoordinator { if (!this.downloadConsensusFromAllAuthorities) { this.missingConsensus = false; } + this.requestingConsensuses.add(nickname); this.requestedConsensuses.add(nickname); request.setRequestedResource( "/tor/status-vote/current/consensus.z"); @@ -182,6 +187,7 @@ public class DownloadCoordinator { DescriptorRequestImpl response) { String nickname = response.getDirectoryNickname(); if (response.getDescriptorType().equals("consensus")) { + this.requestingConsensuses.remove(nickname); if (response.getResponseCode() == 200) { List<RelayNetworkStatusConsensus> parsedConsensuses = RelayNetworkStatusConsensusImpl.parseConsensuses( @@ -236,7 +242,8 @@ public class DownloadCoordinator { if ((!this.missingConsensus || (this.downloadConsensusFromAllAuthorities && this.requestedConsensuses.containsAll( - this.directoryAuthorities.keySet()))) && + this.directoryAuthorities.keySet()) && + this.requestingConsensuses.isEmpty())) && this.missingVotes.isEmpty() && this.requestingVotes.isEmpty()) { /* TODO This logic may be somewhat broken. We don't wait for all

1 0

[metrics-lib/master] Split relay descriptor downloader into three classes.
by karsten＠torproject.org 17 Jan '12

17 Jan '12

commit e868be92e4dab9aa96b5b9acc454ff9dfb5ee1b2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 17 09:48:42 2012 +0100 Split relay descriptor downloader into three classes. The three classes are: - The "user"-facing RelayDescriptorDownloaderImpl that is used to configure what descriptors shall be downloaded. - The DownloadCoordinator that memorizes which descriptors still need to be downloaded, which downloads are in progress, and which downloads are completed or have failed. - The DirectoryDownloader that sends the actual requests to one directory authority or mirror and reports back to DownloadCoordinator for finished downloads. --- .../descriptor/impl/DirectoryDownloader.java | 107 +++++++ .../descriptor/impl/DownloadCoordinator.java | 259 +++++++++++++++ .../impl/RelayDescriptorDownloaderImpl.java | 332 +------------------- 3 files changed, 381 insertions(+), 317 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/org/torproject/descriptor/impl/DirectoryDownloader.java new file mode 100644 index 0000000..d07c5c9 --- /dev/null +++ b/src/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -0,0 +1,107 @@ +/* Copyright 2011, 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.zip.InflaterInputStream; + +/* Download descriptors from one directory authority or mirror. First, + * ask the coordinator thread to create a request, run it, and deliver + * the response. Repeat until the coordinator thread says there are no + * further requests to make. */ +public class DirectoryDownloader implements Runnable { + + private String nickname; + private String ipPort; + protected DirectoryDownloader(String nickname, String ip, int dirPort) { + this.nickname = nickname; + this.ipPort = ip + ":" + String.valueOf(dirPort); + } + + private DownloadCoordinator downloadCoordinator; + protected void setDownloadCoordinator( + DownloadCoordinator downloadCoordinator) { + this.downloadCoordinator = downloadCoordinator; + } + + private long requestTimeout; + protected void setRequestTimeout(long requestTimeout) { + this.requestTimeout = requestTimeout; + } + + public void run() { + boolean keepRunning = true; + do { + DescriptorRequestImpl request = + this.downloadCoordinator.createRequest(this.nickname); + if (request != null) { + String url = "http://" + this.ipPort + + request.getRequestedResource(); + request.setRequestStart(System.currentTimeMillis()); + Thread timeoutThread = new Thread(new RequestTimeout( + this.requestTimeout)); + timeoutThread.start(); + try { + URL u = new URL(url); + HttpURLConnection huc = + (HttpURLConnection) u.openConnection(); + huc.setRequestMethod("GET"); + huc.connect(); + int responseCode = huc.getResponseCode(); + request.setResponseCode(responseCode); + if (responseCode == 200) { + BufferedInputStream in = new BufferedInputStream( + new InflaterInputStream(huc.getInputStream())); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + int len; + byte[] data = new byte[1024]; + while ((len = in.read(data, 0, 1024)) >= 0) { + baos.write(data, 0, len); + } + in.close(); + byte[] responseBytes = baos.toByteArray(); + request.setResponseBytes(responseBytes); + request.setRequestEnd(System.currentTimeMillis()); + } + } catch (IOException e) { + /* Stop downloading from this directory if there are any + * problems, e.g., refused connections. */ + keepRunning = false; + } + /* TODO How do we find out if we were interrupted, and by who? + * Set the request or global timeout flag in the response. */ + timeoutThread.interrupt(); + this.downloadCoordinator.deliverResponse(request); + } else { + keepRunning = false; + } + } while (keepRunning); + } + + /* Interrupt a download request if it takes longer than a given time. */ + private static class RequestTimeout implements Runnable { + private long timeoutMillis; + private Thread downloaderThread; + private RequestTimeout(long timeoutMillis) { + this.downloaderThread = Thread.currentThread(); + this.timeoutMillis = timeoutMillis; + } + public void run() { + long started = System.currentTimeMillis(), sleep; + while ((sleep = started + this.timeoutMillis + - System.currentTimeMillis()) > 0L) { + try { + Thread.sleep(sleep); + } catch (InterruptedException e) { + return; + } + } + this.downloaderThread.interrupt(); + } + } +} + diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinator.java b/src/org/torproject/descriptor/impl/DownloadCoordinator.java new file mode 100644 index 0000000..c706415 --- /dev/null +++ b/src/org/torproject/descriptor/impl/DownloadCoordinator.java @@ -0,0 +1,259 @@ +/* Copyright 2011, 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorRequest; +import org.torproject.descriptor.DirSourceEntry; +import org.torproject.descriptor.RelayNetworkStatusConsensus; +import org.torproject.descriptor.RelayNetworkStatusVote; + +/* TODO This whole download logic is a mess and needs a cleanup. */ +public class DownloadCoordinator { + + private BlockingIteratorImpl<DescriptorRequest> descriptorQueue = + new BlockingIteratorImpl<DescriptorRequest>(); + protected Iterator<DescriptorRequest> getDescriptorQueue() { + return this.descriptorQueue; + } + + private SortedMap<String, DirectoryDownloader> directoryAuthorities; + private SortedMap<String, DirectoryDownloader> directoryMirrors; + private boolean downloadConsensusFromAllAuthorities; + private boolean includeCurrentReferencedVotes; + private long requestTimeoutMillis; + private long globalTimeoutMillis; + + protected DownloadCoordinator( + SortedMap<String, DirectoryDownloader> directoryAuthorities, + SortedMap<String, DirectoryDownloader> directoryMirrors, + boolean downloadConsensus, + boolean downloadConsensusFromAllAuthorities, + Set<String> downloadVotes, boolean includeCurrentReferencedVotes, + long requestTimeoutMillis, long globalTimeoutMillis) { + this.directoryAuthorities = directoryAuthorities; + this.directoryMirrors = directoryMirrors; + this.missingConsensus = downloadConsensus; + this.downloadConsensusFromAllAuthorities = + downloadConsensusFromAllAuthorities; + this.missingVotes = downloadVotes; + this.includeCurrentReferencedVotes = includeCurrentReferencedVotes; + this.requestTimeoutMillis = requestTimeoutMillis; + this.globalTimeoutMillis = globalTimeoutMillis; + if (this.directoryMirrors.isEmpty() && + this.directoryAuthorities.isEmpty()) { + this.descriptorQueue.setOutOfDescriptors(); + /* TODO Should we say anything if we don't have any directories + * configured? */ + } else { + GlobalTimer globalTimer = new GlobalTimer(this.globalTimeoutMillis, + this); + this.globalTimerThread = new Thread(globalTimer); + this.globalTimerThread.start(); + for (DirectoryDownloader directoryMirror : + this.directoryMirrors.values()) { + directoryMirror.setDownloadCoordinator(this); + directoryMirror.setRequestTimeout(this.requestTimeoutMillis); + new Thread(directoryMirror).start(); + } + for (DirectoryDownloader directoryAuthority : + this.directoryAuthorities.values()) { + directoryAuthority.setDownloadCoordinator(this); + directoryAuthority.setRequestTimeout(this.requestTimeoutMillis); + new Thread(directoryAuthority).start(); + } + } + } + + /* Interrupt all downloads if the total download time exceeds a given + * time. */ + private Thread globalTimerThread; + private static class GlobalTimer implements Runnable { + private long timeoutMillis; + private DownloadCoordinator downloadCoordinator; + private GlobalTimer(long timeoutMillis, + DownloadCoordinator downloadCoordinator) { + this.timeoutMillis = timeoutMillis; + this.downloadCoordinator = downloadCoordinator; + } + public void run() { + long started = System.currentTimeMillis(), sleep; + while ((sleep = started + this.timeoutMillis + - System.currentTimeMillis()) > 0L) { + try { + Thread.sleep(sleep); + } catch (InterruptedException e) { + return; + } + } + this.downloadCoordinator.interruptAllDownloads(); + } + } + + /* Are we missing the consensus, and should the next directory that + * hasn't tried downloading it before attempt to download it? */ + private boolean missingConsensus = false; + + /* Which directories have attempted to download the consensus so far, + * including those directories that are currently attempting it? */ + private Set<String> requestedConsensuses = new HashSet<String>(); + + /* Which votes are we currently missing? */ + private Set<String> missingVotes = new HashSet<String>(); + + /* Which vote (map value) is a given directory (map key) currently + * attempting to download? */ + private Map<String, String> requestingVotes = + new HashMap<String, String>(); + + /* Which votes (map value) has a given directory (map key) attempted or + * is currently attempting to download? */ + private Map<String, Set<String>> requestedVotes = + new HashMap<String, Set<String>>(); + + private boolean hasFinishedDownloading = false; + + /* Look up what request a directory should make next. If there is + * nothing to do right now, but maybe later, block the caller. If + * we're done downloading, return null to notify the caller. */ + protected synchronized DescriptorRequestImpl createRequest( + String nickname) { + while (!this.hasFinishedDownloading) { + DescriptorRequestImpl request = new DescriptorRequestImpl(); + request.setDirectoryNickname(nickname); + if ((this.missingConsensus || + (this.downloadConsensusFromAllAuthorities && + this.directoryAuthorities.containsKey(nickname))) && + !this.requestedConsensuses.contains(nickname)) { + if (!this.downloadConsensusFromAllAuthorities) { + this.missingConsensus = false; + } + this.requestedConsensuses.add(nickname); + request.setRequestedResource( + "/tor/status-vote/current/consensus.z"); + request.setDescriptorType("consensus"); + return request; + } + if (!this.missingVotes.isEmpty() && + this.directoryAuthorities.containsKey(nickname)) { + String requestingVote = null; + for (String missingVote : this.missingVotes) { + if (!this.requestedVotes.containsKey(nickname) || + !this.requestedVotes.get(nickname).contains(missingVote)) { + requestingVote = missingVote; + } + } + if (requestingVote != null) { + this.requestingVotes.put(nickname, requestingVote); + if (!this.requestedVotes.containsKey(nickname)) { + this.requestedVotes.put(nickname, new HashSet<String>()); + } + this.requestedVotes.get(nickname).add(requestingVote); + this.missingVotes.remove(requestingVote); + request.setRequestedResource("/tor/status-vote/current/" + + requestingVote + ".z"); + request.setDescriptorType("vote"); + return request; + } + } + /* TODO Add server descriptors and extra-info descriptors later. */ + try { + this.wait(); + } catch (InterruptedException e) { + /* TODO What shall we do? */ + } + } + return null; + } + + /* Deliver a response which may either contain one or more descriptors + * or a failure response code. Update the lists of missing descriptors, + * decide if there are more descriptors to download, and wake up any + * waiting downloader threads. */ + protected synchronized void deliverResponse( + DescriptorRequestImpl response) { + String nickname = response.getDirectoryNickname(); + if (response.getDescriptorType().equals("consensus")) { + if (response.getResponseCode() == 200) { + List<RelayNetworkStatusConsensus> parsedConsensuses = + RelayNetworkStatusConsensusImpl.parseConsensuses( + response.getResponseBytes()); + List<Descriptor> parsedDescriptors = + new ArrayList<Descriptor>(parsedConsensuses); + response.setDescriptors(parsedDescriptors); + if (this.includeCurrentReferencedVotes) { + /* TODO Only add votes if the consensus is not older than one + * hour. Or does that make no sense? */ + for (RelayNetworkStatusConsensus parsedConsensus : + parsedConsensuses) { + for (DirSourceEntry dirSource : + parsedConsensus.getDirSourceEntries().values()) { + String identity = dirSource.getIdentity(); + if (!this.missingVotes.contains(identity)) { + boolean alreadyRequested = false; + for (Set<String> requestedBefore : + this.requestedVotes.values()) { + if (requestedBefore.contains(identity)) { + alreadyRequested = true; + break; + } + } + if (!alreadyRequested) { + this.missingVotes.add(identity); + } + } + } + } + /* TODO Later, add referenced server descriptors. */ + } + } else { + this.missingConsensus = true; + } + } else if (response.getDescriptorType().equals("vote")) { + String requestedVote = requestingVotes.remove(nickname); + if (response.getResponseCode() == 200) { + List<RelayNetworkStatusVote> parsedVotes = + RelayNetworkStatusVoteImpl.parseVotes( + response.getResponseBytes()); + List<Descriptor> parsedDescriptors = + new ArrayList<Descriptor>(parsedVotes); + response.setDescriptors(parsedDescriptors); + } else { + this.missingVotes.add(requestedVote); + } + } + if (response.getRequestEnd() != 0L) { + this.descriptorQueue.add(response); + } + if ((!this.missingConsensus || + (this.downloadConsensusFromAllAuthorities && + this.requestedConsensuses.containsAll( + this.directoryAuthorities.keySet()))) && + this.missingVotes.isEmpty() && + this.requestingVotes.isEmpty()) { + /* TODO This logic may be somewhat broken. We don't wait for all + * consensus requests to complete or fail, which results in adding + * (failed) requests to the queue when we think we're done. */ + this.hasFinishedDownloading = true; + this.globalTimerThread.interrupt(); + this.descriptorQueue.setOutOfDescriptors(); + } + /* Wake up all waiting downloader threads. Maybe they can now + * download something, or they'll realize we're done downloading. */ + this.notifyAll(); + } + + private synchronized void interruptAllDownloads() { + this.hasFinishedDownloading = true; + this.notifyAll(); + } +} + diff --git a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java index 6805cc4..fff6b36 100644 --- a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java @@ -2,11 +2,6 @@ * See LICENSE for licensing information */ package org.torproject.descriptor.impl; -import java.io.BufferedInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -16,7 +11,6 @@ import java.util.List; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import java.util.zip.InflaterInputStream; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorRequest; import org.torproject.descriptor.DirSourceEntry; @@ -24,21 +18,10 @@ import org.torproject.descriptor.RelayDescriptorDownloader; import org.torproject.descriptor.RelayNetworkStatusConsensus; import org.torproject.descriptor.RelayNetworkStatusVote; -/* TODO Should this class be split up and be moved to its own subpackage? - * It's huge, and it's not going to get smaller in the future. */ public class RelayDescriptorDownloaderImpl implements RelayDescriptorDownloader { - /* TODO Move part of the factory class to the impl package and make this - * constructor protected. */ - public RelayDescriptorDownloaderImpl() { - } - private boolean hasStartedDownloading = false; - private boolean hasFinishedDownloading = false; - - private BlockingIteratorImpl<DescriptorRequest> descriptorQueue = - new BlockingIteratorImpl<DescriptorRequest>(); private SortedMap<String, DirectoryDownloader> directoryAuthorities = new TreeMap<String, DirectoryDownloader>(); @@ -50,7 +33,7 @@ public class RelayDescriptorDownloaderImpl } this.checkDirectoryParameters(nickname, ip, dirPort); DirectoryDownloader directoryAuthority = new DirectoryDownloader( - nickname, ip, dirPort, this); + nickname, ip, dirPort); this.directoryAuthorities.put(nickname, directoryAuthority); } @@ -64,7 +47,7 @@ public class RelayDescriptorDownloaderImpl } this.checkDirectoryParameters(nickname, ip, dirPort); DirectoryDownloader directoryMirror = new DirectoryDownloader( - nickname, ip, dirPort, this); + nickname, ip, dirPort); this.directoryMirrors.put(nickname, directoryMirror); /* TODO Implement prioritizing mirrors for non-vote downloads. */ throw new UnsupportedOperationException("Prioritizing directory " @@ -96,12 +79,13 @@ public class RelayDescriptorDownloaderImpl } } + private boolean downloadConsensus = false; public void setIncludeCurrentConsensus() { if (this.hasStartedDownloading) { throw new IllegalStateException("Reconfiguration is not permitted " + "after starting to download."); } - this.missingConsensus = true; + this.downloadConsensus = true; } private boolean downloadConsensusFromAllAuthorities = false; @@ -122,13 +106,14 @@ public class RelayDescriptorDownloaderImpl this.includeCurrentReferencedVotes = true; } + private Set<String> downloadVotes = new HashSet<String>(); public void setIncludeCurrentVote(String fingerprint) { if (this.hasStartedDownloading) { throw new IllegalStateException("Reconfiguration is not permitted " + "after starting to download."); } this.checkVoteFingerprint(fingerprint); - this.missingVotes.add(fingerprint); + this.downloadVotes.add(fingerprint); } public void setIncludeCurrentVotes(Set<String> fingerprints) { @@ -248,302 +233,15 @@ public class RelayDescriptorDownloaderImpl throw new IllegalStateException("Initiating downloads is only " + "permitted once."); } - if (this.directoryMirrors.isEmpty() && - this.directoryAuthorities.isEmpty()) { - this.descriptorQueue.setOutOfDescriptors(); - /* TODO Should we say anything if we don't have any directories - * configured? */ - } else { - GlobalTimer globalTimer = new GlobalTimer(this.globalTimeoutMillis, - this); - this.globalTimerThread = new Thread(globalTimer); - this.globalTimerThread.start(); - for (DirectoryDownloader directoryMirror : - this.directoryMirrors.values()) { - directoryMirror.setRequestTimeout(this.requestTimeoutMillis); - new Thread(directoryMirror).start(); - } - for (DirectoryDownloader directoryAuthority : - this.directoryAuthorities.values()) { - directoryAuthority.setRequestTimeout(this.requestTimeoutMillis); - new Thread(directoryAuthority).start(); - } - } - return this.descriptorQueue; - } - - /* Interrupt all downloads if the total download time exceeds a given - * time. */ - private Thread globalTimerThread; - private static class GlobalTimer implements Runnable { - private long timeoutMillis; - private RelayDescriptorDownloaderImpl downloadCoordinator; - private GlobalTimer(long timeoutMillis, - RelayDescriptorDownloaderImpl downloadCoordinator) { - this.timeoutMillis = timeoutMillis; - this.downloadCoordinator = downloadCoordinator; - } - public void run() { - long started = System.currentTimeMillis(), sleep; - while ((sleep = started + this.timeoutMillis - - System.currentTimeMillis()) > 0L) { - try { - Thread.sleep(sleep); - } catch (InterruptedException e) { - return; - } - } - this.downloadCoordinator.interruptAllDownloads(); - } - } - - /* TODO This whole download logic is a mess. It should probably go to - * its own class, and it needs a cleanup. */ - - /* Are we missing the consensus, and should the next directory that - * hasn't tried downloading it before attempt to download it? */ - private boolean missingConsensus = false; - - /* Which directories have attempted to download the consensus so far, - * including those directories that are currently attempting it? */ - private Set<String> requestedConsensuses = new HashSet<String>(); - - /* Which votes are we currently missing? */ - private Set<String> missingVotes = new HashSet<String>(); - - /* Which vote (map value) is a given directory (map key) currently - * attempting to download? */ - private Map<String, String> requestingVotes = - new HashMap<String, String>(); - - /* Which votes (map value) has a given directory (map key) attempted or - * is currently attempting to download? */ - private Map<String, Set<String>> requestedVotes = - new HashMap<String, Set<String>>(); - - /* Look up what request a directory should make next. If there is - * nothing to do right now, but maybe later, block the caller. If - * we're done downloading, return null to notify the caller. */ - private synchronized DescriptorRequestImpl createRequest( - String nickname) { - while (!this.hasFinishedDownloading) { - DescriptorRequestImpl request = new DescriptorRequestImpl(); - request.setDirectoryNickname(nickname); - if ((this.missingConsensus || - (this.downloadConsensusFromAllAuthorities && - this.directoryAuthorities.containsKey(nickname))) && - !this.requestedConsensuses.contains(nickname)) { - if (!this.downloadConsensusFromAllAuthorities) { - this.missingConsensus = false; - } - this.requestedConsensuses.add(nickname); - request.setRequestedResource( - "/tor/status-vote/current/consensus.z"); - request.setDescriptorType("consensus"); - return request; - } - if (!this.missingVotes.isEmpty() && - this.directoryAuthorities.containsKey(nickname)) { - String requestingVote = null; - for (String missingVote : this.missingVotes) { - if (!this.requestedVotes.containsKey(nickname) || - !this.requestedVotes.get(nickname).contains(missingVote)) { - requestingVote = missingVote; - } - } - if (requestingVote != null) { - this.requestingVotes.put(nickname, requestingVote); - if (!this.requestedVotes.containsKey(nickname)) { - this.requestedVotes.put(nickname, new HashSet<String>()); - } - this.requestedVotes.get(nickname).add(requestingVote); - this.missingVotes.remove(requestingVote); - request.setRequestedResource("/tor/status-vote/current/" - + requestingVote + ".z"); - request.setDescriptorType("vote"); - return request; - } - } - /* TODO Add server descriptors and extra-info descriptors later. */ - try { - this.wait(); - } catch (InterruptedException e) { - /* TODO What shall we do? */ - } - } - return null; - } - - /* Deliver a response which may either contain one or more descriptors - * or a failure response code. Update the lists of missing descriptors, - * decide if there are more descriptors to download, and wake up any - * waiting downloader threads. */ - private synchronized void deliverResponse( - DescriptorRequestImpl response) { - String nickname = response.getDirectoryNickname(); - if (response.getDescriptorType().equals("consensus")) { - if (response.getResponseCode() == 200) { - List<RelayNetworkStatusConsensus> parsedConsensuses = - RelayNetworkStatusConsensusImpl.parseConsensuses( - response.getResponseBytes()); - List<Descriptor> parsedDescriptors = - new ArrayList<Descriptor>(parsedConsensuses); - response.setDescriptors(parsedDescriptors); - if (this.includeCurrentReferencedVotes) { - /* TODO Only add votes if the consensus is not older than one - * hour. Or does that make no sense? */ - for (RelayNetworkStatusConsensus parsedConsensus : - parsedConsensuses) { - for (DirSourceEntry dirSource : - parsedConsensus.getDirSourceEntries().values()) { - String identity = dirSource.getIdentity(); - if (!this.missingVotes.contains(identity)) { - boolean alreadyRequested = false; - for (Set<String> requestedBefore : - this.requestedVotes.values()) { - if (requestedBefore.contains(identity)) { - alreadyRequested = true; - break; - } - } - if (!alreadyRequested) { - this.missingVotes.add(identity); - } - } - } - } - /* TODO Later, add referenced server descriptors. */ - } - } else { - this.missingConsensus = true; - } - } else if (response.getDescriptorType().equals("vote")) { - String requestedVote = requestingVotes.remove(nickname); - if (response.getResponseCode() == 200) { - List<RelayNetworkStatusVote> parsedVotes = - RelayNetworkStatusVoteImpl.parseVotes( - response.getResponseBytes()); - List<Descriptor> parsedDescriptors = - new ArrayList<Descriptor>(parsedVotes); - response.setDescriptors(parsedDescriptors); - } else { - this.missingVotes.add(requestedVote); - } - } - if (response.getRequestEnd() != 0L) { - this.descriptorQueue.add(response); - } - if ((!this.missingConsensus || - (this.downloadConsensusFromAllAuthorities && - this.requestedConsensuses.containsAll( - this.directoryAuthorities.keySet()))) && - this.missingVotes.isEmpty() && - this.requestingVotes.isEmpty()) { - /* TODO This logic may be somewhat broken. We don't wait for all - * consensus requests to complete or fail, which results in adding - * (failed) requests to the queue when we think we're done. */ - this.hasFinishedDownloading = true; - this.globalTimerThread.interrupt(); - this.descriptorQueue.setOutOfDescriptors(); - } - /* Wake up all waiting downloader threads. Maybe they can now - * download something, or they'll realize we're done downloading. */ - this.notifyAll(); - } - - private synchronized void interruptAllDownloads() { - this.hasFinishedDownloading = true; - this.notifyAll(); - } - - /* Download descriptors from one directory authority or mirror. First, - * ask the coordinator thread to create a request, run it, and deliver - * the response. Repeat until the coordinator thread says there are no - * further requests to make. */ - private static class DirectoryDownloader implements Runnable { - private String nickname; - private String ipPort; - private RelayDescriptorDownloaderImpl downloadCoordinator; - private DirectoryDownloader(String nickname, String ip, int dirPort, - RelayDescriptorDownloaderImpl downloadCoordinator) { - this.nickname = nickname; - this.ipPort = ip + ":" + String.valueOf(dirPort); - this.downloadCoordinator = downloadCoordinator; - } - private long requestTimeout; - private void setRequestTimeout(long requestTimeout) { - this.requestTimeout = requestTimeout; - } - public void run() { - boolean keepRunning = true; - do { - DescriptorRequestImpl request = - this.downloadCoordinator.createRequest(this.nickname); - if (request != null) { - String url = "http://" + this.ipPort - + request.getRequestedResource(); - request.setRequestStart(System.currentTimeMillis()); - Thread timeoutThread = new Thread(new RequestTimeout( - this.requestTimeout)); - timeoutThread.start(); - try { - URL u = new URL(url); - HttpURLConnection huc = - (HttpURLConnection) u.openConnection(); - huc.setRequestMethod("GET"); - huc.connect(); - int responseCode = huc.getResponseCode(); - request.setResponseCode(responseCode); - if (responseCode == 200) { - BufferedInputStream in = new BufferedInputStream( - new InflaterInputStream(huc.getInputStream())); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len; - byte[] data = new byte[1024]; - while ((len = in.read(data, 0, 1024)) >= 0) { - baos.write(data, 0, len); - } - in.close(); - byte[] responseBytes = baos.toByteArray(); - request.setResponseBytes(responseBytes); - request.setRequestEnd(System.currentTimeMillis()); - } - } catch (IOException e) { - /* Stop downloading from this directory if there are any - * problems, e.g., refused connections. */ - keepRunning = false; - } - /* TODO How do we find out if we were interrupted, and by who? - * Set the request or global timeout flag in the response. */ - timeoutThread.interrupt(); - this.downloadCoordinator.deliverResponse(request); - } else { - keepRunning = false; - } - } while (keepRunning); - } - } - - /* Interrupt a download request if it takes longer than a given time. */ - private static class RequestTimeout implements Runnable { - private long timeoutMillis; - private Thread downloaderThread; - private RequestTimeout(long timeoutMillis) { - this.downloaderThread = Thread.currentThread(); - this.timeoutMillis = timeoutMillis; - } - public void run() { - long started = System.currentTimeMillis(), sleep; - while ((sleep = started + this.timeoutMillis - - System.currentTimeMillis()) > 0L) { - try { - Thread.sleep(sleep); - } catch (InterruptedException e) { - return; - } - } - this.downloaderThread.interrupt(); - } + this.hasStartedDownloading = true; + DownloadCoordinator downloadCoordinator = new DownloadCoordinator( + this.directoryAuthorities, this.directoryMirrors, + this.downloadConsensus, this.downloadConsensusFromAllAuthorities, + this.downloadVotes, this.includeCurrentReferencedVotes, + this.requestTimeoutMillis, this.globalTimeoutMillis); + Iterator<DescriptorRequest> descriptorQueue = downloadCoordinator. + getDescriptorQueue(); + return descriptorQueue; } }

1 0

[tor/master] fix crash bug in original feature4207 branch
by arma＠torproject.org 17 Jan '12

17 Jan '12

commit 1e923dd2fbdc0834b8fb3ba97b658f15a6d5f6b4 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jan 16 21:20:46 2012 -0500 fix crash bug in original feature4207 branch PLURAL() assumes that the plural is the canonical name for the option, so now it is. --- doc/tor.1.txt | 8 ++++---- src/or/config.c | 8 ++++---- src/or/or.h | 10 +++++----- src/or/policies.c | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index adc84e7..56e0bd0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1462,13 +1462,13 @@ DIRECTORY AUTHORITY SERVER OPTIONS authority publishes, or accepted as an OR address in any descriptor submitted for publication by this authority. -**AuthDirBadDirCC** __CC__,... + +**AuthDirBadDirCCs** __CC__,... + -**AuthDirBadExitCC** __CC__,... + +**AuthDirBadExitCCs** __CC__,... + -**AuthDirInvalidCC** __CC__,... + +**AuthDirInvalidCCs** __CC__,... + -**AuthDirRejectCC** __CC__,...:: +**AuthDirRejectCCs** __CC__,...:: Authoritative directories only. These options contain a comma-separated list of country codes such that any server in one of those country codes will be marked as a bad directory/bad exit/invalid for use, or rejected diff --git a/src/or/config.c b/src/or/config.c index 6ecc81d..2627c14 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -186,15 +186,15 @@ static config_var_t _option_vars[] = { V(AlternateHSAuthority, LINELIST, NULL), V(AssumeReachable, BOOL, "0"), V(AuthDirBadDir, LINELIST, NULL), - V(AuthDirBadDirCC, CSV, ""), + V(AuthDirBadDirCCs, CSV, ""), V(AuthDirBadExit, LINELIST, NULL), - V(AuthDirBadExitCC, CSV, ""), + V(AuthDirBadExitCCs, CSV, ""), V(AuthDirInvalid, LINELIST, NULL), - V(AuthDirInvalidCC, CSV, ""), + V(AuthDirInvalidCCs, CSV, ""), V(AuthDirFastGuarantee, MEMUNIT, "100 KB"), V(AuthDirGuardBWGuarantee, MEMUNIT, "250 KB"), V(AuthDirReject, LINELIST, NULL), - V(AuthDirRejectCC, CSV, ""), + V(AuthDirRejectCCs, CSV, ""), V(AuthDirRejectUnlisted, BOOL, "0"), V(AuthDirListBadDirs, BOOL, "0"), V(AuthDirListBadExits, BOOL, "0"), diff --git a/src/or/or.h b/src/or/or.h index cf42979..8681d49 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3239,15 +3239,15 @@ typedef struct { * never mark as valid. */ /** @name AuthDir...CC * - * Lists of of country codes to mark as BadDir, BadExit, or Invalid, or to + * Lists of country codes to mark as BadDir, BadExit, or Invalid, or to * reject entirely. * * @{ */ - smartlist_t *AuthDirBadDirCC; - smartlist_t *AuthDirBadExitCC; - smartlist_t *AuthDirInvalidCC; - smartlist_t *AuthDirRejectCC; + smartlist_t *AuthDirBadDirCCs; + smartlist_t *AuthDirBadExitCCs; + smartlist_t *AuthDirInvalidCCs; + smartlist_t *AuthDirRejectCCs; /**@}*/ int AuthDirListBadDirs; /**< True iff we should list bad dirs, diff --git a/src/or/policies.c b/src/or/policies.c index 53cdf48..6ae5171 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -336,7 +336,7 @@ authdir_policy_permits_address(uint32_t addr, uint16_t port) { if (! addr_policy_permits_address(addr, port, authdir_reject_policy)) return 0; - return !addr_is_in_cc_list(addr, get_options()->AuthDirRejectCC); + return !addr_is_in_cc_list(addr, get_options()->AuthDirRejectCCs); } /** Return 1 if addr:port is considered valid in our @@ -347,7 +347,7 @@ authdir_policy_valid_address(uint32_t addr, uint16_t port) { if (! addr_policy_permits_address(addr, port, authdir_invalid_policy)) return 0; - return !addr_is_in_cc_list(addr, get_options()->AuthDirInvalidCC); + return !addr_is_in_cc_list(addr, get_options()->AuthDirInvalidCCs); } /** Return 1 if addr:port should be marked as a bad dir, @@ -358,7 +358,7 @@ authdir_policy_baddir_address(uint32_t addr, uint16_t port) { if (! addr_policy_permits_address(addr, port, authdir_baddir_policy)) return 1; - return addr_is_in_cc_list(addr, get_options()->AuthDirBadDirCC); + return addr_is_in_cc_list(addr, get_options()->AuthDirBadDirCCs); } /** Return 1 if addr:port should be marked as a bad exit, @@ -369,7 +369,7 @@ authdir_policy_badexit_address(uint32_t addr, uint16_t port) { if (! addr_policy_permits_address(addr, port, authdir_badexit_policy)) return 1; - return addr_is_in_cc_list(addr, get_options()->AuthDirBadExitCC); + return addr_is_in_cc_list(addr, get_options()->AuthDirBadExitCCs); } #define REJECT(arg) \

1 0

[torspec/master] Cleanup: changes introduced on 0.2.3.11-alpha were listed as 0.2.3.2-alpha
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit c4402e05e4d2d8c628ed8d5f7e5acc4d133a266b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 16 16:52:51 2012 -0500 Cleanup: changes introduced on 0.2.3.11-alpha were listed as 0.2.3.2-alpha --- control-spec.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 60a5bc0..66088f7 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1210,7 +1210,7 @@ The path is provided only when the circuit has been extended at least one hop. - The "BUILD_FLAGS" field is provided only in versions 0.2.3.2-alpha + The "BUILD_FLAGS" field is provided only in versions 0.2.3.11-alpha and later. Clients MUST accept build flags not listed above. Build flags are defined as follows: @@ -1233,7 +1233,7 @@ CONTROLLER (circuit built by a controller) The "HS_STATE" field is provided only for hidden-service circuits, - and only in versions 0.2.3.2-alpha and later. Clients MUST accept + and only in versions 0.2.3.11-alpha and later. Clients MUST accept hidden-service circuit states not listed above. Hidden-service circuit states are defined as follows: @@ -1257,7 +1257,7 @@ HSSR_JOINED (connected to client's RP circuit) The "REND_QUERY" field is provided only for hidden-service-related - circuits, and only in versions 0.2.3.2-alpha and later. Clients + circuits, and only in versions 0.2.3.11-alpha and later. Clients MUST accept hidden service addresses in formats other than that specified above.

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 16 Jan '12

16 Jan '12

commit 2530324971f7651c200ec8726635f938a143c006 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 16 21:15:04 2012 +0000 Update translations for gettor --- ru/gettor.po | 55 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 10 deletions(-) diff --git a/ru/gettor.po b/ru/gettor.po index cd0701d..c76d6bf 100644 --- a/ru/gettor.po +++ b/ru/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-01-16 20:41+0000\n" +"PO-Revision-Date: 2012-01-16 21:02+0000\n" "Last-Translator: Valerij Ler <lerkru(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -21,11 +21,11 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "Привет, это \"GetTor\" робот." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "Спасибо за запрос" #: lib/gettor/i18n.py:31 msgid "" @@ -33,6 +33,9 @@ msgid "" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." msgstr "" +"К сожалению мы не ответин на ваш почтовый запрос. Вам \n" +"необходимо иметь аккаунт GMAIL.COM, YAHOO.COM или YAHOO.CN \n" +"и отправить письмо с одного из них." #: lib/gettor/i18n.py:35 msgid "" @@ -40,9 +43,9 @@ msgid "" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." msgstr "" -"We only process requests from email services that support \"DKIM\",\n" -"which is an email feature that lets us verify that the address in the\n" -"\"From\" line is actually the one who sent the mail." +"Мы обрабатываем запросы с почтовых служб которые поддерживают \n" +"\"DKIM\", это свойство письма, которое позволяет позволяет удос что \n" +"поле \"От кого\" содержит настоящего отправителя письма." #: lib/gettor/i18n.py:39 msgid "" @@ -50,6 +53,10 @@ msgid "" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" msgstr "" +"(Мы просим прощения за то что не отвечаем на это письмо. Т.к. ваше\n" +"письмо пришло с почтового ящика не поддерживающего DKIM, мы \n" +"отошлем короткое объяснение, а в дальнейшем данный почтовый \n" +"адрес будет игнорироваться.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" @@ -69,18 +76,29 @@ msgid "" " linux-x86_64\n" " source" msgstr "" +"Мы пришлем вам пакет Tor, если вы укажете какой хотите получить.\n" +"Пожалуйста выберите один из следующих пакетов:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" #: lib/gettor/i18n.py:56 msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "" +msgstr "Пожалуйста ответь на это письмо в котором укажите имя одного пакета." #: lib/gettor/i18n.py:59 msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" msgstr "" +"ПОЛУЧЕНИЕ ЛОКАЛИЗОВАННОЙ ВЕРСИИ TOR.\n" +"======================================" #: lib/gettor/i18n.py:62 msgid "" @@ -89,6 +107,10 @@ msgid "" "\n" " gettor+fa(a)torproject.org" msgstr "" +"Чтобы получить версию Tor на вашем родном языке укажите \n" +"нужный язык в адресе письма:\n" +"\n" +" gettor+fa(a)torproject.org" #: lib/gettor/i18n.py:67 msgid "" @@ -99,11 +121,11 @@ msgstr "" #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "" +msgstr "Список поддерживаемых локалей:" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" -msgstr "" +msgstr "Ниже приведен список доступных языков:" #: lib/gettor/i18n.py:75 msgid "" @@ -119,10 +141,21 @@ msgid "" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" msgstr "" +" gettor+ar(a)torproject.org: Арабский\n" +" gettor+de(a)torproject.org: Немецкий\n" +" gettor+en(a)torproject.org: Английский\n" +" gettor+es(a)torproject.org: Испанский\n" +" gettor+fa(a)torproject.org: Фарси (Иран)\n" +" gettor+fr(a)torproject.org: Французский\n" +" gettor+it(a)torproject.org: Итальянский\n" +" gettor+nl(a)torproject.org: Немецкий\n" +" gettor+pl(a)torproject.org: Польский\n" +" gettor+ru(a)torproject.org: Русский\n" +" gettor+zh(a)torproject.org: Китайский" #: lib/gettor/i18n.py:87 msgid "If you select no language, you will receive the English version." -msgstr "" +msgstr "Если вы не выберите язык, то загрузится английская версия." #: lib/gettor/i18n.py:89 msgid "" @@ -198,6 +231,8 @@ msgid "" "SUPPORT\n" "=======" msgstr "" +"ПОДДЕРЖКА\n" +"=======" #: lib/gettor/i18n.py:133 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 16 Jan '12

16 Jan '12

commit b332429b96af0c9d01c868f50b63967c2b49891a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 16 20:45:04 2012 +0000 Update translations for gettor --- ru/gettor.po | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ru/gettor.po b/ru/gettor.po index 2ac98d0..cd0701d 100644 --- a/ru/gettor.po +++ b/ru/gettor.po @@ -4,13 +4,14 @@ # # Translators: # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# Valerij Ler <lerkru(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2010-11-30 05:01+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-01-16 20:41+0000\n" +"Last-Translator: Valerij Ler <lerkru(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,6 +40,9 @@ msgid "" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." msgstr "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." #: lib/gettor/i18n.py:39 msgid ""

1 0

[obfsproxy/master] Correctly check the return value of proto_conn_create().
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit f3726bdd5e782fc3c59645f096e337bb19b4608e Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jan 16 16:15:44 2012 +0200 Correctly check the return value of proto_conn_create(). --- src/network.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network.c b/src/network.c index 86d46e7..3e15503 100644 --- a/src/network.c +++ b/src/network.c @@ -516,7 +516,7 @@ open_outbound(conn_t *conn, bufferevent_data_cb readcb) } newconn = proto_conn_create(conn->cfg); - if (!conn) { + if (!newconn) { log_warn("%s: failed to allocate state for outbound connection", conn->peername); bufferevent_free(buf); @@ -570,7 +570,7 @@ open_outbound_hostname(conn_t *conn, int af, const char *addr, int port) return NULL; } newconn = proto_conn_create(conn->cfg); - if (!conn) { + if (!newconn) { log_warn("%s: failed to allocate state for outbound connection", conn->peername); bufferevent_free(buf);

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4916'
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit d54f1221faf1da44360a14da50096ce47485a963 Merge: c24f24b f3726bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 16 15:48:03 2012 -0500 Merge remote-tracking branch 'asn/bug4916' src/network.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[obfsproxy/master] Fix target of sizeof in pending_socks_cb().
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit c24f24b5647e9816f2ce76e265edd6091dc7abe3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 16 15:43:24 2012 -0500 Fix target of sizeof in pending_socks_cb(). --- src/network.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/network.c b/src/network.c index bdf64c3..99b40b5 100644 --- a/src/network.c +++ b/src/network.c @@ -941,7 +941,7 @@ pending_socks_cb(struct bufferevent *bev, short what, void *arg) if (what & BEV_EVENT_CONNECTED) { struct sockaddr_storage ss; struct sockaddr *sa = (struct sockaddr*)&ss; - socklen_t slen = sizeof(&ss); + socklen_t slen = sizeof(ss); obfs_assert(!circ->is_flushing);

1 0