[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-cvs
Subject: [IPCop-cvs] ipcop/src/install+setup/setup dhcp.c,1.10,1.11 main.c,1.6,1.7 networking.c,1.6,1.7
From: Mark Wormgoor <riddles () users ! sourceforge ! net>
Date: 2005-03-29 18:45:33
Message-ID: E1DGLj2-0007NX-P5 () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/ipcop/ipcop/src/install+setup/setup
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25484/src/install+setup/setup
Modified Files:
dhcp.c main.c networking.c
Log Message:
Merging all changes from 1.4 back into trunk
Index: networking.c
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/install+setup/setup/networking.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** networking.c 9 Jun 2004 14:22:03 -0000 1.6
--- networking.c 29 Mar 2005 18:45:31 -0000 1.7
***************
*** 699,703 ****
char message[1000];
char temp[STRING_SIZE] = "0";
! struct newtWinEntry entries[DNSGATEWAY_TOTAL];
char *values[DNSGATEWAY_TOTAL]; /* pointers for the values. */
int error;
--- 699,703 ----
char message[1000];
char temp[STRING_SIZE] = "0";
! struct newtWinEntry entries[DNSGATEWAY_TOTAL+1];
char *values[DNSGATEWAY_TOTAL]; /* pointers for the values. */
int error;
Index: main.c
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/install+setup/setup/main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** main.c 20 Sep 2004 13:42:34 -0000 1.6
--- main.c 29 Mar 2005 18:45:31 -0000 1.7
***************
*** 36,39 ****
--- 36,40 ----
extern char *it_tr[];
extern char *el_tr[];
+ extern char *so_tr[];
extern char *sv_tr[];
extern char *no_tr[];
***************
*** 48,53 ****
char **langtrs[] = { en_tr, NULL };
#else
! char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", \
"la", "hu", "nl", "no", "pl", "pt", "fi", "sv", "tr", "vi", NULL };
! char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, \
it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL }; \
#endif int choice;
--- 49,54 ----
char **langtrs[] = { en_tr, NULL };
#else
! char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", \
"la", "hu", "nl", "no", "pl", "pt", "so", "fi", "sv", "tr", "vi", \
NULL };
! char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, \
it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, \
NULL }; #endif
int choice;
Index: dhcp.c
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/install+setup/setup/dhcp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dhcp.c 9 Jun 2004 14:22:03 -0000 1.10
--- dhcp.c 29 Mar 2005 18:45:31 -0000 1.11
***************
*** 50,55 ****
ctr[TR_PRIMARY_DNS], ctr[TR_SECONDARY_DNS], ctr[TR_DEFAULT_LEASE],
ctr[TR_MAX_LEASE], ctr[TR_DOMAIN_NAME_SUFFIX] };
! char *varnames[MAX_BOXES] = { "START_ADDR", "END_ADDR", "DNS1", "DNS2",
! "DEFAULT_LEASE_TIME", "MAX_LEASE_TIME", "DOMAIN_NAME"};
char defaults[MAX_BOXES][STRING_SIZE];
int result;
--- 50,57 ----
ctr[TR_PRIMARY_DNS], ctr[TR_SECONDARY_DNS], ctr[TR_DEFAULT_LEASE],
ctr[TR_MAX_LEASE], ctr[TR_DOMAIN_NAME_SUFFIX] };
! char *varnames[MAX_BOXES] = { "START_ADDR_GREEN", "END_ADDR_GREEN",
! "DNS1_GREEN", "DNS2_GREEN",
! "DEFAULT_LEASE_TIME_GREEN", "MAX_LEASE_TIME_GREEN",
! "DOMAIN_NAME_GREEN"};
char defaults[MAX_BOXES][STRING_SIZE];
int result;
***************
*** 105,109 ****
newtFormAddComponent(dhcpform, header);
! strcpy(temp, ""); findkey(dhcpkv, "ENABLE", temp);
if (strcmp(temp, "on") == 0)
startenabled = '*';
--- 107,111 ----
newtFormAddComponent(dhcpform, header);
! strcpy(temp, ""); findkey(dhcpkv, "ENABLE_GREEN", temp);
if (strcmp(temp, "on") == 0)
startenabled = '*';
***************
*** 189,200 ****
if (enabledresult == '*')
{
! replacekeyvalue(dhcpkv, "ENABLE", "on");
! fclose(fopen(CONFIG_ROOT "/dhcp/enable", "w"));
! chown(CONFIG_ROOT "/dhcp/enable", 99, 99);
}
else
{
! replacekeyvalue(dhcpkv, "ENABLE", "off");
! unlink(CONFIG_ROOT "/dhcp/enable");
}
replacekeyvalue(dhcpkv, "VALID", "yes");
--- 191,202 ----
if (enabledresult == '*')
{
! replacekeyvalue(dhcpkv, "ENABLE_GREEN", "on");
! fclose(fopen(CONFIG_ROOT "/dhcp/enable_green", "w"));
! chown(CONFIG_ROOT "/dhcp/enable_green", 99, 99);
}
else
{
! replacekeyvalue(dhcpkv, "ENABLE_GREEN", "off");
! unlink(CONFIG_ROOT "/dhcp/enable_green");
}
replacekeyvalue(dhcpkv, "VALID", "yes");
***************
*** 221,225 ****
}
! fprintf(file, "\trange dynamic-bootp %s %s;\n", results[START_ADDRESS], \
results[END_ADDRESS]);
fprintf(file, "\tdefault-lease-time %d;\n", (int) \
atol(results[DEFAULT_LEASE_TIME]) * 60);
fprintf(file, "\tmax-lease-time %d;\n", (int) atol(results[MAX_LEASE_TIME]) * \
60);
--- 223,227 ----
}
! fprintf(file, "\trange %s %s;\n", results[START_ADDRESS], \
results[END_ADDRESS]);
fprintf(file, "\tdefault-lease-time %d;\n", (int) \
atol(results[DEFAULT_LEASE_TIME]) * 60);
fprintf(file, "\tmax-lease-time %d;\n", (int) atol(results[MAX_LEASE_TIME]) * \
60);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
IPCop-cvs mailing list
IPCop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic