Changeset 424 in flair-src for trunk

Timestamp:

May 3, 2021, 10:56:05 AM (4 years ago)

Author:

Sanahuja Guillaume

Message:

use utmp for autdetecting ip address

File:

• trunk/lib/FlairCore/src/FrameworkManager_impl.cpp (modified) (3 diffs)

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -35 +35 @@
 #include <signal.h>
 #include <fcntl.h>
+#include <utmp.h>
 #ifdef __XENO__
 #include <native/task.h>
@@ -222 +223 @@
   }
   if(address=="autodetect") {
-    Printf("autodetecting gcs ip address based on ssh connection\n");
+    Printf("Autodetecting gcs ip address based on ssh connection\n");
     address=AutoDetectGCS(); 
   }
@@ -253 +254 @@
 
 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;
+  int logsize = 10;//should be sufficient
+  int file;
+  struct utmp log[logsize];
+
+  file = open("/var/run/utmp", O_RDONLY);
+
+//return only first matching occurence
+//TODO: check also log->ut_addr_v6[0]
+  if (file) {
+    int read_size=read(file, &log, sizeof(log));
+    int nb=read_size/sizeof(struct utmp);
+  
+    for(int i = 0; i < nb; i++) {
+      //printf("\n ut_user: %s host: %s %x\n ut_type: %ld line %s\n", log[i].ut_user,log[i].ut_host,log[i].ut_addr_v6[0], log[i].ut_type,log[i].ut_line);
+      if(log[i].ut_type==USER_PROCESS) {
+        close(file);
+        return log[i].ut_host;
+      }
+   
+    }
+
+    close(file);
+  }
+  
+  Err("Failed to run autodetect command\n" );
+  return "";
 }