Changeset 414 in flair-src for trunk/lib/FlairCore

Timestamp:

Mar 26, 2021, 11:31:57 AM (4 years ago)

Author:

Sanahuja Guillaume

Message:

added possibility to autodetect gcs ip when using autodetect as address parameter, see demos. This only works when ssh connected to a target (not in simulation)

Location:

trunk/lib/FlairCore/src

Files:

• FrameworkManager_impl.cpp (modified) (3 diffs)
• unexported/FrameworkManager_impl.h (modified) (1 diff)

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -221 +221 @@
     return;
   }
+  if(address=="autodetect") {
+    Printf("autodetecting gcs ip address based on ssh connection\n");
+    address=AutoDetectGCS(); 
+  }
   this->address=address;
   this->port=port;
@@ -246 +250 @@
   gcs_watchdog = new Watchdog(this, std::bind(&FrameworkManager_impl::SetConnectionLost, this),watchdogTimeout);
   gcs_watchdog->Start();
+}
+
+string FrameworkManager_impl::AutoDetectGCS(void) {
+    FILE *fp;
+    char result[15];
+
+    //get only first result and remove line feed
+    fp = popen("who | awk '{ print $7; }' | head -n 1 | tr -d '\n'", "r");
+    if (fp == NULL) {
+        Err("Failed to run autodetect command\n" );
+    }
+
+    fgets(result, sizeof(result), fp);
+    pclose(fp);
+    
+    return result;
 }
 
@@ -295 +315 @@
 // it switches back to RT in ProcessXML when mutex are locked
 void FrameworkManager_impl::Run(void) {
+    
+  if (self->ErrorOccured() == true) {
+    return ;
+  }
+
+
   while (!ToBeStopped()) {
     ssize_t bytesRead;

trunk/lib/FlairCore/src/unexported/FrameworkManager_impl.h

@@ -90 +90 @@
   void SaveXmlChange(char *buf);
   void SaveXml(void);
+  std::string AutoDetectGCS(void);
   size_t rcv_buf_size;
   char *rcv_buf;