Passage sur le serveur, suppression des fuites mémoire.

Renormalisation des trames. Suppression de la trame CONNECT_RESPONSE, introduction de la trame ERR_RESPONSE.

Passage sur le serveur, suppression des fuites mémoire.
Renormalisation des trames. Suppression de la trame CONNECT_RESPONSE, introduction de la trame ERR_RESPONSE.
Jean-Yves Didier
Commit 11591998637e2f1c5500128fcc3549807b06a1bc 11591998 1 parent a1430e57
Showing 5 changed files with 98 additions and 97 deletions
network/arcsnetworkcomponent.cpp
network/arcsnetworkframes.cpp
network/arcsnetworkframes.h
network/arcsnetworkproxyslot.cpp
network/arcsnetworkserver.cpp
--- a/network/arcsnetworkcomponent.cpp
View file @1159199
+++ b/network/arcsnetworkcomponent.cpp
View file @1159199
--- a/network/arcsnetworkframes.cpp
View file @1159199
+++ b/network/arcsnetworkframes.cpp
View file @1159199
@@ -32,64 +32,66 @@ QHash<int,QString> ARCS::Network::initErrors()
     ///////////////////////////////////////////////////////////////////////////
     // general errors
-    res[600]="Null frame recieved";
+    res[600]="error while receiving frame: '%1'";
     res[601]="Listening on ports 2020 to 2084 failed";
     res[602]="Cannot listen to port %1";
     res[603]="Not bound to any interface";
+    res[604]="Call error on id #%1";
     ///////////////////////////////////////////////////////////////////////////
     // errors on client side
     res[400]="CALL_REQUEST: wrong id (%1)";
     res[401]="CALL_REQUEST: wrong port number (%1)";
     res[404]="CALL_REQUEST: wrong signal name (%1)";
-    res[407]="CALL_REQUEST: network error (while connecting): '%1'";
+    res[407]="CALL_REQUEST: error while connecting: '%1'";
-    res[408]="CALL_REQUEST: network error (while reading frame): '%1'";
+    res[408]="CALL_REQUEST: error while reading frame: '%1'";
-    res[409]="CALL_REQUEST: network error (while writing frame): '%1'";
+    res[409]="CALL_REQUEST: error while writing frame: '%1'";
+    // there is a problem with this part of the protocol.
     res[405]="IFACE_REQUEST: time out with error '%1'";
-    res[409]="IFACE_REQUEST: network error (while writing frame): '%1'";
+    res[409]="IFACE_REQUEST: error while writing frame: '%1'";
     res[413]="CONNECT_REQUEST: wrong destination (%1)";
     res[414]="CONNECT_REQUEST: wrong port number (%1)";
     res[415]="CONNECT_REQUEST: wrong slot name (%1)";
-    res[417]="CONNECT_REQUEST: network error (while connecting): '%1'";
+    res[417]="CONNECT_REQUEST: error while connecting: '%1'";
-    res[418]="CONNECT_REQUEST: network error (while reading frame): '%1'";
+    res[418]="CONNECT_REQUEST: error while reading frame: '%1'";
-    res[419]="CONNECT_REQUEST: network error (while writing frame): '%1'";
+    res[419]="CONNECT_REQUEST: error while writing frame: '%1'";
     res[424]="DISCONNECT_REQUEST: wrong source name (%1)";
-    res[427]="DISCONNECT_REQUEST: network error (while connecting): '%1'";
+    res[427]="DISCONNECT_REQUEST: error while connecting: '%1'";
-    res[429]="DISCONNECT_REQUEST: network error (while writing frame): '%1'";
+    res[429]="DISCONNECT_REQUEST: error while writing frame: '%1'";
     res[435]="SLOT_REQUEST: wrong slot name (%1)";
-    res[437]="SLOT_REQUEST: network error (while connecting): '%1'";
+    res[437]="SLOT_REQUEST: error while connecting: '%1'";
-    res[438]="SLOT_REQUEST: network error (while reading frame): '%1'";
+    res[438]="SLOT_REQUEST: error while reading frame: '%1'";
-    res[439]="SLOT_REQUEST: network error (while writing frame): '%1'";
+    res[439]="SLOT_REQUEST: error while writing frame: '%1'";
     res[440]="SIGNAL_REQUEST: wrong id (%1)";
     res[441]="SIGNAL_REQUEST: wrong port number (%1)";
     res[444]="SIGNAL_REQUEST: wrong signal name (%1)";
