Commit e2f430c7 authored by Jay Satiro's avatar Jay Satiro
Browse files

socks: Fix incorrect port numbers in failed connect messages

parent ea2c959d

lib/socks.c

+14 −14
Original line number Diff line number Diff line
@@ -300,8 +300,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name, 
            ", request rejected or failed.",

            (unsigned char)socksreq[4], (unsigned char)socksreq[5],

            (unsigned char)socksreq[6], (unsigned char)socksreq[7],

            ((socksreq[8] << 8) | socksreq[9]),

            socksreq[1]);

            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

            (unsigned char)socksreq[1]);

      return CURLE_COULDNT_CONNECT;

    case 92:

      failf(data,
@@ -310,8 +310,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name, 
            "identd on the client.",

            (unsigned char)socksreq[4], (unsigned char)socksreq[5],

            (unsigned char)socksreq[6], (unsigned char)socksreq[7],

            ((socksreq[8] << 8) | socksreq[9]),

            socksreq[1]);

            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

            (unsigned char)socksreq[1]);

      return CURLE_COULDNT_CONNECT;

    case 93:

      failf(data,
@@ -320,8 +320,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name, 
            "report different user-ids.",

            (unsigned char)socksreq[4], (unsigned char)socksreq[5],

            (unsigned char)socksreq[6], (unsigned char)socksreq[7],

            ((socksreq[8] << 8) | socksreq[9]),

            socksreq[1]);

            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

            (unsigned char)socksreq[1]);

      return CURLE_COULDNT_CONNECT;

    default:

      failf(data,
@@ -329,8 +329,8 @@ CURLcode Curl_SOCKS4(const char *proxy_name, 
            ", Unknown.",

            (unsigned char)socksreq[4], (unsigned char)socksreq[5],

            (unsigned char)socksreq[6], (unsigned char)socksreq[7],

            ((socksreq[8] << 8) | socksreq[9]),

            socksreq[1]);

            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

            (unsigned char)socksreq[1]);

      return CURLE_COULDNT_CONNECT;

    }

  }
@@ -674,15 +674,15 @@ CURLcode Curl_SOCKS5(const char *proxy_name, 
            "Can't complete SOCKS5 connection to %d.%d.%d.%d:%d. (%d)",

            (unsigned char)socksreq[4], (unsigned char)socksreq[5],

            (unsigned char)socksreq[6], (unsigned char)socksreq[7],

            ((socksreq[8] << 8) | socksreq[9]),

            socksreq[1]);

            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

            (unsigned char)socksreq[1]);

    }

    else if(socksreq[3] == 3) {

      failf(data,

            "Can't complete SOCKS5 connection to %s:%d. (%d)",

            hostname,

            ((socksreq[8] << 8) | socksreq[9]),

            socksreq[1]);

            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

            (unsigned char)socksreq[1]);

    }

    else if(socksreq[3] == 4) {

      failf(data,
@@ -696,8 +696,8 @@ CURLcode Curl_SOCKS5(const char *proxy_name, 
            (unsigned char)socksreq[14], (unsigned char)socksreq[15],

            (unsigned char)socksreq[16], (unsigned char)socksreq[17],

            (unsigned char)socksreq[18], (unsigned char)socksreq[19],

            ((socksreq[8] << 8) | socksreq[9]),

            socksreq[1]);

            (((unsigned char)socksreq[8] << 8) | (unsigned char)socksreq[9]),

            (unsigned char)socksreq[1]);

    }

    return CURLE_COULDNT_CONNECT;

  }