From 8c13345a4d437243a6ca3db5b0ae453524850baa Mon Sep 17 00:00:00 2001 From: Wesley Miaw Date: Mon, 7 Oct 2019 14:33:21 -0700 Subject: [PATCH] Remove unused files LinuxInterfaces.c and LinuxInterfaces.h. --- server/LinuxInterfaces.c | 80 ---------------------------------------- server/LinuxInterfaces.h | 29 --------------- server/dial_server.c | 1 - 3 files changed, 110 deletions(-) delete mode 100644 server/LinuxInterfaces.c delete mode 100644 server/LinuxInterfaces.h diff --git a/server/LinuxInterfaces.c b/server/LinuxInterfaces.c deleted file mode 100644 index 0225e3e..0000000 --- a/server/LinuxInterfaces.c +++ /dev/null @@ -1,80 +0,0 @@ -#include "LinuxInterfaces.h" -#include -#include -#include - -/* Fetch the MACAddress of a network interface */ -int getMACAddress(char* ifname, char* macBuf, unsigned int macBufSize) -{ - struct ifreq ifr; - int sock; - unsigned char chMAC[6]; - - sock=socket(AF_INET,SOCK_DGRAM,0); - strcpy( ifr.ifr_name, ifname ); - ifr.ifr_addr.sa_family = AF_INET; - if (ioctl( sock, SIOCGIFHWADDR, &ifr ) < 0) { - close(sock); - return -1; - } - memcpy(chMAC, ifr.ifr_hwaddr.sa_data, 6); - if (macBufSize<32){ - close(sock); - return -1; - }else{ - sprintf(macBuf,"%02X:%02X:%02X:%02X:%02X:%02X",chMAC[0],chMAC[1],chMAC[2],chMAC[3],chMAC[4],chMAC[5]); - } - close(sock); - return 0; -} - -bool hasRoute(const char *nf, int flag) -{ - bool result = false; - const char* fileName = "/proc/net/route"; - int r; - FILE* fp = fopen(fileName, "r"); - - if (fp) { - char line[1024]; - int nfBegin = 0, nfEnd = 0, nfFlag = 0; - const int nfLen = strlen(nf); - while (!feof(fp)) { - if (!fgets(line, sizeof(line), fp)) - break; - r = sscanf(line, "%n%*s%n %*s %*s %d %*s %*s %*s %*s %*s %*s %*s", &nfBegin, &nfEnd, &nfFlag); - if (r == 1 && nfBegin == 0 && nfEnd == nfLen && !strncmp(nf, line, nfLen) && (flag == -1 || nfFlag == flag)) { - result = true; - break; - } - } - fclose(fp); - } - return result; -} - -bool isDefault(char *nf) -{ - return hasRoute(nf, 0x03); -} - -NetInterface getDefaultNetworkInterfaces() -{ - DIR *d; - struct dirent *dir; - d = opendir("/sys/class/net/"); - NetInterface defaultNet; - if (d){ - while ((dir = readdir(d)) != NULL){ - if(strcmp(dir->d_name,".") && strcmp(dir->d_name,"..")){ - if (hasRoute(dir->d_name, -1) && isDefault(dir->d_name)){ - getMACAddress(dir->d_name, defaultNet.macAddress, MACBUFSIZE); - break; - } - } - } - closedir(d); - } - return defaultNet; -} - diff --git a/server/LinuxInterfaces.h b/server/LinuxInterfaces.h deleted file mode 100644 index f552cbb..0000000 --- a/server/LinuxInterfaces.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef LINUXINTERFACES_H_ -#define LINUXINTERFACES_H_ - -#ifndef __APPLE__ -#include -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -/* Fetch the MACAddress of a network interface */ -#define MACBUFSIZE 32 -#define WAKEUPTIMEOUT 15 - -typedef struct -{ - char macAddress[MACBUFSIZE]; -}NetInterface; - -NetInterface getDefaultNetworkInterfaces(); - -#endif diff --git a/server/dial_server.c b/server/dial_server.c index 8007c3d..c8fd7a8 100644 --- a/server/dial_server.c +++ b/server/dial_server.c @@ -37,7 +37,6 @@ #include "mongoose.h" #include "url_lib.h" -#include "LinuxInterfaces.h" // TODO: Partners should define this port #define DIAL_PORT (56789)