diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-08 16:47:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-08 16:47:49 -0400 |
| commit | 9de456a303f1931bef43e5a48afdf08293279c45 (patch) | |
| tree | a68a46c98f4cca1058b1b0fec6d4d96377b50f61 | |
| parent | 30b8fc3e0d5a2eafa052672619aaaac733f3fa3d (diff) | |
| parent | b8abadedd3cb7ac3d140becf23d0a624e6405749 (diff) | |
| download | tor-9de456a303f1931bef43e5a48afdf08293279c45.tar.gz tor-9de456a303f1931bef43e5a48afdf08293279c45.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug9904 | 4 | ||||
| -rw-r--r-- | src/common/address.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug9904 b/changes/bug9904 new file mode 100644 index 0000000000..eec4144cce --- /dev/null +++ b/changes/bug9904 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When examining list of network interfaces to find our address, do + not consider non-running or disabled network interfaces. Fixes bug + 9904; bugfix on 0.2.3.11-alpha. Patch from "hantwister". diff --git a/src/common/address.c b/src/common/address.c index 945e5e79bd..b9f2d93154 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1188,6 +1188,8 @@ get_interface_addresses_raw(int severity) result = smartlist_new(); for (i = ifa; i; i = i->ifa_next) { tor_addr_t tmp; + if ((i->ifa_flags & (IFF_UP | IFF_RUNNING)) != (IFF_UP | IFF_RUNNING)) + continue; if (!i->ifa_addr) continue; if (i->ifa_addr->sa_family != AF_INET && |