Bugfixes, List stopt nicht

myclient.c

@@ -10,54 +10,54 @@
 #define BUF 1024
 #define PORT 6543
 
-int main (int argc, char **argv) {
-  char* meinport = argv[2];
-  int create_socket;
-  char buffer[BUF];
-  struct sockaddr_in address;
-  int size;
+int main(int argc, char **argv)
+{
+   char *meinport = argv[2];
+   int create_socket;
+   char buffer[BUF];
+   struct sockaddr_in address;
+   int size;
 
-  if( argc < 2 ){
-     printf("Usage: %s ServerAdresse\n", argv[0]);
-     exit(EXIT_FAILURE);
-  }
+   if (argc < 2)
+   {
+      printf("Usage: %s ServerAdresse\n", argv[0]);
+      exit(EXIT_FAILURE);
+   }
 
-  if ((create_socket = socket (AF_INET, SOCK_STREAM, 0)) == -1)
-  {
-     perror("Socket error");
-     return EXIT_FAILURE;
-  }
-  
-  memset(&address,0,sizeof(address));
-  address.sin_family = AF_INET;
-  address.sin_port = htons (*meinport);
-  inet_aton (argv[1], &address.sin_addr);
-  
+   if ((create_socket = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+   {
+      perror("Socket error");
+      return EXIT_FAILURE;
+   }
 
-  if (connect ( create_socket, (struct sockaddr *) &address, sizeof (address)) == 0)
-  {
-     printf ("Connection with server (%s) established\n", inet_ntoa (address.sin_addr));
-     size=recv(create_socket,buffer,BUF-1, 0);
-     if (size>0)
-     {
-        buffer[size]= '\0';
-        printf("%s",buffer);
-     }
-  }
-  else
-  {
-     perror("Connect error - no server available");
-     return EXIT_FAILURE;
-  }
+   memset(&address, 0, sizeof(address));
+   address.sin_family = AF_INET;
+   address.sin_port = htons(*meinport);
+   inet_aton(argv[1], &address.sin_addr);
+
+   if (connect(create_socket, (struct sockaddr *)&address, sizeof(address)) == 0)
+   {
+      printf("Connection with server (%s) established\n", inet_ntoa(address.sin_addr));
+      size = recv(create_socket, buffer, BUF - 1, 0);
+      if (size > 0)
+      {
+         buffer[size] = '\0';
+         printf("%s", buffer);
+      }
+   }
+   else
+   {
+      perror("Connect error - no server available");
+      return EXIT_FAILURE;
+   }
 
    int last = 0;
    int mode = 0;
    char bufferString[1024];
-   do {
-      char *p=getenv("USER");
-      printf("\x1B[32m");
-      printf("%s@%s:%d", p, inet_ntoa (address.sin_addr),ntohs(address.sin_port));
-      if (strncmp (bufferString, "send", 4)  == 0 || mode == 1){
+   do
+   {
+      if (strncmp(bufferString, "send", 4) == 0 || mode == 1)
+      {
          switch (last)
          {
          case 0:
@@ -82,22 +82,61 @@ int main (int argc, char **argv) {
             printf("\x1B[34m");
             printf("->SEND->Nachricht eingeben: \n");
             break;
-         }    
-      }else if (strncmp (bufferString, "list", 4)  == 0 ){
-         printf("LIST wurde endlich erkannt!\n");
-      }else if (strncmp (bufferString, "read", 4)  == 0 ){
+         }
+      }
+      else if (strncmp(bufferString, "list", 4) == 0 || mode == 2)
+      {
+         switch (last)
+         {
+         case 0:
+            last += 1;
+            mode = 2;
+            printf("\x1B[34m");
+            printf("->LIST->Username eingeben: \n");
+            break;
+         case 1:
+            last = 0;
+            mode = 0;
+            printf("\x1B[34m");
+            printf("->List");
+            do
+            {
+               size = recv(create_socket, buffer, BUF - 1, 0);
+               if (size > 0)
+               {
+                  buffer[size] = '\0';
+                  //if (strcmp(buffer, "LISTREADSTOPNOW\n") == 0)
+                  //{
+                     printf("\x1B[37m %s", buffer);
+                     printf("CHECK LASTLINE: %d", strncmp(buffer, "LISTREADSTOPNOW\n", strlen("LISTREADSTOPNOW\n")));
+                     printf("CHECK LASTLINE other: %d", strcmp(buffer, "LISTREADSTOPNOW\n"));
+                  //}
+               }
+            }
+            while (strncmp(buffer, "LISTREADSTOPNOW\n", strlen("LISTREADSTOPNOW\n")) != 0);
+            break;
+         }
+      }
+      else if (strncmp(bufferString, "read", 4) == 0)
+      {
          printf("READ wurde endlich erkannt!\n");
-      } else if (strncmp (bufferString, "del", 4)  == 0 ){
+      }
+      else if (strncmp(bufferString, "del", 4) == 0)
+      {
          printf("DEL wurde endlich erkannt!\n");
       }
-      printf("\033[0;33m");
-      printf("$ ");
-      printf("\x1B[37m");
-      fgets (buffer, BUF, stdin);
+      else
+      {
+         char *p = getenv("USER");
+         printf("\x1B[32m");
+         printf("%s@%s:%d", p, inet_ntoa(address.sin_addr), ntohs(address.sin_port));
+      }
+
+      printf("\x1B[33m$ \x1B[37m");
+      fgets(buffer, BUF, stdin);
       strcpy(bufferString, buffer);
-      send(create_socket, buffer, strlen (buffer), 0);
-  } 
-  while (strcmp (buffer, "quit\n") != 0);
-  close (create_socket);
-  return EXIT_SUCCESS;
+      send(create_socket, buffer, strlen(buffer), 0);
+   } while (strcmp(buffer, "quit\n") != 0);
+   close(create_socket);
+   return EXIT_SUCCESS;
 }

myserver.c

@@ -7,9 +7,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 #define BUF 1024
 #define PORT 6543
 
+char *verzeichnis;
+
 struct msgNumber
 {
    int index;
@@ -23,9 +26,12 @@ struct msgNumberArr
 int writeUsersMessages(char username[1024], int *msgNumbs, int lenght)
 {
    FILE *filePointer;
-   printf("Start writeUsersMessages() username: %s", username);
-   //strcat(username, ".bin");
-   filePointer = fopen(username, "wb");
+   char filename[1024];
+   strcpy(filename, verzeichnis);
+   strcat(filename, username);
+   strcat(filename, ".bin");
+   printf("Start writeUsersMessages()  filename: %s\n", filename);
+   filePointer = fopen(filename, "wb");
    /**/
    if (!filePointer)
    {
@@ -48,9 +54,17 @@ int writeUsersMessages(char username[1024], int *msgNumbs, int lenght)
 struct msgNumberArr getUserMessages(char username[1024])
 {
    FILE *filePointer;
-   strcat(username, ".bin");
-   filePointer = fopen(username, "wb");
-   printf("start getUserMessages()\n");
+   char filename[1024];
+   if ('\n' == username[strlen(username) - 1])
+   {
+      username[strlen(username) - 1] = '\0';
+   }
+   strcpy(filename, verzeichnis);
+   strcat(filename, username);
+   strcat(filename, ".bin");
+   printf("getUserMessages() Filename: %s\n", filename);
+   filePointer = fopen(filename, "rb");
+   printf("\n\nstart getUserMessages() Filename: %s, Username: %s\n\n", filename, username);
    if (!filePointer)
    {
       printf("\x1B[31User Message Speicher konnte nicht gelesen werden!\x1B[37m\n");
@@ -60,17 +74,16 @@ struct msgNumberArr getUserMessages(char username[1024])
    }
    int i = 0;
    struct msgNumberArr msgNumbersStruct;
-   
+
    //int msgNumberArr[1024];
-   
+
    //printf("Vorm while\n");
    //while(!feof(filePointer))
    //while (fread(&msgNumbers, sizeof(struct msgNumber), 1, filePointer))
    //{
-      //printf("Im while\n");
-   
-   fread(&msgNumbersStruct, sizeof(struct msgNumberArr),1, filePointer);
-   
+   //printf("Im while\n");
+
+   fread(&msgNumbersStruct, sizeof(struct msgNumberArr), 1, filePointer);
    //}
    //printf("Nach dem while\n");
    fclose(filePointer);
@@ -79,6 +92,11 @@ struct msgNumberArr getUserMessages(char username[1024])
 
 int addUserMessage(char username[1024], int msgNumber)
 {
+   if ('\n' == username[strlen(username) - 1])
+   {
+      username[strlen(username) - 1] = '\0';
+   }
+   //username[strlen(username)-1] = "\0";
    printf("addUserMessage(), username: %s, msgNumber: %d\n", username, msgNumber);
    int msgNumbers[1024];
    struct msgNumberArr msgNumbersStruct = getUserMessages(username);
@@ -106,8 +124,8 @@ int addUserMessage(char username[1024], int msgNumber)
       newNumbers[0] = msgNumber;
       for (int i = 1; i <= nMsgs; i++)
       {
-         printf("addUserMessage() msg number old: %d", msgNumbers[i-1]);
-         newNumbers[i] = msgNumbers[i-1];
+         printf("addUserMessage() msg number old: %d", msgNumbers[i - 1]);
+         newNumbers[i] = msgNumbers[i - 1];
       }
       printf("Vor dem writeUsersMessages() username: %s", username);
       result = writeUsersMessages(username, newNumbers, nMsgs + 1);
@@ -128,7 +146,10 @@ int addUserMessage(char username[1024], int msgNumber)
 int writeMessageNumber(int number)
 {
    FILE *filePointer;
-   filePointer = fopen("msgNumber.bin", "wb");
+   char filename[1024];
+   strcpy(filename, verzeichnis);
+   strcat(filename, "msgNumber.bin");
+   filePointer = fopen(filename, "wb");
    struct msgNumber my_record;
    my_record.index = number;
    printf("MSG NUMMBER IN writeMessageNumber(): %d\n", number);
@@ -146,7 +167,10 @@ int writeMessageNumber(int number)
 int readLastMessageNumber()
 {
    FILE *filePointer;
-   filePointer = fopen("msgNumber.bin", "rb");
+   char filename[1024];
+   strcpy(filename, verzeichnis);
+   strcat(filename, "msgNumber.bin");
+   filePointer = fopen(filename, "rb");
    struct msgNumber my_record;
    if (!filePointer)
    {
@@ -201,22 +225,36 @@ struct rec readFile(char filename[1024])
 {
    FILE *filePointer;
    char fullfilename[1024];
+   strcpy(fullfilename, verzeichnis);
    strcat(fullfilename, filename);
    strcat(fullfilename, ".bin");
    filePointer = fopen(fullfilename, "rb");
-   struct rec my_record;
+   printf("ReadFile Fullfilename: %s\n", fullfilename);
    if (!filePointer)
    {
-      printf("\x1B[31mFile konnte nicht gelesen werden!\x1B[37m\n");
-      my_record.sender = "0";
-      my_record.receiver = "0";
-      my_record.betreff = "0";
-      my_record.msg = "0";
-      return my_record;
+      perror("\x1B[31mFile konnte nicht gelesen werden!\x1B[37m\n");
+      //printf("\x1B[31mFile konnte nicht gelesen werden!\x1B[37m\n");
+      //struct rec nullstruct;
+      //nullstruct.sender = "0";
+      //nullstruct.receiver = "0";
+      //nullstruct.betreff = "0";
+      //nullstruct.msg = "0";
+      //return &nullstruct;
    }
-   fread(&my_record, sizeof(struct msgNumber), 1, filePointer);
+   printf("A");
+   struct rec *my_record;
+   //struct rec *my_record_p = malloc(sizeof(struct rec));
+   printf("B");
+   fread(my_record, sizeof(struct rec), 1, filePointer);
+   printf("C");
+   printf("\nBETREFF in readFile(): %s", my_record->betreff);
+   printf("D");
    fclose(filePointer);
-   return my_record;
+   //my_record_p->betreff = my_record.betreff;
+   //my_record_p->sender = my_record.sender;
+   //my_record_p->receiver = my_record.receiver;
+   //my_record_p->msg = my_record.msg;
+   return *my_record;
 }
 
 int writeToFile(char sender[1024], char betreff[1024], char receiver[1024], char message[1024])
@@ -232,8 +270,12 @@ int writeToFile(char sender[1024], char betreff[1024], char receiver[1024], char
    else
    {
       printf("MSG NUMMBER found, schreibe file mit msgNummber: %d!\n", msgNumber);
-      sprintf(filename, "%d", msgNumber);
+      strcpy(filename, verzeichnis);
+      char msgNumberStr[1024];
+      sprintf(msgNumberStr, "%d", msgNumber);
+      strcat(filename, msgNumberStr);
       strcat(filename, ".bin");
+      printf("\nwriteToFile() Filename: %s\n", filename);
       filePointer = fopen(filename, "wb");
       struct rec my_record;
       if (!filePointer)
@@ -248,9 +290,17 @@ int writeToFile(char sender[1024], char betreff[1024], char receiver[1024], char
          my_record.betreff = betreff;
          my_record.msg = message;
          printf("Vor useradd() in writeToFile()! sender: %s, msgnumber: %d, msg: %s, betrf: %s, empf: %s\n", sender, msgNumber, message, betreff, receiver);
-         int userresult = addUserMessage(sender, msgNumber);
-         printf("Nach useradd() in writeToFile(): %d", userresult);
-         if (userresult == 0)
+         char receiverfile[1024];
+         strcpy(receiverfile, "posteingang/");
+         strcat(receiverfile, receiver);
+         int receiverresult = addUserMessage(receiverfile, msgNumber);
+         printf("receiverresult: %d", receiverresult);
+         char senderfile[1024];
+         strcpy(senderfile, "postausgang/");
+         strcat(senderfile, sender);
+         int senderresult = addUserMessage(senderfile, msgNumber);
+         printf("senderresult: %d", senderresult);
+         if (senderresult == 0 || receiverresult == 0)
          {
             printf("\x1B[31mKonnte die Nachricht dem User nicht hinzufügen! Das Speichern der Nachricht wird abgebrochen!\x1B[37m\n");
             return 0;
@@ -266,9 +316,33 @@ int writeToFile(char sender[1024], char betreff[1024], char receiver[1024], char
    }
 }
 
+//struct rec *readFromFile(char msgNumber[1024])
+//{
+//   FILE *filePointer;
+//   char filename[1024];
+//   strcpy(filename, msgNumber);
+//   strcat(filename, ".bin");
+//   filePointer = fopen(filename, "rb");
+//   struct rec *my_record_pointer = malloc(sizeof(struct rec));
+//   struct rec my_record;
+//   if (!filePointer)
+//   {
+//      perror("\x1B[31mWrite File konnte nicht geöffnet werden!\x1B[37m\n");
+//   }
+//   else
+//   {
+//
+//      fread(&my_record, sizeof(struct rec), 1, filePointer);
+//      fclose(filePointer);
+//      printf("\n\nReadFile Number: %s Betreff: %s\n\n", msgNumber, my_record.betreff);
+//      my_record_pointer = &my_record;
+//      return my_record_pointer;
+//   }
+//}
+
 int main(int argc, char **argv)
 {
-   char *verzeichnis = argv[1];
+   verzeichnis = strdup(argv[1]);
    char *meinport = argv[2];
    printf("\x1B[35mMein server Verzeichniss: %s\n", verzeichnis);
    printf("Mein server Port: %s\n", meinport);
@@ -391,9 +465,115 @@ int main(int argc, char **argv)
                   break;
                }
             }
-            else if (strncmp(bufferString, "list", 4) == 0)
+            else if (strncmp(bufferString, "list", 4) == 0 || mode == 2)
             {
-               printf("LIST wurde endlich erkannt!\n");
+               switch (last)
+               {
+               case 0:
+                  last += 1;
+                  mode = 2;
+                  printf("\x1B[34m");
+                  printf("->LIST:\x1B[33m %s\x1B[37m\n", bufferString);
+                  bufferString[0] = '\0';
+                  buffer[0] = '\0';
+                  fflush(stdout);
+                  break;
+               case 1:
+                  last = 0;
+                  mode = 0;
+                  printf("\x1B[34m");
+                  printf("->LIST->Username wurde eingegeben:\x1B[33m %s\x1B[37m\n", bufferString);
+                  char *username;
+                  username = strdup(bufferString);
+
+                  //POSTEINGANG
+                  char filename[1024];
+                  strcpy(filename, "posteingang/");
+                  strcat(filename, username);
+                  printf("Filename: %s ENDE\n", filename);
+
+                  struct msgNumberArr msgNumbersStruct = getUserMessages(filename);
+                  printf("msgnumberstruct lenght: %d\n", msgNumbersStruct.lenght);
+                  printf("0\n");
+                  printf("0.1\n");
+                  struct rec userFilesStruct[1024];
+                  printf("1\n");
+
+                  //Send to client
+                  char posteingangMsg[1024];
+                  sprintf(posteingangMsg, "\x1B[32mPOSTEINGANG Nachrichten: %d\n\n\n\n", msgNumbersStruct.lenght);
+                  int sendresult = send(new_socket, posteingangMsg, strlen(posteingangMsg), 0);
+                  printf("Send result: %d", sendresult);
+
+                  for (int i = 0; i < msgNumbersStruct.lenght; i++)
+                  {
+
+                     printf("2.1&2.%d\n", i);
+                     char filename[1024];
+                     printf("2.3.%d\n", i);
+                     sprintf(filename, "%d", msgNumbersStruct.index[i]);
+                     printf("2.4.%d\n", i);
+                     struct rec my_record_p = readFile(filename);
+                     printf("2.5.%d\n", i);
+                     //Send to client
+                     printf("\n\nEINGANG -- Nachricht: %d Betreff: %s", i, my_record_p.betreff);
+                     sprintf(posteingangMsg, "\x1B[34mBetreff: %s\n", my_record_p.betreff);
+                     sendresult = send(new_socket, posteingangMsg, strlen(posteingangMsg), 0);
+                     printf("Send result: %d\n", sendresult);
+
+                     userFilesStruct[i] = my_record_p;
+                     printf("2.6.%d\n", i);
+                  }
+                  printf("3\n");
+
+                  //postausgang
+
+                  filename[1024];
+                  strcpy(filename, "postausgang/");
+                  strcat(filename, username);
+                  printf("Filename: %s ENDE\n", filename);
+
+                  struct msgNumberArr msgNumbersStructAusgang = getUserMessages(filename);
+                  printf("msgnumberstruct lenght: %d\n", msgNumbersStructAusgang.lenght);
+                  //Send to client
+                  char postausgangMsg[1024];
+                  sprintf(postausgangMsg, "\x1B[32mPOSTAUSGANG Nachrichten: %d\n", msgNumbersStructAusgang.lenght);
+                  sendresult = send(new_socket, postausgangMsg, strlen(postausgangMsg), 0);
+                  printf("Send result: %d", sendresult);
+
+                  printf("0\n");
+                  printf("0.1\n");
+                  struct rec userFilesStructAusgang[1024];
+                  printf("1\n");
+                  for (int i = 0; i < msgNumbersStructAusgang.lenght; i++)
+                  {
+
+                     printf("2.1&2.%d\n", i);
+                     char filename[1024];
+                     printf("2.3.%d\n", i);
+                     sprintf(filename, "%d", msgNumbersStructAusgang.index[i]);
+                     printf("2.4.%d\n", i);
+                     struct rec my_record_p = readFile(filename);
+                     printf("2.5.%d\n", i);
+                     printf("\n\nAUSGANG -- Nachricht: %d Betreff: %s\n\n", i, my_record_p.betreff);
+                     //Send to client
+                     char postausgangMsg[1024];
+                     sprintf(postausgangMsg, "\x1B[34mBetreff: %s\n", my_record_p.betreff);
+                     sendresult = send(new_socket, postausgangMsg, strlen(postausgangMsg), 0);
+                     printf("Send result: %d", sendresult);
+
+                     userFilesStructAusgang[i] = my_record_p;
+                     printf("2.6.%d\n", i);
+                  }
+                  //Send to client
+                  sendresult = send(new_socket, "LISTREADSTOPNOW\n", strlen("LISTREADSTOPNOW\n"), 0);
+                  printf("Send result: %d", sendresult);
+                  printf("3\n");
+                  bufferString[0] = '\0';
+                  buffer[0] = '\0';
+                  fflush(stdout);
+                  break;
+               }
             }
             else if (strncmp(bufferString, "read", 4) == 0)
             {