From 1cc762aa8f89a5e4324f1482d97affa5ef6298bd Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 13 Jun 2014 14:53:00 +0200 Subject: lookup: Move UDP/TCP port and Ethernet type lookup into own module Up to now, the lookup of TCP/UDP port names and Ethernet types was tightly integrated with the dissector infrastructure, since it is its main user. However, flowtop also makes use of the name lookup functionality without needing the actual dissector infrastructure. Thus, the basic dissector infrastructure also needs to be linked into flowtop without actually being used. Fix this by extracting the port/ethertype lookup into an own module which can then be used either directly (for flowtop) or as part of the dissector infrastructure (for netsniff-ng). This also reverts the quick & dirty fix introduced in commit f3322c6 ("flowtop: Include netlink dissector to fix build temporarily"). Signed-off-by: Tobias Klauser --- dissector_eth.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'dissector_eth.h') diff --git a/dissector_eth.h b/dissector_eth.h index c02213f..6d14809 100644 --- a/dissector_eth.h +++ b/dissector_eth.h @@ -16,10 +16,6 @@ extern struct hash_table eth_lay3; extern void dissector_init_ethernet(int fnttype); extern void dissector_cleanup_ethernet(void); -extern char *lookup_port_udp(unsigned int id); -extern char *lookup_port_tcp(unsigned int id); -extern char *lookup_ether_type(unsigned int id); - #ifdef HAVE_DISSECTOR_PROTOS static inline struct protocol *dissector_get_ethernet_entry_point(void) { -- cgit v1.2.3-54-g00ecf