Attachment 2854 Details for Bug 2598 – add debugging to ssh-agent

[patch] add debugging to ssh-agent

openssh-agent-debug.patch (text/plain), 1.53 KB, created by Darren Tucker on 2016-07-19 14:02:53 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2016-07-19 14:02:53 AEST

Size: 1.53 KB

patch

obsolete

>diff --git a/log.c b/log.c
>index ad12930..4db68e2 100644
>--- a/log.c
>+++ b/log.c
>@@ -429,7 +429,8 @@ do_log(LogLevel level, const char *fmt, va_list args)
> 		break;
> 	}
> 	if (txt != NULL && log_handler == NULL) {
>-		snprintf(fmtbuf, sizeof(fmtbuf), "%s: %s", txt, fmt);
>+		snprintf(fmtbuf, sizeof(fmtbuf), "%s[%ld,%ld]: %s", txt,
>+		    (long int)time(NULL), (long int)monotime(), fmt);
> 		vsnprintf(msgbuf, sizeof(msgbuf), fmtbuf, args);
> 	} else {
> 		vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
>diff --git a/ssh-agent.c b/ssh-agent.c
>index c38906d..3828d28 100644
>--- a/ssh-agent.c
>+++ b/ssh-agent.c
>@@ -541,9 +541,12 @@ reaper(void)
> 				TAILQ_REMOVE(&tab->idlist, id, next);
> 				free_identity(id);
> 				tab->nentries--;
>-			} else
>+			} else {
>+				debug3("key '%s' death time %ld", id->comment,
>+				    id->death);
> 				deadline = (deadline == 0) ? id->death :
> 				    MIN(deadline, id->death);
>+			}
> 		}
> 	}
> 	if (deadline == 0 || deadline <= now)
>@@ -638,6 +641,8 @@ process_add_identity(SocketEntry *e, int version)
> 				goto err;
> 			}
> 			death = monotime() + seconds;
>+			debug3("constrain lifetime key '%s' seconds %u "
>+			    "death time %ld", comment, seconds, death);
> 			break;
> 		case SSH_AGENT_CONSTRAIN_CONFIRM:
> 			confirm = 1;
>@@ -1031,6 +1036,7 @@ prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl, u_int *nallocp,
> 		}
> 	}
> 	deadline = reaper();
>+	debug3("reaper deadline %ld", (long int)deadline);
> 	if (parent_alive_interval != 0)
> 		deadline = (deadline == 0) ? parent_alive_interval :
> 		    MIN(deadline, parent_alive_interval);

Actions: View | Diff

Attachments on bug 2598: 2852 | 2854 | 2855