Details

Reviewers

Group Reviewers

Commits

Summary

Add USE_GITLAB documentation with examples

Reviewed by\: lifanov (mentor), matthew (mentor), docscommitter
Approved by\: lifanov (mentor), matthew (mentor), docscommitter
Differential Revision\: https://reviews.freebsd.org/DXXXXX

Diff Detail

Repository

rD FreeBSD doc repository - subversion

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 11772
Build 12116: arc lint + arc unit

Event Timeline

ultima created this revision.Sep 6 2017, 9:02 PM

Herald added a reviewer: mat. · View Herald TranscriptSep 6 2017, 9:02 PM

Harbormaster completed remote builds in B11404: Diff 32747.Sep 6 2017, 9:02 PM

ultima added a subscriber: Doc Committers.Sep 6 2017, 9:03 PM

Balance </sect 2> is buildable

Harbormaster completed remote builds in B11406: Diff 32749.Sep 6 2017, 9:31 PM

As this is a commit against the docs repo, you don't need approval from Nikolai or me, but you will need approval from someone with a docs commit bit.

In D12261#254471, @matthew wrote:

As this is a commit against the docs repo, you don't need approval from Nikolai or me, but you will need approval from someone with a docs commit bit.

Ah, okay. I thought all commits required mentor approval, so this means only the case under the commit bit type.

ultima edited reviewers, added: Doc Committers; removed: lifanov, matthew.Sep 7 2017, 7:50 PM

ultima removed a subscriber: Doc Committers.

In D12261#254548, @ultima wrote:

In D12261#254471, @matthew wrote:

As this is a commit against the docs repo, you don't need approval from Nikolai or me, but you will need approval from someone with a docs commit bit.

Ah, okay. I thought all commits required mentor approval, so this means only the case under the commit bit type.

If you are being mentored, all commits require your mentors approval, wherever the commit goes.
This also requires some doc committer approval. I'll have a look at it next week. (As I will have a look at the USE_GITLAB changes you made, have not had time this week.)

In D12261#254651, @mat wrote:

In D12261#254548, @ultima wrote:

In D12261#254471, @matthew wrote:

As this is a commit against the docs repo, you don't need approval from Nikolai or me, but you will need approval from someone with a docs commit bit.

Ah, okay. I thought all commits required mentor approval, so this means only the case under the commit bit type.

If you are being mentored, all commits require your mentors approval, wherever the commit goes.
This also requires some doc committer approval. I'll have a look at it next week. (As I will have a look at the USE_GITLAB changes you made, have not had time this week.)

Its no problem, take your time. This isn't a small change that is easily glanced at afterall.

mat added inline comments.Sep 21 2017, 1:55 PM

en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
2884	<application>GitLab</application>, these variables are available for uses and (and all other occurrences of Gitlab)
2886	empty line between para and table.
2946–2948	I wonder if there is a way to express the optionalliness (yes, I wrote it, so it exists) of those two directly in docbook. (but it is not important)
2954–2956	the `</table>` and `<example>` should have the same indentation, but there is a good chance that it is phabricator being stupid.
2961	maybe `on gitlab.com` it is kind of vague otherwise, the whole chapter is about Gitlab, one can assume you're going to talk about it.
2975	xlink:href="https://gitlab.com">gitlab.com</link> and (because it would probably be better to have a different way of saying Gitlab as an application, and gitlab.com, the web site.)
2987	RFC 6761 describe domains names to be used in documentation, domains that are expected to not exist and the users know are for documentation purposes only. You should probably use, something like `<literal>http://git.example.com</literal>` to make sure of that. (I added the literal for free 😉)
3007	the date the commit to the &os; ports tree is made.</para>
3008–3009	empty line between tip and note.
3026	default distribution file is not fetched from a GitLab site. (Because a default distribution is somewhat required, I know, you copied it from something I wrote, would be nice to fix it too 😇.)

Thanks for taking a look mat, trust me I'm not trying to mask the fact that some/part/most of the docs were copied then modified instead of created from scratch. These areas are still a bit above my skill level and it will definitely take some time before I get to the point of writing from zero.

I'v been a bit busy lately with interviewing / studying and such, will try and get to the corrections on the weekend, and also submit the correct for GitHub if I have the time.

In D12261#258089, @ultima wrote:

Thanks for taking a look mat, trust me I'm not trying to mask the fact that some/part/most of the docs were copied then modified instead of created from scratch. These areas are still a bit above my skill level and it will definitely take some time before I get to the point of writing from zero.

Well, I would not have noticed you copied stuff if not for phabricator's little orange tab at the start of the line saying "copied from line xxx" :-)

I'v been a bit busy lately with interviewing / studying and such, will try and get to the corrections on the weekend, and also submit the correct for GitHub if I have the time.

Sure, no rush.

Fixed various items

Harbormaster completed remote builds in B11772: Diff 33474.Sep 27 2017, 3:35 AM

ultima added inline comments.Sep 27 2017, 3:36 AM

en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
2954–2956	Looks like it was actually my mistake, fixed!
2987	Good to know, example.com has been dubbed the example domain. RFC 6761 Bookmarked! I'm pretty sure if you did charge I would be in debt for years. >.<

ultima mentioned this in D12512: Clearer wording for when GitHub's is not the default group.Sep 27 2017, 3:42 AM

ultima added inline comments.Sep 27 2017, 3:45 AM

en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
3026	The fix for GitHub is at D12512

I completely forgot about this.

This revision is now accepted and ready to land.Feb 19 2018, 1:23 PM

wblock added a subscriber: wblock.Mar 2 2018, 6:37 PM

wblock added inline comments.

en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
2885	Should that be "available for use" or does it really mean USES? Also, s/may/might/ (because "may" usually means permission, and "might" is when something has a probability).

s/uses/use ; s/may/might/

This revision now requires review to proceed.Mar 3 2018, 6:58 AM

Harbormaster completed remote builds in B15349: Diff 39908.Mar 3 2018, 6:58 AM

ultima marked an inline comment as done.Mar 3 2018, 7:00 AM

ultima added inline comments.

en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
2885	Nice catch, I should have probably realized the uses sounded a bit off when I fixed it! >.<

This revision was not accepted when it landed; it landed in state Needs Review.Mar 3 2018, 7:03 AM

Closed by commit rD51456: * Add USE_GITLAB (authored by ultima). · Explain Why

This revision was automatically updated to reflect the committed changes.

ultima marked an inline comment as done.

Diff 33474

View Options

en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml

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 Lines	fetch_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

Add USE_GITLAB documentation
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 33474

en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml

Add USE_GITLAB documentationClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 33474

en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml

Add USE_GITLAB documentation
ClosedPublic
Actions

Revision Contents
Changeset List