Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh

Conflicts:
	include/libssh/priv.h

1 files changed, 18 insertions, 6 deletions

diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index bf348d4e..1cb3f64c 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -32,19 +32,16 @@
 
 #ifdef _MSC_VER
 #define snprintf _snprintf
+/** Imitate define of inttypes.h */
+#define PRIdS "Id"
 #else
 #include <unistd.h>
+#define PRIdS "zd"
 #endif
 
 #include "config.h"
 #include "libssh/libssh.h"
 
-/* Debugging constants */
-
-/* Define this if you want to debug crypto systems */
-/* it's usefull when you are debugging the lib */
-/*#define DEBUG_CRYPTO */
-
 /* some constants */
 #define MAX_PACKET_LEN 262144
 #define ERROR_BUFFERLEN 1024
@@ -362,6 +359,7 @@ enum ssh_scp_states {
   SSH_SCP_READ_READING, //File is opened and reading
   SSH_SCP_ERROR         //Something bad happened
 };
+
 struct ssh_scp_struct {
   ssh_session session;
   int mode;
@@ -372,6 +370,16 @@ struct ssh_scp_struct {
   size_t processed;
 };
 
+
+struct ssh_scp_request_struct {
+  ssh_scp scp;
+  enum ssh_scp_request_types type;
+  char *name;
+  char *mode;
+  size_t size;
+  int acked;
+};
+
 struct ssh_message_struct;
 
 struct ssh_session_struct {
@@ -860,6 +868,10 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
 void message_handle(SSH_SESSION *session, uint32_t type);
 int ssh_execute_message_callbacks(SSH_SESSION *session);
 
+/* scp.c */
+
+ssh_scp_request ssh_scp_request_new(void);
+
 /* log.c */
 
 #ifndef __FUNCTION__