Add client side sending of "\0host=%s\0" extended
arg for git native protocol, backwards compatibly.
Signed-off-by: Jon Loeliger <jdl@jdl.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
-static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
+/*
+ * Returns a connected socket() fd, or else die()s.
+ */
+static int git_tcp_connect_sock(char *host)
{
int sockfd = -1;
char *colon, *end;
{
int sockfd = -1;
char *colon, *end;
die("Unable to look up %s (%s)", host, gai_strerror(gai));
for (ai0 = ai; ai; ai = ai->ai_next) {
die("Unable to look up %s (%s)", host, gai_strerror(gai));
for (ai0 = ai; ai; ai = ai->ai_next) {
- sockfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ sockfd = socket(ai->ai_family,
+ ai->ai_socktype, ai->ai_protocol);
if (sockfd < 0)
continue;
if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
if (sockfd < 0)
continue;
if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
if (sockfd < 0)
die("unable to connect a socket (%s)", strerror(errno));
if (sockfd < 0)
die("unable to connect a socket (%s)", strerror(errno));
- fd[0] = sockfd;
- fd[1] = sockfd;
- packet_write(sockfd, "%s %s\n", prog, path);
- return 0;
-static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
+/*
+ * Returns a connected socket() fd, or else die()s.
+ */
+static int git_tcp_connect_sock(char *host)
{
int sockfd = -1;
char *colon, *end;
{
int sockfd = -1;
char *colon, *end;
he = gethostbyname(host);
if (!he)
die("Unable to look up %s (%s)", host, hstrerror(h_errno));
he = gethostbyname(host);
if (!he)
die("Unable to look up %s (%s)", host, hstrerror(h_errno));
if (sockfd < 0)
die("unable to connect a socket (%s)", strerror(errno));
if (sockfd < 0)
die("unable to connect a socket (%s)", strerror(errno));
+ return sockfd;
+}
+
+#endif /* NO_IPV6 */
+
+
+static void git_tcp_connect(int fd[2],
+ const char *prog, char *host, char *path)
+{
+ int sockfd = git_tcp_connect_sock(host);
+
fd[0] = sockfd;
fd[1] = sockfd;
fd[0] = sockfd;
fd[1] = sockfd;
- packet_write(sockfd, "%s %s\n", prog, path);
- return 0;
static char *git_proxy_command = NULL;
static const char *rhost_name = NULL;
static char *git_proxy_command = NULL;
static const char *rhost_name = NULL;
return (git_proxy_command && *git_proxy_command);
}
return (git_proxy_command && *git_proxy_command);
}
-static int git_proxy_connect(int fd[2], const char *prog, char *host, char *path)
+static void git_proxy_connect(int fd[2],
+ const char *prog, char *host, char *path)
{
char *port = STR(DEFAULT_GIT_PORT);
char *colon, *end;
{
char *port = STR(DEFAULT_GIT_PORT);
char *colon, *end;
execlp(git_proxy_command, git_proxy_command, host, port, NULL);
die("exec failed");
}
execlp(git_proxy_command, git_proxy_command, host, port, NULL);
die("exec failed");
}
+ if (pid < 0)
+ die("fork failed");
fd[0] = pipefd[0][0];
fd[1] = pipefd[1][1];
close(pipefd[0][1]);
close(pipefd[1][0]);
fd[0] = pipefd[0][0];
fd[1] = pipefd[1][1];
close(pipefd[0][1]);
close(pipefd[1][0]);
- packet_write(fd[1], "%s %s\n", prog, path);
- return pid;
}
if (protocol == PROTO_GIT) {
}
if (protocol == PROTO_GIT) {
+ /* These underlying connection commands die() if they
+ * cannot connect.
+ */
+ char *target_host = strdup(host);
- ret = git_proxy_connect(fd, prog, host, path);
+ git_proxy_connect(fd, prog, host, path);
- ret = git_tcp_connect(fd, prog, host, path);
+ git_tcp_connect(fd, prog, host, path);
+ /*
+ * Separate original protocol components prog and path
+ * from extended components with a NUL byte.
+ */
+ packet_write(fd[1],
+ "%s %s%chost=%s%c",
+ prog, path, 0,
+ target_host, 0);
+ free(target_host);
if (free_path)
free(path);
if (free_path)
free(path);
}
if (pipe(pipefd[0]) < 0 || pipe(pipefd[1]) < 0)
}
if (pipe(pipefd[0]) < 0 || pipe(pipefd[1]) < 0)
static int execute(void)
{
static char line[1000];
static int execute(void)
{
static char line[1000];
alarm(init_timeout ? init_timeout : timeout);
alarm(init_timeout ? init_timeout : timeout);
- len = packet_read_line(0, line, sizeof(line));
+ pktlen = packet_read_line(0, line, sizeof(line));
+ len = strlen(line);
+ if (pktlen != len)
+ loginfo("Extended attributes (%d bytes) exist <%.*s>",
+ (int) pktlen - len,
+ (int) pktlen - len, line + len + 1);
if (len && line[len-1] == '\n')
line[--len] = 0;
if (len && line[len-1] == '\n')
line[--len] = 0;