folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed sim_parse_addr to actually use the default_host parameter if a host component wasn't provided in the input

Browse source
This commit is contained in:
Mark Pizzolato 2013-01-06 05:11:51 -08:00
parent b78c91b4db
commit f51a702ebd
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sim_sock.c
View file

@ -470,7 +470,7 @@ int load_ws2(void) {
= optional pointer to default host if none specified = optional pointer to default host if none specified
host_len = length of host buffer host_len = length of host buffer
default_port default_port
= optional pointer to default host if none specified = optional pointer to default port if none specified
port_len = length of port buffer port_len = length of port buffer
validate_addr = optional name/addr which is checked to be equivalent validate_addr = optional name/addr which is checked to be equivalent
to the host result of parsing the other input. This to the host result of parsing the other input. This
@ -498,7 +498,8 @@ if ((host != NULL) && (host_len != 0))
memset (host, 0, host_len); memset (host, 0, host_len);
if ((port != NULL) && (port_len != 0)) if ((port != NULL) && (port_len != 0))
memset (port, 0, port_len); memset (port, 0, port_len);
strncpy (gbuf, cptr, CBUFSIZE); gbuf[sizeof(gbuf)-1] = '\0';
strncpy (gbuf, cptr, sizeof(gbuf)-1);
hostp = gbuf; /* default addr */ hostp = gbuf; /* default addr */
portp = NULL; portp = NULL;
if ((portp = strrchr (gbuf, ':')) && /* x:y? split */ if ((portp = strrchr (gbuf, ':')) && /* x:y? split */
@ -507,12 +508,9 @@ if ((portp = strrchr (gbuf, ':')) && /* x:y? split */
if (*portp == '\0') if (*portp == '\0')
portp = (char *)default_port; portp = (char *)default_port;
} }
else else { /* No colon in input */
if (default_port) portp = gbuf; /* Input is the port specifier */
portp = (char *)default_port; hostp = (char *)default_host; /* host is defaulted if provided */
else {
portp = gbuf;
hostp = NULL;
} }
if (portp != NULL) { if (portp != NULL) {
portval = strtoul(portp, &endc, 10); portval = strtoul(portp, &endc, 10);
@ -536,7 +534,9 @@ if (hostp != NULL) {
if (']' == hostp[strlen(hostp)-1]) { if (']' == hostp[strlen(hostp)-1]) {
if ('[' != hostp[0]) if ('[' != hostp[0])
return SCPE_ARG; /* invalid domain literal */ return SCPE_ARG; /* invalid domain literal */
strcpy(hostp, hostp+1); /* remove brackets from domain literal host */ /* host may be the const default_host so move to temp buffer before modifying */
strncpy(gbuf, hostp+1, sizeof(gbuf)-1); /* remove brackets from domain literal host */
hostp = gbuf;
hostp[strlen(hostp)-1] = '\0'; hostp[strlen(hostp)-1] = '\0';
} }
} }