Implement the git TCP transport up to ls-remote Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352
diff --git a/include/git2/pkt.h b/include/git2/pkt.h
index 8ba3c2a..7d61d4d 100644
--- a/include/git2/pkt.h
+++ b/include/git2/pkt.h
@@ -55,3 +55,4 @@ struct git_pkt_ref {
* Create a git protocol request.
*/
int git_pkt_gen_proto(char **out, int *outlen, const char *url);
+int git_pkt_parse_line(git_pkt **head, const char *line, const char **out);
diff --git a/src/transport.c b/src/transport.c
index 2ef99dc..fb0dc32 100644
--- a/src/transport.c
+++ b/src/transport.c
@@ -8,7 +8,7 @@ struct {
char *prefix;
git_transport_cb fn;
} transports[] = {
- {"git://", git_transport_dummy},
+ {"git://", git_transport_git},
{"http://", git_transport_dummy},
{"https://", git_transport_dummy},
{"file://", git_transport_local},
diff --git a/src/transport.h b/src/transport.h
index d70caaa..e951d4c 100644
--- a/src/transport.h
+++ b/src/transport.h
@@ -79,6 +79,7 @@ struct git_transport {
};
int git_transport_local(struct git_transport *transport);
+int git_transport_git(struct git_transport *transport);
int git_transport_dummy(struct git_transport *transport);
#endif
diff --git a/src/transport_git.c b/src/transport_git.c
new file mode 100644
index 0000000..526292c
--- /dev/null
+++ b/src/transport_git.c
@@ -0,0 +1,312 @@
+/*
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2,
+ * as published by the Free Software Foundation.
+ *
+ * In addition to the permissions in the GNU General Public License,
+ * the authors give you unlimited permission to link the compiled
+ * version of this file into combinations with other programs,
+ * and to distribute those combinations without any restriction
+ * coming from the use of this file. (The General Public License
+ * restrictions do apply in other respects; for example, they cover
+ * modification of the file, and distribution when not linked into
+ * a combined executable.)
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _MSC_VER
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netdb.h>
+#else
+# include <winsock2.h>
+# include <Ws2tcpip.h>
+# pragma comment(lib, "Ws2_32.lib")
+#endif
+
+#include "git2/net.h"
+#include "git2/pkt.h"
+#include "git2/common.h"
+#include "git2/types.h"
+#include "git2/errors.h"
+
+#include "vector.h"
+#include "transport.h"
+#include "common.h"
+
+typedef struct {
+ int socket;
+ git_vector refs;
+ git_remote_head **heads;
+} git_priv;
+
+/* The URL should already have been stripped of the protocol */
+static int extract_host_and_port(char **host, char **port, const char *url)
+{
+ char *colon, *slash, *delim;
+ int error = GIT_SUCCESS;
+
+ colon = strchr(url, ':');
+ slash = strchr(url, '/');
+
+ if (slash == NULL)
+ return git__throw(GIT_EOBJCORRUPTED, "Malformed URL: missing /");
+
+ if (colon == NULL) {
+ *port = git__strdup(GIT_DEFAULT_PORT);
+ } else {
+ *port = git__strndup(colon + 1, slash - colon - 1);
+ }
+ if (*port == NULL)
+ return GIT_ENOMEM;;
+
+
+ delim = colon == NULL ? slash : colon;
+ *host = git__strndup(url, delim - url);
+ if (*host == NULL) {
+ free(*port);
+ error = GIT_ENOMEM;
+ }
+
+ return error;
+}
+
+/*
+ * Parse the URL and connect to a server, storing the socket in
+ * out. For convenience this also takes care of asking for the remote
+ * refs
+ */
+static int do_connect(git_priv *priv, const char *url)
+{
+ int s = -1;
+ char *host, *port, *msg;
+ const char prefix[] = "git://";
+ int error, ret, msg_len, connected = 0;
+ struct addrinfo *info, *p;
+ struct addrinfo hints;
+
+ memset(&hints, 0x0, sizeof(struct addrinfo));
+ hints.ai_family = AF_UNSPEC; /* IPv4 or IPv6 */
+ hints.ai_socktype = SOCK_STREAM; /* TCP */
+
+ if (!git__prefixcmp(url, prefix))
+ url += STRLEN(prefix);
+
+ error = extract_host_and_port(&host, &port, url);
+
+ ret = getaddrinfo(host, port, &hints, &info);
+ if (ret != 0) {
+ info = NULL;
+ error = git__throw(GIT_EOSERR, "Failed to get address info: %s", gai_strerror(ret));
+ goto cleanup;
+ }
+
+ for (p = info; p != NULL; p = p->ai_next) {
+ s = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
+ if (s < 0) {
+ error = git__throw(GIT_EOSERR, "Failed to create socket");
+ goto cleanup;
+ }
+
+ ret = connect(s, p->ai_addr, p->ai_addrlen);
+ if (ret < 0) { /* Try the next one */
+ continue;
+ }
+ connected = 1;
+
+ error = git_pkt_gen_proto(&msg, &msg_len, url);
+ if (error < GIT_SUCCESS)
+ break;
+
+ /* FIXME: Do this in a loop */
+ ret = send(s, msg, msg_len, 0);
+ free(msg);
+ if (ret < 0)
+ error = git__throw(GIT_EOSERR, "Failed to send request");
+ }
+
+ priv->socket = s;
+
+cleanup:
+ freeaddrinfo(info);
+ free(host);
+ free(port);
+
+ if (error < GIT_SUCCESS && s > 0)
+ close(s);
+ if (!connected)
+ error = git__throw(GIT_EOSERR, "Failed to connect to any of the addresses");
+
+ return error;
+}
+
+/*
+ * Read from the socket and store the references in the vector
+ */
+static int store_refs(git_priv *priv)
+{
+ int s = priv->socket;
+ git_vector *refs = &priv->refs;
+ int error = GIT_SUCCESS;
+ char buffer[1024] = {0};
+ const char *line_end, *ptr;
+ int off = 0, ret;
+ git_pkt *pkt;
+
+ while (1) {
+ ret = recv(s, buffer, sizeof(buffer) - off, 0);
+ if (ret < 0)
+ return git__throw(GIT_EOSERR, "Failed to receive data");
+ if (ret == 0)
+ puts("got zero!");
+
+ ptr = buffer;
+ while (1) {
+ error = git_pkt_parse_line(&pkt, ptr, &line_end);
+ /*
+ * An error here can mean that the input in corrupt or
+ * (more likely) that the input hasn't arrived yet.
+ *
+ * FIXME: Add actual error checking. Right now we just ask
+ * for more input.
+ */
+ if (error < GIT_SUCCESS)
+ break;
+
+ error = git_vector_insert(refs, pkt);
+ if (error < GIT_SUCCESS)
+ return error;
+
+ if (pkt->type != GIT_PKT_REF)
+ return GIT_SUCCESS;
+
+ ptr = line_end;
+ }
+
+ /*
+ * Move the rest to the start of the buffer
+ */
+ memmove(buffer, line_end, sizeof(buffer) - (line_end - buffer));
+ off = ret - (line_end - buffer);
+ }
+
+ return error;
+}
+
+/*
+ * Since this is a network connection, we need to parse and store the
+ * pkt-lines at this stage and keep them there.
+ */
+static int git_connect(git_transport *transport, git_net_direction direction)
+{
+ git_priv *priv;
+ int error = GIT_SUCCESS;
+
+ if (direction == INTENT_PUSH)
+ return git__throw(GIT_EINVALIDARGS, "Pushing is not supported with the git protocol");
+
+ priv = git__malloc(sizeof(git_priv));
+ if (priv == NULL)
+ return GIT_ENOMEM;
+
+ memset(priv, 0x0, sizeof(git_priv));
+ transport->private = priv;
+ error = git_vector_init(&priv->refs, 16, NULL);
+ if (error < GIT_SUCCESS)
+ goto cleanup;
+
+ /* Connect and ask for the refs */
+ error = do_connect(priv, transport->url);
+ if (error < GIT_SUCCESS)
+ return error;
+
+ error = store_refs(priv);
+
+cleanup:
+ if (error < GIT_SUCCESS) {
+ git_vector_free(&priv->refs);
+ free(priv);
+ }
+
+ return error;
+}
+
+static int git_ls(git_transport *transport, git_headarray *array)
+{
+ git_priv *priv = transport->private;
+ git_vector *refs = &priv->refs;
+ int len = 0;
+ unsigned int i;
+
+ array->heads = git__calloc(refs->length, sizeof(git_remote_head *));
+ if (array->heads == NULL)
+ return GIT_ENOMEM;
+
+ for (i = 0; i < refs->length; ++i) {
+ git_pkt *p = git_vector_get(refs, i);
+ if (p->type != GIT_PKT_REF)
+ continue;
+
+ ++len;
+ array->heads[i] = &(((git_pkt_ref *) p)->head);
+ }
+ array->len = len;
+ priv->heads = array->heads;
+
+ return GIT_SUCCESS;
+}
+
+static int git_close(git_transport *transport)
+{
+ git_priv *priv = transport->private;
+ int s = priv->socket;
+ int error;
+
+ error = close(s);
+ if (error < 0)
+ error = git__throw(GIT_EOSERR, "Failed to close socket");
+
+ return error;
+}
+
+static void git_free(git_transport *transport)
+{
+ git_priv *priv = transport->private;
+ git_vector *refs = &priv->refs;
+ unsigned int i;
+
+ for (i = 0; i < refs->length; ++i) {
+ git_pkt *p = git_vector_get(refs, i);
+ if (p->type == GIT_PKT_REF) {
+ free(((git_pkt_ref *)p)->head.name);
+ free(((git_pkt_ref *)p)->capabilities);
+ }
+
+ free(p);
+ }
+
+ git_vector_free(refs);
+ free(priv->heads);
+ free(priv);
+ free(transport->url);
+ free(transport);
+}
+
+int git_transport_git(git_transport *transport)
+{
+ transport->connect = git_connect;
+ transport->ls = git_ls;
+ transport->close = git_close;
+ transport->free = git_free;
+
+ return GIT_SUCCESS;
+}