From 7d610ef06f4000a718f71282571e3a3dc9025145 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 29 Apr 2015 12:44:56 +0200
Subject: [PATCH 301/325] ggatec: Log the command type for hdr packets (when
 debugging)

... and provide more details about failed requests.

Obtained from: ElectroBSD
---
 sbin/ggate/ggatec/ggatec.c | 11 ++++++++---
 sbin/ggate/shared/ggate.c  | 16 ++++++++++++++++
 sbin/ggate/shared/ggate.h  |  1 +
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/sbin/ggate/ggatec/ggatec.c b/sbin/ggate/ggatec/ggatec.c
index b9f159ce272f..3be5d63a1ac9 100644
--- a/sbin/ggate/ggatec/ggatec.c
+++ b/sbin/ggate/ggatec/ggatec.c
@@ -176,7 +176,9 @@ send_thread(void *arg __unused)
 		g_gate_swap2n_hdr(&hdr);
 
 		data = g_gate_send(sendfd, &hdr, sizeof(hdr), MSG_NOSIGNAL);
-		g_gate_log(LOG_DEBUG, "Sent hdr packet.");
+		g_gate_log(LOG_DEBUG, "Sent hdr packet (%s).",
+		    g_gate_cmd2str(hdr.gh_cmd));
+
 		g_gate_swap2h_hdr(&hdr);
 		if (reconnect)
 			break;
@@ -234,7 +236,8 @@ recv_thread(void *arg __unused)
 			pthread_kill(sendtd, SIGUSR1);
 			break;
 		}
-		g_gate_log(LOG_DEBUG, "Received hdr packet.");
+		g_gate_log(LOG_DEBUG, "Received hdr packet (%s).",
+		    g_gate_cmd2str(hdr.gh_cmd));
 
 		ggio.gctl_seq = hdr.gh_seq;
 		ggio.gctl_cmd = hdr.gh_cmd;
@@ -255,7 +258,9 @@ recv_thread(void *arg __unused)
 
 		if (ggio.gctl_error != 0) {
 			g_gate_log(LOG_ERR,
-			    "Remote side signaled error %d: %s.",
+			    "%s for %d bytes at offset %d failed. "
+			    "Error %d: %s.", g_gate_cmd2str(ggio.gctl_cmd),
+			    ggio.gctl_length, ggio.gctl_offset,
 			    ggio.gctl_error, strerror(ggio.gctl_error));
 		}
 
diff --git a/sbin/ggate/shared/ggate.c b/sbin/ggate/shared/ggate.c
index 2f544f7a2c9c..6197540d9678 100644
--- a/sbin/ggate/shared/ggate.c
+++ b/sbin/ggate/shared/ggate.c
@@ -409,3 +409,19 @@ g_gate_str2ip(const char *str)
 		return (INADDR_NONE);
 	return (((struct in_addr *)(void *)hp->h_addr)->s_addr);
 }
+
+const char *
+g_gate_cmd2str(int cmd)
+{
+
+	switch (cmd) {
+	case GGATE_CMD_READ:
+		return ("GGATE_CMD_READ");
+	case GGATE_CMD_WRITE:
+		return ("GGATE_CMD_WRITE");
+	case GGATE_CMD_FLUSH:
+		return ("GGATE_CMD_FLUSH");
+	}
+
+	return ("unknown (invalid?) GGATE command");
+}
diff --git a/sbin/ggate/shared/ggate.h b/sbin/ggate/shared/ggate.h
index a649e7fd322d..50758708f522 100644
--- a/sbin/ggate/shared/ggate.h
+++ b/sbin/ggate/shared/ggate.h
@@ -114,6 +114,7 @@ void	g_gate_socket_settings(int sfd);
 void	g_gate_list(int unit, int verbose);
 #endif
 in_addr_t g_gate_str2ip(const char *str);
+const char *g_gate_cmd2str(int cmd);
 
 /*
  * g_gate_swap2h_* - functions swap bytes to host byte order (from big endian).
-- 
2.32.0