diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-15 11:20:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-15 11:20:48 -0400 |
| commit | 9f83142591dba5460f2cf09e49f716d5c7238f06 (patch) | |
| tree | 558d1d3430532e7eb0b963e6ceba2b9e63d25cfa /src/or/dnsserv.c | |
| parent | 469b847c70c7cb801fa806e3336697866c1453d1 (diff) | |
| parent | 30e2d41a650876793b75bef04a2e18cbf5bc3fd6 (diff) | |
| download | tor-9f83142591dba5460f2cf09e49f716d5c7238f06.tar.gz tor-9f83142591dba5460f2cf09e49f716d5c7238f06.zip | |
Merge remote-tracking branch 'public/bug1031'
Diffstat (limited to 'src/or/dnsserv.c')
| -rw-r--r-- | src/or/dnsserv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 69adcef9ea..5875d96b8b 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -133,7 +133,7 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) strlcpy(entry_conn->socks_request->address, q->name, sizeof(entry_conn->socks_request->address)); - entry_conn->socks_request->listener_type = listener->_base.type; + entry_conn->socks_request->listener_type = listener->base_.type; entry_conn->dns_server_request = req; entry_conn->isolation_flags = listener->isolation_flags; entry_conn->session_group = listener->session_group; @@ -178,7 +178,7 @@ dnsserv_launch_request(const char *name, int reverse) /* Make a new dummy AP connection, and attach the request to it. */ entry_conn = entry_connection_new(CONN_TYPE_AP, AF_INET); conn = ENTRY_TO_EDGE_CONN(entry_conn); - conn->_base.state = AP_CONN_STATE_RESOLVE_WAIT; + conn->base_.state = AP_CONN_STATE_RESOLVE_WAIT; if (reverse) entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR; |