Skip to content

Commit b56991c

Browse files
committed
feat: prefix and no prefix mode
1 parent 4616cab commit b56991c

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

inc/util.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ BOOL WINAPI IsServerCommand(LocalThreadInfo *lThInfo, char *command);
168168

169169
extern int keepRunning;
170170
extern int isGuiRunning;
171+
extern int flagIsPrefix;
171172

172173
extern HANDLE glOutputMutex;
173174
extern HANDLE glThreadMutex;

src/mailserver.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ char errorBuffer[512];
2121
int keepRunning = 1;
2222
int isGuiRunning = 1;
2323
int flagNOGUI = 0;
24+
int flagIsPrefix = 1;
2425

2526
HANDLE glOutputMutex;
2627
HANDLE glThreadMutex;
@@ -82,9 +83,14 @@ UserInfo *ReadUsersFromFile(char *filename, int *nUsers){
8283
// сообщения пользователей во время старта сессии - а читать их по требованию
8384
int main(int argc, char **argv){
8485
if(argc != 1){
85-
if(strncmp(argv[1], "-NO-GUI", 8) == 0){
86-
flagNOGUI = 1;
87-
isGuiRunning = 0;
86+
for(int i = 1; i < argc; i++){
87+
if(strncmp(argv[1], "-NO-GUI", 8) == 0){
88+
flagNOGUI = 1;
89+
isGuiRunning = 0;
90+
}
91+
if(strncmp(argv[1], "-NO-PREF", 9) == 0){
92+
flagIsPrefix = 0;
93+
}
8894
}
8995
}
9096
if(flagNOGUI == 0){

src/util.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ void WriteToSession(SessionLog *sessionLog, char *msg, int size){
3838
}
3939

4040
void WriteToSessionPrefix(SessionLog *sessionLog, int isServer){
41-
if(isServer){
42-
WriteToSession(sessionLog, "SERVER: ", 8);
43-
} else{
44-
WriteToSession(sessionLog, "CLIENT: ", 8);
41+
if(flagIsPrefix){
42+
if(isServer){
43+
WriteToSession(sessionLog, "=== SERVER ===\015\012", 16);
44+
} else{
45+
WriteToSession(sessionLog, "=== CLIENT ===\015\012", 16);
46+
}
4547
}
4648
}
4749

@@ -118,7 +120,7 @@ void StopProcessingClient(LocalThreadInfo *lThInfo){
118120
PLTH_REPORT(lThInfo, "Terminating.\nBuffer data:\n===\n%s===\n", lThInfo->buff);
119121

120122
lThInfo->sessionLog.isDead = 1;
121-
WriteToSession(&lThInfo->sessionLog, "======END OF SESSION======\015\012", 28);
123+
WriteToSession(&lThInfo->sessionLog, "======END OF SESSION======\015\012", 30);
122124
MigrateDeadSession(&lThInfo->sessionLog);
123125
closesocket(lThInfo->pthreadInfo->client);
124126
free(lThInfo->buff);

0 commit comments

Comments
 (0)