- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Make connection_printf_to_buf's behaviour sane
by nickm＠torproject.org 17 Jun '11

17 Jun '11

commit 68cd0a9abeab126b3d954f060d922fd71cb945f7 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jun 15 21:16:44 2011 -0700 Make connection_printf_to_buf's behaviour sane --- changes/fix-connection_printf_to_buf | 10 ++++++++++ src/or/control.c | 29 +++++++++++------------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/changes/fix-connection_printf_to_buf b/changes/fix-connection_printf_to_buf new file mode 100644 index 0000000..b6fa092 --- /dev/null +++ b/changes/fix-connection_printf_to_buf @@ -0,0 +1,10 @@ + * Code simplifications and refactoring: + + - Make connection_printf_to_buf's behaviour sane. Its callers + expect it to emit a CRLF iff the format string ends with CRLF; + it actually emits a CRLF iff (a) the format string ends with + CRLF or (b) the resulting string is over 1023 characters long or + (c) the format string does not end with CRLF ''and'' the + resulting string is 1021 characters long or longer. Bugfix on + 0.1.1.9-alpha; fixes bug 3407. + diff --git a/src/or/control.c b/src/or/control.c index 5d2d135..2308cd6 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -481,33 +481,26 @@ decode_escaped_string(const char *start, size_t in_len_max, } /** Acts like sprintf, but writes its formatted string to the end of - * conn-\>outbuf. The message may be truncated if it is too long, - * but it will always end with a CRLF sequence. - * - * Currently the length of the message is limited to 1024 (including the - * ending CR LF NUL ("\\r\\n\\0"). */ + * conn-\>outbuf. */ static void connection_printf_to_buf(control_connection_t *conn, const char *format, ...) { -#define CONNECTION_PRINTF_TO_BUF_BUFFERSIZE 1024 va_list ap; - char buf[CONNECTION_PRINTF_TO_BUF_BUFFERSIZE]; - int r; - size_t len; + char *buf = NULL; + int len; + va_start(ap,format); - r = tor_vsnprintf(buf, sizeof(buf), format, ap); + len = tor_vasprintf(&buf, format, ap); va_end(ap); - if (r<0) { + + if (len < 0) { log_warn(LD_BUG, "Unable to format string for controller."); return; } - len = strlen(buf); - if (fast_memcmp("\r\n\0", buf+len-2, 3)) { - buf[CONNECTION_PRINTF_TO_BUF_BUFFERSIZE-1] = '\0'; - buf[CONNECTION_PRINTF_TO_BUF_BUFFERSIZE-2] = '\n'; - buf[CONNECTION_PRINTF_TO_BUF_BUFFERSIZE-3] = '\r'; - } - connection_write_to_buf(buf, len, TO_CONN(conn)); + + connection_write_to_buf(buf, (size_t)len, TO_CONN(conn)); + + tor_free(buf); } /** Write all of the open control ports to ControlPortWriteToFile */

1 0

[tor/maint-0.2.2] Fix comment typo
by nickm＠torproject.org 17 Jun '11

17 Jun '11

commit 70785f87bb47e481053719f2a514bf0598c62b2d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 16 02:57:58 2011 -0700 Fix comment typo --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 2308cd6..2170a9b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -98,7 +98,7 @@ static int disable_log_messages = 0; static int authentication_cookie_is_set = 0; /** If authentication_cookie_is_set, a secret cookie that we've stored to disk * and which we're using to authenticate controllers. (If the controller can - * read it off disk, it has permission to connect. */ + * read it off disk, it has permission to connect.) */ static char authentication_cookie[AUTHENTICATION_COOKIE_LEN]; /** A sufficiently large size to record the last bootstrap phase string. */

1 0

[tor/maint-0.2.2] Make send_control_event_impl's behaviour sane
by nickm＠torproject.org 17 Jun '11

17 Jun '11

