emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Busybox CVS version ipcalc have problems:

Browse Source 
- Can`t use 255.255.255.255 address
- typo: double check for valid ip address and uncheck for valid mask

httpd unseted SERVER_PORT (my bug from last_patch111).

last_patch_112 from Vladimir N. Oleynik
This commit is contained in:
Glenn L McGrath 2003-09-12 00:44:50 +00:00
parent 81155f8fa8
commit 14092a1ed2
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
networking/httpd.c
View File

@ -1990,9 +1990,6 @@ int httpd_main(int argc, char *argv[])
if(uid > 0) if(uid > 0)
setuid(uid); setuid(uid);
# endif # endif
# ifdef CONFIG_FEATURE_HTTPD_CGI
addEnvPort("SERVER");
# endif
#endif #endif
#ifdef CONFIG_FEATURE_HTTPD_CGI #ifdef CONFIG_FEATURE_HTTPD_CGI
@ -2005,6 +2002,9 @@ int httpd_main(int argc, char *argv[])
if(p) { if(p) {
setenv("PATH", p, 0); setenv("PATH", p, 0);
} }
# ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
addEnvPort("SERVER");
# endif
} }
#endif #endif

51
networking/ipcalc.c
View File

@ -43,15 +43,14 @@ static unsigned long get_netmask(unsigned long ipaddr)
#ifdef CONFIG_FEATURE_IPCALC_FANCY #ifdef CONFIG_FEATURE_IPCALC_FANCY
static int get_prefix(unsigned long netmask) static int get_prefix(unsigned long netmask)
{ {
unsigned long t; unsigned long msk = 0x80000000;
int ret = 0; int ret = 0;
for (t = 0; t < 32; t++) { netmask = htonl(netmask);
if (htonl(netmask) & (0x80000000 >> t)) { while(msk) {
if (netmask & msk)
ret++; ret++;
} else { msk >>= 1;
break;
}
} }
return ret; return ret;
} }
@ -64,14 +63,16 @@ static int get_prefix(unsigned long netmask)
#define HOSTNAME 0x10 #define HOSTNAME 0x10
#define SILENT 0x20 #define SILENT 0x20
int ipcalc_main(int argc, char **argv) int ipcalc_main(int argc, char **argv)
{ {
unsigned long mode; unsigned long mode;
unsigned long netmask = 0; unsigned long netmask;
unsigned long broadcast; unsigned long broadcast;
unsigned long network; unsigned long network;
unsigned long ipaddr; unsigned long ipaddr;
struct in_addr a;
#ifdef CONFIG_FEATURE_IPCALC_FANCY #ifdef CONFIG_FEATURE_IPCALC_FANCY
unsigned long netprefix = 0; unsigned long netprefix = 0;
@ -116,20 +117,21 @@ int ipcalc_main(int argc, char **argv)
*prefixstr = (char)0; *prefixstr = (char)0;
prefixstr++; prefixstr++;
if (*prefixstr) { if (*prefixstr) {
unsigned int msk;
netprefix = atol(prefixstr); netprefix = atol(prefixstr);
if (netprefix > 32) { if (netprefix > 32) {
IPCALC_MSG(bb_error_msg_and_die("bad IP prefix: %s\n", prefixstr), IPCALC_MSG(bb_error_msg_and_die("bad IP prefix: %s\n", prefixstr),
exit(EXIT_FAILURE)); exit(EXIT_FAILURE));
} }
if (netprefix) { netmask = 0;
netmask = 0x80000000; msk = 0x80000000;
netprefix--; while (netprefix > 0) {
while(netprefix) { netmask |= msk;
netmask = 0x80000000 | (netmask >> 1); msk >>= 1;
netprefix--; netprefix--;
} }
netmask = htonl(netmask); netmask = htonl(netmask);
}
/* Even if it was 0, we will signify that we have a netmask. This allows */ /* Even if it was 0, we will signify that we have a netmask. This allows */
/* for specification of default routes, etc which have a 0 netmask/prefix */ /* for specification of default routes, etc which have a 0 netmask/prefix */
have_netmask = 1; have_netmask = 1;
@ -138,34 +140,37 @@ int ipcalc_main(int argc, char **argv)
} }
prefixstr++; prefixstr++;
} }
ipaddr = inet_addr(ipstr); ipaddr = inet_aton(ipstr, &a);
#else #else
ipaddr = inet_addr(argv[optind]); ipaddr = inet_aton(argv[optind], &a);
#endif #endif
if (ipaddr == INADDR_NONE) { if (ipaddr == 0) {
IPCALC_MSG(bb_error_msg_and_die("bad IP address: %s", argv[optind]), IPCALC_MSG(bb_error_msg_and_die("bad IP address: %s", argv[optind]),
exit(EXIT_FAILURE)); exit(EXIT_FAILURE));
} }
ipaddr = a.s_addr;
if (argc - optind == 2) { if (argc - optind == 2) {
#ifdef CONFIG_FEATURE_IPCALC_FANCY #ifdef CONFIG_FEATURE_IPCALC_FANCY
if (have_netmask == 1) { if (have_netmask) {
IPCALC_MSG(bb_error_msg_and_die("Both prefix and netmask were specified, use one or the other.\n"), IPCALC_MSG(bb_error_msg_and_die("Both prefix and netmask were specified, use one or the other.\n"),
exit(EXIT_FAILURE)); exit(EXIT_FAILURE));
} }
have_netmask = 1;
#endif
netmask = inet_addr(argv[optind + 1]);
}
if (ipaddr == INADDR_NONE) { #endif
netmask = inet_aton(argv[optind + 1], &a);
if (netmask == 0) {
IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[optind + 1]), IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[optind + 1]),
exit(EXIT_FAILURE)); exit(EXIT_FAILURE));
} }
netmask = a.s_addr;
} else {
#ifdef CONFIG_FEATURE_IPCALC_FANCY
if (!have_netmask)
#endif
/* JHC - If the netmask wasn't provided then calculate it */ /* JHC - If the netmask wasn't provided then calculate it */
if (!netmask) {
netmask = get_netmask(ipaddr); netmask = get_netmask(ipaddr);
} }