From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 5 Jul 2018 20:43:29 +0000 (+0200)
Subject: libssh: include line number in state change debug messages
X-Git-Tag: curl-7_61_0~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d3eeaadb49e2c55b29e51982f377c968ab9c934;p=curl

libssh: include line number in state change debug messages

Closes #2713
---

diff --git a/lib/ssh-libssh.c b/lib/ssh-libssh.c
index 69c87ac67..1c00879ba 100644
--- a/lib/ssh-libssh.c
+++ b/lib/ssh-libssh.c
@@ -204,11 +204,21 @@ static CURLcode sftp_error_to_CURLE(int err)
   return CURLE_SSH;
 }
 
+#ifndef DEBUGBUILD
+#define state(x,y) mystate(x,y)
+#else
+#define state(x,y) mystate(x,y, __LINE__)
+#endif
+
 /*
  * SSH State machine related code
  */
 /* This is the ONLY way to change SSH state! */
-static void state(struct connectdata *conn, sshstate nowstate)
+static void mystate(struct connectdata *conn, sshstate nowstate
+#ifdef DEBUGBUILD
+                    , int lineno
+#endif
+  )
 {
   struct ssh_conn *sshc = &conn->proto.sshc;
 #if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
@@ -278,8 +288,9 @@ static void state(struct connectdata *conn, sshstate nowstate)
 
 
   if(sshc->state != nowstate) {
-    infof(conn->data, "SSH %p state change from %s to %s\n",
-          (void *) sshc, names[sshc->state], names[nowstate]);
+    infof(conn->data, "SSH %p state change from %s to %s (line %d)\n",
+          (void *) sshc, names[sshc->state], names[nowstate],
+          lineno);
   }
 #endif