nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix misleading default, fix previous commit

Browse Source
This commit is contained in:
John
2022-12-11 10:00:08 +01:00
parent 1bd7ef5f5a
commit 40884341f7
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/ebuspicloader.cpp
+4 -5
View File
@@ -1047,7 +1047,7 @@ int readSettings(int fd, uint8_t* currentData = nullptr) {
} }
std::cout << std::endl; std::cout << std::endl;
if (maskLen == 0x1f || (ip[0]|ip[1]|ip[2]|ip[3]) == 0) { if (maskLen == 0x1f || (ip[0]|ip[1]|ip[2]|ip[3]) == 0) {
std::cout << "IP address: DHCP" << std::endl; std::cout << "IP address: DHCP (default)" << std::endl;
} else { } else {
std::cout << "IP address:"; std::cout << "IP address:";
for (uint8_t pos = 0, maskRemain = maskLen; pos < 4; pos++, maskRemain -= maskRemain >= 8 ? 8 : maskRemain) { for (uint8_t pos = 0, maskRemain = maskLen; pos < 4; pos++, maskRemain -= maskRemain >= 8 ? 8 : maskRemain) {
@@ -1079,9 +1079,6 @@ int readSettings(int fd, uint8_t* currentData = nullptr) {
for (int i=0; i < 4; i++) { for (int i=0; i < 4; i++) {
std::cout << (i == 0?' ':'.') << std::dec << static_cast<unsigned>(ip[i]); std::cout << (i == 0?' ':'.') << std::dec << static_cast<unsigned>(ip[i]);
} }
if (gw == 0x3f) {
std::cout << " (default)";
}
std::cout << std::endl; std::cout << std::endl;
} }
uint16_t arbitrationDelay = configData[3]&0x3f; uint16_t arbitrationDelay = configData[3]&0x3f;
@@ -1139,7 +1136,9 @@ bool writeSettings(int fd, uint8_t* currentData = nullptr) {
if (setMacFromIp) { if (setMacFromIp) {
configData[1] = (configData[1]&~0x20) | (setMacFromIpValue ? 0 : 0x20); // set useMUI configData[1] = (configData[1]&~0x20) | (setMacFromIpValue ? 0 : 0x20); // set useMUI
} }
if (setIp) { if (setDhcp) {
configData[1] |= 0x1f;
} else if (setIp) {
if (setMask) { if (setMask) {
configData[1] = (configData[1]&~0x1f) | (setMaskLen&0x1f); configData[1] = (configData[1]&~0x1f) | (setMaskLen&0x1f);
} }