From ae11589205291f78c4cf5e9417f69853440d5307 Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Mon, 16 Nov 2009 23:20:16 +0100
Subject: Pcap: more cleanup and minimalist API

---
 libssh/pcap.c    | 23 +++++++++++++++++++++--
 libssh/session.c |  6 ++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'libssh')

diff --git a/libssh/pcap.c b/libssh/pcap.c
index 2ff2e4d5..2da0087e 100644
--- a/libssh/pcap.c
+++ b/libssh/pcap.c
@@ -220,6 +220,10 @@ ssh_pcap_context ssh_pcap_context_new(ssh_session session){
 	return ctx;
 }
 
+void ssh_pcap_context_free(ssh_pcap_context ctx){
+	SAFE_FREE(ctx);
+}
+
 void ssh_pcap_context_set_file(ssh_pcap_context ctx, ssh_pcap_file pcap){
 	ctx->file=pcap;
 }
@@ -355,8 +359,23 @@ int ssh_pcap_context_write(ssh_pcap_context ctx,enum ssh_pcap_direction directio
 	return err;
 }
 
-void ssh_set_pcap_context(ssh_session session, ssh_pcap_context pcap){
-	session->pcap_ctx=pcap;
+/** @brief sets the pcap file used to trace the session
+ * @param current session
+ * @param pcap an handler to a pcap file. A pcap file may be used in several
+ * sessions.
+ * @returns SSH_ERROR in case of error, SSH_OK otherwise.
+ */
+int ssh_set_pcap_file(ssh_session session, ssh_pcap_file pcap){
+	ssh_pcap_context ctx=ssh_pcap_context_new(session);
+	if(ctx==NULL){
+		ssh_set_error_oom(session);
+		return SSH_ERROR;
+	}
+	ctx->file=pcap;
+	if(session->pcap_ctx)
+		ssh_pcap_context_free(session->pcap_ctx);
+	session->pcap_ctx=ctx;
+	return SSH_OK;
 }
 
 
diff --git a/libssh/session.c b/libssh/session.c
index a3e2ed85..b2c0368e 100644
--- a/libssh/session.c
+++ b/libssh/session.c
@@ -118,6 +118,12 @@ void ssh_free(ssh_session session) {
   SAFE_FREE(session->serverbanner);
   SAFE_FREE(session->clientbanner);
   SAFE_FREE(session->banner);
+#ifdef WITH_PCAP
+  if(session->pcap_ctx){
+  	ssh_pcap_context_free(session->pcap_ctx);
+  	session->pcap_ctx=NULL;
+  }
+#endif
   buffer_free(session->in_buffer);
   buffer_free(session->out_buffer);
   session->in_buffer=session->out_buffer=NULL;
-- 
cgit