Commit f6ecda84 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9

parents 925ef048 4473271c

changes/bug18100

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Major bugfixes (linux TPROXY support):

    - Fix a typo that had prevented TPROXY-based transparent proxying from

      working under Linux. Fixes bug 18100; bugfix on 0.2.6.3-alpha.

      Patch from "d4fq0fQAgoJ".

src/or/connection_edge.c

+2 −2
Original line number Diff line number Diff line
@@ -1910,8 +1910,8 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req) 
  socklen_t orig_dst_len = sizeof(orig_dst);

  tor_addr_t addr;



#ifdef TRANS_TRPOXY

  if (options->TransProxyType_parsed == TPT_TPROXY) {

#ifdef TRANS_TPROXY

  if (get_options()->TransProxyType_parsed == TPT_TPROXY) {

    if (getsockname(ENTRY_TO_CONN(conn)->s, (struct sockaddr*)&orig_dst,

                    &orig_dst_len) < 0) {

      int e = tor_socket_errno(ENTRY_TO_CONN(conn)->s);