From f8b102ef0cb9f4e13043663d6dda45c92df8d8e5 Mon Sep 17 00:00:00 2001
From: Daniel Tartavel <contact@librepc.com>
Date: Thu, 7 May 2020 19:05:41 +0200
Subject: [PATCH] get connexion time from utmp

---
 main.c | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/main.c b/main.c
index cdc7a42..caa225f 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,7 @@ int isinarray( int pid, int array[], int n )
 	}	return 0;
 }
 
-void getutmp( int pid, char user[], char host_ip[] )
+void getutmp( int pid, char user[], char host_ip[], time_t * time )
 {
 	struct utmp * utmp;
 	setutent();
@@ -32,6 +32,7 @@ void getutmp( int pid, char user[], char host_ip[] )
 		{
 			sprintf(user, "%s", utmp->ut_user);
 			sprintf(host_ip, "%s", utmp->ut_host);
+			*time = utmp->ut_tv.tv_sec;
 			break;
 		}
 	}
@@ -93,7 +94,7 @@ int getpids(int pid, int exploded[])
 	}
 }
 
-int getprocinfo( int ppid, char cmdline[], char cmd[], char user[], char host_ip[] )
+int getprocinfo( int ppid, char cmdline[], char cmd[], char user[], char host_ip[], char date[] )
 {
 	FILE *fh1;
 	char child_path[128];
@@ -106,9 +107,18 @@ int getprocinfo( int ppid, char cmdline[], char cmd[], char user[], char host_ip
 	int pid = ppid;
 	int level = 0;
 	int retval = 0;
-//	char  * pos;
+	time_t  *timet=0;
 
-	getutmp( pid, user, host_ip );
+	getutmp( pid, user, host_ip, timet );
+	if ( timet != 0)
+	{
+		sprintf(date, "%s", ctime(timet));
+	}else
+	{
+		time( timet );
+		sprintf( date, "%s", ctime( timet));
+		date[strlen(date)-1] = 0;
+	}
 	while ( flag == 0)
 	{
 		r = getpids( pid, child_pid );
@@ -236,22 +246,20 @@ int main()
 				if( r == 0 )
 				{
 					user[0]='\0';
-					rinfo = getprocinfo( pid, cmdline, cmd, user, host_ip );
+					rinfo = getprocinfo( pid, cmdline, cmd, user, host_ip, date );
 					if( rinfo == 0 )
 					{
 						x++;
 						childrens[x] = pid;
 						flag[x] = 1;
+						// date of connexion
 
-						time( &now );
-						sprintf( date, "%s", ctime(&now));
-						date[strlen(date)-1] = 0;
 						if (user[0] == '\0')
 						{
-							sprintf( str, "%s \"%s: tunnel ouvert le %s avec la commande: %s %s\"", commande, HOSTNAME, date, cmd, cmdline );
+							sprintf( str, "%s \"%s: tunnel ouvert le %s depuis %s avec la commande: %s %s\"", commande, HOSTNAME, date, host_ip, cmd, cmdline );
 						}else
 						{
-							sprintf( str, "%s \"%s: %s s'est connecté le %s avec la commande: %s %s\"", commande, HOSTNAME, user, date, cmd, cmdline );
+							sprintf( str, "%s \"%s: %s s'est connecté le %s depuis %s avec la commande: %s %s\"", commande, HOSTNAME, user, date, host_ip, cmd, cmdline );
 						}
 						if ( start != 1 )
 						{
@@ -263,7 +271,7 @@ int main()
 									perror(logfile);
 									return 7;
 								}
-								fprintf(fh1, "%s: Connexion de %s commnade: %s %s", date, user, cmd, cmdline);
+								fprintf(fh1, "%s: Connexion de %s depuis %s commande: %s %s", date, user, host_ip, cmd, cmdline);
 								fclose(fh1);
 							}else if (id<0)
 							{
@@ -281,7 +289,7 @@ int main()
 								perror(logfile);
 								return 7;
 							}
-							fprintf(fh1, "%s: %s Connecté - %s  %s\n", date, user, cmd, cmdline);
+							fprintf(fh1, "%s: %s Connecté depuis %s - %s  %s\n", date, host_ip, user, cmd, cmdline);
 							fclose(fh1);
 						}
 					}