On Tue, May 26, 2015 at 03:01:08PM -0700, Stefan Beller wrote:
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -716,10 +716,47 @@ static void format_symref_info(struct strbuf *buf, struct string_list *symref)
> strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
> }
>
> -static const char *advertise_capabilities = "multi_ack thin-pack side-band"
> +static char *advertise_capabilities = "multi_ack thin-pack side-band"
> " side-band-64k ofs-delta shallow no-progress"
> " include-tag multi_ack_detailed";
If we are upload-pack-2, should we advertise that in the capabilities? I
think it may make things easier later if we try to provide some
opportunistic out-of-band data. E.g., if see tell git-daemon:
git-upload-pack repo\0host=whatever\0\0version=2
how do we know whether version=2 was understood and kicked us into v2
mode, versus an old server that ignored it?
It also just makes the protocol more self-describing; from the
conversation you can see which version is in use.
> +static void send_capabilities(void)
> +{
> + char buf[100];
> +
> + while (next_capability(buf))
> + packet_write(1, "capability:%s\n", buf);
Having a static-sized buffer and then passing it to a function which has
no idea of the buffer size seems like a recipe for a buffer overflow. :)
You are fine here because you are parsing the hard-coded capabilities
string, and we know 100 is enough there. But it's nice to avoid such
magic.
Like Eric, I find the whole next_capability thing a little ugly. His
suggestion to pass in the parsing state is an improvement, but I wonder
why we need to parse at all. Can we keep the capabilities as:
const char *capabilities[] = {
"multi_ack",
"thin-pack",
... etc ...
};
and then loop over the array? The v1 writer will need to be modified,
but it should be fairly straightforward (loop and add them to the buffer
rather than dumping the whole string).
Also, do we need the capability noise-word? They all have it, except
for:
> + packet_write(1, "agent:%s\n", git_user_agent_sanitized());
But isn't that basically a capability, too (I agree it is stretching the
definition of "capability", but I think that ship has sailed; the
client's response is not "I support this, too" but "I want to enable
this").
IOW, is there a reason that the initial conversation is not just:
pkt-line("multi_ack");
pkt-line("thin-pack");
...
pkt-line("agent=v2.5.0");
pkt-line(0000);
We already have framing for each capability due to the use of pkt-line.
The "capability:" is just one more thing the client has to parse past.
The keys are already unique up to any "=", so I don't think there is any
ambiguity (e.g., we don't care about "capability:agent"; we have already
assigned a meaning to the term "agent", and will never introduce a
standalone capability with the same name).
Likewise, if we introduce new protocol items here, the client should
either ignore them (if it does not understand them) or know what to do
with them.
> +static void receive_capabilities(void)
> +{
> + int done = 0;
> + while (1) {
> + char *line = packet_read_line(0, NULL);
> + if (!line)
> + break;
> + if (starts_with(line, "capability:"))
> + parse_features(line + strlen("capability:"));
> + }
Use:
const char *cap;
if (skip_prefix(line, "capability:", &cap))
parse_features(cap);
Or better yet, if you take my suggestion above:
parse_features(line);
:)
> +static int endswith(const char *teststring, const char *ending)
> +{
> + int slen = strlen(teststring);
> + int elen = strlen(ending);
> + return !strcmp(teststring + slen - elen, ending);
> +}
Eric mentioned the underflow problems here, but I wonder even more:
what's wrong with the global ends_with() that we already provide?
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html