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

ll_proto.c: code shrink

Browse Source 
text    data     bss     dec     hex filename
    762       0       0     762     2fa ll_proto.o.old
    526       0       0     526     20e ll_proto.o

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-09-02 14:29:45 +02:00
parent a0fd4a789c
commit 405dafffbb
1 changed files with 86 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
networking/libiproute/ll_proto.c
View File

@ -14,19 +14,10 @@
#include <netinet/if_ether.h> #include <netinet/if_ether.h>
#if !ENABLE_WERROR /* Please conditionalize exotic protocols on CONFIG_something */
#warning de-bloat
#endif
/* Before re-enabling this, please (1) conditionalize exotic protocols
* on CONFIG_something, and (2) decouple strings and numbers
* (use llproto_ids[] = n,n,n..; and llproto_names[] = "loop\0" "pup\0" ...;)
*/
#define __PF(f,n) { ETH_P_##f, #n }, static const uint16_t llproto_ids[] =
static struct { #define __PF(f,n) ETH_P_##f,
int id;
const char *name;
} llproto_names[] = {
__PF(LOOP,loop) __PF(LOOP,loop)
__PF(PUP,pup) __PF(PUP,pup)
#ifdef ETH_P_PUPAT #ifdef ETH_P_PUPAT
@ -86,9 +77,77 @@ __PF(IRDA,irda)
__PF(ECONET,econet) __PF(ECONET,econet)
#endif #endif
{ 0x8100, "802.1Q" }, 0x8100,
{ ETH_P_IP, "ipv4" }, ETH_P_IP
}; ;
#undef __PF
/* Keep declarations above and below in sync! */
static const char llproto_names[] =
#define __PF(f,n) #n "\0"
__PF(LOOP,loop)
__PF(PUP,pup)
#ifdef ETH_P_PUPAT
__PF(PUPAT,pupat)
#endif
__PF(IP,ip)
__PF(X25,x25)
__PF(ARP,arp)
__PF(BPQ,bpq)
#ifdef ETH_P_IEEEPUP
__PF(IEEEPUP,ieeepup)
#endif
#ifdef ETH_P_IEEEPUPAT
__PF(IEEEPUPAT,ieeepupat)
#endif
__PF(DEC,dec)
__PF(DNA_DL,dna_dl)
__PF(DNA_RC,dna_rc)
__PF(DNA_RT,dna_rt)
__PF(LAT,lat)
__PF(DIAG,diag)
__PF(CUST,cust)
__PF(SCA,sca)
__PF(RARP,rarp)
__PF(ATALK,atalk)
__PF(AARP,aarp)
__PF(IPX,ipx)
__PF(IPV6,ipv6)
#ifdef ETH_P_PPP_DISC
__PF(PPP_DISC,ppp_disc)
#endif
#ifdef ETH_P_PPP_SES
__PF(PPP_SES,ppp_ses)
#endif
#ifdef ETH_P_ATMMPOA
__PF(ATMMPOA,atmmpoa)
#endif
#ifdef ETH_P_ATMFATE
__PF(ATMFATE,atmfate)
#endif
__PF(802_3,802_3)
__PF(AX25,ax25)
__PF(ALL,all)
__PF(802_2,802_2)
__PF(SNAP,snap)
__PF(DDCMP,ddcmp)
__PF(WAN_PPP,wan_ppp)
__PF(PPP_MP,ppp_mp)
__PF(LOCALTALK,localtalk)
__PF(PPPTALK,ppptalk)
__PF(TR_802_2,tr_802_2)
__PF(MOBITEX,mobitex)
__PF(CONTROL,control)
__PF(IRDA,irda)
#ifdef ETH_P_ECONET
__PF(ECONET,econet)
#endif
"802.1Q" "\0"
"ipv4" "\0"
;
#undef __PF #undef __PF
@ -96,23 +155,26 @@ const char* FAST_FUNC ll_proto_n2a(unsigned short id, char *buf, int len)
{ {
unsigned i; unsigned i;
id = ntohs(id); id = ntohs(id);
for (i = 0; i < ARRAY_SIZE(llproto_names); i++) { for (i = 0; i < ARRAY_SIZE(llproto_ids); i++) {
if (llproto_names[i].id == id) if (llproto_ids[i] == id)
return llproto_names[i].name; return nth_string(llproto_names, i);
} }
snprintf(buf, len, "[%d]", id); snprintf(buf, len, "[%u]", id);
return buf; return buf;
} }
int FAST_FUNC ll_proto_a2n(unsigned short *id, char *buf) int FAST_FUNC ll_proto_a2n(unsigned short *id, char *buf)
{ {
unsigned i; unsigned i;
for (i = 0; i < ARRAY_SIZE(llproto_names); i++) { const char *name = llproto_names;
if (strcasecmp(llproto_names[i].name, buf) == 0) { for (i = 0; i < ARRAY_SIZE(llproto_ids); i++) {
i = llproto_names[i].id; if (strcasecmp(name, buf) == 0) {
goto good; i = llproto_ids[i];
} goto good;
}
name += strlen(name) + 1;
} }
errno = 0;
i = bb_strtou(buf, NULL, 0); i = bb_strtou(buf, NULL, 0);
if (errno || i > 0xffff) if (errno || i > 0xffff)
return -1; return -1;