cmhi
/
vcpe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 1. 清除无效代码

This commit is contained in:
huangxin 2023-01-28 15:59:34 +08:00
parent a3e24c8ce4
commit 3cbbb839a6
1 changed files with 111 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

218
srcs/opendhcp183/opendhcpd.cpp
View File

@ -50,9 +50,9 @@ data2 cfig;
bool verbatim = false; bool verbatim = false;
data9 dhcpr; data9 dhcpr;
data9 token; data9 token;
MYBYTE currentInd = 0; //MYBYTE currentInd = 0;
MYBYTE newInd = 0; //MYBYTE newInd = 0;
data18 magin; //data18 magin;
bool kRunning = true; bool kRunning = true;
dhcpMap dhcpCache; dhcpMap dhcpCache;
char serviceName[] = "OpenDHCP"; char serviceName[] = "OpenDHCP";
@ -64,7 +64,7 @@ char exeFile[PATH_MAX] = "";
char iniFile[PATH_MAX] = ""; char iniFile[PATH_MAX] = "";
char leaFile[PATH_MAX] = ""; char leaFile[PATH_MAX] = "";
//char logFile[PATH_MAX] = ""; //char logFile[PATH_MAX] = "";
char tempFile[PATH_MAX] = "/tmp/opendhcp.tmp"; //char tempFile[PATH_MAX] = "/tmp/opendhcp.tmp";
char filePATH[PATH_MAX] = ""; char filePATH[PATH_MAX] = "";
char htmlTitle[PATH_MAX] = ""; char htmlTitle[PATH_MAX] = "";
char icoFile[PATH_MAX] = ""; char icoFile[PATH_MAX] = "";
@ -87,7 +87,7 @@ struct ifreq IfcBuf[MAX_SERVERS];
const char NBSP = 32; const char NBSP = 32;
const char RANGESET[] = "RANGE_SET"; const char RANGESET[] = "RANGE_SET";
const char GLOBALOPTIONS[] = "GLOBAL_OPTIONS"; const char GLOBALOPTIONS[] = "GLOBAL_OPTIONS";
const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; //const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
//const char send200[] = "HTTP/1.1 200 OK\r\nDate: %s\r\nLast-Modified: %s\r\nContent-Type: text/html\r\nConnection: Close\r\nTransfer-Encoding: chunked\r\n"; //const char send200[] = "HTTP/1.1 200 OK\r\nDate: %s\r\nLast-Modified: %s\r\nContent-Type: text/html\r\nConnection: Close\r\nTransfer-Encoding: chunked\r\n";
//const char send200[] = "HTTP/1.1 200 OK\r\nDate: %s\r\nLast-Modified: %s\r\nContent-Type: text/html\r\nConnection: Close\r\nContent-Length: \r\n\r\n"; //const char send200[] = "HTTP/1.1 200 OK\r\nDate: %s\r\nLast-Modified: %s\r\nContent-Type: text/html\r\nConnection: Close\r\nContent-Length: \r\n\r\n";
//const char send200[] = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n"; //const char send200[] = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: Close\r\n\r\n";
@ -673,26 +673,26 @@ void on_system_exit(void *p) {
} }
} }
bool chkQu(char *query) { //bool chkQu(char *query) {
if (strlen(query) >= UCHAR_MAX) { // if (strlen(query) >= UCHAR_MAX) {
return false; // return false;
} // }
//
while (true) { // while (true) {
char *dp = strchr(query, '.'); // char *dp = strchr(query, '.');
if (dp) { // if (dp) {
MYWORD size = dp - query; // MYWORD size = dp - query;
if (size >= 64) { // if (size >= 64) {
return false; // return false;
} // }
query += (size + 1); // query += (size + 1);
} else if (strlen(query) >= 64) { // } else if (strlen(query) >= 64) {
return false; // return false;
} else { // } else {
return true; // return true;
} // }
} // }
} //}
MYWORD fUShort(void *raw) { MYWORD fUShort(void *raw) {
return ntohs(*((MYWORD *)raw)); return ntohs(*((MYWORD *)raw));
@ -2239,23 +2239,23 @@ void lockIP(MYDWORD ip) {
} }
} }
void holdIP(MYDWORD ip) { //void holdIP(MYDWORD ip) {
if (ip) { // if (ip) {
MYDWORD iip = htonl(ip); // MYDWORD iip = htonl(ip);
//
for (char rangeInd = 0; rangeInd < cfig.rangeCount; rangeInd++) { // for (char rangeInd = 0; rangeInd < cfig.rangeCount; rangeInd++) {
if (iip >= cfig.dhcpRanges[rangeInd].rangeStart && iip <= cfig.dhcpRanges[rangeInd].rangeEnd) { // if (iip >= cfig.dhcpRanges[rangeInd].rangeStart && iip <= cfig.dhcpRanges[rangeInd].rangeEnd) {
unsigned int ind = iip - cfig.dhcpRanges[rangeInd].rangeStart; // unsigned int ind = iip - cfig.dhcpRanges[rangeInd].rangeStart;
//
if (cfig.dhcpRanges[rangeInd].expiry[ind] == 0) { // if (cfig.dhcpRanges[rangeInd].expiry[ind] == 0) {
cfig.dhcpRanges[rangeInd].expiry[ind] = 1; // cfig.dhcpRanges[rangeInd].expiry[ind] = 1;
} // }
//
break; // break;
} // }
} // }
} // }
} //}
void *sendToken(void *lpParam) { void *sendToken(void *lpParam) {
sleep(10); sleep(10);
@ -3830,21 +3830,22 @@ void mySplit(char *name, char *value, const char *source, char splitChar) {
//printf("%s %s\n", name, value); //printf("%s %s\n", name, value);
} }
MYDWORD getClassNetwork(MYDWORD ip) { //
data15 data {}; //MYDWORD getClassNetwork(MYDWORD ip) {
data.ip = ip; // data15 data {};
data.octate[3] = 0; // data.ip = ip;
// data.octate[3] = 0;
if (data.octate[0] < 192) { //
data.octate[2] = 0; // if (data.octate[0] < 192) {
} // data.octate[2] = 0;
// }
if (data.octate[0] < 128) { //
data.octate[1] = 0; // if (data.octate[0] < 128) {
} // data.octate[1] = 0;
// }
return data.ip; //
} // return data.ip;
//}
/* /*
char *IP2Auth(MYDWORD ip) char *IP2Auth(MYDWORD ip)
@ -4169,47 +4170,47 @@ char *IP62String(char *target, MYBYTE *source)
return target; return target;
} }
*/ */
//
char *IP62String(char *target, MYBYTE *source) { //char *IP62String(char *target, MYBYTE *source) {
char *dp = target; // char *dp = target;
bool zerostarted = false; // bool zerostarted = false;
bool zeroended = false; // bool zeroended = false;
//
for (MYBYTE i = 0; i < 16; i += 2, source += 2) { // for (MYBYTE i = 0; i < 16; i += 2, source += 2) {
if (source[0]) { // if (source[0]) {
if (zerostarted) { // if (zerostarted) {
zeroended = true; // zeroended = true;
} // }
//
if (zerostarted && zeroended) { // if (zerostarted && zeroended) {
dp += sprintf(dp, "::"); // dp += sprintf(dp, "::");
zerostarted = false; // zerostarted = false;
} else if (dp != target) { // } else if (dp != target) {
dp += sprintf(dp, ":"); // dp += sprintf(dp, ":");
} // }
//
dp += sprintf(dp, "%x", source[0]); // dp += sprintf(dp, "%x", source[0]);
dp += sprintf(dp, "%02x", source[1]); // dp += sprintf(dp, "%02x", source[1]);
} else if (source[1]) { // } else if (source[1]) {
if (zerostarted) { // if (zerostarted) {
zeroended = true; // zeroended = true;
} // }
//
if (zerostarted && zeroended) { // if (zerostarted && zeroended) {
dp += sprintf(dp, "::"); // dp += sprintf(dp, "::");
zerostarted = false; // zerostarted = false;
} else if (dp != target) { // } else if (dp != target) {
dp += sprintf(dp, ":"); // dp += sprintf(dp, ":");
} // }
//
dp += sprintf(dp, "%0x", source[1]); // dp += sprintf(dp, "%0x", source[1]);
} else if (!zeroended) { // } else if (!zeroended) {
zerostarted = true; // zerostarted = true;
} // }
} // }
//
return target; // return target;
} //}
char *getHexValue(MYBYTE *target, char *source, MYBYTE *size) { char *getHexValue(MYBYTE *target, char *source, MYBYTE *size) {
if (*size) { if (*size) {
@ -4287,6 +4288,7 @@ char *myLower(char *string) {
return string; return string;
} }
#if 0
bool wildcmp(char *string, char *wild) { bool wildcmp(char *string, char *wild) {
// Written by Jack Handy - jakkhandy@hotmail.com // Written by Jack Handy - jakkhandy@hotmail.com
// slightly modified // slightly modified
@ -4357,6 +4359,7 @@ void listDhcpCache() {
p++; p++;
} }
} }
#endif
void calcRangeLimits(MYDWORD ip, MYDWORD mask, MYDWORD *rangeStart, MYDWORD *rangeEnd) { void calcRangeLimits(MYDWORD ip, MYDWORD mask, MYDWORD *rangeStart, MYDWORD *rangeEnd) {
*rangeStart = htonl(ip & mask) + 1; *rangeStart = htonl(ip & mask) + 1;
@ -4478,20 +4481,20 @@ void *init(void *lparam) {
if ((f = fopen(iniFile, "rt"))) { if ((f = fopen(iniFile, "rt"))) {
fclose(f); fclose(f);
} }
// else { // else {
// sprintf(logBuff, "Warning: file %s not found, defaults will be used", iniFile); // sprintf(logBuff, "Warning: file %s not found, defaults will be used", iniFile);
// logDHCPMess(logBuff, 1); // logDHCPMess(logBuff, 1);
// } // }
sleep(1); sleep(1);
if ((f = fopen(iniFile, "rt"))) { if ((f = fopen(iniFile, "rt"))) {
fclose(f); fclose(f);
} }
// else { // else {
// sprintf(logBuff, "Warning: file %s not found, defaults will be used", iniFile); // sprintf(logBuff, "Warning: file %s not found, defaults will be used", iniFile);
// logDHCPMess(logBuff, 1); // logDHCPMess(logBuff, 1);
// } // }
sprintf(logBuff, "Starting DHCP Service"); sprintf(logBuff, "Starting DHCP Service");
logDHCPMess(logBuff, 1); logDHCPMess(logBuff, 1);
@ -5251,6 +5254,8 @@ void *updateStateFile(void *lparam) {
pthread_exit(nullptr); pthread_exit(nullptr);
} }
#if 0
void debug(const char *mess) { void debug(const char *mess) {
char ts[254]; char ts[254];
strcpy(ts, mess); strcpy(ts, mess);
@ -5263,7 +5268,6 @@ void debug(int i) {
logDHCPMess(ts, 1); logDHCPMess(ts, 1);
} }
#if 0
void *logThread(void *lpParam) { void *logThread(void *lpParam) {
pthread_mutex_lock(&mutLogFile); pthread_mutex_lock(&mutLogFile);
char *mess = (char *)lpParam; char *mess = (char *)lpParam;