commit 227896e447625b0718690d7228f1239a0fc399d1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 16 03:39:37 2011 -0700 Make send_control_event_impl's behaviour sane --- changes/fix-connection_printf_to_buf | 7 ++++++- src/or/control.c | 33 +++++++++------------------------ 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/changes/fix-connection_printf_to_buf b/changes/fix-connection_printf_to_buf index b6fa092..e191eac 100644 --- a/changes/fix-connection_printf_to_buf +++ b/changes/fix-connection_printf_to_buf @@ -6,5 +6,10 @@ CRLF or (b) the resulting string is over 1023 characters long or (c) the format string does not end with CRLF ''and'' the resulting string is 1021 characters long or longer. Bugfix on - 0.1.1.9-alpha; fixes bug 3407. + 0.1.1.9-alpha; fixes part of bug 3407. + + - Make send_control_event_impl's behaviour sane. Its callers + expect it to always emit a CRLF at the end of the string; it + might emit extra control characters as well. Bugfix on + 0.1.1.9-alpha; fixes another part of bug 3407. diff --git a/src/or/control.c b/src/or/control.c index 2170a9b..e7d2044 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -602,43 +602,28 @@ send_control_event_string(uint16_t event, event_format_t which, /** Helper for send_control_event and control_event_status: * Send an event to all v1 controllers that are listening for code * event. The event's body is created by the printf-style format in - * format, and other arguments as provided. - * - * Currently the length of the message is limited to 10064 (including the - * ending \\r\\n\\0). */ + * format, and other arguments as provided. */ static void send_control_event_impl(uint16_t event, event_format_t which, const char *format, va_list ap) { - /* This is just a little longer than the longest allowed log message */ -#define SEND_CONTROL1_EVENT_BUFFERSIZE 10064 - int r; - char buf[SEND_CONTROL1_EVENT_BUFFERSIZE]; - size_t len; + char *buf = NULL; + int len; - r = tor_vsnprintf(buf, sizeof(buf), format, ap); - if (r<0) { + len = tor_vasprintf(&buf, format, ap); + if (len < 0) { log_warn(LD_BUG, "Unable to format event for controller."); return; } - len = strlen(buf); - if (fast_memcmp("\r\n\0", buf+len-2, 3)) { - /* if it is not properly terminated, do it now */ - buf[SEND_CONTROL1_EVENT_BUFFERSIZE-1] = '\0'; - buf[SEND_CONTROL1_EVENT_BUFFERSIZE-2] = '\n'; - buf[SEND_CONTROL1_EVENT_BUFFERSIZE-3] = '\r'; - } - send_control_event_string(event, which|ALL_FORMATS, buf); + + tor_free(buf); } /** Send an event to all v1 controllers that are listening for code * event. The event's body is created by the printf-style format in - * format, and other arguments as provided. - * - * Currently the length of the message is limited to 10064 (including the - * ending \\n\\r\\0. */ + * format, and other arguments as provided. */ static void send_control_event(uint16_t event, event_format_t which, const char *format, ...)

1 0

[tor/maint-0.2.2] Merge branch 'bug3407' into maint-0.2.2
by nickm＠torproject.org 17 Jun '11

17 Jun '11

commit 209229f100d20958d0826d4f6773d7f6b3a43ade Merge: 64bfbcb 227896e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 14:59:39 2011 -0400 Merge branch 'bug3407' into maint-0.2.2 changes/fix-connection_printf_to_buf | 15 ++++++++ src/or/control.c | 66 +++++++++++---------------------- 2 files changed, 37 insertions(+), 44 deletions(-)

1 0

[torbutton/master] Remove some transifex puke.
by mikeperry＠torproject.org 17 Jun '11

17 Jun '11

commit 132e3ad98da172b0b3ec1d38ea58a9f034f8e5b3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 17 12:00:47 2011 -0700 Remove some transifex puke. --- src/chrome/locale/en/torbutton.dtd.orig | 135 ------------------------------- src/chrome/locale/en/torbutton.dtd.rej | 10 --- 2 files changed, 0 insertions(+), 145 deletions(-) diff --git a/src/chrome/locale/en/torbutton.dtd.orig b/src/chrome/locale/en/torbutton.dtd.orig deleted file mode 100644 index e6a5caf..0000000 --- a/src/chrome/locale/en/torbutton.dtd.orig +++ /dev/null @@ -1,135 +0,0 @@ -<!ENTITY torbutton.prefs.title "Torbutton Preferences"> -<!ENTITY torbutton.prefs.display_settings "Display Settings"> -<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar"> -<!ENTITY torbutton.prefs.panel_format "Status bar display format:"> -<!ENTITY torbutton.prefs.panel_text_format "Text"> -<!ENTITY torbutton.prefs.panel_icon_format "Icon"> -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.about.title "About Torbutton"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> -<!ENTITY torbutton.context_menu.toggle "Toggle Tor status"> -<!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> -<!ENTITY torbutton.context_menu.about "About Torbutton..."> -<!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> -<!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL"> -<!ENTITY torbutton.context_menu.copyTor.key "p"> -<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab"> -<!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window"> -<!ENTITY torbutton.context_menu.openTorWindow.key "d"> -<!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.sec_settings "Security Settings"> -<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> -<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> -<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> -<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> -<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> -<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> -<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> -<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> -<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose"> -<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> -<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> -<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> -<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> -<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> -<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage"> -<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> -<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> -<!ENTITY torbutton.prefs.cookies "Cookies"> -<!ENTITY torbutton.prefs.cache "Cache"> -<!ENTITY torbutton.prefs.history "History"> -<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> -<!ENTITY torbutton.prefs.shutdown "Shutdown"> -<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> -<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> -<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> -<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> -<!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> -<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> -<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> -<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> -<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> -<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> -<!ENTITY torbutton.prefs.forms "Forms"> -<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> -<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> -<!ENTITY torbutton.prefs.tor "Tor"> -<!ENTITY torbutton.prefs.non_tor "Non-Tor"> -<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:"> -<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> -<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> -<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> -<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> -<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> -<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> -<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> -<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> -<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> -<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> -<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> -<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> -<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> -<!ENTITY torbutton.prefs.startup "Startup"> -<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> -<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk"> -<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk"> -<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:"> -<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor"> -<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> -<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh"> -<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options"> -<!ENTITY torbutton.prefs.nospoof "Do not spoof referer"> -<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page"> -<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer"> -<!ENTITY torbutton.prefs.spoofblank "Make referer blank"> -<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> -<!ENTITY torbutton.cookiedialog.domainCol "Host"> -<!ENTITY torbutton.cookiedialog.nameCol "Name"> -<!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage"> -<!ENTITY torbutton.prefs.dtd_recommended "(recommended)"> -<!ENTITY torbutton.prefs.dtd_optional "(optional)"> -<!ENTITY torbutton.prefs.dtd_crucial "(crucial)"> -<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor"> -<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:"> -<!ENTITY torbutton.prefs.engine1 "ixquick.com"> -<!ENTITY torbutton.prefs.engine2 "Bing.com"> -<!ENTITY torbutton.prefs.engine3 "Yahoo.com"> -<!ENTITY torbutton.prefs.engine4 "scroogle.org"> -<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries"> diff --git a/src/chrome/locale/en/torbutton.dtd.rej b/src/chrome/locale/en/torbutton.dtd.rej deleted file mode 100644 index dda8b26..0000000 --- a/src/chrome/locale/en/torbutton.dtd.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- src/chrome/locale/en/torbutton.dtd -+++ src/chrome/locale/en/torbutton.dtd -@@ -93,6 +93,7 @@ - <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> - <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> - <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> -+<!ENTITY torbutton.prefs.transparentTor "Enable Transparent Torification"> - <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage"> - <!ENTITY torbutton.prefs.dtd_recommended "(recommended)"> - <!ENTITY torbutton.prefs.dtd_optional "(optional)">

1 0

[tor/maint-0.2.2] Correct some outdated comments
by nickm＠torproject.org 17 Jun '11

17 Jun '11

commit 39480c797851c8c70914153b403a282a02e7aebb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 24 22:20:12 2011 -0700 Correct some outdated comments --- src/or/control.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 0dad1b9..5d2d135 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -606,12 +606,12 @@ send_control_event_string(uint16_t event, event_format_t which, } SMARTLIST_FOREACH_END(conn); } -/** Helper for send_control1_event and send_control1_event_extended: +/** Helper for send_control_event and control_event_status: * Send an event to all v1 controllers that are listening for code * event. The event's body is created by the printf-style format in * format, and other arguments as provided. * - * Currently the length of the message is limited to 1024 (including the + * Currently the length of the message is limited to 10064 (including the * ending \\r\\n\\0). */ static void send_control_event_impl(uint16_t event, event_format_t which, @@ -644,7 +644,7 @@ send_control_event_impl(uint16_t event, event_format_t which, * event. The event's body is created by the printf-style format in * format, and other arguments as provided. * - * Currently the length of the message is limited to 1024 (including the + * Currently the length of the message is limited to 10064 (including the * ending \\n\\r\\0. */ static void send_control_event(uint16_t event, event_format_t which,

1 0

[flashproxy/master] Use uniform patch naming.
by dcf＠torproject.org 17 Jun '11

17 Jun '11

commit 98d58fdd87e5485de522810ffe98642c9b011441 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 17 10:10:32 2011 -0700 Use uniform patch naming. Use extension .patch rather than .diff. Use a lower-case "cumulus". --- Cumulus-no-manage-log.patch | 39 --------------------------------------- README | 2 +- cumulus-no-manage-log.patch | 39 +++++++++++++++++++++++++++++++++++++++ tor-ignore-bridge-failure.diff | 19 ------------------- tor-ignore-bridge-failure.patch | 19 +++++++++++++++++++ 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/Cumulus-no-manage-log.patch b/Cumulus-no-manage-log.patch deleted file mode 100644 index 810b52d..0000000 --- a/Cumulus-no-manage-log.patch +++ /dev/null @@ -1,39 +0,0 @@ -Don't try to re-open log files. This avoids a failure after --daemon -causes a chdir to /. - -diff --git a/CumulusService/sources/main.cpp b/CumulusService/sources/main.cpp -index 891621f..39ea4eb 100644 ---- a/CumulusService/sources/main.cpp -+++ b/CumulusService/sources/main.cpp -@@ -132,7 +132,6 @@ protected: - void dumpHandler(const char* data,int size) { - cout.write(data,size); - _logStream.write(data,size); -- manageLogFile(); - } - - void logHandler(Thread::TID threadId,const std::string& threadName,Priority priority,const char *filePath,long line, const char *text) { -@@ -140,23 +139,6 @@ protected: - _logStream << DateTimeFormatter::format(LocalDateTime(),"%d/%m %H:%M:%S.%c ") - << g_logPriorities[priority-1] << '\t' << threadName << '(' << threadId << ")\t" - << Path(filePath).getFileName() << '[' << line << "] " << text << std::endl; -- manageLogFile(); -- } -- -- void manageLogFile() { -- if(_logFile.getSize()>LOG_SIZE) { -- _logStream.close(); -- int num = 10; -- File file(LOG_FILE(10)); -- if(file.exists()) -- file.remove(); -- while(--num>=0) { -- file = LOG_FILE_VAR(num); -- if(file.exists()) -- file.renameTo(LOG_FILE_VAR(num+1)); -- } -- _logStream.open(LOG_FILE(0),ios::in | ios::ate); -- } - } - - bool onConnection(Client& client) { diff --git a/README b/README index 773d3cb..ef7e826 100644 --- a/README +++ b/README @@ -108,7 +108,7 @@ Follow these steps to install the Cumulus server. You need to open port 1935/udp in the firewall. $ git clone git://github.com/OpenRTMFP/Cumulus.git $ cd Cumulus - $ patch -p0 < Cumulus-no-manage-log.patch + $ patch -p0 < cumulus-no-manage-log.patch $ cd CumulusLib $ make LIBS=./ # cp libCumulus.so /usr/local/lib diff --git a/cumulus-no-manage-log.patch b/cumulus-no-manage-log.patch new file mode 100644 index 0000000..810b52d --- /dev/null +++ b/cumulus-no-manage-log.patch @@ -0,0 +1,39 @@ +Don't try to re-open log files. This avoids a failure after --daemon +causes a chdir to /. + +diff --git a/CumulusService/sources/main.cpp b/CumulusService/sources/main.cpp +index 891621f..39ea4eb 100644 +--- a/CumulusService/sources/main.cpp ++++ b/CumulusService/sources/main.cpp +@@ -132,7 +132,6 @@ protected: + void dumpHandler(const char* data,int size) { + cout.write(data,size); + _logStream.write(data,size); +- manageLogFile(); + } + + void logHandler(Thread::TID threadId,const std::string& threadName,Priority priority,const char *filePath,long line, const char *text) { +@@ -140,23 +139,6 @@ protected: + _logStream << DateTimeFormatter::format(LocalDateTime(),"%d/%m %H:%M:%S.%c ") + << g_logPriorities[priority-1] << '\t' << threadName << '(' << threadId << ")\t" + << Path(filePath).getFileName() << '[' << line << "] " << text << std::endl; +- manageLogFile(); +- } +- +- void manageLogFile() { +- if(_logFile.getSize()>LOG_SIZE) { +- _logStream.close(); +- int num = 10; +- File file(LOG_FILE(10)); +- if(file.exists()) +- file.remove(); +- while(--num>=0) { +- file = LOG_FILE_VAR(num); +- if(file.exists()) +- file.renameTo(LOG_FILE_VAR(num+1)); +- } +- _logStream.open(LOG_FILE(0),ios::in | ios::ate); +- } + } + + bool onConnection(Client& client) { diff --git a/tor-ignore-bridge-failure.diff b/tor-ignore-bridge-failure.diff deleted file mode 100644 index fa50366..0000000 --- a/tor-ignore-bridge-failure.diff +++ /dev/null @@ -1,19 +0,0 @@ -This patch causes Tor to ignore bridge reachability failures. This is -helpful when the bridge is only intermittently available, as when -connecting through a flash proxy. - -diff --git src/or/circuitbuild.c src/or/circuitbuild.c -index ac0df91..1794634 100644 ---- src/or/circuitbuild.c -+++ src/or/circuitbuild.c -@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, - int idx = -1; - char buf[HEX_DIGEST_LEN+1]; - -+ /* Ignore bridge reachability problems. */ -+ if (! succeeded) -+ return 0; -+ - if (! entry_guards) - return 0; - diff --git a/tor-ignore-bridge-failure.patch b/tor-ignore-bridge-failure.patch new file mode 100644 index 0000000..fa50366 --- /dev/null +++ b/tor-ignore-bridge-failure.patch @@ -0,0 +1,19 @@ +This patch causes Tor to ignore bridge reachability failures. This is +helpful when the bridge is only intermittently available, as when +connecting through a flash proxy. + +diff --git src/or/circuitbuild.c src/or/circuitbuild.c +index ac0df91..1794634 100644 +--- src/or/circuitbuild.c ++++ src/or/circuitbuild.c +@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, + int idx = -1; + char buf[HEX_DIGEST_LEN+1]; + ++ /* Ignore bridge reachability problems. */ ++ if (! succeeded) ++ return 0; ++ + if (! entry_guards) + return 0; +

1 0

[arm/master] Tor shutdown indicator when in client mode
by atagar＠torproject.org 17 Jun '11

17 Jun '11

commit 8fd556d502e42c33eaff038b6a6b0d2b99523da3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 09:46:49 2011 -0700 Tor shutdown indicator when in client mode When we're running as a client the ports line is replaced with the shutdown message when tor is no longer running. Also changing the "Relaying Disabled" indicator to be cyan rather than bold red since this isn't really a problem. --- src/cli/headerPanel.py | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index b5b3826..145e75b 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -183,7 +183,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(0, 43, uiTools.cropStr("Tor %s" % self.vals["tor/version"], contentSpace, 4)) # Line 2 / Line 2 Left (tor ip/port information) - x = 0 + x, includeControlPort = 0, True if self.vals["tor/orPort"]: myAddress = "Unknown" if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] @@ -198,21 +198,29 @@ class HeaderPanel(panel.Panel, threading.Thread): else: break else: # non-relay (client only) - # TODO: not sure what sort of stats to provide... - self.addstr(1, x, "Relaying Disabled", curses.A_BOLD | uiTools.getColor("red")) - x += 17 - - if self.vals["tor/isAuthPassword"]: authType = "password" - elif self.vals["tor/isAuthCookie"]: authType = "cookie" - else: authType = "open" - - if x + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: - authColor = "red" if authType == "open" else "green" - self.addstr(1, x, ", Control Port (") - self.addstr(1, x + 16, authType, uiTools.getColor(authColor)) - self.addstr(1, x + 16 + len(authType), "): %s" % self.vals["tor/controlPort"]) - elif x + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: - self.addstr(1, 0, ", Control Port: %s" % self.vals["tor/controlPort"]) + if self._isTorConnected: + self.addstr(1, x, "Relaying Disabled", uiTools.getColor("cyan")) + x += 17 + else: + statusTime = torTools.getConn().getStatus()[1] + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) + self.addstr(1, x, "Tor Disconnected", curses.A_BOLD | uiTools.getColor("red")) + self.addstr(1, x + 16, " (%s, press r to reconnect)" % statusTimeLabel) + x += 41 + len(statusTimeLabel) + includeControlPort = False + + if includeControlPort: + if self.vals["tor/isAuthPassword"]: authType = "password" + elif self.vals["tor/isAuthCookie"]: authType = "cookie" + else: authType = "open" + + if x + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: + authColor = "red" if authType == "open" else "green" + self.addstr(1, x, ", Control Port (") + self.addstr(1, x + 16, authType, uiTools.getColor(authColor)) + self.addstr(1, x + 16 + len(authType), "): %s" % self.vals["tor/controlPort"]) + elif x + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: + self.addstr(1, 0, ", Control Port: %s" % self.vals["tor/controlPort"]) # Line 3 / Line 1 Right (system usage info) y, x = (0, leftWidth) if isWide else (2, 0)

1 0

[flashproxy/master] Add a note to try tor-fw-helper.
by dcf＠torproject.org 17 Jun '11

17 Jun '11

commit 31509358601dac911189423dba2bc57bbf26ea75 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 17 02:04:58 2011 -0700 Add a note to try tor-fw-helper. --- notes.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/notes.txt b/notes.txt index 86a38a3..928b921 100644 --- a/notes.txt +++ b/notes.txt @@ -1,5 +1,7 @@ == Things to do +Try tor-fw-helper for NAT traversal. + Limit rate of registration in facilitator, maybe just one reg per IP. We need to solve the problem of potential changing fingerprints when

1 0

[flashproxy/master] Add instructions for building the Cumulus server.
by dcf＠torproject.org 17 Jun '11

17 Jun '11

commit 67d49a45b114ac93b9fe36592509bf9fd1c2804b Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 17 01:19:34 2011 -0700 Add instructions for building the Cumulus server. --- Cumulus-no-manage-log.patch | 39 ++++++++++++++++++++++++++++++ README | 32 +++++++++++++++++++++++++ cumulus | 55 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 0 deletions(-) diff --git a/Cumulus-no-manage-log.patch b/Cumulus-no-manage-log.patch new file mode 100644 index 0000000..810b52d --- /dev/null +++ b/Cumulus-no-manage-log.patch @@ -0,0 +1,39 @@ +Don't try to re-open log files. This avoids a failure after --daemon +causes a chdir to /. + +diff --git a/CumulusService/sources/main.cpp b/CumulusService/sources/main.cpp +index 891621f..39ea4eb 100644 +--- a/CumulusService/sources/main.cpp ++++ b/CumulusService/sources/main.cpp +@@ -132,7 +132,6 @@ protected: + void dumpHandler(const char* data,int size) { + cout.write(data,size); + _logStream.write(data,size); +- manageLogFile(); + } + + void logHandler(Thread::TID threadId,const std::string& threadName,Priority priority,const char *filePath,long line, const char *text) { +@@ -140,23 +139,6 @@ protected: + _logStream << DateTimeFormatter::format(LocalDateTime(),"%d/%m %H:%M:%S.%c ") + << g_logPriorities[priority-1] << '\t' << threadName << '(' << threadId << ")\t" + << Path(filePath).getFileName() << '[' << line << "] " << text << std::endl; +- manageLogFile(); +- } +- +- void manageLogFile() { +- if(_logFile.getSize()>LOG_SIZE) { +- _logStream.close(); +- int num = 10; +- File file(LOG_FILE(10)); +- if(file.exists()) +- file.remove(); +- while(--num>=0) { +- file = LOG_FILE_VAR(num); +- if(file.exists()) +- file.renameTo(LOG_FILE_VAR(num+1)); +- } +- _logStream.open(LOG_FILE(0),ios::in | ios::ate); +- } + } + + bool onConnection(Client& client) { diff --git a/README b/README index 4b6a2dc..ccde8b9 100644 --- a/README +++ b/README @@ -94,6 +94,38 @@ try deleting the files in ~/.tor or /var/lib/tor. You will be able to see byte counts flowing in the browser window, and eventually be able to build a circuit. +== Building the Cumulus RTMFP server + +There is a free RTMFP rendezvous server called Cumulus. It is a +replacement for the Adobe Cirrus service at rtmfp://p2p.rtmfp.net/. +These are instructions to build and install it. + +First install the prerequisite libpoco, http://poco.sourceforge.net/. +You only need the "Basic Edition." + # apt-get install libpoco-dev +or + $ cd poco-VERSION + $ ./configure && make + # make install + +Follow these steps to install the Cumulus server. You need to open port +1935/udp in the firewall. + $ git clone git://github.com/OpenRTMFP/Cumulus.git + $ cd Cumulus + $ patch -p0 < Cumulus-no-manage-log.patch + $ cd CumulusLib + $ make LIBS=./ + # cp libCumulus.so /usr/local/lib + $ cd ../../CumulusService + $ make + # cp CumulusService /usr/local/bin + # useradd -d /dev/null -s /bin/false cumulus + # mkdir /var/cumulus + # chown -R cumulus.cumulus /var/cumulus + # cp flashproxy/cumulus /etc/init.d/cumulus + # chkconfig --add cumulus + # service cumulus start + == Rationale The purpose of this project is to create many, generally ephemeral diff --git a/cumulus b/cumulus new file mode 100755 index 0000000..7fdac3e --- /dev/null +++ b/cumulus @@ -0,0 +1,55 @@ +#!/bin/sh +# +# cumulus This shell script takes care of starting and stopping +# the Cumulus server. +# +# chkconfig: 2345 90 10 +# description: Cumulus RTMFP server. +# processname: CumulusService +# pidfile: /var/cumulus/cumulus.pid + +# Source function library. +. /etc/rc.d/init.d/functions + +BINDIR=/usr/local/bin +VARDIR=/var/cumulus +CUMULUS=$BINDIR/CumulusService +PIDFILE=$VARDIR/cumulus.pid +USER=cumulus + +# See how we were called. +case "$1" in + start) + [ -x $CUMULUS ] || exit 1 + echo -n $"Starting Cumulus server: " + cd $VARDIR && daemon --user cumulus --pidfile $PIDFILE $CUMULUS --daemon --pidfile=$PIDFILE + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cumulus + ;; + stop) + # Stop daemon. + echo -n $"Shutting down Cumulus server: " + killproc CumulusService + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/cumulus + ;; + status) + status cumulus + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + ;; + condrestart) + [ -f /var/lock/subsys/cumulus ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart}" + RETVAL=3 + ;; +esac + +exit $RETVAL

1 0