Users: fix crashing on Windows; rename tty to more common name sessionName

This commit is contained in:
李通洲
2023-10-10 20:21:11 +08:00
parent 4e75fa958d
commit 5493f418ed
4 changed files with 12 additions and 11 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ typedef struct FFUserResult
FFstrbuf name;
FFstrbuf hostName;
FFstrbuf clientIp;
FFstrbuf tty;
FFstrbuf sessionName;
uint64_t loginTime; // ms
} FFUserResult;
+1 -1
View File
@@ -31,7 +31,7 @@ next:
FFUserResult* user = (FFUserResult*) ffListAdd(users);
ffStrbufInitS(&user->name, n->ut_user);
ffStrbufInitS(&user->hostName, n->ut_host);
ffStrbufInitS(&user->tty, n->ut_line);
ffStrbufInitS(&user->sessionName, n->ut_line);
#ifdef __linux__
if(n->ut_addr_v6[0] || n->ut_addr_v6[1] || n->ut_addr_v6[2] || n->ut_addr_v6[3])
ffStrbufInitF(&user->clientIp, "%u.%u.%u.%u", n->ut_addr_v6[0], n->ut_addr_v6[1], n->ut_addr_v6[2], n->ut_addr_v6[3]);
+2 -1
View File
@@ -28,7 +28,8 @@ const char* ffDetectUsers(FFlist* users)
FFUserResult* user = (FFUserResult*) ffListAdd(users);
ffStrbufInitWS(&user->name, session->pUserName);
ffStrbufInitWS(&user->hostName, session->pHostName);
ffStrbufInitS(&user->clientIp, "0.0.0.0");
ffStrbufInitWS(&user->sessionName, session->pSessionName);
ffStrbufInit(&user->clientIp);
user->loginTime = 0;
DWORD bytes = 0;