Commit 1b75c29e by Carlos Martín Nieto

gitno: remove code which is no longer needed

Most of the network-facing facilities have been copied to the socket and
openssl streams. No code now uses these functions directly anymore, so
we can now remove them.
parent 4fd4341f
...@@ -33,8 +33,6 @@ typedef struct gitno_buffer { ...@@ -33,8 +33,6 @@ typedef struct gitno_buffer {
char *data; char *data;
size_t len; size_t len;
size_t offset; size_t offset;
git_stream *io;
gitno_socket *socket;
int (*recv)(struct gitno_buffer *buffer); int (*recv)(struct gitno_buffer *buffer);
void *cb_data; void *cb_data;
} gitno_buffer; } gitno_buffer;
...@@ -58,19 +56,13 @@ enum { ...@@ -58,19 +56,13 @@ enum {
*/ */
int gitno__match_host(const char *pattern, const char *host); int gitno__match_host(const char *pattern, const char *host);
void gitno_buffer_setup(gitno_socket *t, gitno_buffer *buf, char *data, size_t len);
void gitno_buffer_setup_fromstream(git_stream *st, gitno_buffer *buf, char *data, size_t len); void gitno_buffer_setup_fromstream(git_stream *st, gitno_buffer *buf, char *data, size_t len);
void gitno_buffer_setup_callback(gitno_socket *t, gitno_buffer *buf, char *data, size_t len, int (*recv)(gitno_buffer *buf), void *cb_data); void gitno_buffer_setup_callback(gitno_buffer *buf, char *data, size_t len, int (*recv)(gitno_buffer *buf), void *cb_data);
int gitno_recv(gitno_buffer *buf); int gitno_recv(gitno_buffer *buf);
void gitno_consume(gitno_buffer *buf, const char *ptr); void gitno_consume(gitno_buffer *buf, const char *ptr);
void gitno_consume_n(gitno_buffer *buf, size_t cons); void gitno_consume_n(gitno_buffer *buf, size_t cons);
int gitno_connect(gitno_socket *socket, const char *host, const char *port, int flags);
int gitno_send(gitno_socket *socket, const char *msg, size_t len, int flags);
int gitno_close(gitno_socket *s);
int gitno_select_in(gitno_buffer *buf, long int sec, long int usec);
typedef struct gitno_connection_data { typedef struct gitno_connection_data {
char *host; char *host;
char *port; char *port;
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "posix.h" #include "posix.h"
#include "stream.h" #include "stream.h"
#include "socket_stream.h" #include "socket_stream.h"
#include "netops.h"
#include "git2/transport.h" #include "git2/transport.h"
static int ssl_set_error(SSL *ssl, int error) static int ssl_set_error(SSL *ssl, int error)
...@@ -103,7 +104,7 @@ static int verify_server_cert(SSL *ssl, const char *host) ...@@ -103,7 +104,7 @@ static int verify_server_cert(SSL *ssl, const char *host)
if (SSL_get_verify_result(ssl) != X509_V_OK) { if (SSL_get_verify_result(ssl) != X509_V_OK) {
giterr_set(GITERR_SSL, "The SSL certificate is invalid"); giterr_set(GITERR_SSL, "The SSL certificate is invalid");
return -1; return GIT_ECERTIFICATE;
} }
/* Try to parse the host as an IP address to see if it is */ /* Try to parse the host as an IP address to see if it is */
......
...@@ -99,7 +99,6 @@ int socket_connect(git_stream *stream) ...@@ -99,7 +99,6 @@ int socket_connect(git_stream *stream)
if ((ret = p_getaddrinfo(st->host, st->port, &hints, &info)) != 0) { if ((ret = p_getaddrinfo(st->host, st->port, &hints, &info)) != 0) {
giterr_set(GITERR_NET, giterr_set(GITERR_NET,
"Failed to resolve address for %s: %s", st->host, p_gai_strerror(ret)); "Failed to resolve address for %s: %s", st->host, p_gai_strerror(ret));
return -1; return -1;
} }
......
...@@ -158,7 +158,7 @@ static int git_smart__connect( ...@@ -158,7 +158,7 @@ static int git_smart__connect(
/* Save off the current stream (i.e. socket) that we are working with */ /* Save off the current stream (i.e. socket) that we are working with */
t->current_stream = stream; t->current_stream = stream;
gitno_buffer_setup_callback(NULL, &t->buffer, t->buffer_data, sizeof(t->buffer_data), git_smart__recv_cb, t); gitno_buffer_setup_callback(&t->buffer, t->buffer_data, sizeof(t->buffer_data), git_smart__recv_cb, t);
/* 2 flushes for RPC; 1 for stateful */ /* 2 flushes for RPC; 1 for stateful */
if ((error = git_smart__store_refs(t, t->rpc ? 2 : 1)) < 0) if ((error = git_smart__store_refs(t, t->rpc ? 2 : 1)) < 0)
...@@ -252,7 +252,7 @@ int git_smart__negotiation_step(git_transport *transport, void *data, size_t len ...@@ -252,7 +252,7 @@ int git_smart__negotiation_step(git_transport *transport, void *data, size_t len
if ((error = stream->write(stream, (const char *)data, len)) < 0) if ((error = stream->write(stream, (const char *)data, len)) < 0)
return error; return error;
gitno_buffer_setup_callback(NULL, &t->buffer, t->buffer_data, sizeof(t->buffer_data), git_smart__recv_cb, t); gitno_buffer_setup_callback(&t->buffer, t->buffer_data, sizeof(t->buffer_data), git_smart__recv_cb, t);
return 0; return 0;
} }
...@@ -278,7 +278,7 @@ int git_smart__get_push_stream(transport_smart *t, git_smart_subtransport_stream ...@@ -278,7 +278,7 @@ int git_smart__get_push_stream(transport_smart *t, git_smart_subtransport_stream
/* Save off the current stream (i.e. socket) that we are working with */ /* Save off the current stream (i.e. socket) that we are working with */
t->current_stream = *stream; t->current_stream = *stream;
gitno_buffer_setup_callback(NULL, &t->buffer, t->buffer_data, sizeof(t->buffer_data), git_smart__recv_cb, t); gitno_buffer_setup_callback(&t->buffer, t->buffer_data, sizeof(t->buffer_data), git_smart__recv_cb, t);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment