Page MenuHomeFreeBSD
Differential D9507

Update net-mgmt/prometheus to 1.5.1
ClosedPublic
Actions

Authored by krion on Feb 9 2017, 9:20 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 15, 3:52 PM
Unknown Object (File)
Mon, Apr 14, 6:04 AM
Unknown Object (File)
Nov 26 2024, 9:35 AM
Unknown Object (File)
Nov 24 2024, 11:43 PM
Unknown Object (File)
Nov 22 2024, 7:17 PM
Unknown Object (File)
Nov 19 2024, 11:48 PM
Unknown Object (File)
Nov 19 2024, 1:54 PM
Unknown Object (File)
Nov 19 2024, 8:50 AM
View All 45 Files
Subscribers
None

Details

Reviewers
fjoe
mat
Commits
rP433755: Update net-mgmt/prometheus to 1.5.1
Summary

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216927

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

krion updated this revision to Diff 24910.Feb 9 2017, 9:20 AM
krion retitled this revision from to Update net-mgmt/prometheus to 1.5.1.
krion updated this object.
krion edited the test plan for this revision. (Show Details)
krion added reviewers: mat, fjoe.
mat accepted this revision.Feb 9 2017, 5:07 PM
mat edited edge metadata.
This revision is now accepted and ready to land.Feb 9 2017, 5:07 PM
Closed by commit rP433755: Update net-mgmt/prometheus to 1.5.1 (authored by krion). · Explain WhyFeb 9 2017, 5:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
net-mgmt/
prometheus/
2 lines
6 lines

Diff 24937

View Options

head/net-mgmt/prometheus/Makefile

