thodg/libgit2/src/netops.h

• Show log

  Commit

• Hash : b4b96d56
  Author :
  Date : 2012-05-05T13:30:33
  

  Fix gitno_connect() error handling on Windows
  
  gitno_connect() can return an error or socket, which is fine on most
  platforms where sockets are file descriptors (signed int), but on Windows,
  SOCKET is an unsigned type, which is problematic when we are trying to
  test if the socket was actually a negative error code.
  
  This fix seperates the error code and socket in gitno_connect(), and fixes
  the error handling in do_connect() functions to compensate. It appears
  that git_connect() and the git-transport do_connect() functions had bugs
  in the non-windows cases too (leaking sockets, and not properly reporting
  connection error, respectively) so I went ahead and fixed those too.
  

Download

• src/netops.h

• /*
   * Copyright (C) 2009-2012 the libgit2 contributors
   *
   * 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_netops_h__
  #define INCLUDE_netops_h__
  
  #ifndef GIT_WIN32
  typedef int GIT_SOCKET;
  #else
  typedef SOCKET GIT_SOCKET;
  #endif
  
  typedef struct gitno_buffer {
  	char *data;
  	size_t len;
  	size_t offset;
  	GIT_SOCKET fd;
  } gitno_buffer;
  
  void gitno_buffer_setup(gitno_buffer *buf, char *data, unsigned int len, int fd);
  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(const char *host, const char *port, GIT_SOCKET *s);
  int gitno_send(GIT_SOCKET s, const char *msg, size_t len, int flags);
  int gitno_close(GIT_SOCKET s);
  int gitno_send_chunk_size(int s, size_t len);
  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);
  
  #endif
  

Download