aboutsummaryrefslogtreecommitdiff
path: root/src/tools
Commit message (Expand)AuthorAge
* Fix some remaining nmake/msvc build issuesNick Mathewson2012-05-16
* Apply a patch from Gisle Vanem to make tor-gencert build under MSVC•••(Note: It makes sense to use tor-gencert on Windows for testing purposes only. If you are a directory authority operator, and you are contemplating running tor-gencert on a Windows box in an actual production environment, you are probably making a mistake.) Nick Mathewson2012-05-07
* Fix compile error against miniupnpc-1.6 when --enable-upnp•••The bump from miniupnpc-1.5 to 1.6 changes the definition of two functions used by tor-fw-helper-upnp.c, upnpDiscover() and UPNP_AddPortMapping(). This patch addresses this and adds a check in configure.in for backwards compatibility. Thanks to Nickolay Kolchin-Semyonov for some hints. X-Tor-Bug-URL: https://trac.torproject.org/projects/tor/ticket/5434 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=376621 Signed-off-by: Anthony G. Basile <blueness@gentoo.org> Anthony G. Basile2012-04-24
* Include compat.h from natpmp-helper to fix build•••This means tor_socket_t is declared. Sebastian Hahn2012-02-14
* Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32•••This commit is completely mechanical; I used this perl script to make it: #!/usr/bin/perl -w -i.bak -p if (/^\s*\#/) { s/MS_WINDOWS/_WIN32/g; s/\bWIN32\b/_WIN32/g; } Nick Mathewson2012-01-31
* Rename nonconformant identifiers.•••Fixes bug 4893. These changes are pure mechanical, and were generated with this perl script: /usr/bin/perl -w -i.bak -p s/crypto_pk_env_t/crypto_pk_t/g; s/crypto_dh_env_t/crypto_dh_t/g; s/crypto_cipher_env_t/crypto_cipher_t/g; s/crypto_digest_env_t/crypto_digest_t/g; s/aes_free_cipher/aes_cipher_free/g; s/crypto_free_cipher_env/crypto_cipher_free/g; s/crypto_free_digest_env/crypto_digest_free/g; s/crypto_free_pk_env/crypto_pk_free/g; s/_crypto_dh_env_get_dh/_crypto_dh_get_dh/g; s/_crypto_new_pk_env_rsa/_crypto_new_pk_from_rsa/g; s/_crypto_pk_env_get_evp_pkey/_crypto_pk_get_evp_pkey/g; s/_crypto_pk_env_get_rsa/_crypto_pk_get_rsa/g; s/crypto_new_cipher_env/crypto_cipher_new/g; s/crypto_new_digest_env/crypto_digest_new/g; s/crypto_new_digest256_env/crypto_digest256_new/g; s/crypto_new_pk_env/crypto_pk_new/g; s/crypto_create_crypto_env/crypto_cipher_new/g; s/connection_create_listener/connection_listener_new/g; s/smartlist_create/smartlist_new/g; s/transport_create/transport_new/g; Nick Mathewson2012-01-18
* Use tor_socket_t, not unsigned, in tor-fw-helper-natmp.cNick Mathewson2012-01-18
* -lm should not be hardcoded.•••On some platforms (Haiku/BeOS) libm lives in libcore. Also added 'network' to the list of libraries to search for connect(). Martin Hebnes Pedersen2011-12-19
* Fix compilation of natpmp-helper on non-windows•••Fixes a small oversight in 5dbfb1b3e0efc95be34ba7d69852511c9bac1f4b. Sebastian Hahn2011-12-10
* Make file descriptor type an unsigned integer•••This avoids a warning from gcc (comparison between signed and unsigned integer expressions [-Werror=sign-compare]), under Windows Steven Murdoch2011-11-30
* Support NAT-PMP on Windows•••- Link in libws32 and libiphlpapi, needed for libnatpmp (both in ./configure and when compiling tor-fw-helper-natpmp.c) - Define STATICLIB under Windows, to allow tor-fw-helper-natpmp.c to link - Don't include arpa/inet.h which isn't present in Mingw32 and doesn't appear to be needed on either Windows or MacOS X Steven Murdoch2011-11-30
* tor-gencert: Fix a minor formatting issue in an error message (re: #4574)Peter Palfrader2011-11-25
* Fix names of functions that convert strings to addrs•••Now let's have "lookup" indicate that there can be a hostname resolution, and "parse" indicate that there wasn't. Previously, we had one "lookup" function that did resolution; four "parse" functions, half of which did resolution; and a "from_str()" function that didn't do resolution. That's confusing and error-prone! The code changes in this commit are exactly the result of this perl script, run under "perl -p -i.bak" : s/tor_addr_port_parse/tor_addr_port_lookup/g; s/parse_addr_port(?=[^_])/addr_port_lookup/g; s/tor_addr_from_str/tor_addr_parse/g; This patch leaves aton and pton alone: their naming convention and behavior is is determined by the sockets API. More renaming may be needed. Nick Mathewson2011-10-11
* Correct reference to libiphlpapi from libiphlapiSteven Murdoch2011-08-22
* Appease "make check spaces"Steven Murdoch2011-08-22
* Only link ws2_32 and iphlapi on windows.•••This is a tweak for the tor-fw-helper port to windows. Nick Mathewson2011-08-19
* Link and build tor-fw-helper on Windows•••- Update configure script to test for libminiupnpc along with the libws2_32 and libiphlpapi libraries required by libminiupnpc - When building tor-fw-helper, link in libiphlpapi - Link in libminiupnpc statically becasue I could not get the DLL to link properly - Call WSAStartup before doing network operations - Fix up a compiler warning about uninitialized backend_state N.B. The changes to configure.in and Makefile.am will break on non- Windows platforms. Steven Murdoch2011-08-19
* Re-order tor_fw_helper_LDADD flags so that they work•••Patch from "blueness". Nick Mathewson2011-08-01
* Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-07-19
|\
| * Specify text or binary mode in every start_writing_to_stdio_file callRobert Ransom2011-07-19
* | Fix tor-fw-helper-natpmp.c API usage•••libnatpmp-20110618 changed the API that tor-fw-helper used and for a time tor-fw-helper could not build against the newest libnatpmp. This patch brings support for libnatpmp to tor-fw-helper. Jacob Appelbaum2011-06-20
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-28
|\|
| * Remove the -F option from tor-resolve.•••It used to mean "Force": it would tell tor-resolve to ask tor to resolve an address even if it ended with .onion. But when AutomapHostsOnResolve was added, automatically refusing to resolve .onion hosts stopped making sense. So in 0.2.1.16-rc (commit 298dc95dfd8), we made tor-resolve happy to resolve anything. The -F option stayed in, though, even though it didn't do anything. Oddly, it never got documented. Found while fixing GCC 4.6 "set, unused variable" warnings. Nick Mathewson2011-05-23
* | Bump copyright statements to 2011 (master)Nick Mathewson2011-01-03
* | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\|
| * Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2•••Conflicts: src/common/test.h src/or/test.c Nick Mathewson2011-01-03
| |\
| | * Bump copyright statements to 2011Nick Mathewson2011-01-03
* | | Stop linking src/tools/* against libeventNick Mathewson2010-11-11
* | | Fix up tor-fw-helper "INCLUDES" directiveNick Mathewson2010-11-11
* | | Split long lines in configure.in and Makefile.am files•••Having very long single lines with lots and lots of things in them tends to make files hard to diff and hard to merge. Since our tools are one-line-at-a-time, we should try to construct lists that way too, within reason. This incidentally turned up a few headers in configure.in that we were for some reason searching for twice. Nick Mathewson2010-11-11
* | | Fix space and formatting issuesNick Mathewson2010-09-30
* | | Turn select() usage in tor-fw-helper into a function.Nick Mathewson2010-09-30
* | | Start tor-fw-helper in the background, and log whatever it outputsSteven Murdoch2010-09-30
* | | Changes to tor-fw-helper, some based on Nick's review••• * MINIUPNPC rather than the generic UPNP * Nick suggested a better abstraction model for tor-fw-helper * Fix autoconf to build with either natpmp or miniupnpc * Add AM_PROG_CC_C_O to fix automake complaint * update spec to address nickm's concern * refactor nat-pmp to match upnp state * we prefer tor_snprintf to snprintf * link properlty for tor_snprintf * rename test_commandline_options to log_commandline_options * cast this uint as an int * detect possible FD_SETSIZE errors * make note about future enhancements for natpmp * add upnp enhancement note * ChangeLog entry * doxygen and check-spaces cleanup * create tor-fw-helper.1.txt Jacob Appelbaum2010-09-30
* | | First implementation of tor-fw-helper.•••tor-fw-helper is a command-line tool to wrap and abstract various firewall port-forwarding tools. This commit matches the state of Jacob's tor-fw-helper branch as of 23 September 2010. (commit msg by Nick) Jacob Appelbaum2010-09-30
|/ /
* | Rename log.h to torlog.h•••This should make us conflict less with system files named "log.h". Yes, we shouldn't have been conflicting with those anyway, but some people's compilers act very oddly. The actual change was done with one "git mv", by editing Makefile.am, and running find . -name '*.[ch]' | xargs perl -i -pe 'if (/^#include.*\Wlog.h/) {s/log.h/torlog.h/; }' Nick Mathewson2010-07-09
* | clean up whitespace in src/toolsNick Mathewson2010-05-20
* | Add --enable-static-zlib option•••Works like the --enable-static-openssl/libevent options. Requires --with-zlib-dir to be set. Note that other dependencies might still pull in a dynamicly linked zlib, if you don't link them in statically too. Sebastian Hahn2010-04-14
* | Merge remote branch 'origin/maint-0.2.1'•••Conflicts: src/common/test.h src/or/test.c Nick Mathewson2010-02-27
|\|
| * Update Tor Project copyright yearsNick Mathewson2010-02-27
* | Make expand_filename into a tor_strdup() alias on windows.•••On Windows, we don't have a notion of ~ meaning "our homedir", so we were deliberately using an #ifdef to avoid calling expand_filename() in multiple places. This is silly: The right place to turn a function into a no-op on a single platform is in the function itself, not in every single call-site. Nick Mathewson2010-02-22
* | Expand homedirs in paths passed to tor-checkkey•••This is so that coverity stops complaining about using a user-supplied string with the open() syscall. Let's see if it works. Sebastian Hahn2010-02-22
* | Merge commit 'origin/maint-0.2.1'•••Resolved conflicts in: configure.in src/or/Makefile.am src/tools/Makefile.am Nick Mathewson2010-01-24
|\|
| * Add --enable-static-(openssl|libevent) options•••These options only work when using --with-(openssl|libevent)-dir to explicitly pick a libevent or openssl location. Nick Mathewson2010-01-24
* | Build Bug: -lm should come after passing ../common/libor.a to linker•••The following commit: commit e56747f9cf29ed788baf8805bfe391925d8a19da Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 15 14:32:55 2009 -0500 Refactor a bit so that it is safe to include math.h, and mostly not needed. introduced this line: tor_resolve_LDADD = -lm ../common/libor.a @TOR_LIB_WS32@ which caused the build to fail, because only ../common/libor.a (via the embedded ../common/util.o via ../common/util.c) referenced libm's `lround' and `log' symbols, so that the linker (GNU ld) didn't bother to import those symbols before reading ../common/libor.a, thus leaving those symbols undefined. The solution was to swap the order, producing the line: tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIB_WS32@ Signed-off-by: Michael Witten <mfwitten@gmail.com> Michael Witten2010-01-18
* | Refactor a bit so that it is safe to include math.h, and mostly not needed.Nick Mathewson2009-12-15
* | Make tor-gencert build on Android•••Previously, tor-gencert would call RSA_generate_key() directly. This won't work on Android, which removes the (deprecated since OpenSSL 0.9.8) function. We can't call RSA_generate_key_ex() unconditionally either, since that didn't exist before 0.9.8. Instead, we must call our own crypto_pk_generate_key_with_bits, which knows how to call RSA_generate_key or RSA_generate_key_ex as appropriate. [Based on patch by Nathan Freitas] Nick Mathewson2009-09-29
* | Include util.h and log.h as relative paths.•••This shouldn't be necessary, but apparently the Android cross-compiler doesn't respect -I as well as it should. (-I is supposed to add to the *front* of the search path. Android's gcc wrapper apparently likes to add to the end. This is broken, but we need to work around it.) Nathan Freitas2009-09-29
* | Merge commit 'origin/maint-0.2.1'Nick Mathewson2009-09-01
|\|
| * Fix compile warnings on Snow Leopard•••Big thanks to nickm and arma for helping me with this! Sebastian Hahn2009-09-01