From f2c21f6f8440399acc730284becb4c6020b61b9e Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 9 Sep 2011 22:59:26 +0200
Subject: [PATCH] new function: libssh2_session_banner_get

Returns the banner from the server handshake

Fixes #226
---
 docs/Makefile.am                  |  1 +
 docs/libssh2_session_banner_get.3 | 19 +++++++++++++++++++
 include/libssh2.h                 |  1 +
 src/session.c                     | 16 ++++++++++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 docs/libssh2_session_banner_get.3

diff --git a/docs/Makefile.am b/docs/Makefile.am
index e0b72b4..ce18ce0 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -92,6 +92,7 @@ dist_man_MANS = \
 	libssh2_scp_send64.3 \
 	libssh2_scp_send_ex.3 \
 	libssh2_session_abstract.3 \
+	libssh2_session_banner_get.3 \
 	libssh2_session_block_directions.3 \
 	libssh2_session_callback_set.3 \
 	libssh2_session_disconnect.3 \
diff --git a/docs/libssh2_session_banner_get.3 b/docs/libssh2_session_banner_get.3
new file mode 100644
index 0000000..814b000
--- /dev/null
+++ b/docs/libssh2_session_banner_get.3
@@ -0,0 +1,19 @@
+.TH libssh2_session_banner_get 3 "9 Sep 2011" "libssh2 1.4.0" "libssh2 manual"
+.SH NAME
+libssh2_session_banner_get - get the remote banner
+.SH SYNOPSIS
+#include <libssh2.h>
+
+const char *libssh2_session_banner_get(oLIBSSH2_SESSION *session);
+.SH DESCRIPTION
+Once the session has been setup and \fIlibssh2_session_handshake(3)\fP has
+completed successfully, this function can be used to get the server id from
+the banner each server presents.
+.SH RETURN VALUE
+A pointer to a string or NULL if something failed. The data pointed to will be
+allocated and associated to the session handle and will be freed by libssh2
+when \fIlibssh2_session_free(3)\fP is used.
+.SH SEE ALSO
+.BR libssh2_session_banner_set(3),
+.BR libssh2_session_handshake(3),
+.BR libssh2_session_free(3)
diff --git a/include/libssh2.h b/include/libssh2.h
index 07f582f..aba5488 100644
--- a/include/libssh2.h
+++ b/include/libssh2.h
@@ -487,6 +487,7 @@ LIBSSH2_API int libssh2_session_block_directions(LIBSSH2_SESSION *session);
 
 LIBSSH2_API int libssh2_session_flag(LIBSSH2_SESSION *session, int flag,
                                      int value);
+LIBSSH2_API const char *libssh2_session_banner_get(LIBSSH2_SESSION *session);
 
 /* Userauth API */
 LIBSSH2_API char *libssh2_userauth_list(LIBSSH2_SESSION *session,
diff --git a/src/session.c b/src/session.c
index 50d08ee..2706e58 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1718,3 +1718,19 @@ libssh2_session_block_directions(LIBSSH2_SESSION *session)
     return session->socket_block_directions;
 }
 
+/* libssh2_session_banner_get
+ * Get the remote banner (server ID string)
+ */
+
+LIBSSH2_API const char *
+libssh2_session_banner_get(LIBSSH2_SESSION *session)
+{
+    /* to avoid a coredump when session is NULL */
+    if (NULL == session)
+        return NULL;
+
+    if (NULL==session->remote.banner)
+        return NULL;
+
+    return (const char *) session->remote.banner;
+}