Update version to 0.4.0.

Tthe problem is that winsock2.h defines socklen_t as a typedef, not as a
define, so depending on the order of includes you can get errors in
ws2tcpip.h with msvc.

CPackConfig.cmake

@@ -12,8 +12,8 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 
 ### versions
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "3")
+set(CPACK_PACKAGE_VERSION_MINOR "4")
-set(CPACK_PACKAGE_VERSION_PATCH "91")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 

ChangeLog

@@ -1,7 +1,7 @@
 ChangeLog
 ==========
 
-version 0.4 (released xxxx-xx-xx)
+version 0.4.0 (released 2009-12-10)
   * Added scp support.
   * Added support for sending signals (RFC 4254, section 6.9).
   * Added MSVC support.

include/libssh/CMakeLists.txt

@@ -3,7 +3,6 @@ project(libssh-headers C)
 set(libssh_HDRS
   callbacks.h
   libssh.h
-  crypto.h
   ssh2.h
 )
 

include/libssh/libssh.h

@@ -50,6 +50,7 @@
 
 #ifdef _MSC_VER
   /* Visual Studio hasn't inttypes.h so it doesn't know uint32_t */
+  typedef int int32_t;
   typedef unsigned int uint32_t;
   typedef unsigned short uint16_t;
   typedef unsigned char uint8_t;

include/libssh/pcap.h

@@ -7,7 +7,7 @@
 #ifdef WITH_PCAP
 typedef struct ssh_pcap_context_struct* ssh_pcap_context;
 
-int ssh_pcap_file_write_packet(ssh_pcap_file pcap, ssh_buffer packet, u_int32_t original_len);
+int ssh_pcap_file_write_packet(ssh_pcap_file pcap, ssh_buffer packet, uint32_t original_len);
 
 ssh_pcap_context ssh_pcap_context_new(ssh_session session);
 void ssh_pcap_context_free(ssh_pcap_context ctx);
@@ -18,7 +18,7 @@ enum ssh_pcap_direction{
 };
 void ssh_pcap_context_set_file(ssh_pcap_context, ssh_pcap_file);
 int ssh_pcap_context_write(ssh_pcap_context,enum ssh_pcap_direction direction, void *data,
-		u_int32_t len, u_int32_t origlen);
+		uint32_t len, uint32_t origlen);
 
 
 #endif /* WITH_PCAP */

include/libssh/priv.h

@@ -185,6 +185,11 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
 
 /* log.c */
 
+/* misc.c */
+#ifdef _WIN32
+int gettimeofday(struct timeval *__p, void *__t);
+#endif /* _WIN32 */
+
 #ifndef __FUNCTION__
 #if defined(__SUNPRO_C)
 #define __FUNCTION__ __func__

libssh/misc.c

@@ -87,14 +87,30 @@ char *ssh_get_user_home_dir(void) {
   return NULL;
 }
 
