Renamed flow_entry_direction to flow_direction to be little shorter. Changed enum value names to be in upper case.
Signed-off-by: Vadim Kochan <[email protected]> --- flowtop.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flowtop.c b/flowtop.c index 54a749a..6496e44 100644 --- a/flowtop.c +++ b/flowtop.c @@ -99,6 +99,14 @@ struct flow_list { #define INCLUDE_ICMP (1 << 5) #define INCLUDE_SCTP (1 << 6) +enum flow_direction { + FLOW_DIR_SRC, + FLOW_DIR_DST, +}; + +#define SELFLD(dir,src_member,dst_member) \ + (((dir) == FLOW_DIR_SRC) ? n->src_member : n->dst_member) + struct sysctl_params_ctx { int nfct_acct; int nfct_tstamp; @@ -631,16 +639,8 @@ static void flow_entry_from_ct(struct flow_entry *n, const struct nf_conntrack * n->ip4_dst_addr = ntohl(n->ip4_dst_addr); } -enum flow_entry_direction { - flow_entry_src, - flow_entry_dst, -}; - -#define SELFLD(dir,src_member,dst_member) \ - (((dir) == flow_entry_src) ? n->src_member : n->dst_member) - static void flow_entry_get_sain4_obj(const struct flow_entry *n, - enum flow_entry_direction dir, + enum flow_direction dir, struct sockaddr_in *sa) { memset(sa, 0, sizeof(*sa)); @@ -649,7 +649,7 @@ static void flow_entry_get_sain4_obj(const struct flow_entry *n, } static void flow_entry_get_sain6_obj(const struct flow_entry *n, - enum flow_entry_direction dir, + enum flow_direction dir, struct sockaddr_in6 *sa) { memset(sa, 0, sizeof(*sa)); @@ -661,7 +661,7 @@ static void flow_entry_get_sain6_obj(const struct flow_entry *n, static void flow_entry_geo_city_lookup_generic(struct flow_entry *n, - enum flow_entry_direction dir) + enum flow_direction dir) { struct sockaddr_in sa4; struct sockaddr_in6 sa6; @@ -693,7 +693,7 @@ flow_entry_geo_city_lookup_generic(struct flow_entry *n, static void flow_entry_geo_country_lookup_generic(struct flow_entry *n, - enum flow_entry_direction dir) + enum flow_direction dir) { struct sockaddr_in sa4; struct sockaddr_in6 sa6; @@ -724,7 +724,7 @@ flow_entry_geo_country_lookup_generic(struct flow_entry *n, } static void flow_entry_get_extended_geo(struct flow_entry *n, - enum flow_entry_direction dir) + enum flow_direction dir) { if (resolve_geoip) { flow_entry_geo_city_lookup_generic(n, dir); @@ -733,7 +733,7 @@ static void flow_entry_get_extended_geo(struct flow_entry *n, } static void flow_entry_get_extended_revdns(struct flow_entry *n, - enum flow_entry_direction dir) + enum flow_direction dir) { size_t sa_len; struct sockaddr_in sa4; @@ -792,12 +792,12 @@ static void flow_entry_get_extended(struct flow_entry *n) return; if (show_src) { - flow_entry_get_extended_revdns(n, flow_entry_src); - flow_entry_get_extended_geo(n, flow_entry_src); + flow_entry_get_extended_revdns(n, FLOW_DIR_SRC); + flow_entry_get_extended_geo(n, FLOW_DIR_SRC); } - flow_entry_get_extended_revdns(n, flow_entry_dst); - flow_entry_get_extended_geo(n, flow_entry_dst); + flow_entry_get_extended_revdns(n, FLOW_DIR_DST); + flow_entry_get_extended_geo(n, FLOW_DIR_DST); /* Lookup application */ n->inode = get_port_inode(n->port_src, n->l4_proto, -- 2.6.1 -- You received this message because you are subscribed to the Google Groups "netsniff-ng" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
