Fin du SUBSCRIBE et UNSUBSCRIBE

TP1_Chat/TP1_Chat/ClientUdp.cs

@@ -41,29 +41,37 @@ namespace ClientUdp
                 Console.Write("? ");
                 String msg = Console.ReadLine();
                 bool estSub = false;
+                bool exit = true;
 
                 //************************************************************** Communications
                 //ChatMessage messageRecu = new ChatMessage(bufferReception);
 
-                while (!msg.Equals("exit"))
+                while (exit)
                 {
                     if (msg.Substring(0, 1) == "/")     //si commande d'un type special
                     {
-                        if (msg.Substring(1, 3) == "GET")   //si commande GET
+                        if (msg.Substring(1, 3).Equals("GET"))   //si commande GET
                         {   //on envoie un message en GET
                             ClientUdp.envoyerMessage(Commande.GET, clientSocket, serverEP, msg.Substring(1, 3), "martin");
                             ClientUdp.receptionMessage(serverEP, clientSocket);
                         }
-                        else if(msg.Substring(1,9) == "SUBSCRIBE")
+                        else if (msg.Substring(1, 4).Equals("QUIT"))
+                        {
+                            ClientUdp.envoyerMessage(Commande.UNSUBSCRIBE, clientSocket, serverEP, "UNSUBSCRIBE", "martin");
+                            estSub = false;
+                            exit = false;
+                        }
+                        else if(msg.Substring(1,9).Equals("SUBSCRIBE"))
                         {
                             ClientUdp.envoyerMessage(Commande.SUBSCRIBE, clientSocket, serverEP, msg.Substring(1, 9), "martin");
                             estSub = true;
                         }
-                        else if (msg.Substring(1, 11) == "UNSUBSCRIBE")
+                        else if (msg.Substring(1, 11).Equals("UNSUBSCRIBE"))
                         {
                             ClientUdp.envoyerMessage(Commande.UNSUBSCRIBE, clientSocket, serverEP, msg.Substring(1, 11), "martin");
                             estSub = false;
                         }
+                        
                         else
                         {   //on envoie un message en POST
                             ClientUdp.envoyerMessage(Commande.POST,clientSocket, serverEP, msg, "martin");
@@ -82,7 +90,7 @@ namespace ClientUdp
                     Console.Write("? ");
                     msg = Console.ReadLine();
                 }
-                
+
 
 
                 //************************************************************** Conclusion

TP1_Chat/TP1_Chat/ServeurUdp.cs

@@ -81,23 +81,29 @@ namespace ServeurUdp
                             break;
                         //SUBSCRIBE permet de recevoir tous les messages envoyés sur le serveurs
                         case Commande.SUBSCRIBE:
-                            //EndPoint subEP = new IPEndPoint(IPAddress.Parse(clientEP.ToString()), 22222);
-                            listeSub[nbSub] = clientEP;
+                            if (!listeSub.Contains(clientEP))
+                            {
+                                listeSub[nbSub] = clientEP;
+                                nbSub++;
+                            }
                             Console.WriteLine(listeSub[nbSub]);
-                            nbSub++;
-
                             break;
                         //Annule la reception des messages
                         case Commande.UNSUBSCRIBE:
-                            /*
-                            foreach(string sub in listeSub)
+
+                            for (int i = 0; i < nbSub; i++)
                             {
-                                if (sub == message.pseudo)
+                                if (listeSub[i].Equals(clientEP))
                                 {
-                                    listeSub[](message.pseudo);
+                                    listeSub[i] = null;
+                                    while (i < nbSub)
+                                    {
+                                        listeSub[i] = listeSub[i + 1];
+                                        i++;
+                                    }
                                     nbSub--;
                                 }
-                            } */
+                            }
                             break;
                         default: break;
                     }