Show All 36 Lines
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h>
#include <netdb.h> #include <netdb.h>
#include <poll.h> #include <poll.h>
#include <pwd.h> #include <pwd.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
Show All 16 Lines#ifdef EAI_NODATA
{ EAI_NODATA, FETCH_RESOLV, "Host not found" }, { EAI_NODATA, FETCH_RESOLV, "Host not found" },
#endif #endif
{ EAI_AGAIN, FETCH_TEMP, "Transient resolver failure" }, { EAI_AGAIN, FETCH_TEMP, "Transient resolver failure" },
{ EAI_FAIL, FETCH_RESOLV, "Non-recoverable resolver failure" }, { EAI_FAIL, FETCH_RESOLV, "Non-recoverable resolver failure" },
{ EAI_NONAME, FETCH_RESOLV, "No address record" }, { EAI_NONAME, FETCH_RESOLV, "No address record" },
{ -1, FETCH_UNKNOWN, "Unknown resolver error" } { -1, FETCH_UNKNOWN, "Unknown resolver error" }
}; };
/*
* SOCKS5 error enumerations
*/
enum SOCKS5_ERR {
/* Protocol errors */
SOCKS5_ERR_SELECTION,
SOCKS5_ERR_READ_METHOD,
SOCKS5_ERR_VER5_ONLY,
SOCKS5_ERR_NOMETHODS,
SOCKS5_ERR_NOTIMPLEMENTED,
SOCKS5_ERR_HOSTNAME_SIZE,
SOCKS5_ERR_REQUEST,
SOCKS5_ERR_REPLY,
SOCKS5_ERR_NON_VER5_RESP,
SOCKS5_ERR_GENERAL,
SOCKS5_ERR_NOT_ALLOWED,
SOCKS5_ERR_NET_UNREACHABLE,
SOCKS5_ERR_HOST_UNREACHABLE,
SOCKS5_ERR_CONN_REFUSED,
SOCKS5_ERR_TTL_EXPIRED,
SOCKS5_ERR_COM_UNSUPPORTED,
SOCKS5_ERR_ADDR_UNSUPPORTED,
SOCKS5_ERR_UNSPECIFIED,
/* Configuration errors */
SOCKS5_ERR_BAD_HOST,
SOCKS5_ERR_BAD_PROXY_FORMAT,
SOCKS5_ERR_BAD_PORT
};
/*
* Error messages for SOCKS5 errors
*/
static struct fetcherr socks5_errlist[] = {
/* SOCKS5 protocol errors */
{ SOCKS5_ERR_SELECTION, FETCH_ABORT, "SOCKS5: Failed to send selection method" },
{ SOCKS5_ERR_READ_METHOD, FETCH_ABORT, "SOCKS5: Failed to read method" },
{ SOCKS5_ERR_VER5_ONLY, FETCH_PROTO, "SOCKS5: Only version 5 is implemented" },
{ SOCKS5_ERR_NOMETHODS, FETCH_PROTO, "SOCKS5: No acceptable methods" },
{ SOCKS5_ERR_NOTIMPLEMENTED, FETCH_PROTO, "SOCKS5: Method currently not implemented" },
{ SOCKS5_ERR_HOSTNAME_SIZE, FETCH_PROTO, "SOCKS5: Hostname size is above 256 bytes" },
{ SOCKS5_ERR_REQUEST, FETCH_PROTO, "SOCKS5: Failed to request" },
{ SOCKS5_ERR_REPLY, FETCH_PROTO, "SOCKS5: Failed to receive reply" },
{ SOCKS5_ERR_NON_VER5_RESP, FETCH_PROTO, "SOCKS5: Server responded with a non-version 5 response" },
{ SOCKS5_ERR_GENERAL, FETCH_ABORT, "SOCKS5: General server failure" },
{ SOCKS5_ERR_NOT_ALLOWED, FETCH_AUTH, "SOCKS5: Connection not allowed by ruleset" },
{ SOCKS5_ERR_NET_UNREACHABLE, FETCH_NETWORK, "SOCKS5: Network unreachable" },
{ SOCKS5_ERR_HOST_UNREACHABLE, FETCH_ABORT, "SOCKS5: Host unreachable" },
{ SOCKS5_ERR_CONN_REFUSED, FETCH_ABORT, "SOCKS5: Connection refused" },
{ SOCKS5_ERR_TTL_EXPIRED, FETCH_TIMEOUT, "SOCKS5: TTL expired" },
{ SOCKS5_ERR_COM_UNSUPPORTED, FETCH_PROTO, "SOCKS5: Command not supported" },
{ SOCKS5_ERR_ADDR_UNSUPPORTED, FETCH_ABORT, "SOCKS5: Address type not supported" },
{ SOCKS5_ERR_UNSPECIFIED, FETCH_UNKNOWN, "SOCKS5: Unspecified error" },
/* Configuration error */
{ SOCKS5_ERR_BAD_HOST, FETCH_ABORT, "SOCKS5: Bad proxy host" },
{ SOCKS5_ERR_BAD_PROXY_FORMAT, FETCH_ABORT, "SOCKS5: Bad proxy format" },
{ SOCKS5_ERR_BAD_PORT, FETCH_ABORT, "SOCKS5: Bad port" }
};
/* End-of-Line */ /* End-of-Line */
static const char ENDL[2] = "\r\n"; static const char ENDL[2] = "\r\n";
/*** Error-reporting functions ***********************************************/ /*** Error-reporting functions ***********************************************/
/* /*
* Map error code to string * Map error code to string
▲ Show 20 Lines • Show All 224 Lines • ▼ Show 20 Linesfetch_resolve(const char *addr, int port, int af)
} }
return (res); return (res);
syserr: syserr:
fetch_syserr(); fetch_syserr();
return (NULL); return (NULL);
} }
/* /*
* Bind a socket to a specific local address * Bind a socket to a specific local address
*/ */
int int
fetch_bind(int sd, int af, const char *addr) fetch_bind(int sd, int af, const char *addr)
{ {
struct addrinfo *cliai, *ai; struct addrinfo *cliai, *ai;
int err; int err;
if ((cliai = fetch_resolve(addr, 0, af)) == NULL) if ((cliai = fetch_resolve(addr, 0, af)) == NULL)
return (-1); return (-1);
for (ai = cliai; ai != NULL; ai = ai->ai_next) for (ai = cliai; ai != NULL; ai = ai->ai_next)
if ((err = bind(sd, ai->ai_addr, ai->ai_addrlen)) == 0) if ((err = bind(sd, ai->ai_addr, ai->ai_addrlen)) == 0)
break; break;
if (err != 0) if (err != 0)
fetch_syserr(); fetch_syserr();
freeaddrinfo(cliai); freeaddrinfo(cliai);
return (err == 0 ? 0 : -1); return (err == 0 ? 0 : -1);
} }
/* /*
* SOCKS5 connection initiation, based on RFC 1928
* Default DNS resolution over SOCKS5
*/
int
fetch_socks5_init(conn_t *conn, const char *host, int port, int verbose)
{
/*
* Size is based on largest packet prefix (4 bytes) +
* Largest FQDN (256) + one byte size (1) +
* Port (2)
*/
unsigned char buf[BUFF_SIZE];
lattera-gmail.comUnsubmitted
Done
Inline Actions

Should this size be macro-ized?

lattera-gmail.com: Should this size be macro-ized?
unsigned char *ptr;
int ret = 1;
if (verbose)
fetch_info("Initializing SOCKS5 connection: %s:%d", host, port);
/* Connection initialization */
ptr = buf;
lattera-gmail.comUnsubmitted
Done
Inline Actions

Magic values should be macro-ized.

lattera-gmail.com: Magic values should be macro-ized.
*ptr++ = SOCKS_VERSION_5;
*ptr++ = SOCKS_CONNECTION;
*ptr++ = SOCKS_RSV;
if (fetch_write(conn, buf, 3) != 3) {
ret = SOCKS5_ERR_SELECTION;
goto fail;
}
/* Verify response from SOCKS5 server */
if (fetch_read(conn, buf, 2) != 2) {
ret = SOCKS5_ERR_READ_METHOD;
goto fail;
}
ptr = buf;
if (ptr[0] != SOCKS_VERSION_5) {
ret = SOCKS5_ERR_VER5_ONLY;
goto fail;
}
if (ptr[1] == SOCKS_NOMETHODS) {
ret = SOCKS5_ERR_NOMETHODS;
goto fail;
}
kevansUnsubmitted
Done
Inline Actions

Move this else up to the line above it; if we could get rid of the magic number here, that'd be great.

kevans: Move this else up to the line above it; if we could get rid of the magic number here, that'd be…
else if (ptr[1] != SOCKS5_NOTIMPLEMENTED) {
ret = SOCKS5_ERR_NOTIMPLEMENTED;
goto fail;
}
/* Send Request */
lattera-gmail.comUnsubmitted
Done
Inline Actions

ptr is already set to buf.

lattera-gmail.com: `ptr` is already set to `buf`.
*ptr++ = SOCKS_VERSION_5;
*ptr++ = SOCKS_CONNECTION;
*ptr++ = SOCKS_RSV;
/* Encode all targets as a hostname to avoid DNS leaks */
*ptr++ = SOCKS_ATYP_DOMAINNAME;
if (strlen(host) > FQDN_SIZE) {
lattera-gmail.comUnsubmitted
Done
Inline Actions

Since you're doing pointer arithmetic, strlen(host) needs to be validated to be 256 characters or less. As you modify where ptr points to, you need to ensure ptr is still within bounds prior to dereferencing it.

lattera-gmail.com: Since you're doing pointer arithmetic, `strlen(host)` needs to be validated to be 256…
ret = SOCKS5_ERR_HOSTNAME_SIZE;
goto fail;
}
*ptr++ = strlen(host);
strncpy(ptr, host, strlen(host));
ptr = ptr + strlen(host);
port = htons(port);
*ptr++ = port & 0x00ff;
*ptr++ = (port & 0xff00) >> 8;
if (fetch_write(conn, buf, ptr - buf) != ptr - buf) {
ret = SOCKS5_ERR_REQUEST;
goto fail;
}
/* BND.ADDR is variable length, read the largest on non-blocking socket */
if (!fetch_read(conn, buf, BUFF_SIZE)) {
ret = SOCKS5_ERR_REPLY;
goto fail;
}
ptr = buf;
if (*ptr++ != SOCKS_VERSION_5) {
ret = SOCKS5_ERR_NON_VER5_RESP;
goto fail;
}
switch(*ptr++) {
case SOCKS_SUCCESS:
break;
lattera-gmail.comUnsubmitted
Done
Inline Actions

No need for the breaks after goto.

lattera-gmail.com: No need for the breaks after goto.
case SOCKS_GENERAL_FAILURE:
ret = SOCKS5_ERR_GENERAL;
goto fail;
case SOCKS_CONNECTION_NOT_ALLOWED:
ret = SOCKS5_ERR_NOT_ALLOWED;
goto fail;
case SOCKS_NETWORK_UNREACHABLE:
ret = SOCKS5_ERR_NET_UNREACHABLE;
goto fail;
case SOCKS_HOST_UNREACHABLE:
ret = SOCKS5_ERR_HOST_UNREACHABLE;
goto fail;
case SOCKS_CONNECTION_REFUSED:
ret = SOCKS5_ERR_CONN_REFUSED;
goto fail;
case SOCKS_TTL_EXPIRED:
ret = SOCKS5_ERR_TTL_EXPIRED;
goto fail;
case SOCKS_COMMAND_NOT_SUPPORTED:
ret = SOCKS5_ERR_COM_UNSUPPORTED;
goto fail;
case SOCKS_ADDRESS_NOT_SUPPORTED:
ret = SOCKS5_ERR_ADDR_UNSUPPORTED;
goto fail;
default:
ret = SOCKS5_ERR_UNSPECIFIED;
goto fail;
}
return (ret);
fail:
socks5_seterr(ret);
return (0);
}
/*
* Perform SOCKS5 initialization
*/
int
fetch_socks5_getenv(char **host, int *port)
{
char *socks5env, *endptr, *ext;
kevansUnsubmitted
Done
Inline Actions

This should read: (socks5env = getenv("SOCKS5_PROXY")) == NULL || *socks5env == '\0' (prefer explicitly comparisons as per style(9))

kevans: This should read: `(socks5env = getenv("SOCKS5_PROXY")) == NULL || *socks5env == '\0'` (prefer…
if ((socks5env = getenv("SOCKS5_PROXY")) == NULL || *socks5env == '\0') {
*host = NULL;
kevansUnsubmitted
Not Done
Inline Actions

I'll leave this note here once; this function returns 0, 1, or 2 -- the difference between 1 and 2 doesn't seem to be significant from a callers' perspective, and I'm not sure this matches the prevailing style for libfetch which tends to return 0 for success, -1 for error.

kevans: I'll leave this note here once; this function returns 0, 1, or 2 -- the difference between 1…
*port = -1;
return (-1);
}
/* IPv6 addresses begin and end in brackets */
kevansUnsubmitted
Done
Inline Actions

Binary operators should have spaces around them (strlen(socks5env) - 1)

kevans: Binary operators should have spaces around them (`strlen(socks5env) - 1`)
if (socks5env[0] == '[') {
if (socks5env[strlen(socks5env) - 1] == ']') {
*host = strndup(socks5env, strlen(socks5env));
if (*host == NULL)
goto fail;
*port = 1080; /* Default port as defined in RFC1928 */
kevansUnsubmitted
Done
Inline Actions

Move this a line up, } else {

kevans: Move this a line up, `} else {`
} else {
lattera-gmail.comUnsubmitted
Done
Inline Actions

Need to check for NULL return value.

lattera-gmail.com: Need to check for NULL return value.
ext = strstr(socks5env, "]:");
kevansUnsubmitted
Done
Inline Actions

ext == NULL

kevans: `ext == NULL`
if (ext == NULL) {
socks5_seterr(SOCKS5_ERR_BAD_PROXY_FORMAT);
return (0);
}
ext=ext+1;
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them.

kevans: See above w.r.t. binary operators and spaces around them.
*host = strndup(socks5env, ext - socks5env);
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them; ext and socks5env should also likely be unparenthesized here.

kevans: See above w.r.t. binary operators and spaces around them; ext and socks5env should also likely…
if (*host == NULL)
goto fail;
errno = 0;
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them.

Also, why strtoimax here and below? You're given an int to work with here, so this should likely be something more like:

long portconv;

portconv = strtol(...);
if (portconv <= 0 || portconv > INT_MAX)
    ... error ...
*port = portconv;

strtoimax and strtol are effectively the same, just with different min/max limits -- you might as well use the smallest set of limits larger than what you can handle, even if efficiency isn't all that much of a concern here.

kevans: See above w.r.t. binary operators and spaces around them. Also, why strtoimax here and below?
*port = strtoimax(ext + 1, (char **)&endptr, 10);
lattera-gmail.comUnsubmitted
Done
Inline Actions

Need to check for NULL return value.

lattera-gmail.com: Need to check for NULL return value.
kevansUnsubmitted
Not Done
Inline Actions

You must set errno = 0 before the calls to strtoimax to know for sure that this errno check is valid. Further, don't check specifically for EINVAL -- errno != 0.

kevans: You must set errno = 0 before the calls to strtoimax to know for sure that this errno check is…
if ((*port == 0 && errno == EINVAL) || *port < 0 || *port > 65535) {
socks5_seterr(SOCKS5_ERR_BAD_PORT);
return (0);
}
}
} else {
kevansUnsubmitted
Done
Inline Actions

else should move to the line above it

kevans: else should move to the line above it
ext = strrchr(socks5env, ':');
if (ext == NULL) {
kevansUnsubmitted
Done
Inline Actions

ext == NULL

kevans: `ext == NULL`
*host = strdup(socks5env);
*port = 1080;
} else {
lattera-gmail.comUnsubmitted
Done
Inline Actions

Need to check for NULL return value.

lattera-gmail.com: Need to check for NULL return value.
*host = strndup(socks5env, ext-socks5env);
kevansUnsubmitted
Done
Inline Actions

Moved to the line above it

kevans: Moved to the line above it
if (*host == NULL)
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them.

kevans: See above w.r.t. binary operators and spaces around them.
goto fail;
errno = 0;
lattera-gmail.comUnsubmitted
Done
Inline Actions

Need to check for NULL return value.

lattera-gmail.com: Need to check for NULL return value.
kevansUnsubmitted
Not Done
Inline Actions

You must set errno = 0 before the calls to strtoimax to know for sure that this errno check is valid. Further, don't check specifically for EINVAL -- errno != 0.

kevans: You must set errno = 0 before the calls to strtoimax to know for sure that this errno check is…
*port = strtoimax(ext + 1, (char **)&endptr, 10);
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them.

kevans: See above w.r.t. binary operators and spaces around them.
if ((*port == 0 && errno == EINVAL) || *port < 0 || *port > 65535) {
socks5_seterr(SOCKS5_ERR_BAD_PORT);
return (0);
}
}
}
return (2);
fail:
fprintf(stderr, "Failure to allocate memory, exiting.\n");
return (-1);
}
/*
* Establish a TCP connection to the specified port on the specified host. * Establish a TCP connection to the specified port on the specified host.
*/ */
conn_t * conn_t *
fetch_connect(const char *host, int port, int af, int verbose) fetch_connect(const char *host, int port, int af, int verbose)
{ {
struct addrinfo *cais = NULL, *sais = NULL, *cai, *sai; struct addrinfo *cais = NULL, *sais = NULL, *cai, *sai;
const char *bindaddr; const char *bindaddr;
conn_t *conn = NULL; conn_t *conn = NULL;
int err = 0, sd = -1; int err = 0, sd = -1;
kevansUnsubmitted
Done
Inline Actions

This should move down to the line with other int declarations, sorted alphabetically there.

kevans: This should move down to the line with other int declarations, sorted alphabetically there.
char *sockshost;
int socksport;
DEBUGF("---> %s:%d\n", host, port); DEBUGF("---> %s:%d\n", host, port);
/* Check if SOCKS5_PROXY env variable is set */
if(!fetch_socks5_getenv(&sockshost, &socksport))
goto fail;
/* Not using SOCKS5 proxy */
if (sockshost == NULL) {
kevansUnsubmitted
Done
Inline Actions

sockshost == NULL

kevans: `sockshost == NULL`
/* resolve server address */ /* resolve server address */
if (verbose) if (verbose)
fetch_info("resolving server address: %s:%d", host, port); fetch_info("resolving server address: %s:%d", host, port);
if ((sais = fetch_resolve(host, port, af)) == NULL) if ((sais = fetch_resolve(host, port, af)) == NULL)
goto fail; goto fail;
/* resolve client address */ /* resolve client address */
bindaddr = getenv("FETCH_BIND_ADDRESS"); bindaddr = getenv("FETCH_BIND_ADDRESS");
if (bindaddr != NULL && *bindaddr != '\0') { if (bindaddr != NULL && *bindaddr != '\0') {
if (verbose) if (verbose)
fetch_info("resolving client address: %s", bindaddr); fetch_info("resolving client address: %s", bindaddr);
if ((cais = fetch_resolve(bindaddr, 0, af)) == NULL) if ((cais = fetch_resolve(bindaddr, 0, af)) == NULL)
goto fail; goto fail;
} }
} else {
/* resolve socks5 proxy address */
kevansUnsubmitted
Done
Inline Actions

Moved up to the line above

kevans: Moved up to the line above
if (verbose)
fetch_info("resolving SOCKS5 server address: %s:%d", sockshost, socksport);
if ((sais = fetch_resolve(sockshost, socksport, af)) == NULL) {
socks5_seterr(SOCKS5_ERR_BAD_HOST);
goto fail;
kevansUnsubmitted
Done
Inline Actions

Braces around this single-statement block should match the prevailing style elsewhere in the file for single-statement blocks; it looks like the braces should be dropped here.

kevans: Braces around this single-statement block should match the prevailing style elsewhere in the…
farhan_farhan.codesAuthorUnsubmitted
Done
Inline Actions

This one seems correct, no?

farhan_farhan.codes: This one seems correct, no?
kevansUnsubmitted
Not Done
Inline Actions

Correct, but stylistically inconsistent with the rest of the file- take a look ,for instance, at lines 556/557.

kevans: Correct, but stylistically inconsistent with the rest of the file- take a look ,for instance…
farhan_farhan.codesAuthorUnsubmitted
Done
Inline Actions

oh, I misunderstood your original comment. My mistake. Removing now.

farhan_farhan.codes: oh, I misunderstood your original comment. My mistake. Removing now.
}
}
/* try each server address in turn */ /* try each server address in turn */
for (err = 0, sai = sais; sai != NULL; sai = sai->ai_next) { for (err = 0, sai = sais; sai != NULL; sai = sai->ai_next) {
/* open socket */ /* open socket */
if ((sd = socket(sai->ai_family, SOCK_STREAM, 0)) < 0) if ((sd = socket(sai->ai_family, SOCK_STREAM, 0)) < 0)
goto syserr; goto syserr;
/* attempt to bind to client address */ /* attempt to bind to client address */
for (err = 0, cai = cais; cai != NULL; cai = cai->ai_next) { for (err = 0, cai = cais; cai != NULL; cai = cai->ai_next) {
Show All 10 Lines for (err = 0, sai = sais; sai != NULL; sai = sai->ai_next) {
/* attempt to connect to server address */ /* attempt to connect to server address */
if ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) == 0) if ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) == 0)
break; break;
/* clean up before next attempt */ /* clean up before next attempt */
close(sd); close(sd);
sd = -1; sd = -1;
} }
if (err != 0) { if (err != 0) {
if (verbose) if (verbose && sockshost == NULL) {
fetch_info("failed to connect to %s:%d", host, port); fetch_info("failed to connect to %s:%d", host, port);
goto syserr; goto syserr;
} }
else if (sockshost) {
if (verbose)
fetch_info("failed to connect to SOCKS5 server %s:%d", sockshost, socksport);
kevansUnsubmitted
Done
Inline Actions

This socks5_seterr is currently blocked behind an if(verbose) -- I suspect you want to break that one out above before the verbose blocks start and set it if sockshost != NULL

kevans: This socks5_seterr is currently blocked behind an if(verbose) -- I suspect you want to break…
socks5_seterr(SOCKS5_ERR_CONN_REFUSED);
goto syserr1;
}
goto syserr;
}
if ((conn = fetch_reopen(sd)) == NULL) if ((conn = fetch_reopen(sd)) == NULL)
kevansUnsubmitted
Done
Inline Actions

Added line should go away

kevans: Added line should go away
goto syserr; goto syserr;
if (sockshost)
if (!fetch_socks5_init(conn, host, port, verbose))
goto fail;
if (cais != NULL) if (cais != NULL)
freeaddrinfo(cais); freeaddrinfo(cais);
if (sais != NULL) if (sais != NULL)
freeaddrinfo(sais); freeaddrinfo(sais);
return (conn); return (conn);
syserr: syserr:
fetch_syserr(); fetch_syserr();
syserr1:
goto fail; goto fail;
fail: fail:
if (sd >= 0) if (sd >= 0)
close(sd); close(sd);
if (cais != NULL) if (cais != NULL)
freeaddrinfo(cais); freeaddrinfo(cais);
if (sais != NULL) if (sais != NULL)
freeaddrinfo(sais); freeaddrinfo(sais);
▲ Show 20 Lines • Show All 1,106 Lines • Show Last 20 Lines
View Options

head/net-mgmt/prometheus/distinfo

Show All 36 Lines
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h>
#include <netdb.h> #include <netdb.h>
#include <poll.h> #include <poll.h>
#include <pwd.h> #include <pwd.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
Show All 16 Lines#ifdef EAI_NODATA
{ EAI_NODATA, FETCH_RESOLV, "Host not found" }, { EAI_NODATA, FETCH_RESOLV, "Host not found" },
#endif #endif
{ EAI_AGAIN, FETCH_TEMP, "Transient resolver failure" }, { EAI_AGAIN, FETCH_TEMP, "Transient resolver failure" },
{ EAI_FAIL, FETCH_RESOLV, "Non-recoverable resolver failure" }, { EAI_FAIL, FETCH_RESOLV, "Non-recoverable resolver failure" },
{ EAI_NONAME, FETCH_RESOLV, "No address record" }, { EAI_NONAME, FETCH_RESOLV, "No address record" },
{ -1, FETCH_UNKNOWN, "Unknown resolver error" } { -1, FETCH_UNKNOWN, "Unknown resolver error" }
}; };
/*
* SOCKS5 error enumerations
*/
enum SOCKS5_ERR {
/* Protocol errors */
SOCKS5_ERR_SELECTION,
SOCKS5_ERR_READ_METHOD,
SOCKS5_ERR_VER5_ONLY,
SOCKS5_ERR_NOMETHODS,
SOCKS5_ERR_NOTIMPLEMENTED,
SOCKS5_ERR_HOSTNAME_SIZE,
SOCKS5_ERR_REQUEST,
SOCKS5_ERR_REPLY,
SOCKS5_ERR_NON_VER5_RESP,
SOCKS5_ERR_GENERAL,
SOCKS5_ERR_NOT_ALLOWED,
SOCKS5_ERR_NET_UNREACHABLE,
SOCKS5_ERR_HOST_UNREACHABLE,
SOCKS5_ERR_CONN_REFUSED,
SOCKS5_ERR_TTL_EXPIRED,
SOCKS5_ERR_COM_UNSUPPORTED,
SOCKS5_ERR_ADDR_UNSUPPORTED,
SOCKS5_ERR_UNSPECIFIED,
/* Configuration errors */
SOCKS5_ERR_BAD_HOST,
SOCKS5_ERR_BAD_PROXY_FORMAT,
SOCKS5_ERR_BAD_PORT
};
/*
* Error messages for SOCKS5 errors
*/
static struct fetcherr socks5_errlist[] = {
/* SOCKS5 protocol errors */
{ SOCKS5_ERR_SELECTION, FETCH_ABORT, "SOCKS5: Failed to send selection method" },
{ SOCKS5_ERR_READ_METHOD, FETCH_ABORT, "SOCKS5: Failed to read method" },
{ SOCKS5_ERR_VER5_ONLY, FETCH_PROTO, "SOCKS5: Only version 5 is implemented" },
{ SOCKS5_ERR_NOMETHODS, FETCH_PROTO, "SOCKS5: No acceptable methods" },
{ SOCKS5_ERR_NOTIMPLEMENTED, FETCH_PROTO, "SOCKS5: Method currently not implemented" },
{ SOCKS5_ERR_HOSTNAME_SIZE, FETCH_PROTO, "SOCKS5: Hostname size is above 256 bytes" },
{ SOCKS5_ERR_REQUEST, FETCH_PROTO, "SOCKS5: Failed to request" },
{ SOCKS5_ERR_REPLY, FETCH_PROTO, "SOCKS5: Failed to receive reply" },
{ SOCKS5_ERR_NON_VER5_RESP, FETCH_PROTO, "SOCKS5: Server responded with a non-version 5 response" },
{ SOCKS5_ERR_GENERAL, FETCH_ABORT, "SOCKS5: General server failure" },
{ SOCKS5_ERR_NOT_ALLOWED, FETCH_AUTH, "SOCKS5: Connection not allowed by ruleset" },
{ SOCKS5_ERR_NET_UNREACHABLE, FETCH_NETWORK, "SOCKS5: Network unreachable" },
{ SOCKS5_ERR_HOST_UNREACHABLE, FETCH_ABORT, "SOCKS5: Host unreachable" },
{ SOCKS5_ERR_CONN_REFUSED, FETCH_ABORT, "SOCKS5: Connection refused" },
{ SOCKS5_ERR_TTL_EXPIRED, FETCH_TIMEOUT, "SOCKS5: TTL expired" },
{ SOCKS5_ERR_COM_UNSUPPORTED, FETCH_PROTO, "SOCKS5: Command not supported" },
{ SOCKS5_ERR_ADDR_UNSUPPORTED, FETCH_ABORT, "SOCKS5: Address type not supported" },
{ SOCKS5_ERR_UNSPECIFIED, FETCH_UNKNOWN, "SOCKS5: Unspecified error" },
/* Configuration error */
{ SOCKS5_ERR_BAD_HOST, FETCH_ABORT, "SOCKS5: Bad proxy host" },
{ SOCKS5_ERR_BAD_PROXY_FORMAT, FETCH_ABORT, "SOCKS5: Bad proxy format" },
{ SOCKS5_ERR_BAD_PORT, FETCH_ABORT, "SOCKS5: Bad port" }
};
/* End-of-Line */ /* End-of-Line */
static const char ENDL[2] = "\r\n"; static const char ENDL[2] = "\r\n";
/*** Error-reporting functions ***********************************************/ /*** Error-reporting functions ***********************************************/
/* /*
* Map error code to string * Map error code to string
▲ Show 20 Lines • Show All 224 Lines • ▼ Show 20 Linesfetch_resolve(const char *addr, int port, int af)
} }
return (res); return (res);
syserr: syserr:
fetch_syserr(); fetch_syserr();
return (NULL); return (NULL);
} }
/* /*
* Bind a socket to a specific local address * Bind a socket to a specific local address
*/ */
int int
fetch_bind(int sd, int af, const char *addr) fetch_bind(int sd, int af, const char *addr)
{ {
struct addrinfo *cliai, *ai; struct addrinfo *cliai, *ai;
int err; int err;
if ((cliai = fetch_resolve(addr, 0, af)) == NULL) if ((cliai = fetch_resolve(addr, 0, af)) == NULL)
return (-1); return (-1);
for (ai = cliai; ai != NULL; ai = ai->ai_next) for (ai = cliai; ai != NULL; ai = ai->ai_next)
if ((err = bind(sd, ai->ai_addr, ai->ai_addrlen)) == 0) if ((err = bind(sd, ai->ai_addr, ai->ai_addrlen)) == 0)
break; break;
if (err != 0) if (err != 0)
fetch_syserr(); fetch_syserr();
freeaddrinfo(cliai); freeaddrinfo(cliai);
return (err == 0 ? 0 : -1); return (err == 0 ? 0 : -1);
} }
/* /*
* SOCKS5 connection initiation, based on RFC 1928
* Default DNS resolution over SOCKS5
*/
int
fetch_socks5_init(conn_t *conn, const char *host, int port, int verbose)
{
/*
* Size is based on largest packet prefix (4 bytes) +
* Largest FQDN (256) + one byte size (1) +
* Port (2)
*/
unsigned char buf[BUFF_SIZE];
lattera-gmail.comUnsubmitted
Done
Inline Actions

Should this size be macro-ized?

lattera-gmail.com: Should this size be macro-ized?
unsigned char *ptr;
int ret = 1;
if (verbose)
fetch_info("Initializing SOCKS5 connection: %s:%d", host, port);
/* Connection initialization */
ptr = buf;
lattera-gmail.comUnsubmitted
Done
Inline Actions

Magic values should be macro-ized.

lattera-gmail.com: Magic values should be macro-ized.
*ptr++ = SOCKS_VERSION_5;
*ptr++ = SOCKS_CONNECTION;
*ptr++ = SOCKS_RSV;
if (fetch_write(conn, buf, 3) != 3) {
ret = SOCKS5_ERR_SELECTION;
goto fail;
}
/* Verify response from SOCKS5 server */
if (fetch_read(conn, buf, 2) != 2) {
ret = SOCKS5_ERR_READ_METHOD;
goto fail;
}
ptr = buf;
if (ptr[0] != SOCKS_VERSION_5) {
ret = SOCKS5_ERR_VER5_ONLY;
goto fail;
}
if (ptr[1] == SOCKS_NOMETHODS) {
ret = SOCKS5_ERR_NOMETHODS;
goto fail;
}
kevansUnsubmitted
Done
Inline Actions

Move this else up to the line above it; if we could get rid of the magic number here, that'd be great.

kevans: Move this else up to the line above it; if we could get rid of the magic number here, that'd be…
else if (ptr[1] != SOCKS5_NOTIMPLEMENTED) {
ret = SOCKS5_ERR_NOTIMPLEMENTED;
goto fail;
}
/* Send Request */
lattera-gmail.comUnsubmitted
Done
Inline Actions

ptr is already set to buf.

lattera-gmail.com: `ptr` is already set to `buf`.
*ptr++ = SOCKS_VERSION_5;
*ptr++ = SOCKS_CONNECTION;
*ptr++ = SOCKS_RSV;
/* Encode all targets as a hostname to avoid DNS leaks */
*ptr++ = SOCKS_ATYP_DOMAINNAME;
if (strlen(host) > FQDN_SIZE) {
lattera-gmail.comUnsubmitted
Done
Inline Actions

Since you're doing pointer arithmetic, strlen(host) needs to be validated to be 256 characters or less. As you modify where ptr points to, you need to ensure ptr is still within bounds prior to dereferencing it.

lattera-gmail.com: Since you're doing pointer arithmetic, `strlen(host)` needs to be validated to be 256…
ret = SOCKS5_ERR_HOSTNAME_SIZE;
goto fail;
}
*ptr++ = strlen(host);
strncpy(ptr, host, strlen(host));
ptr = ptr + strlen(host);
port = htons(port);
*ptr++ = port & 0x00ff;
*ptr++ = (port & 0xff00) >> 8;
if (fetch_write(conn, buf, ptr - buf) != ptr - buf) {
ret = SOCKS5_ERR_REQUEST;
goto fail;
}
/* BND.ADDR is variable length, read the largest on non-blocking socket */
if (!fetch_read(conn, buf, BUFF_SIZE)) {
ret = SOCKS5_ERR_REPLY;
goto fail;
}
ptr = buf;
if (*ptr++ != SOCKS_VERSION_5) {
ret = SOCKS5_ERR_NON_VER5_RESP;
goto fail;
}
switch(*ptr++) {
case SOCKS_SUCCESS:
break;
lattera-gmail.comUnsubmitted
Done
Inline Actions

No need for the breaks after goto.

lattera-gmail.com: No need for the breaks after goto.
case SOCKS_GENERAL_FAILURE:
ret = SOCKS5_ERR_GENERAL;
goto fail;
case SOCKS_CONNECTION_NOT_ALLOWED:
ret = SOCKS5_ERR_NOT_ALLOWED;
goto fail;
case SOCKS_NETWORK_UNREACHABLE:
ret = SOCKS5_ERR_NET_UNREACHABLE;
goto fail;
case SOCKS_HOST_UNREACHABLE:
ret = SOCKS5_ERR_HOST_UNREACHABLE;
goto fail;
case SOCKS_CONNECTION_REFUSED:
ret = SOCKS5_ERR_CONN_REFUSED;
goto fail;
case SOCKS_TTL_EXPIRED:
ret = SOCKS5_ERR_TTL_EXPIRED;
goto fail;
case SOCKS_COMMAND_NOT_SUPPORTED:
ret = SOCKS5_ERR_COM_UNSUPPORTED;
goto fail;
case SOCKS_ADDRESS_NOT_SUPPORTED:
ret = SOCKS5_ERR_ADDR_UNSUPPORTED;
goto fail;
default:
ret = SOCKS5_ERR_UNSPECIFIED;
goto fail;
}
return (ret);
fail:
socks5_seterr(ret);
return (0);
}
/*
* Perform SOCKS5 initialization
*/
int
fetch_socks5_getenv(char **host, int *port)
{
char *socks5env, *endptr, *ext;
kevansUnsubmitted
Done
Inline Actions

This should read: (socks5env = getenv("SOCKS5_PROXY")) == NULL || *socks5env == '\0' (prefer explicitly comparisons as per style(9))

kevans: This should read: `(socks5env = getenv("SOCKS5_PROXY")) == NULL || *socks5env == '\0'` (prefer…
if ((socks5env = getenv("SOCKS5_PROXY")) == NULL || *socks5env == '\0') {
*host = NULL;
kevansUnsubmitted
Not Done
Inline Actions

I'll leave this note here once; this function returns 0, 1, or 2 -- the difference between 1 and 2 doesn't seem to be significant from a callers' perspective, and I'm not sure this matches the prevailing style for libfetch which tends to return 0 for success, -1 for error.

kevans: I'll leave this note here once; this function returns 0, 1, or 2 -- the difference between 1…
*port = -1;
return (-1);
}
/* IPv6 addresses begin and end in brackets */
kevansUnsubmitted
Done
Inline Actions

Binary operators should have spaces around them (strlen(socks5env) - 1)

kevans: Binary operators should have spaces around them (`strlen(socks5env) - 1`)
if (socks5env[0] == '[') {
if (socks5env[strlen(socks5env) - 1] == ']') {
*host = strndup(socks5env, strlen(socks5env));
if (*host == NULL)
goto fail;
*port = 1080; /* Default port as defined in RFC1928 */
kevansUnsubmitted
Done
Inline Actions

Move this a line up, } else {

kevans: Move this a line up, `} else {`
} else {
lattera-gmail.comUnsubmitted
Done
Inline Actions

Need to check for NULL return value.

lattera-gmail.com: Need to check for NULL return value.
ext = strstr(socks5env, "]:");
kevansUnsubmitted
Done
Inline Actions

ext == NULL

kevans: `ext == NULL`
if (ext == NULL) {
socks5_seterr(SOCKS5_ERR_BAD_PROXY_FORMAT);
return (0);
}
ext=ext+1;
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them.

kevans: See above w.r.t. binary operators and spaces around them.
*host = strndup(socks5env, ext - socks5env);
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them; ext and socks5env should also likely be unparenthesized here.

kevans: See above w.r.t. binary operators and spaces around them; ext and socks5env should also likely…
if (*host == NULL)
goto fail;
errno = 0;
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them.

Also, why strtoimax here and below? You're given an int to work with here, so this should likely be something more like:

long portconv;

portconv = strtol(...);
if (portconv <= 0 || portconv > INT_MAX)
    ... error ...
*port = portconv;

strtoimax and strtol are effectively the same, just with different min/max limits -- you might as well use the smallest set of limits larger than what you can handle, even if efficiency isn't all that much of a concern here.

kevans: See above w.r.t. binary operators and spaces around them. Also, why strtoimax here and below?
*port = strtoimax(ext + 1, (char **)&endptr, 10);
lattera-gmail.comUnsubmitted
Done
Inline Actions

Need to check for NULL return value.

lattera-gmail.com: Need to check for NULL return value.
kevansUnsubmitted
Not Done
Inline Actions

You must set errno = 0 before the calls to strtoimax to know for sure that this errno check is valid. Further, don't check specifically for EINVAL -- errno != 0.

kevans: You must set errno = 0 before the calls to strtoimax to know for sure that this errno check is…
if ((*port == 0 && errno == EINVAL) || *port < 0 || *port > 65535) {
socks5_seterr(SOCKS5_ERR_BAD_PORT);
return (0);
}
}
} else {
kevansUnsubmitted
Done
Inline Actions

else should move to the line above it

kevans: else should move to the line above it
ext = strrchr(socks5env, ':');
if (ext == NULL) {
kevansUnsubmitted
Done
Inline Actions

ext == NULL

kevans: `ext == NULL`
*host = strdup(socks5env);
*port = 1080;
} else {
lattera-gmail.comUnsubmitted
Done
Inline Actions

Need to check for NULL return value.

lattera-gmail.com: Need to check for NULL return value.
*host = strndup(socks5env, ext-socks5env);
kevansUnsubmitted
Done
Inline Actions

Moved to the line above it

kevans: Moved to the line above it
if (*host == NULL)
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them.

kevans: See above w.r.t. binary operators and spaces around them.
goto fail;
errno = 0;
lattera-gmail.comUnsubmitted
Done
Inline Actions

Need to check for NULL return value.

lattera-gmail.com: Need to check for NULL return value.
kevansUnsubmitted
Not Done
Inline Actions

You must set errno = 0 before the calls to strtoimax to know for sure that this errno check is valid. Further, don't check specifically for EINVAL -- errno != 0.

kevans: You must set errno = 0 before the calls to strtoimax to know for sure that this errno check is…
*port = strtoimax(ext + 1, (char **)&endptr, 10);
kevansUnsubmitted
Done
Inline Actions

See above w.r.t. binary operators and spaces around them.

kevans: See above w.r.t. binary operators and spaces around them.
if ((*port == 0 && errno == EINVAL) || *port < 0 || *port > 65535) {
socks5_seterr(SOCKS5_ERR_BAD_PORT);
return (0);
}
}
}
return (2);
fail:
fprintf(stderr, "Failure to allocate memory, exiting.\n");
return (-1);
}
/*
* Establish a TCP connection to the specified port on the specified host. * Establish a TCP connection to the specified port on the specified host.
*/ */
conn_t * conn_t *
fetch_connect(const char *host, int port, int af, int verbose) fetch_connect(const char *host, int port, int af, int verbose)
{ {
struct addrinfo *cais = NULL, *sais = NULL, *cai, *sai; struct addrinfo *cais = NULL, *sais = NULL, *cai, *sai;
const char *bindaddr; const char *bindaddr;
conn_t *conn = NULL; conn_t *conn = NULL;
int err = 0, sd = -1; int err = 0, sd = -1;
kevansUnsubmitted
Done
Inline Actions

This should move down to the line with other int declarations, sorted alphabetically there.

kevans: This should move down to the line with other int declarations, sorted alphabetically there.
char *sockshost;
int socksport;
DEBUGF("---> %s:%d\n", host, port); DEBUGF("---> %s:%d\n", host, port);
/* Check if SOCKS5_PROXY env variable is set */
if(!fetch_socks5_getenv(&sockshost, &socksport))
goto fail;
/* Not using SOCKS5 proxy */
if (sockshost == NULL) {
kevansUnsubmitted
Done
Inline Actions

sockshost == NULL

kevans: `sockshost == NULL`
/* resolve server address */ /* resolve server address */
if (verbose) if (verbose)
fetch_info("resolving server address: %s:%d", host, port); fetch_info("resolving server address: %s:%d", host, port);
if ((sais = fetch_resolve(host, port, af)) == NULL) if ((sais = fetch_resolve(host, port, af)) == NULL)
goto fail; goto fail;
/* resolve client address */ /* resolve client address */
bindaddr = getenv("FETCH_BIND_ADDRESS"); bindaddr = getenv("FETCH_BIND_ADDRESS");
if (bindaddr != NULL && *bindaddr != '\0') { if (bindaddr != NULL && *bindaddr != '\0') {
if (verbose) if (verbose)
fetch_info("resolving client address: %s", bindaddr); fetch_info("resolving client address: %s", bindaddr);
if ((cais = fetch_resolve(bindaddr, 0, af)) == NULL) if ((cais = fetch_resolve(bindaddr, 0, af)) == NULL)
goto fail; goto fail;
} }
} else {
/* resolve socks5 proxy address */
kevansUnsubmitted
Done
Inline Actions

Moved up to the line above

kevans: Moved up to the line above
if (verbose)
fetch_info("resolving SOCKS5 server address: %s:%d", sockshost, socksport);
if ((sais = fetch_resolve(sockshost, socksport, af)) == NULL) {
socks5_seterr(SOCKS5_ERR_BAD_HOST);
goto fail;
kevansUnsubmitted
Done
Inline Actions

Braces around this single-statement block should match the prevailing style elsewhere in the file for single-statement blocks; it looks like the braces should be dropped here.

kevans: Braces around this single-statement block should match the prevailing style elsewhere in the…
farhan_farhan.codesAuthorUnsubmitted
Done
Inline Actions

This one seems correct, no?

farhan_farhan.codes: This one seems correct, no?
kevansUnsubmitted
Not Done
Inline Actions

Correct, but stylistically inconsistent with the rest of the file- take a look ,for instance, at lines 556/557.

kevans: Correct, but stylistically inconsistent with the rest of the file- take a look ,for instance…
farhan_farhan.codesAuthorUnsubmitted
Done
Inline Actions

oh, I misunderstood your original comment. My mistake. Removing now.

farhan_farhan.codes: oh, I misunderstood your original comment. My mistake. Removing now.
}
}
/* try each server address in turn */ /* try each server address in turn */
for (err = 0, sai = sais; sai != NULL; sai = sai->ai_next) { for (err = 0, sai = sais; sai != NULL; sai = sai->ai_next) {
/* open socket */ /* open socket */
if ((sd = socket(sai->ai_family, SOCK_STREAM, 0)) < 0) if ((sd = socket(sai->ai_family, SOCK_STREAM, 0)) < 0)
goto syserr; goto syserr;
/* attempt to bind to client address */ /* attempt to bind to client address */
for (err = 0, cai = cais; cai != NULL; cai = cai->ai_next) { for (err = 0, cai = cais; cai != NULL; cai = cai->ai_next) {
Show All 10 Lines for (err = 0, sai = sais; sai != NULL; sai = sai->ai_next) {
/* attempt to connect to server address */ /* attempt to connect to server address */
if ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) == 0) if ((err = connect(sd, sai->ai_addr, sai->ai_addrlen)) == 0)
break; break;
/* clean up before next attempt */ /* clean up before next attempt */
close(sd); close(sd);
sd = -1; sd = -1;
} }
if (err != 0) { if (err != 0) {
if (verbose) if (verbose && sockshost == NULL) {
fetch_info("failed to connect to %s:%d", host, port); fetch_info("failed to connect to %s:%d", host, port);
goto syserr; goto syserr;
} }
else if (sockshost) {
if (verbose)
fetch_info("failed to connect to SOCKS5 server %s:%d", sockshost, socksport);
kevansUnsubmitted
Done
Inline Actions

This socks5_seterr is currently blocked behind an if(verbose) -- I suspect you want to break that one out above before the verbose blocks start and set it if sockshost != NULL

kevans: This socks5_seterr is currently blocked behind an if(verbose) -- I suspect you want to break…
socks5_seterr(SOCKS5_ERR_CONN_REFUSED);
goto syserr1;
}
goto syserr;
}
if ((conn = fetch_reopen(sd)) == NULL) if ((conn = fetch_reopen(sd)) == NULL)
kevansUnsubmitted
Done
Inline Actions

Added line should go away

kevans: Added line should go away
goto syserr; goto syserr;
if (sockshost)
if (!fetch_socks5_init(conn, host, port, verbose))
goto fail;
if (cais != NULL) if (cais != NULL)
freeaddrinfo(cais); freeaddrinfo(cais);
if (sais != NULL) if (sais != NULL)
freeaddrinfo(sais); freeaddrinfo(sais);
return (conn); return (conn);
syserr: syserr:
fetch_syserr(); fetch_syserr();
syserr1:
goto fail; goto fail;
fail: fail:
if (sd >= 0) if (sd >= 0)
close(sd); close(sd);
if (cais != NULL) if (cais != NULL)
freeaddrinfo(cais); freeaddrinfo(cais);
if (sais != NULL) if (sais != NULL)
freeaddrinfo(sais); freeaddrinfo(sais);
▲ Show 20 Lines • Show All 1,106 Lines • Show Last 20 Lines