- /* we have read access on file */
+/* we have read access on file */
- int ssh_file_readaccess_ok(const char *file) {
+int ssh_file_readaccess_ok(const char *file) {
   if (_access(file, 4) < 0) {
     return 0;
   }
 
   return 1;
 }
+
+#define SSH_USEC_IN_SEC         1000000LL
+#define SSH_SECONDS_SINCE_1601  11644473600LL
+
+int gettimeofday(struct timeval *__p, void *__t) {
+  union {
+    unsigned long long ns100; /* time since 1 Jan 1601 in 100ns units */
+    FILETIME ft;
+  } now;
+
+  GetSystemTimeAsFileTime (&now.ft);
+  __p->tv_usec = (long) ((now.ns100 / 10LL) % SSH_USEC_IN_SEC);
+  __p->tv_sec  = (long)(((now.ns100 / 10LL ) / SSH_USEC_IN_SEC) - SSH_SECONDS_SINCE_1601);
+
+  return (0);
+}
 #else /* _WIN32 */
 char *ssh_get_user_home_dir(void) {
   char *szPath = NULL;

libssh/options.c

@@ -553,6 +553,7 @@ int ssh_options_set(ssh_session session, enum ssh_options_e type,
 
         session->log_verbosity = *x & 0xffff;
       }
+      break;
     case SSH_OPTIONS_LOG_VERBOSITY_STR:
       if (value == NULL) {
         session->log_verbosity = 0 & 0xffff;

libssh/pcap.c

@@ -30,8 +30,10 @@
 #ifdef WITH_PCAP
 
 #include <stdio.h>
+#ifndef _WIN32
 #include <sys/time.h>
 #include <sys/socket.h>
+#endif
 #include <errno.h>
 
 
@@ -46,13 +48,13 @@
  * Just for information.
  */
 struct pcap_hdr_s {
-	u_int32_t magic_number;   /* magic number */
+	uint32_t magic_number;   /* magic number */
-	u_int16_t version_major;  /* major version number */
+	uint16_t version_major;  /* major version number */
-	u_int16_t version_minor;  /* minor version number */
+	uint16_t version_minor;  /* minor version number */
 	int32_t   thiszone;       /* GMT to local correction */
-	u_int32_t sigfigs;        /* accuracy of timestamps */
+	uint32_t sigfigs;        /* accuracy of timestamps */
-	u_int32_t snaplen;        /* max length of captured packets, in octets */
+	uint32_t snaplen;        /* max length of captured packets, in octets */
-	u_int32_t network;        /* data link type */
+	uint32_t network;        /* data link type */
 };
 
 #define PCAP_MAGIC 0xa1b2c3d4
@@ -73,10 +75,10 @@ struct pcap_hdr_s {
  * Just for information.
  */
 struct pcaprec_hdr_s {
-	u_int32_t ts_sec;         /* timestamp seconds */
+	uint32_t ts_sec;         /* timestamp seconds */
-	u_int32_t ts_usec;        /* timestamp microseconds */
+	uint32_t ts_usec;        /* timestamp microseconds */
-	u_int32_t incl_len;       /* number of octets of packet saved in file */
+	uint32_t incl_len;       /* number of octets of packet saved in file */
-	u_int32_t orig_len;       /* actual length of packet */
+	uint32_t orig_len;       /* actual length of packet */
 };
 
 /** @private
@@ -92,12 +94,12 @@ struct ssh_pcap_context_struct {
 	/* All of these informations are useful to generate
 	 * the dummy IP and TCP packets
 	 */
-	u_int32_t ipsource;
+	uint32_t ipsource;
-	u_int32_t ipdest;
+	uint32_t ipdest;
-	u_int16_t portsource;
+	uint16_t portsource;
-	u_int16_t portdest;
+	uint16_t portdest;
-	u_int32_t outsequence;
+	uint32_t outsequence;
-	u_int32_t insequence;
+	uint32_t insequence;
 };
 
 /** @private
@@ -106,7 +108,7 @@ struct ssh_pcap_context_struct {
  */
 struct ssh_pcap_file_struct {
 	FILE *output;
-	u_int16_t ipsequence;
+	uint16_t ipsequence;
 };
 
 /**
@@ -136,7 +138,7 @@ static int ssh_pcap_file_write(ssh_pcap_file pcap, ssh_buffer packet){
  * @brief prepends a packet with the pcap header and writes packet
  * on file
  */
-int ssh_pcap_file_write_packet(ssh_pcap_file pcap, ssh_buffer packet, u_int32_t original_len){
+int ssh_pcap_file_write_packet(ssh_pcap_file pcap, ssh_buffer packet, uint32_t original_len){
 	ssh_buffer header=buffer_new();
 	struct timeval now;
 	int err;
@@ -282,7 +284,7 @@ static int ssh_pcap_context_connect(ssh_pcap_context ctx){
  * @returns SSH_ERROR an error happened.
  */
 int ssh_pcap_context_write(ssh_pcap_context ctx,enum ssh_pcap_direction direction
-		, void *data, u_int32_t len, u_int32_t origlen){
+		, void *data, uint32_t len, uint32_t origlen){
 	ssh_buffer ip;
 	int err;
 	if(ctx==NULL || ctx->file ==NULL)