[tor-commits] [tor/master] Allow IPv4 traffic on default and old-style-config SocksPorts.

[nickm at torproject.org]

commit 28cbe908398f24366a9056d2508ae94690d82bba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 15 22:49:43 2012 -0500

    Allow IPv4 traffic on default and old-style-config SocksPorts.
    
    Looks like when i was writing the code to set the ipv4_traffic flag on
    port_cfg_t, I missed some cases, such as the one where the port was
    set from its default value.
    
    Fix for 7493. Bug not in any released Tor.
---
 src/or/config.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index e069c7c..f7a803f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4543,6 +4543,7 @@ parse_port_config(smartlist_t *out,
       tor_addr_make_unspec(&cfg->addr); /* Server ports default to 0.0.0.0 */
       cfg->no_listen = 1;
       cfg->bind_ipv4_only = 1;
+      cfg->ipv4_traffic = 1;
       smartlist_add(out, cfg);
     }
 
@@ -4562,6 +4563,7 @@ parse_port_config(smartlist_t *out,
         cfg->session_group = SESSION_GROUP_UNSET;
         cfg->isolation_flags = ISO_DEFAULT;
         cfg->no_advertise = 1;
+        cfg->ipv4_traffic = 1;
         smartlist_add(out, cfg);
       }
     }
@@ -4585,6 +4587,7 @@ parse_port_config(smartlist_t *out,
        tor_addr_parse(&cfg->addr, defaultaddr);
        cfg->session_group = SESSION_GROUP_UNSET;
        cfg->isolation_flags = ISO_DEFAULT;
+       cfg->ipv4_traffic = 1;
        smartlist_add(out, cfg);
     }
     return 0;