-    res[447]="SIGNAL_REQUEST: network error (while connecting): '%1'";
+    res[447]="SIGNAL_REQUEST: error while connecting: '%1'";
-    // classification hasardeuse
+    res[449]="SIGNAL_REQUEST: error while writing frame: '%1'";
-    res[449]="SIGNAL_REQUEST: network error (while writing frame): '%1'";
     res[467]="IFACE_RESPONSE: received invalid response";
-    res[468]="IFACE_RESPONSE: network error (while reading frame): '%1'";
+    res[468]="IFACE_RESPONSE: error while reading frame: '%1'";
     res[486]="SLOT_RESPONSE: received invalid response";
-    res[488]="SLOT_RESPONSE: network error (while reading frame): '%1'";
+    res[488]="SLOT_RESPONSE: error while reading frame: '%1'";
     ///////////////////////////////////////////////////////////////////////////
     // errors on server side
-    res[554]="INTERFACE_RESPONSE: wrong signal name (%1)"; //?
+    //res[554]="IFACE_RESPONSE: wrong signal name (%1)"; //?
-    res[555]="INTERFACE_RESPONSE: wrong slot name (%1)"; //?
+    //res[555]="IFACE_RESPONSE: wrong slot name (%1)"; //?
+    res[569]="IFACE_RESPONSE: error while writing frame: '%1'";
-    res[560]="ACK_RESPONSE: wrong id (%1)";
+    //res[560]="ACK_RESPONSE: wrong id (%1)";
-    res[564]="ACK_RESPONSE: wrong signal name (%1)";
+    //res[564]="ACK_RESPONSE: wrong signal name (%1)";
-
+    res[559]="ACK_RESPONSE: error while writing frame: '%1'";
-    res[570]="CONNECT_RESPONSE: wrong id (%1)";
     res[585]="SLOT_RESPONSE: wrong slot name (%1)";
+    res[589]="SLOT_RESPONSE: error while writing frame: '%1'";
     return res;
 }
@@ -119,16 +121,12 @@ void ARCSNetworkFrame::setType(ARCSNetworkFrames t)
      case DISCONNECT_REQUEST:
           data = new ARCSNetworkDisconnectRequest();
           break;
-     case CONNECT_RESPONSE:
-          data = new ARCSNetworkConnectResponse();
-          break;
      case CALL_REQUEST:
           data = new ARCSNetworkCallRequest();
           break;
      case ACK_RESPONSE:
           data = new ARCSNetworkAckResponse(); //nouvelle trame
           break;
-
      case SLOT_REQUEST:
           data = new ARCSNetworkSlotRequest();
           break;
@@ -138,6 +136,9 @@ void ARCSNetworkFrame::setType(ARCSNetworkFrames t)
      case SLOT_RESPONSE:
          data = new ARCSNetworkSlotResponse(); // nouvelle trame
          break;
+     case ERR_RESPONSE:
+         data = new ARCSNetworkErrResponse();
+         break;
      default:
           type = INVALID;
           data = 0 ;
