← Back to branch summary

~clint-fewbar/ubuntu/precise/squid3/ignore-sighup-early

« back to all changes in this revision

Viewing changes to src/tunnel.cc

  • Committer: Package Import Robot
  • Author(s): Luigi Gangitano
  • Date: 2011-09-02 13:33:41 UTC
  • mto: (21.2.8 sid)
  • mto: This revision was merged to the branch mainline in revision 30.
  • Revision ID: package-import@ubuntu.com-20110902133341-56p01dh4mh6e308v
Tags: upstream-3.1.15
Import upstream version 3.1.15

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tunnel.cc
64
64
    bool noConnections() const;
65
65
    char *url;
66
66
    char *host;                 /* either request->host or proxy host */
67
 
    u_short port;
 
67
    unsigned short port;
68
68
    HttpRequest *request;
69
69
    FwdServer *servers;
70
70
 
470
470
    if (tunnelState->servers) {
471
471
        if (tunnelState->servers->_peer)
472
472
            hierarchyNote(&tunnelState->request->hier, tunnelState->servers->code,
473
 
                          tunnelState->servers->_peer->host);
 
473
                          tunnelState->servers->_peer->name);
474
474
        else if (Config.onoff.log_ip_on_direct)
475
475
            hierarchyNote(&tunnelState->request->hier, tunnelState->servers->code,
476
476
                          fd_table[tunnelState->server.fd()].ipaddr);
560
560
 
561
561
    if (tunnelState->servers->_peer)
562
562
        hierarchyNote(&tunnelState->request->hier, tunnelState->servers->code,
563
 
                      tunnelState->servers->_peer->host);
 
563
                      tunnelState->servers->_peer->name);
564
564
    else if (Config.onoff.log_ip_on_direct)
565
565
        hierarchyNote(&tunnelState->request->hier, tunnelState->servers->code,
566
566
                      fd_table[tunnelState->server.fd()].ipaddr);