Mise à jour de l'API de réseau

Jean-Yves Didier
Commit 5e297b30a3566d17489cd812268215db3d54dd7f 5e297b30 1 parent a0b0df03
Showing 3 changed files with 40 additions and 14 deletions
network/arcsnetworkframes.cpp
network/arcsnetworkframes.h
network/arcsnetworkserver.cpp
--- a/network/arcsnetworkframes.cpp
View file @5e297b3
+++ b/network/arcsnetworkframes.cpp
View file @5e297b3
@@ -21,11 +21,24 @@ void ARCS::Network::logError(int errorCode,QString moreInfo)
                                      errors[errorCode].arg(moreInfo));
 }
+void ARCS::Network::logInformation(QString moreInfo)
+{
+    ARCSLog::getInstance()->logInformation("Net",moreInfo);
+}
+
+
 QHash<int,QString> ARCS::Network::initErrors()
 {
     QHash<int,QString> res;
     ///////////////////////////////////////////////////////////////////////////
+    // general errors
+    res[600]="Null frame recieved";
+    res[601]="Listening on ports 2020 to 2084 failed";
+    res[602]="Cannot listen to port %1";
+    res[603]="Not bound to any interface";
+
+    ///////////////////////////////////////////////////////////////////////////
     // errors on client side
     res[400]="CALL_REQUEST: wrong id (%1)";
     res[401]="CALL_REQUEST: wrong port number (%1)";
--- a/network/arcsnetworkframes.h
View file @5e297b3
+++ b/network/arcsnetworkframes.h
View file @5e297b3
@@ -10,6 +10,7 @@ namespace ARCS {
     namespace Network {
         extern const QHash<int,QString> errors;
         void logError(int errorCode, QString moreInfo=QString::null);
+        void logInformation(QString moreInfo);
     }
 }
--- a/network/arcsnetworkserver.cpp
View file @5e297b3
+++ b/network/arcsnetworkserver.cpp
View file @5e297b3
@@ -27,7 +27,7 @@ void ARCSNetworkServerThread::handleRequest(QTcpSocket* socket)
      //std::cout << "Recieved request" << request->getType() << std::endl;
      if (request == 0)
      {
-          std::cerr << "[Server] Null frame recieved !" << std::endl;
+          ARCS::Network::logError(600);
           return ;
      }
@@ -72,10 +72,9 @@ void ARCSNetworkServerThread::handleConnectRequest(ARCSNetworkConnectRequest* an
      // 1 : requete du slot de l'autre composant.
      QTcpSocket* socketDest = new QTcpSocket();
      socketDest->connectToHost(hostDest, portDest);
-     //std::cout <<"le numro de port"<< portDest << std::endl;
      if (!socketDest->waitForConnected(ARCSNetworkFrame::TimeOut))
      {
-          std::cerr << "Erreur 418 : CONNECT_REQUEST error : depassement du time out " << qPrintable(socketDest->errorString()) << std::endl;
+          ARCS::Network::logError(418,socketDest->errorString());
           return ;
      }
@@ -83,19 +82,25 @@ void ARCSNetworkServerThread::handleConnectRequest(ARCSNetworkConnectRequest* an
      ARCSNetworkFrame request(ARCSNetworkFrame::SLOT_REQUEST);
      ((ARCSNetworkSlotRequest*)request.getData())->setSlot(ancr->getSlot());
      //std::cout << "liste de slots reu " << qPrintable(ancr->getSlot()) << std::endl;
-     if ( !(request.isValid()))  std::cerr <<"Erreur 436 : SLOT_REQUEST error : Trame invalide"<< std::endl;
+     /** implementation sans aucun sens
+     if ( !(request.isValid()))
+     {
+         std::cerr <<"Erreur 436 : SLOT_REQUEST error : Trame invalide"<< std::endl;
+     }*/
      request.writeFrame(socketDest);
      ARCSNetworkFrame* response = ARCSNetworkFrame::readFrame(socketDest);
      if (response )
      {
           if (response->getType() != ARCSNetworkFrame::CONNECT_RESPONSE)
-               std::cerr << "Erreur 416 : CONNECT_RESPONSE error :invalid response recieved to connect request!" << std::endl;
+              //! \todo process if it is an error frame
+               ARCS::Network::logError(416);
           else
                id = ((ARCSNetworkConnectResponse*)response->getData())->getId();
      }
      else
-          std::cerr << "Erreur 417 : CONNECT_RESPONSE error : Null connect response recieved ! " << std::endl;
+            ARCS::Network::logError(417);
+
      socketDest->disconnectFromHost();
      if (response)
@@ -108,7 +113,8 @@ void ARCSNetworkServerThread::handleConnectRequest(ARCSNetworkConnectRequest* an
      ARCSNetworkFrame frame(ARCSNetworkFrame::ACK_RESPONSE);
      ((ARCSNetworkAckResponse*)frame.getData())->setId(id); // utilit du id ?
      frame.writeFrame(socket);
-     /*if ((QString*)ARCSNetworkServer::getInstance()->getSignals()!=ancr->getSignal())
+     /** implementation sans aucun sens
+    if ((QString*)ARCSNetworkServer::getInstance()->getSignals()!=ancr->getSignal())
      {
           std::cerr << "Erreur 444 :SIGNAL_REQUEST error : signal name not  found  " << qPrintable(socket->errorString()) << std::endl;
           return ;
@@ -235,18 +241,18 @@ void ARCSNetworkServer::run()
           while(!server->listen(QHostAddress::Any, i) && i < 2084) i++;
           if (i == 2084)
-               std::cerr << "[Server] listening on ports 2020 to 2084 failed" << std::endl;
+              ARCS::Network::logError(601);
           else
           {
                port = i;
-               std::cout << "[Server] listening to port " << port << std::endl;
+               ARCS::Network::logInformation("Listening to port" + QString::number(port));
           }
      }
      else
      {
           if (!server->listen(QHostAddress::Any, port))
           {
-               std::cerr << "[Server] Cannot listen to port " << port << " error: " << qPrintable(server->errorString());
+              ARCS::Network::logError(602,QString::number(port)+" (" + server->errorString() + ").");
                port = 0;
           }
      }
@@ -271,7 +277,8 @@ void ARCSNetworkServer::getInterface(QStringList & slotList, QStringList & signa
          slotList = interface->getSlots();
          signalList= interface->getSignals();
       }
-     else  std::cerr <<"Erreur can not get the interface"<< std::endl;
+     else
+         ARCS::Network::logError(603);
 }
@@ -311,11 +318,13 @@ int ARCSNetworkServer::createSignalStub(QString s)
           proxySignalsMap.insert(s, id);
           if (interface)
                ARCSAbstractComponent::connect(s,interface, s);
-          //std::cout <<"connexion russi"<< std::endl;
+          else
+              ARCS::Network::logError(603);
+          /** bricolage hasardeux
           if (!interface)
           {
              std::cerr <<"Erreur 415 : CONNECT_REQUEST error : slot name is wrong : pas de cration de proxysignal"  << std::endl;
-          }
+          }*/
      }
      return id;
@@ -333,7 +342,10 @@ int ARCSNetworkServer::createSlotStub(QString signal, int id, quint16 port,QStri
      if (interface)
           interface->connect(signal, this, signal);
-     else std::cerr <<"Erreur 435x : SLOT_REQUEST error : slot name is wrong: pas de cration de proxyslot"  << std::endl;
+     else
+         ARCS::Network::logError(603);
+
+         /*std::cerr <<"Erreur 435x : SLOT_REQUEST error : slot name is wrong: pas de cration de proxyslot"  << std::endl;*/
      return 0;
 }