valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Strip of leading zeroes from the IP. Thanks Zorix

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3843
This commit is contained in:
Peter Veenstra 2013-11-11 12:54:53 +00:00
parent 2a8cf58b99
commit f8bbc2b54d
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/hardware/serialport/softmodem.cpp
View file

@ -362,18 +362,23 @@ void CSerialModem::DoCommand() {
helper[0]=0;
helper--;
}
//Large enough scope, so the buffers are still valid when reaching Dail.
char buffer[128];
char obuffer[128];
if (strlen(foundstr) >= 12) {
// Check if supplied parameter only consists of digits
bool isNum = true;
for (Bitu i=0; i<strlen(foundstr); i++)
size_t fl = strlen(foundstr);
for (size_t i = 0; i < fl; i++)
if (foundstr[i] < '0' || foundstr[i] > '9') isNum = false;
if (isNum) {
// Parameter is a number with at least 12 digits => this cannot
// be a valid IP/name
// Transform by adding dots
char buffer[128];
Bitu j = 0;
for (Bitu i=0; i<strlen(foundstr); i++) {
size_t j = 0;
size_t foundlen = strlen(foundstr);
for (size_t i = 0; i < foundlen; i++) {
buffer[j++] = foundstr[i];
// Add a dot after the third, sixth and ninth number
if (i == 2 || i == 5 || i == 8)
@ -385,6 +390,19 @@ void CSerialModem::DoCommand() {
}
buffer[j] = 0;
foundstr = buffer;
// Remove Zeros from beginning of octets
size_t k = 0;
size_t foundlen2 = strlen(foundstr);
for (size_t i = 0; i < foundlen2; i++) {
if (i == 0 && foundstr[0] == '0') continue;
if (i == 1 && foundstr[0] == '0' && foundstr[1] == '0') continue;
if (foundstr[i] == '0' && foundstr[i-1] == '.') continue;
if (foundstr[i] == '0' && foundstr[i-1] == '0' && foundstr[i-2] == '.') continue;
obuffer[k++] = foundstr[i];
}
obuffer[k] = 0;
foundstr = obuffer;
}
}
Dial(foundstr);
@ -392,8 +410,8 @@ void CSerialModem::DoCommand() {
}
case 'I': // Some strings about firmware
switch (ScanNumber(scanbuf)) {
case 3: SendLine("DosBox Emulated Modem Firmware V1.00"); break;
case 4: SendLine("Modem compiled for DosBox version " VERSION); break;
case 3: SendLine("DOSBox Emulated Modem Firmware V1.00"); break;
case 4: SendLine("Modem compiled for DOSBox version " VERSION); break;
}
break;
case 'E': // Echo on/off