Commit 4e95ef02 by Carlos Martín Nieto

Implement and use gitno_send

parent 1b4f8140
...@@ -23,9 +23,15 @@ ...@@ -23,9 +23,15 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include <sys/types.h> #ifndef _MSC_VER
#include <sys/socket.h> # include <sys/types.h>
#include <netdb.h> # include <sys/socket.h>
# include <netdb.h>
#else
# include <winsock2.h>
# include <Ws2tcpip.h>
# pragma comment(lib, "Ws2_32.lib")
#endif
#include "git2/errors.h" #include "git2/errors.h"
...@@ -74,3 +80,18 @@ cleanup: ...@@ -74,3 +80,18 @@ cleanup:
freeaddrinfo(info); freeaddrinfo(info);
return error; return error;
} }
int gitno_send(int s, const char *msg, int len, int flags)
{
int ret, off = 0;
while (off < len) {
ret = send(s, msg + off, len - off, flags);
if (ret < 0)
return GIT_EOSERR;
off += ret;
}
return off;
}
...@@ -5,5 +5,6 @@ ...@@ -5,5 +5,6 @@
#define INCLUDE_netops_h__ #define INCLUDE_netops_h__
int gitno_connect(const char *host, const char *port); int gitno_connect(const char *host, const char *port);
int gitno_send(int s, const char *msg, int len, int flags);
#endif #endif
...@@ -91,7 +91,7 @@ static int do_connect(git_priv *priv, const char *url) ...@@ -91,7 +91,7 @@ static int do_connect(git_priv *priv, const char *url)
int s = -1; int s = -1;
char *host, *port, *msg; char *host, *port, *msg;
const char prefix[] = "git://"; const char prefix[] = "git://";
int error, ret, msg_len, connected = 0; int error, msg_len, connected = 0;
if (!git__prefixcmp(url, prefix)) if (!git__prefixcmp(url, prefix))
url += STRLEN(prefix); url += STRLEN(prefix);
...@@ -104,13 +104,10 @@ static int do_connect(git_priv *priv, const char *url) ...@@ -104,13 +104,10 @@ static int do_connect(git_priv *priv, const char *url)
if (error < GIT_SUCCESS) if (error < GIT_SUCCESS)
goto cleanup; goto cleanup;
/* FIXME: Do this in a loop */ error = gitno_send(s, msg, msg_len, 0);
ret = send(s, msg, msg_len, 0);
free(msg); free(msg);
if (ret < 0) { if (error < GIT_SUCCESS)
error = git__throw(GIT_EOSERR, "Failed to send request");
goto cleanup; goto cleanup;
}
priv->socket = s; priv->socket = s;
......
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