summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2014-04-29Merge remote-tracking branch 'public/bug11605_024'Nick Mathewson
2014-04-29Quench gcc's complaints about discarding constness in TO_ORIGIN_CIRCUIT.dana koch
This was previously satisfied by using a temporary variable, but there are three other instances in circuitlist.c that gcc is now bothered by, so now introduce a CONST_TO_ORIGIN_CIRCUIT that takes a const circuit_t instead.
2014-04-29Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-04-29Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-04-29Stop leaking memory in error cases of md parsingNick Mathewson
When clearing a list of tokens, it's important to do token_clear() on them first, or else any keys they contain will leak. This didn't leak memory on any of the successful microdescriptor parsing paths, but it does leak on some failing paths when the failure happens during tokenization. Fixes bug 11618; bugfix on 0.2.2.6-alpha.
2014-04-28Merge remote-tracking branch 'public/bug11608'Nick Mathewson
2014-04-28Fix capitalization of MaxMemInQueuesNick Mathewson
This won't affect anybody's configuration, but it makes it match what we documented. Fixes part of 11634.
2014-04-28Actually put ExtORPortCookieAuthFile into config.cNick Mathewson
Fixes bug 11635; bugfix on 0.2.5.1-alpha.
2014-04-27Make the python test scripts work on python3Nick Mathewson
The python scripts invoked by 'make check' didn't work on python3 before. That was a problem on systems where 'python' is python3. Fixes bug 11608; bugfix on 0.2.5.2-alpha.
2014-04-25Bump version to 0.2.5.4-alpha-devNick Mathewson
2014-04-25resolve a typo: sanboxing->sandboxing.Nick Mathewson
2014-04-25Make compilation of tor_memdup_nulterm() with dmallocNick Mathewson
Fixes bug 11605; bugfix on 0.2.4.10-alpha.
2014-04-25Bump version to 0.2.5.4-alpha.Nick Mathewson
Probably releasing within ~22 hours, pending testing
2014-04-25fix memory leak in dump_exit_policy_to_string testsNick Mathewson
2014-04-25Merge branch 'scanbuild_fixes'Nick Mathewson
2014-04-24whitespace fixNick Mathewson
2014-04-24Merge remote-tracking branch 'public/bug11553_025'Nick Mathewson
2014-04-24Merge branch 'bug11396_v2_squashed'Nick Mathewson
Conflicts: src/or/main.c
2014-04-24Expose the real maxmeminqueues via a GETINFONick Mathewson
That is, GETINFO limits/max-mem-in-queues
2014-04-24Change the logic for the default for MaxMemInQueuesNick Mathewson
If we can't detect the physical memory, the new default is 8 GB on 64-bit architectures, and 1 GB on 32-bit architectures. If we *can* detect the physical memory, the new default is CLAMP(256 MB, phys_mem * 0.75, MAX_DFLT) where MAX_DFLT is 8 GB on 64-bit architectures and 2 GB on 32-bit architectures. You can still override the default by hand. The logic here is simply trying to choose a lower default value on systems with less than 12 GB of physical RAM.
2014-04-24get_total_system_memory(): see how much RAM we haveNick Mathewson
2014-04-23Merge remote-tracking branch 'public/bug11553_024' into bug11553_025Nick Mathewson
Conflicts: src/or/circuitbuild.c
2014-04-23Improvements to #11553 fix based on reviewNick Mathewson
Use a per-channel ratelim_t to control the rate at which we report failures for each channel. Explain why I picked N=32. Never return a zero circID. Thanks to Andrea and to cypherpunks.
2014-04-23Merge remote-tracking branch 'public/bug10268'Nick Mathewson
2014-04-23Merge remote-tracking branch 'public/bug11200'Nick Mathewson
2014-04-23Merge branch 'bug11156_issue2_squashed'Nick Mathewson
2014-04-23Slightly improve the documentation of src/or/transports.cGeorge Kadianakis
Make it clear that a SIGHUP is not the only action that can cause a config re-read.
2014-04-23Rename the got_hup element of managed proxies.George Kadianakis
Since we need to toggle that element in non-SIGHUP situations too where the config was re-read (like in SETCONF or RESETCONF).
2014-04-23Don't halt bootstrap to figure out if we should restart PT proxies.George Kadianakis
Instead, figure out if we should restart PT proxies _immediately_ after we re-read the config file.
2014-04-23Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4Nick Mathewson
2014-04-23Merge remote-tracking branch 'public/bug9229_025'Nick Mathewson
Conflicts: src/or/entrynodes.c
2014-04-19scan-build: memarea_strndup() undefined behaviorNick Mathewson
The memarea_strndup() function would have hit undefined behavior by creating an 'end' pointer off the end of a string if it had ever been given an 'n' argument bigger than the length of the memory ares that it's scanning. Fortunately, we never did that except in the unit tests. But it's not a safe behavior to leave lying around.
2014-04-19scan-build: avoid undef behaior in tor_inet_ptonNick Mathewson
If we had an address of the form "1.2.3.4" and we tried to pass it to tor_inet_pton with AF_INET6, it was possible for our 'eow' pointer to briefly move backwards to the point before the start of the string, before we moved it right back to the start of the string. C doesn't allow that, and though we haven't yet hit a compiler that decided to nuke us in response, it's best to fix. So, be more explicit about requiring there to be a : before any IPv4 address part of the IPv6 address. We would have rejected addresses without a : for not being IPv6 later on anyway.
2014-04-19scan-build: sizeof(ptr*) in a debugging log in ext_orport.cNick Mathewson
Instead of taking the length of a buffer, we were taking the length of a pointer, so that our debugging log would cover only the first sizeof(void*) bytes of the client nonce.
2014-04-19scan-build: Fix harmless sizeof(ptr) in test_oom.cNick Mathewson
We meant to using random bytes to fill a buffer, up to 3000 at a time. Instead we were taking them sizeof(void*) at a time.
2014-04-19scan-build: close stdio FILEs on error in tor-gencertNick Mathewson
This is harmless, since tor-gencert exits right afterwards, but it's best to clean up after ourselves.
2014-04-19scan-build: truncate tinytest hexified outputs to 1024 bytes.Nick Mathewson
scan-build didn't like the unlimited version since we might need to overflow size_t to hexify a string that took up half our address space. (!)
2014-04-19scan-build: limit hashtable size so it always fits in SSIZE_MAXNick Mathewson
scan-build recognizes that in theory there could be a numeric overflow here. This can't numeric overflow can't trigger IRL, since in order to fill a hash table with more than P=402653189 buckets with a reasonable load factor of 0.5, we'd first have P/2 malloced objects to put in it--- and each of those would have to take take at least sizeof(void*) worth of malloc overhead plus sizeof(void*) content, which would run you out of address space anyway on a 32-bit system.
2014-04-18scan-build: bulletproof last-chance errormsg generation in rendservice.cNick Mathewson
If 'intro' is NULL in these functions, I'm pretty sure that the error message must be set before we hit the end. But scan-build doesn't notice that, and is worried that we'll do a null-pointer dereference in the last-chance errormsg generation.
2014-04-18scan-build: Have clear_pending_onions walk the lists more obviouslyNick Mathewson
As it stands, it relies on the fact that onion_queue_entry_remove will magically remove each onionskin from the right list. This patch changes the logic to be more resilient to possible bugs in onion_queue_entry_remove, and less confusing to static analysis tools.
2014-04-18scan-build: in cpuworker, initialize tv_startNick Mathewson
scan-build doesn't realize that a request can't be timed at the end unless it's timed at the start, and so it's not possible for us to be subtracting start from end without start being set. Nevertheless, let's not confuse it.
2014-04-18scan-build: get_proxy_addrport should always set its outputsNick Mathewson
When get_proxy_addrport returned PROXY_NONE, it would leave addr/port unset. This is inconsistent, and could (if we used the function in a stupid way) lead to undefined behavior. Bugfix on 5b050a9b0, though I don't think it affects tor-as-it-is.
2014-04-18scan-build: when logging a path length, check build_state.Nick Mathewson
Throughout circuituse, when we log about a circuit, we log its desired path length from build_state. scan-build is irrationally concerned that build_state might be NULL.
2014-04-18scan-build: Be consistent with a needless check in circuitmux.cNick Mathewson
In circuitmux_detach_all_circuits, we check whether an HT iterator gives us NULL. That should be impossible for an HT iterator. But our checking it has confused scan-build (justly) into thinking that our later use of HT_NEXT_RMV might not be kosher. I'm taking the coward's route here and strengthening the check. Bugfix on fd31dd44. (Not a real bug though)
2014-04-18scan-build: fix a crash-on-fail possibility in test_policy.cNick Mathewson
2014-04-18scan-build: Avoid crashing on BUG in circuit_get_by_rend_token_and_purposeNick Mathewson
If we fail in circuit_get_by_rend_token_and_purpose because the circuit has no rend_info, don't try to reference fiends from its rend_info when logging an error. Bugfix on 8b9a2cb68, which is going into Tor 0.2.5.4-alpha.
2014-04-18scan-build: circuit_cpath_support_ntor had a dead initializationNick Mathewson
We were initializing cpath twice, which doesn't make sense.
2014-04-18scan-build: check impossible null-pointer case in buffers.cNick Mathewson
When maintaining buffer freelists, we don't skip more than there are, so (*chp) can't be null to begin with. scan-build has no way to know that.
2014-04-18scan-build: Add a check for result from getaddrinfoNick Mathewson
As documented, getaddrinfo always sets its result when it returns no error. But scan-build doesn't know that, and thinks we might be def
2014-04-18Merge remote-tracking branch 'public/bug9963_v2_024'Nick Mathewson