d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix HTTP port addresses for the IPv6 case.

Browse Source 
Submitted by:	pho and Hajimu UMEMOTO
This commit is contained in:
Jordan K. Hubbard 2000-08-03 02:51:45 +00:00
parent 7d615c1d8b
commit efbfff9480
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
release/sysinstall/media.c
View File

@ -453,7 +453,7 @@ mediaSetFTPPassive(dialogMenuItem *self)
int mediaSetHTTP(dialogMenuItem *self)
{
int result;
char *cp, hbuf[MAXHOSTNAMELEN], *hostname, *var_hostname;
char *cp, *idx, hbuf[MAXHOSTNAMELEN], *hostname, *var_hostname;
int HttpPort;
int what = DITEM_RESTORE;
@ -474,17 +474,18 @@ int mediaSetHTTP(dialogMenuItem *self)
return DITEM_FAILURE;
SAFE_STRCPY(hbuf, cp);
hostname = hbuf;
if (*hostname == '[' && (cp = index(hostname + 1, ']')) != NULL) {
if (*hostname == '[' && (idx = index(hostname + 1, ']')) != NULL &&
(*++idx == '\0' || *idx == ':')) {
++hostname;
*cp = '\0';
*(idx - 1) = '\0';
} else
idx = index(hostname, ':');
if (idx == NULL || *idx != ':')
HttpPort = 3128; /* try this as default */
else {
*(idx++) = '\0';
HttpPort = strtol(idx, 0, 0);
}
cp = index(hostname, ':');
if (cp != NULL && *cp == ':') {
*(cp++) = '\0';
HttpPort = strtol(cp, 0, 0);
}
else
HttpPort = 3128;
variable_set2(VAR_HTTP_HOST, hostname, 0);
variable_set2(VAR_HTTP_PORT, itoa(HttpPort), 0);
@ -501,7 +502,8 @@ int mediaSetHTTP(dialogMenuItem *self)
mediaDevice->shutdown = dummyShutdown;
return DITEM_SUCCESS | DITEM_LEAVE_MENU | what;
}
int
mediaSetUFS(dialogMenuItem *self)
{

24
usr.sbin/sysinstall/media.c
View File

@ -453,7 +453,7 @@ mediaSetFTPPassive(dialogMenuItem *self)
int mediaSetHTTP(dialogMenuItem *self)
{
int result;
char *cp, hbuf[MAXHOSTNAMELEN], *hostname, *var_hostname;
char *cp, *idx, hbuf[MAXHOSTNAMELEN], *hostname, *var_hostname;
int HttpPort;
int what = DITEM_RESTORE;
@ -474,17 +474,18 @@ int mediaSetHTTP(dialogMenuItem *self)
return DITEM_FAILURE;
SAFE_STRCPY(hbuf, cp);
hostname = hbuf;
if (*hostname == '[' && (cp = index(hostname + 1, ']')) != NULL) {
if (*hostname == '[' && (idx = index(hostname + 1, ']')) != NULL &&
(*++idx == '\0' || *idx == ':')) {
++hostname;
*cp = '\0';
*(idx - 1) = '\0';
} else
idx = index(hostname, ':');
if (idx == NULL || *idx != ':')
HttpPort = 3128; /* try this as default */
else {
*(idx++) = '\0';
HttpPort = strtol(idx, 0, 0);
}
cp = index(hostname, ':');
if (cp != NULL && *cp == ':') {
*(cp++) = '\0';
HttpPort = strtol(cp, 0, 0);
}
else
HttpPort = 3128;
variable_set2(VAR_HTTP_HOST, hostname, 0);
variable_set2(VAR_HTTP_PORT, itoa(HttpPort), 0);
@ -501,7 +502,8 @@ int mediaSetHTTP(dialogMenuItem *self)
mediaDevice->shutdown = dummyShutdown;
return DITEM_SUCCESS | DITEM_LEAVE_MENU | what;
}
int
mediaSetUFS(dialogMenuItem *self)
{