Changeset 260 in flair-src for trunk/tools/FlairGCS

Timestamp:

07/26/18 14:44:42 (6 years ago)

Author:

Sanahuja Guillaume

Message:

gcs: do not use socket if connection lost

Location:

trunk/tools/FlairGCS/src

Files:

• ConnectionLayout.cpp (modified) (2 diffs)
• ConnectionLayout.h (modified) (1 diff)
• Manager.cpp (modified) (3 diffs)

trunk/tools/FlairGCS/src/ConnectionLayout.cpp

@@ -16 +16 @@
 
 ConnectionLayout::~ConnectionLayout() {
+}
+
+void ConnectionLayout::udtSocketDestroyed(QObject *obj){
+  socket=NULL;
 }
 
@@ -66 +70 @@
 void ConnectionLayout::XmlToSend(QDomDocument doc) {
    //fprintf(stderr,"xml to send\n%s\n",doc.toString().toLocal8Bit().constData());
+  if(!socket) return;
   
   // xml to send a mettre dans le manager

trunk/tools/FlairGCS/src/ConnectionLayout.h

@@ -33 +33 @@
 private slots:
   void receive(char *buf, int size);
+  void udtSocketDestroyed(QObject *obj);
 
 signals:

trunk/tools/FlairGCS/src/Manager.cpp

@@ -154 +154 @@
   connect(newLayout, SIGNAL(destroyed(QObject *)), this, SLOT(layoutDestroyed(QObject *)));
   connect(udtSocket, SIGNAL(destroyed(QObject *)), this, SLOT(udtSocketDestroyed(QObject *)));
+  connect(udtSocket, SIGNAL(destroyed(QObject *)), newLayout, SLOT(udtSocketDestroyed(QObject *)));
   
   // widget
@@ -187 +188 @@
 void Manager::udtSocketDestroyed(QObject *obj) {
   //mark socket as not valid, it can be a connection lost
-  //in this case we keep the layout for reading, and mark it as problematic
+  //in this case we keep the layout for reading, and mark it as problematic (socket=NULL)
   for(int i=0;i<connections.count();i++) {
     if(connections.at(i).socket==(UdtSocket *)obj) {
@@ -391 +392 @@
 void Manager::send(void) {
   for (int i = 0; i < connections.count(); i++) {
-    QDomDocument doc("remote_ui_xml");
-    connections.at(i).layout->GetUpdateXml((QDomElement *)&doc);
-    // fprintf(stderr,"merge\n%s\n",doc.toString().toLocal8Bit().constData());
-
-    connections.at(i).layout->XmlToSend(doc);
+    if(connections.at(i).socket!=NULL) {
+      QDomDocument doc("remote_ui_xml");
+      connections.at(i).layout->GetUpdateXml((QDomElement *)&doc);
+      // fprintf(stderr,"merge\n%s\n",doc.toString().toLocal8Bit().constData());
+
+      connections.at(i).layout->XmlToSend(doc);
+    }
   }
 }