diff --git a/Network.cpp b/Network.cpp index c41c3b1..b2732e9 100644 --- a/Network.cpp +++ b/Network.cpp @@ -36,59 +36,79 @@ void CNetworkInfo::getNetworkInterface(unsigned char* info) { #define IFLISTSIZ 25 - LogInfo("Interfaces Info"); - struct ifaddrs *ifaddr, *ifa; - int family, s, n, ifnr; - char host[NI_MAXHOST]; - char text[50+INET6_ADDRSTRLEN]; - char interfacelist[IFLISTSIZ][50+INET6_ADDRSTRLEN]; - char *p; + LogInfo("Interfaces Info"); + struct ifaddrs *ifaddr, *ifa; + int family, s, n, ifnr; + char host[NI_MAXHOST]; + char interfacelist[IFLISTSIZ][50+INET6_ADDRSTRLEN]; + char *dflt, *p; + FILE *f; + char line[100]; - strcpy(text,"(interface lookup failed)"); - for(n=0;nifa_next, n++) { - if (ifa->ifa_addr == NULL) - continue; - + strcpy((char*)info,"getifaddrs failure"); + } else { + for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) { + if (ifa->ifa_addr == NULL) + continue; family = ifa->ifa_addr->sa_family; - if (family == AF_INET || family == AF_INET6) { - s = getnameinfo(ifa->ifa_addr, - (family == AF_INET) ? sizeof(struct sockaddr_in) : - sizeof(struct sockaddr_in6), - host, NI_MAXHOST, - NULL, 0, NI_NUMERICHOST); - if (s != 0) { - LogInfo("getnameinfo() failed: %s\n", gai_strerror(s)); - 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++; + s = getnameinfo(ifa->ifa_addr, + (family == AF_INET) ? sizeof(struct sockaddr_in) : + sizeof(struct sockaddr_in6), + host, NI_MAXHOST, + NULL, 0, NI_NUMERICHOST); + if (s != 0) { + LogInfo("getnameinfo() failed: %s\n", gai_strerror(s)); + continue; } - } - freeifaddrs(ifaddr); - for(n=0;n<(ifnr);n++) { - p=strchr(interfacelist[n],'%'); - if (p!=NULL) *p=0; - if (strstr(interfacelist[n],"lo")==NULL) { - strcpy((char*)info,interfacelist[n]); - break; + 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++; } - 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 ); + } } diff --git a/Nextion_ON7LDS/NEXTION_V106_HOR24_ON7LDS.tft b/Nextion_ON7LDS/NEXTION_V106_HOR24_ON7LDS.tft deleted file mode 100644 index 64a6e50..0000000 Binary files a/Nextion_ON7LDS/NEXTION_V106_HOR24_ON7LDS.tft and /dev/null differ diff --git a/Nextion_ON7LDS/NEXTION_V106_HOR28_ON7LDS.tft b/Nextion_ON7LDS/NEXTION_V106_HOR28_ON7LDS.tft deleted file mode 100644 index fe3e4c2..0000000 Binary files a/Nextion_ON7LDS/NEXTION_V106_HOR28_ON7LDS.tft and /dev/null differ diff --git a/Nextion_ON7LDS/NEXTION_V106_HOR35_ON7LDS.tft b/Nextion_ON7LDS/NEXTION_V106_HOR35_ON7LDS.tft deleted file mode 100644 index 6a7e3b9..0000000 Binary files a/Nextion_ON7LDS/NEXTION_V106_HOR35_ON7LDS.tft and /dev/null differ diff --git a/Nextion_ON7LDS/NX3224T024-ON7LDS.HMI b/Nextion_ON7LDS/NX3224T024-ON7LDS.HMI new file mode 100644 index 0000000..c75f1fc Binary files /dev/null and b/Nextion_ON7LDS/NX3224T024-ON7LDS.HMI differ diff --git a/Nextion_ON7LDS/NEXTION_V106_HOR32_ON7LDS.tft b/Nextion_ON7LDS/NX3224T024-ON7LDS.tft similarity index 71% rename from Nextion_ON7LDS/NEXTION_V106_HOR32_ON7LDS.tft rename to Nextion_ON7LDS/NX3224T024-ON7LDS.tft index 9e1ca79..f299074 100644 Binary files a/Nextion_ON7LDS/NEXTION_V106_HOR32_ON7LDS.tft and b/Nextion_ON7LDS/NX3224T024-ON7LDS.tft differ diff --git a/Nextion_ON7LDS/NX3224T028-ON7LDS.HMI b/Nextion_ON7LDS/NX3224T028-ON7LDS.HMI new file mode 100644 index 0000000..9a962b3 Binary files /dev/null and b/Nextion_ON7LDS/NX3224T028-ON7LDS.HMI differ diff --git a/Nextion_ON7LDS/NX3224T028-ON7LDS.tft b/Nextion_ON7LDS/NX3224T028-ON7LDS.tft new file mode 100644 index 0000000..16aefa7 Binary files /dev/null and b/Nextion_ON7LDS/NX3224T028-ON7LDS.tft differ diff --git a/Nextion_ON7LDS/NX4024T032-ON7LDS.HMI b/Nextion_ON7LDS/NX4024T032-ON7LDS.HMI new file mode 100644 index 0000000..9fb3d28 Binary files /dev/null and b/Nextion_ON7LDS/NX4024T032-ON7LDS.HMI differ diff --git a/Nextion_ON7LDS/NX4024T032-ON7LDS.tft b/Nextion_ON7LDS/NX4024T032-ON7LDS.tft new file mode 100644 index 0000000..f09e03b Binary files /dev/null and b/Nextion_ON7LDS/NX4024T032-ON7LDS.tft differ diff --git a/Nextion_ON7LDS/NX4832T035-ON7LDS.HMI b/Nextion_ON7LDS/NX4832T035-ON7LDS.HMI new file mode 100644 index 0000000..d8110f3 Binary files /dev/null and b/Nextion_ON7LDS/NX4832T035-ON7LDS.HMI differ diff --git a/Nextion_ON7LDS/NX4832T035-ON7LDS.tft b/Nextion_ON7LDS/NX4832T035-ON7LDS.tft new file mode 100644 index 0000000..7694a5c Binary files /dev/null and b/Nextion_ON7LDS/NX4832T035-ON7LDS.tft differ diff --git a/Version.h b/Version.h index b6885be..f981526 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20170719"; +const char* VERSION = "20171003_ON7LDS"; #endif