Changed network interface detection

Added Nextion HMI files

Network.cpp

@@ -36,59 +36,79 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info)
 {
 #define IFLISTSIZ 25
 
-        LogInfo("Interfaces Info");
+    LogInfo("Interfaces Info");
-        struct ifaddrs *ifaddr, *ifa;
+    struct ifaddrs *ifaddr, *ifa;
-        int family, s, n, ifnr;
+    int family, s, n, ifnr;
-        char host[NI_MAXHOST];
+    char host[NI_MAXHOST];
-        char text[50+INET6_ADDRSTRLEN];
+    char interfacelist[IFLISTSIZ][50+INET6_ADDRSTRLEN];
-        char interfacelist[IFLISTSIZ][50+INET6_ADDRSTRLEN];
+    char *dflt, *p;
-        char *p;
+    FILE *f;
+    char line[100];
 
-        strcpy(text,"(interface lookup failed)");
+    dflt=NULL;
-        for(n=0;n<IFLISTSIZ;n++) {
+    f = fopen("/proc/net/route" , "r");
-            interfacelist[n][0]=0;
+
+    while(fgets(line , 100 , f))
+    {
+        dflt = strtok(line , " \t");
+        p = strtok(NULL , " \t");
+
+        if(dflt!=NULL && p!=NULL)
+        {
+            if(strcmp(p , "00000000") == 0)
+            {
+                break;
+            }
         }
-        ifnr=0;
+    }
 
+
+    for(n=0;n<IFLISTSIZ;n++) {
+        interfacelist[n][0]=0;
+    }
+    ifnr=0;
         if (getifaddrs(&ifaddr) == -1) {
-            strcpy((char*)info,"getifaddrs failure");
+        strcpy((char*)info,"getifaddrs failure");
-        } else {
+    } else {
-            for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
+        for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
-               if (ifa->ifa_addr == NULL)
+           if (ifa->ifa_addr == NULL)
-                   continue;
+               continue;
-
                 family = ifa->ifa_addr->sa_family;
-
                 if (family == AF_INET || family == AF_INET6) {
-                    s = getnameinfo(ifa->ifa_addr,
+                s = getnameinfo(ifa->ifa_addr,
-                        (family == AF_INET) ? sizeof(struct sockaddr_in) :
+                    (family == AF_INET) ? sizeof(struct sockaddr_in) :
-                                              sizeof(struct sockaddr_in6),
+                                          sizeof(struct sockaddr_in6),
-                        host, NI_MAXHOST,
+                    host, NI_MAXHOST,
-                        NULL, 0, NI_NUMERICHOST);
+                    NULL, 0, NI_NUMERICHOST);
-                    if (s != 0) {
+                if (s != 0) {
-                        LogInfo("getnameinfo() failed: %s\n", gai_strerror(s));
+                    LogInfo("getnameinfo() failed: %s\n", gai_strerror(s));
-                        continue;
+                    continue;
-                    }
-                    if (family == AF_INET) {
-                        sprintf(interfacelist[ifnr], "%s: %s", ifa->ifa_name,host);
-                        LogInfo("    IPv4: %s", interfacelist[ifnr] );
-                    } else {
-                        sprintf(interfacelist[ifnr], "%s: %s", ifa->ifa_name,host);
-                        LogInfo("    IPv6: %s", interfacelist[ifnr] );
-                    }
-                    ifnr++;
                 }
-            }
+                if (family == AF_INET) {
-            freeifaddrs(ifaddr);
+                    sprintf(interfacelist[ifnr], "%s: %s", ifa->ifa_name,host);
-            for(n=0;n<(ifnr);n++) {
+                    LogInfo("    IPv4: %s", interfacelist[ifnr] );
-                p=strchr(interfacelist[n],'%');
+                } else {
-                if (p!=NULL) *p=0;
+                    sprintf(interfacelist[ifnr], "%s: %s", ifa->ifa_name,host);
-                if (strstr(interfacelist[n],"lo")==NULL) {
+                    LogInfo("    IPv6: %s", interfacelist[ifnr] );
-                    strcpy((char*)info,interfacelist[n]);
-                    break;
                 }
+                ifnr++;
             }
-            LogInfo("    IP to show: %s", info );
         }
+        freeifaddrs(ifaddr);
+
+
+        LogInfo("    Default interface is : %s" , dflt);
+
+        for(n=0;n<(ifnr);n++) {
+            p=strchr(interfacelist[n],'%');
+            if (p!=NULL) *p=0;
+            if(strstr(interfacelist[n], dflt) != 0)
+            {
+                strcpy((char*)info,interfacelist[n]);
+                break;
+            }
+        }
+        LogInfo("    IP to show: %s", info );
+    }
 }
 

Version.h

@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20170719";
+const char* VERSION = "20171003_ON7LDS";
 
 #endif