svn commit: trunk/busybox/libbb
vda at busybox.net
vda at busybox.net
Tue Jun 19 11:24:48 UTC 2007
Author: vda
Date: 2007-06-19 04:24:47 -0700 (Tue, 19 Jun 2007)
New Revision: 18850
Log:
make /etc/network parsing configurable. -200 bytes when off.
Modified:
trunk/busybox/libbb/Config.in
trunk/busybox/libbb/inet_common.c
Changeset:
Modified: trunk/busybox/libbb/Config.in
===================================================================
--- trunk/busybox/libbb/Config.in 2007-06-19 11:12:46 UTC (rev 18849)
+++ trunk/busybox/libbb/Config.in 2007-06-19 11:24:47 UTC (rev 18850)
@@ -26,6 +26,14 @@
2 3.0 5088
3 (smallest) 5.1 4912
+config FEATURE_ETC_NETWORKS
+ bool "Support for /etc/networks"
+ default n
+ help
+ Enable support for network names in /etc/networks. This is
+ a rarely used feature which allows you to use names
+ instead of IP/mask pairs in route command.
+
config FEATURE_EDITING
bool "Command line editing"
default n
Modified: trunk/busybox/libbb/inet_common.c
===================================================================
--- trunk/busybox/libbb/inet_common.c 2007-06-19 11:12:46 UTC (rev 18849)
+++ trunk/busybox/libbb/inet_common.c 2007-06-19 11:24:47 UTC (rev 18850)
@@ -14,7 +14,9 @@
int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
{
struct hostent *hp;
+#if ENABLE_FEATURE_ETC_NETWORKS
struct netent *np;
+#endif
/* Grmpf. -FvK */
s_in->sin_family = AF_INET;
@@ -43,6 +45,7 @@
return 0;
}
}
+#if ENABLE_FEATURE_ETC_NETWORKS
/* Try the NETWORKS database to see if this is a known network. */
#ifdef DEBUG
bb_error_msg("getnetbyname(%s)", name);
@@ -52,6 +55,7 @@
s_in->sin_addr.s_addr = htonl(np->n_net);
return 1;
}
+#endif
if (hostfirst) {
/* Don't try again */
return -1;
@@ -140,10 +144,7 @@
ent = gethostbyaddr((char *) &ad, 4, AF_INET);
if (ent)
name = xstrdup(ent->h_name);
- } else {
- /* Hmmm... this is very rare to have named nets,
- * and this getnetbyaddr() call is the only one in bbox.
- * Maybe get rid of or make configurable? */
+ } else if (ENABLE_FEATURE_ETC_NETWORKS) {
struct netent *np;
#ifdef DEBUG
bb_error_msg("getnetbyaddr (%08x)", (unsigned)host_ad);
More information about the busybox-cvs
mailing list