server: first steps

Let's start with baby steps, by letting the server figure out what type
of request the user wants.

This includes some include guards for internal headers, which apparently
we've only ever included once up to now.

Author: carlosmn

include/git2/types.h

@@ -180,6 +180,8 @@ typedef struct git_merge_result git_merge_result;
 /** Representation of a status collection */
 typedef struct git_status_list git_status_list;
 
+/** A server */
+typedef struct git_server git_server;
 
 /** Basic type of any Git reference. */
 typedef enum {

src/server.c

@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * 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 "server.h"
+#include "netops.h"
+
+int git_server_new(git_server **out, int fd)
+{
+	git_server *server;
+
+	server = git__calloc(1, sizeof(git_server));
+	GITERR_CHECK_ALLOC(server);
+
+	server->s.socket = fd;
+
+	*out = server;
+	return 0;
+}
+
+void git_server_free(git_server *server)
+{
+	if (server == NULL)
+		return;
+
+	git__free(server->path);
+	git__free(server);
+}
+
+int git_server__handle_request(git_server *server, git_pkt *pkt)
+{
+	git_pkt_request *req;
+
+	if (pkt->type != GIT_PKT_REQUEST) {
+		giterr_set(GITERR_NET, "first line was not a request");
+		return -1;
+	}
+
+	req = (git_pkt_request *) pkt;
+	server->type = req->request;
+	server->path = git__strdup(req->path);
+	GITERR_CHECK_ALLOC(server->path);
+
+	return 0;
+}
+
+int git_server_run(git_server *server)
+{
+	/* 65535 is the max size of a pkt frame */
+	char buffer[65536] = {0};
+	gitno_buffer buf;
+	gitno_socket *s = &server->s;
+	int error;
+
+	gitno_buffer_setup(s, &buf, buffer, sizeof(buffer));
+
+	/* first we figure out which service the user wants */
+	while (1) {
+		git_pkt *pkt;
+		const char *rest;
+
+
+		if ((error = gitno_recv(&buf)) < 0)
+			return error;
+
+		error = git_pkt_parse_line(&pkt, buffer, &rest, buf.len);
+		if (error == GIT_EBUFS)
+			continue;
+
+		if (error < 0)
+			return error;
+
+		gitno_consume(&buf, rest);
+
+		error = git_server__handle_request(server, pkt);
+		git_pkt_free(pkt);
+
+		if (error < 0)
+			return error;
+
+		break;
+	}
+
+	return 0;
+}

src/server.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+#ifndef INCLUDE_server_h__
+#define INCLUDE_server_h__
+
+#include "common.h"
+#include "transports/smart.h"
+
+struct git_server {
+	enum git_request_type type;
+	gitno_socket s;
+	int rpc;
+	char *path;
+};
+
+extern int git_server_new(git_server **out, int fd);
+extern void git_server_free(git_server *server);
+extern int git_server__handle_request(git_server *server, git_pkt *pkt);
+
+#endif
+

src/transports/smart.h

@@ -4,6 +4,10 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
+
+#ifndef INCLUDE_transports_smart_h__
+#define INCLUDE_transports_smart_h__
+
 #include "git2.h"
 #include "vector.h"
 #include "netops.h"
@@ -199,3 +203,5 @@ int git_pkt_buffer_done(git_buf *buf);
 int git_pkt_buffer_wants(const git_remote_head * const *refs, size_t count, transport_smart_caps *caps, git_buf *buf);
 int git_pkt_buffer_have(git_oid *oid, git_buf *buf);
 void git_pkt_free(git_pkt *pkt);
+
+#endif

tests/network/server.c

@@ -0,0 +1,26 @@
+#include "clar_libgit2.h"
+#include "transports/smart.h"
+#include "server.h"
+
+static git_server *g_server;
+static git_pkt *g_pkt;
+
+void test_network_server__cleanup(void)
+{
+	git_pkt_free(g_pkt);
+	git_server_free(g_server);
+}
+
+void test_network_server__request_type(void)
+{
+	const char buf[] = "0032git-upload-pack /project.git\0host=myserver.com\0";
+	const char *rest;
+	size_t buflen = sizeof(buf);
+
+	cl_git_pass(git_server_new(&g_server, 0));
+	cl_git_pass(git_pkt_parse_line(&g_pkt, buf, &rest, buflen));
+	cl_git_pass(git_server__handle_request(g_server, g_pkt));
+
+	cl_assert_equal_i(GIT_REQUEST_UPLOAD_PACK, g_server->type);
+	cl_assert_equal_s("/project.git", g_server->path);
+}