--- a/network/arcsnetworkframes.h
View file @1159199
+++ b/network/arcsnetworkframes.h
View file @1159199
--- a/network/arcsnetworkproxyslot.cpp
View file @1159199
+++ b/network/arcsnetworkproxyslot.cpp
View file @1159199
@@ -8,76 +8,76 @@
 ARCSNetworkProxySlot::ARCSNetworkProxySlot(ARCSAbstractComponent* cmp, QObject* parent) : QObject(parent)
 {
-     slotId = -1;
+    slotId = -1;
-     home = cmp;
+    home = cmp;
 }
 int ARCSNetworkProxySlot::qt_metacall(QMetaObject::Call call,int id, void** arguments)
 {
-     // should implement a call here !
+    // should implement a call here !
-     id = QObject::qt_metacall(call,id, arguments);
+    id = QObject::qt_metacall(call,id, arguments);
-     if (id < 0 || call != QMetaObject::InvokeMetaMethod)
+    if (id < 0 || call != QMetaObject::InvokeMetaMethod)
-          return id;
+        return id;
-
+
-     if (id != 0)
+    if (id != 0)
-          return -1;
+        return -1;
-
+
-     if (slotId == -1)
+    if (slotId == -1)
-          return -1;
+        return -1;
-
+
-     QStringList request;
+    QStringList request;
-     for (int i =0; i < typeIds.count(); i++)
+    for (int i =0; i < typeIds.count(); i++)
-     {
+    {
-          int it = typeIds[i];
+        int it = typeIds[i];
-
+
-          if (it != QMetaType::Void)
+        if (it != QMetaType::Void)
-          {
+        {
-               QVariant v(it, arguments[i+1]);
+            QVariant v(it, arguments[i+1]);
-               request << ARCSFactory::getInstance()->dataSerialize(v);
+            request << ARCSFactory::getInstance()->dataSerialize(v);
-          }
+        }
-     }
+    }
-
+
-     // call here slot with all its params.
+    // call here slot with all its params.
-     QSharedPointer<QTcpSocket> socket(new QTcpSocket(this));
+    QSharedPointer<QTcpSocket> socket(new QTcpSocket(this));
-     socket->connectToHost(hostName, port);
+    socket->connectToHost(hostName, port);
-     if (!socket->waitForConnected(ARCSNetworkFrame::TimeOut))
+    if (!socket->waitForConnected(ARCSNetworkFrame::TimeOut))
-     {
+    {
-            ARCS::Network::logError(407,socket->errorString());
+        ARCS::Network::logError(407,socket->errorString());
-            /* std::cerr << "Erreur 408: params are " << qPrintable(hostName) << ": " << port
+        /* std::cerr << "Erreur 408: params are " << qPrintable(hostName) << ": " << port
                        << " (" << this << ")" << std::endl;*/
-             return -1;
+        return -1;
-     }
+    }
-     // cration de la frame
+    // cration de la frame
-     ARCSNetworkFrame frameRequest(ARCSNetworkFrame::CALL_REQUEST);
+    ARCSNetworkFrame frameRequest(ARCSNetworkFrame::CALL_REQUEST);
-     ((ARCSNetworkCallRequest*)frameRequest.getData())->setParams(slotId, request);
+    ((ARCSNetworkCallRequest*)frameRequest.getData())->setParams(slotId, request);
-
+
-     if( !frameRequest.writeFrame(socket.data()))
+    if( !frameRequest.writeFrame(socket.data()))
-     {
+    {
-             ARCS::Network::logError(409,socket->errorString());
+        ARCS::Network::logError(409,socket->errorString());
-             return -1;
+        return -1;
-     }
+    }
-
+
-     ARCSNetworkFrame* response = ARCSNetworkFrame::readFrame(socket.data());
+    ARCSNetworkFrame* response = ARCSNetworkFrame::readFrame(socket.data());
-
+
-     //! \todo handle response appropriately
+    //! \todo handle response appropriately
-     // traitement de response -> Non c'est juste pour attendre de manire bloquante !
+    // traitement de response -> Non c'est juste pour attendre de manire bloquante !
-     if (response)
+    if (response)
-          delete response;
+        delete response;
-     return -1;
+    return -1;
 }
 void ARCSNetworkProxySlot::setSlot(QString s)
 {
-     QStringList paramTypes = s.section("(",1,1).section(")", 0,0).split(",");
+    QStringList paramTypes = s.section("(",1,1).section(")", 0,0).split(",");
-     typeIds.clear();
+    typeIds.clear();
-     for (int i=0; i < paramTypes.count(); i++)
+    for (int i=0; i < paramTypes.count(); i++)
-          typeIds.append(QMetaType::type(qPrintable(paramTypes.at(i))));
+        typeIds.append(QMetaType::type(qPrintable(paramTypes.at(i))));
-     slotName = s;
+    slotName = s;
 }
@@ -85,19 +85,19 @@ void ARCSNetworkProxySlot::setSlot(QString s)
 int ARCSNetworkProxySlot::prepareSlotConnect(QString , QString sltName, QString , QString , bool simulate)
 {
-     if (simulate)
+    if (simulate)
-          return 0;
+        return 0;
-
+
-     ARCSNetworkComponent* anc = dynamic_cast<ARCSNetworkComponent*>(home);
+    ARCSNetworkComponent* anc = dynamic_cast<ARCSNetworkComponent*>(home);
-     if (anc)
+    if (anc)
-          anc->requestSlotConnect(this);
+        anc->requestSlotConnect(this);
-     //! \todo insrer ici un traitement appropri
+    //! \todo insrer ici un traitement appropri
-
+
-     if (metaObject()->indexOfSlot(qPrintable(sltName)) != -1)
+    if (metaObject()->indexOfSlot(qPrintable(sltName)) != -1)
-     {
+    {
-          return metaObject()->indexOfSlot(qPrintable(sltName));
+        return metaObject()->indexOfSlot(qPrintable(sltName));
-     }
+    }
-     return metaObject()->methodCount();
+    return metaObject()->methodCount();
 }
--- a/network/arcsnetworkserver.cpp
View file @1159199
+++ b/network/arcsnetworkserver.cpp
View file @1159199