Move `url` to last place in parameter list

[libgit2.git] / src / netops.h

diff --git a/src/netops.h b/src/netops.h
index 4976f87f8a54fc4fe6d4f95eacd2f1ac7035d01a..efbbc65a4591f5793cff9023c0d15cab59adc527 100644 (file)
--- a/src/netops.h
+++ b/src/netops.h
@@ -8,30 +8,62 @@
 #define INCLUDE_netops_h__
 
 #include "posix.h"
-#include "transport.h"
 #include "common.h"
 
-typedef struct gitno_buffer {
+#ifdef GIT_SSL
+# include <openssl/ssl.h>
+#endif
+
+struct gitno_ssl {
+#ifdef GIT_SSL
+       SSL_CTX *ctx;
+       SSL *ssl;
+#else
+       size_t dummy;
+#endif
+};
+
+typedef struct gitno_ssl gitno_ssl;
+
+/* Represents a socket that may or may not be using SSL */
+struct gitno_socket {
+       GIT_SOCKET socket;
+       gitno_ssl ssl;
+};
+
+typedef struct gitno_socket gitno_socket;
+
+struct gitno_buffer {
        char *data;
        size_t len;
        size_t offset;
-       GIT_SOCKET fd;
-#ifdef GIT_SSL
-       struct gitno_ssl *ssl;
-#endif
-} gitno_buffer;
+       gitno_socket *socket;
+       int (*recv)(struct gitno_buffer *buffer);
+       void *cb_data;
+};
+
+typedef struct gitno_buffer gitno_buffer;
+
+/* Flags to gitno_connect */
+enum {
+       /* Attempt to create an SSL connection. */
+       GITNO_CONNECT_SSL = 1,
+
+       /* Valid only when GITNO_CONNECT_SSL is also specified.
+        * Indicates that the server certificate should not be validated. */
+       GITNO_CONNECT_SSL_NO_CHECK_CERT = 2,
+};
 
-void gitno_buffer_setup(git_transport *t, gitno_buffer *buf, char *data, unsigned int len);
+void gitno_buffer_setup(gitno_socket *t, 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);
 int gitno_recv(gitno_buffer *buf);
 
 void gitno_consume(gitno_buffer *buf, const char *ptr);
 void gitno_consume_n(gitno_buffer *buf, size_t cons);
 
-int gitno_connect(git_transport *t, const char *host, const char *port);
-int gitno_send(git_transport *t, const char *msg, size_t len, int flags);
-int gitno_close(GIT_SOCKET s);
-int gitno_ssl_teardown(git_transport *t);
-int gitno_send_chunk_size(int s, size_t len);
+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);
 
 int gitno_extract_host_and_port(char **host, char **port, const char *url, const char *default_port);