libgit2/src/pkt.c
Carlos Martín Nieto 922bc22532 pkt: send all of the wants in the negotiation
A missing if caused the function to return after the first want line
without capabilities.

Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
2011-10-01 14:34:51 +02:00

363 lines
7.3 KiB
C

/*
* Copyright (C) 2009-2011 the libgit2 contributors
*
* This file is part of libgit2, distributed under the GNU GPL v2 with
* a Linking Exception. For full terms see the included COPYING file.
*/
#include "common.h"
#include "git2/types.h"
#include "git2/errors.h"
#include "git2/refs.h"
#include "git2/revwalk.h"
#include "pkt.h"
#include "util.h"
#include "netops.h"
#include "posix.h"
#include <ctype.h>
#define PKT_LEN_SIZE 4
static int flush_pkt(git_pkt **out)
{
git_pkt *pkt;
pkt = git__malloc(sizeof(git_pkt));
if (pkt == NULL)
return GIT_ENOMEM;
pkt->type = GIT_PKT_FLUSH;
*out = pkt;
return GIT_SUCCESS;
}
/* the rest of the line will be useful for multi_ack */
static int ack_pkt(git_pkt **out, const char *GIT_UNUSED(line), size_t GIT_UNUSED(len))
{
git_pkt *pkt;
GIT_UNUSED_ARG(line);
GIT_UNUSED_ARG(len);
pkt = git__malloc(sizeof(git_pkt));
if (pkt == NULL)
return GIT_ENOMEM;
pkt->type = GIT_PKT_ACK;
*out = pkt;
return GIT_SUCCESS;
}
static int nak_pkt(git_pkt **out)
{
git_pkt *pkt;
pkt = git__malloc(sizeof(git_pkt));
if (pkt == NULL)
return GIT_ENOMEM;
pkt->type = GIT_PKT_NAK;
*out = pkt;
return GIT_SUCCESS;
}
static int pack_pkt(git_pkt **out)
{
git_pkt *pkt;
pkt = git__malloc(sizeof(git_pkt));
if (pkt == NULL)
return GIT_ENOMEM;
pkt->type = GIT_PKT_PACK;
*out = pkt;
return GIT_SUCCESS;
}
static int comment_pkt(git_pkt **out, const char *line, size_t len)
{
git_pkt_comment *pkt;
pkt = git__malloc(sizeof(git_pkt_comment) + len + 1);
if (pkt == NULL)
return GIT_ENOMEM;
pkt->type = GIT_PKT_COMMENT;
memcpy(pkt->comment, line, len);
pkt->comment[len] = '\0';
*out = (git_pkt *) pkt;
return GIT_SUCCESS;
}
/*
* Parse an other-ref line.
*/
static int ref_pkt(git_pkt **out, const char *line, size_t len)
{
git_pkt_ref *pkt;
int error;
pkt = git__malloc(sizeof(git_pkt_ref));
if (pkt == NULL)
return GIT_ENOMEM;
memset(pkt, 0x0, sizeof(git_pkt_ref));
pkt->type = GIT_PKT_REF;
error = git_oid_fromstr(&pkt->head.oid, line);
if (error < GIT_SUCCESS) {
error = git__throw(error, "Failed to parse reference ID");
goto out;
}
/* Check for a bit of consistency */
if (line[GIT_OID_HEXSZ] != ' ') {
error = git__throw(GIT_EOBJCORRUPTED, "Failed to parse ref. No SP");
goto out;
}
/* Jump from the name */
line += GIT_OID_HEXSZ + 1;
len -= (GIT_OID_HEXSZ + 1);
if (line[len - 1] == '\n')
--len;
pkt->head.name = git__malloc(len + 1);
if (pkt->head.name == NULL) {
error = GIT_ENOMEM;
goto out;
}
memcpy(pkt->head.name, line, len);
pkt->head.name[len] = '\0';
if (strlen(pkt->head.name) < len) {
pkt->capabilities = strchr(pkt->head.name, '\0') + 1;
}
out:
if (error < GIT_SUCCESS)
free(pkt);
else
*out = (git_pkt *)pkt;
return error;
}
static ssize_t parse_len(const char *line)
{
char num[PKT_LEN_SIZE + 1];
int i, error;
int len;
const char *num_end;
memcpy(num, line, PKT_LEN_SIZE);
num[PKT_LEN_SIZE] = '\0';
for (i = 0; i < PKT_LEN_SIZE; ++i) {
if (!isxdigit(num[i]))
return GIT_ENOTNUM;
}
error = git__strtol32(&len, num, &num_end, 16);
if (error < GIT_SUCCESS) {
return error;
}
return (unsigned int) len;
}
/*
* As per the documentation, the syntax is:
*
* pkt-line = data-pkt / flush-pkt
* data-pkt = pkt-len pkt-payload
* pkt-len = 4*(HEXDIG)
* pkt-payload = (pkt-len -4)*(OCTET)
* flush-pkt = "0000"
*
* Which means that the first four bytes are the length of the line,
* in ASCII hexadecimal (including itself)
*/
int git_pkt_parse_line(git_pkt **head, const char *line, const char **out, size_t bufflen)
{
int error = GIT_SUCCESS;
size_t len;
/* Not even enough for the length */
if (bufflen > 0 && bufflen < PKT_LEN_SIZE)
return GIT_ESHORTBUFFER;
error = parse_len(line);
if (error < GIT_SUCCESS) {
/*
* If we fail to parse the length, it might be because the
* server is trying to send us the packfile already.
*/
if (bufflen >= 4 && !git__prefixcmp(line, "PACK")) {
*out = line;
return pack_pkt(head);
}
return git__throw(error, "Failed to parse pkt length");
}
len = error;
/*
* If we were given a buffer length, then make sure there is
* enough in the buffer to satisfy this line
*/
if (bufflen > 0 && bufflen < len)
return GIT_ESHORTBUFFER;
line += PKT_LEN_SIZE;
/*
* TODO: How do we deal with empty lines? Try again? with the next
* line?
*/
if (len == PKT_LEN_SIZE) {
*out = line;
return GIT_SUCCESS;
}
if (len == 0) { /* Flush pkt */
*out = line;
return flush_pkt(head);
}
len -= PKT_LEN_SIZE; /* the encoded length includes its own size */
/* Assming the minimal size is actually 4 */
if (!git__prefixcmp(line, "ACK"))
error = ack_pkt(head, line, len);
else if (!git__prefixcmp(line, "NAK"))
error = nak_pkt(head);
else if (*line == '#')
error = comment_pkt(head, line, len);
else
error = ref_pkt(head, line, len);
*out = line + len;
return error;
}
void git_pkt_free(git_pkt *pkt)
{
if(pkt->type == GIT_PKT_REF) {
git_pkt_ref *p = (git_pkt_ref *) pkt;
free(p->head.name);
}
free(pkt);
}
int git_pkt_send_flush(int s)
{
char flush[] = "0000";
return gitno_send(s, flush, strlen(flush), 0);
}
static int send_want_with_caps(git_remote_head *head, git_transport_caps *caps, int fd)
{
char capstr[20]; /* Longer than we need */
char oid[GIT_OID_HEXSZ +1] = {0}, *cmd;
int error, len;
if (caps->ofs_delta)
strcpy(capstr, GIT_CAP_OFS_DELTA);
len = strlen("XXXXwant ") + GIT_OID_HEXSZ + 1 /* NUL */ + strlen(capstr) + 1 /* LF */;
cmd = git__malloc(len + 1);
if (cmd == NULL)
return GIT_ENOMEM;
git_oid_fmt(oid, &head->oid);
memset(cmd, 0x0, len + 1);
p_snprintf(cmd, len + 1, "%04xwant %s%c%s\n", len, oid, 0, capstr);
error = gitno_send(fd, cmd, len, 0);
free(cmd);
return error;
}
/*
* All "want" packets have the same length and format, so what we do
* is overwrite the OID each time.
*/
#define WANT_PREFIX "0032want "
int git_pkt_send_wants(git_headarray *refs, git_transport_caps *caps, int fd)
{
unsigned int i = 0;
int error = GIT_SUCCESS;
char buf[sizeof(WANT_PREFIX) + GIT_OID_HEXSZ + 1];
git_remote_head *head;
memcpy(buf, WANT_PREFIX, strlen(WANT_PREFIX));
buf[sizeof(buf) - 2] = '\n';
buf[sizeof(buf) - 1] = '\0';
/* If there are common caps, find the first one */
if (caps->common) {
for (; i < refs->len; ++i) {
head = refs->heads[i];
if (head->local)
continue;
else
break;
}
error = send_want_with_caps(refs->heads[i], caps, fd);
if (error < GIT_SUCCESS)
return git__rethrow(error, "Failed to send want pkt with caps");
/* Increase it here so it's correct whether we run this or not */
i++;
}
/* Continue from where we left off */
for (; i < refs->len; ++i) {
head = refs->heads[i];
if (head->local)
continue;
git_oid_fmt(buf + strlen(WANT_PREFIX), &head->oid);
error = gitno_send(fd, buf, strlen(buf), 0);
if (error < 0) {
return git__rethrow(error, "Failed to send want pkt");
}
}
return git_pkt_send_flush(fd);
}
/*
* TODO: this should be a more generic function, maybe to be used by
* git_pkt_send_wants, as it's not performance-critical
*/
#define HAVE_PREFIX "0032have "
int git_pkt_send_have(git_oid *oid, int fd)
{
char buf[] = "0032have 0000000000000000000000000000000000000000\n";
git_oid_fmt(buf + strlen(HAVE_PREFIX), oid);
return gitno_send(fd, buf, strlen(buf), 0);
}
int git_pkt_send_done(int fd)
{
char buf[] = "0009done\n";
return gitno_send(fd, buf, strlen(buf), 0);
}