torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve error msgs in tor-resolve.c; resolve bug 112

Browse Source 
svn:r3947
This commit is contained in:
Nick Mathewson
2005-04-01 07:04:40 +00:00
parent 3b6359737e
commit bc668233ad
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/tor-resolve.c
+10 -5
View File
@@ -74,15 +74,21 @@ parse_socks4a_resolve_response(const char *response, size_t len,
tor_assert(response);
tor_assert(addr_out);
if (len < RESPONSE_LEN)
if (len < RESPONSE_LEN) {
log_fn(LOG_WARN,"Truncated socks response.");
return -1;
if (((uint8_t)response[0])!=0) /* version: 0 */
}
if (((uint8_t)response[0])!=0) { /* version: 0 */
log_fn(LOG_WARN,"Nonzero version in socks response: bad format.");
return -1;
}
status = (uint8_t)response[1];
if (get_uint16(response+2)!=0) /* port: 0 */
if (get_uint16(response+2)!=0) { /* port: 0 */
log_fn(LOG_WARN,"Nonzero port in socks response: bad format.");
return -1;
}
if (status != 90) {
log_fn(LOG_WARN,"Got status response '%d', meaning not success.", status);
log_fn(LOG_WARN,"Got status response '%d': socks request failed.", status);
return -1;
}
@@ -151,7 +157,6 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport,
}
if (parse_socks4a_resolve_response(response_buf, RESPONSE_LEN,result_addr)<0){
log_fn(LOG_ERR, "Error parsing SOCKS response");
return -1;
}