Merge pull request FreeRDP#2538 from MartinHaimberger/mh-add-transpor…

…t-get-bytes transport: added function to get bytes written
raguram-github · Apr 20, 2015 · 12e256b · 12e256b
2 parents 5622b91 + 9c0d275
commit 12e256b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/include/freerdp/freerdp.h b/include/freerdp/freerdp.h
@@ -275,6 +275,8 @@ FREERDP_API const char* freerdp_get_last_error_name(UINT32 error);
 FREERDP_API const char* freerdp_get_last_error_string(UINT32 error);
 FREERDP_API void freerdp_set_last_error(rdpContext* context, UINT32 lastError);
 
+FREERDP_API ULONG freerdp_get_transport_sent(rdpContext* context, BOOL resetCount);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c
@@ -697,3 +697,10 @@ void freerdp_free(freerdp* instance)
 		free(instance);
 	}
 }
+
+FREERDP_API ULONG freerdp_get_transport_sent(rdpContext* context, BOOL resetCount) {
+	ULONG written = context->rdp->transport->written;
+	if (resetCount)
+		context->rdp->transport->written = 0;
+	return written;
+}
diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c
@@ -576,10 +576,12 @@ int transport_write(rdpTransport* transport, wStream* s)
 {
 	int length;
 	int status = -1;
+	int writtenlength = 0;
 
 	EnterCriticalSection(&(transport->WriteLock));
 
 	length = Stream_GetPosition(s);
+	writtenlength = length;
 	Stream_SetPosition(s, 0);
 
 	if (length > 0)
@@ -637,8 +639,10 @@ int transport_write(rdpTransport* transport, wStream* s)
 		length -= status;
 		Stream_Seek(s, status);
 	}
+	transport->written += writtenlength;
 
 out_cleanup:
+
 	if (status < 0)
 	{
 		/* A write error indicates that the peer has dropped the connection */

diff --git a/libfreerdp/core/transport.h b/libfreerdp/core/transport.h
@@ -76,6 +76,7 @@ struct rdp_transport
 	BOOL GatewayEnabled;
 	CRITICAL_SECTION ReadLock;
 	CRITICAL_SECTION WriteLock;
+	ULONG written;
 };
 
 wStream* transport_send_stream_init(rdpTransport* transport, int size);