webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Patched the installer for configuring the firewill without a red device.

Browse Source 
(This is only for testing purposes...!)


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1037 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-10-31 19:52:06 +00:00
parent 86f4024ad5
commit 855446c6c9
4 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
langs/de/install/lang_de.c
View File

@@ -557,5 +557,15 @@ char *de_tr[] = {
"Nein",
/* TR_AS */
"als",
/* TR_IGNORE */
"Ignorieren",
/* TR_PPP_DIALUP */
"PPP Einwahl (PPPoE, Modem, ATM ...)",
/* TR_DHCP */
"DHCP",
/* TR_DHCP_STARTSERVER */
"Starte den DHCP-Server ...",
/* TR_DHCP_STOPSERVER */
"Stoppe den DHCP-Server ...",
};

11
langs/en/install/lang_en.c
View File

@@ -553,5 +553,16 @@ char *en_tr[] = {
"No",
/* TR_AS */
"as",
/* TR_IGNORE */
"Ignore",
/* TR_PPP_DIALUP */
"PPP DIALUP (PPPoE, Modem, ATM ...)",
/* TR_DHCP */
"DHCP",
/* TR_DHCP_STARTSERVER */
"Starting DHCP-Server ...",
/* TR_DHCP_STOPSERVER */
"Stopping DHCP-Server ...",
};

4
src/install+setup/libsmooth/netstuff.c
View File

@@ -92,8 +92,8 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
if (strcmp(temp, "DHCP") == 0) startdhcptype = 1;
if (strcmp(temp, "PPPOE") == 0) startpppoetype = 1;
statictyperadio = newtRadiobutton(2, 4, ctr[TR_STATIC], startstatictype, NULL);
dhcptyperadio = newtRadiobutton(2, 5, "DHCP", startdhcptype, statictyperadio);
pppoetyperadio = newtRadiobutton(2, 6, "PPPOE", startpppoetype, dhcptyperadio);
dhcptyperadio = newtRadiobutton(2, 5, ctr[TR_DHCP], startdhcptype, statictyperadio);
pppoetyperadio = newtRadiobutton(2, 6, ctr[TR_PPP_DIALUP], startpppoetype, dhcptyperadio);
newtFormAddComponents(networkform, statictyperadio, dhcptyperadio,
pppoetyperadio, NULL);
newtComponentAddCallback(statictyperadio, networkdialogcallbacktype, NULL);

78
src/install+setup/setup/networking.c
View File

@@ -47,7 +47,7 @@ int configtypecards[] = {
int netaddresschange;
int oktoleave(char *errormessage);
int oktoleave(void);
int firstmenu(void);
int configtypemenu(void);
int drivermenu(void);
@@ -61,7 +61,6 @@ int handlenetworking(void)
int done;
int choice;
int found;
char errormessage[STRING_SIZE];
netaddresschange = 0;
@@ -92,10 +91,7 @@ int handlenetworking(void)
break;
case 0:
if (oktoleave(errormessage))
done = 1;
else
errorbox(errormessage);
if (oktoleave()) done = 1;
break;
default:
@@ -121,11 +117,12 @@ int handlenetworking(void)
return 1;
}
int oktoleave(char *errormessage)
int oktoleave(void)
{
struct keyvalue *kv = initkeyvalues();
char temp[STRING_SIZE];
int configtype;
int rc;
if (!(readkeyvalues(kv, CONFIG_ROOT "/ethernet/settings")))
{
@@ -142,27 +139,35 @@ int oktoleave(char *errormessage)
strcpy(temp, ""); findkey(kv, "GREEN_DEV", temp);
if (!(strlen(temp)))
{
strcpy(errormessage, ctr[TR_NO_GREEN_INTERFACE]);
goto EXIT;
errorbox(ctr[TR_NO_GREEN_INTERFACE]);
freekeyvalues(kv);
return 0;
}
if (!(interfacecheck(kv, "GREEN")))
{
strcpy(errormessage, ctr[TR_MISSING_GREEN_IP]);
goto EXIT;
errorbox(ctr[TR_MISSING_GREEN_IP]);
freekeyvalues(kv);
return 0;
}
}
if (HAS_RED)
{
strcpy(temp, ""); findkey(kv, "RED_DEV", temp);
if (!(strlen(temp)))
{
strcpy(errormessage, ctr[TR_NO_RED_INTERFACE]);
goto EXIT;
rc = newtWinChoice(ctr[TR_ERROR], ctr[TR_OK], ctr[TR_IGNORE], ctr[TR_NO_RED_INTERFACE]);
if (rc == 0 || rc == 1)
{
freekeyvalues(kv);
return 0;
}
}
if (!(interfacecheck(kv, "RED")))
{
strcpy(errormessage, ctr[TR_MISSING_RED_IP]);
goto EXIT;
errorbox(ctr[TR_MISSING_RED_IP]);
freekeyvalues(kv);
return 0;
}
}
if (HAS_ORANGE)
@@ -170,13 +175,15 @@ int oktoleave(char *errormessage)
strcpy(temp, ""); findkey(kv, "ORANGE_DEV", temp);
if (!(strlen(temp)))
{
strcpy(errormessage, ctr[TR_NO_ORANGE_INTERFACE]);
goto EXIT;
errorbox(ctr[TR_NO_ORANGE_INTERFACE]);
freekeyvalues(kv);
return 0;
}
if (!(interfacecheck(kv, "ORANGE")))
{
strcpy(errormessage, ctr[TR_MISSING_ORANGE_IP]);
goto EXIT;
errorbox(ctr[TR_MISSING_ORANGE_IP]);
freekeyvalues(kv);
return 0;
}
}
if (HAS_BLUE)
@@ -184,13 +191,15 @@ int oktoleave(char *errormessage)
strcpy(temp, ""); findkey(kv, "BLUE_DEV", temp);
if (!(strlen(temp)))
{
strcpy(errormessage, ctr[TR_NO_BLUE_INTERFACE]);
goto EXIT;
errorbox(ctr[TR_NO_BLUE_INTERFACE]);
freekeyvalues(kv);
return 0;
}
if (!(interfacecheck(kv, "BLUE")))
{
strcpy(errormessage, ctr[TR_MISSING_BLUE_IP]);
goto EXIT;
errorbox(ctr[TR_MISSING_BLUE_IP]);
freekeyvalues(kv);
return 0;
}
}
if (configtype == 0)
@@ -198,24 +207,19 @@ int oktoleave(char *errormessage)
strcpy(temp, ""); findkey(kv, "DNS1", temp);
if (!(strlen(temp)))
{
strcpy(errormessage, ctr[TR_MISSING_DNS]);
goto EXIT;
errorbox(ctr[TR_MISSING_DNS]);
freekeyvalues(kv);
return 0;
}
strcpy(temp, ""); findkey(kv, "DEFAULT_GATEWAY", temp);
if (!(strlen(temp)))
{
strcpy(errormessage, ctr[TR_MISSING_DEFAULT]);
goto EXIT;
errorbox(ctr[TR_MISSING_DEFAULT]);
freekeyvalues(kv);
return 0;
}
}
strcpy(errormessage, "");
EXIT:
freekeyvalues(kv);
if (strlen(errormessage))
return 0;
else
return 1;
return 1;
}
@@ -284,8 +288,6 @@ int configtypemenu(void)
findkey(kv, "CONFIG_TYPE", temp); choise = atol(temp);
choise--;
do
{
sprintf(message, ctr[TR_NETWORK_CONFIGURATION_TYPE_LONG], NAME);
rc = newtWinMenu(ctr[TR_NETWORK_CONFIGURATION_TYPE], message, 50, 5, 5,
6, configtypenames, &choise, ctr[TR_OK], ctr[TR_CANCEL], NULL);
@@ -293,8 +295,6 @@ int configtypemenu(void)
sprintf(message, ctr[TR_NOT_ENOUGH_INTERFACES] , configtypecards[choise], found);
errorbox(message);
}
}
while ( configtypecards[choise] > found);
if (rc == 0 || rc == 1)
{