Attachment 179142 Details for Bug 216317 – Patch to remove inline functions

[patch] Patch to remove inline functions

patch-inline (text/plain), 25.19 KB, created by Victor Sudakov on 2017-01-20 16:37:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Victor Sudakov

Created: 2017-01-20 16:37:34 UTC

Size: 25.19 KB

patch

obsolete

>--- lib/ftfil.c.bak	2004-01-05 17:55:23.000000000 +0000
>+++ lib/ftfil.c	2017-01-20 05:47:47.508438000 +0000
>@@ -357,109 +357,109 @@
> static int parse_primitive_type_double(struct line_parser *lp,
>   struct ftfil *ftfil);
> static int parse_primitive_type_rate(struct line_parser *lp,
>   struct ftfil *ftfil);
> 
>-inline int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
>+int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
>   struct fts3rec_offsets *fo);
>-inline int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
>+int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
>   struct fts3rec_offsets *fo);
>-inline int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
>+int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
>+int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
>+int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
>+int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
>   char *rec, struct fts3rec_offsets *fo); 
>-inline int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
>+int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
>+int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
>+int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
>+int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
>+int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len
>+int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len
>   *lookup, char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len
>+int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len
>   *lookup, char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
>+int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
>   struct fts3rec_offsets *fo);
>-inline int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
>+int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
>   struct fts3rec_offsets *fo);
>-inline int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
>+int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
>   struct fts3rec_offsets *fo);
>-inline int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
>+int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
>   struct fts3rec_offsets *fo);
>-inline int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
>+int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
>+int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
>   struct fts3rec_offsets *fo);
> 
>-inline int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
>+int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
>+int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
>-inline int eval_match_start_time(struct ftfil_lookup_time *lookup,
>+int eval_match_start_time(struct ftfil_lookup_time *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_end_time(struct ftfil_lookup_time *lookup,
>+int eval_match_end_time(struct ftfil_lookup_time *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
>-inline int eval_match_src_tag_l(struct ftfil_lookup_tag_mask *lookup,
>+int eval_match_src_tag_l(struct ftfil_lookup_tag_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
>+int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_dst_tag_l(struct ftfil_lookup_tag_mask *lookup,
>+int eval_match_dst_tag_l(struct ftfil_lookup_tag_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
>+int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
>-inline int eval_match_ip_sc_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_sc_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_sc_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_sc_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_sc_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_sc_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
>-inline int eval_match_ip_nexthop_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_nexthop_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_nexthop_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_nexthop_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_nexthop_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_nexthop_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
>-inline int eval_match_ip_src_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_src_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_src_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_src_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_src_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_src_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
>-inline int eval_match_ip_dst_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_dst_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_dst_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_dst_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_dst_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_dst_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
>-inline int eval_match_ip_exporter_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_exporter_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_exporter_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_exporter_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_ip_exporter_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_exporter_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
>-inline int eval_match_pps(struct ftfil_lookup_double *lookup,
>+int eval_match_pps(struct ftfil_lookup_double *lookup,
>   char *rec, struct fts3rec_offsets *fo);
>-inline int eval_match_bps(struct ftfil_lookup_double *lookup,
>+int eval_match_bps(struct ftfil_lookup_double *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
>-inline int eval_match_random_sample(struct ftfil_lookup_rate *lookup,
>+int eval_match_random_sample(struct ftfil_lookup_rate *lookup,
>   char *rec, struct fts3rec_offsets *fo);
> 
> static int resolve_primitives(struct ftfil *ftfil);
> 
> #define NEXT_WORD(A,B)\
>@@ -545,11 +545,11 @@
>  * Evalute src_as
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
>+int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   u_int16 *src_as;
>   int val;
> 
>@@ -572,11 +572,11 @@
>  * Evalute dst_as
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
>+int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   u_int16 *dst_as;
>   int val;
> 
>@@ -600,11 +600,11 @@
>  * Evalute ip_prot
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
>+int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   u_int8 *ip_prot;
>   int val;
> 
>@@ -628,11 +628,11 @@
>  * Evalute ip_src_prefix_len
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
>+int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int8 *src_mask;
>   int val;
> 
>@@ -656,11 +656,11 @@
>  * Evalute ip_dst_prefix_len
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
>+int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int8 *dst_mask;
>   int val;
> 
>@@ -684,11 +684,11 @@
>  * Evalute ip_tos
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
>+int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int8 tos;
>   int val;
> 
>@@ -712,11 +712,11 @@
>  * Evalute marked_ip_tos
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
>+int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int8 marked_tos;
>   int val;
> 
>@@ -741,11 +741,11 @@
>  * Evalute ip_tcp_flags
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
>+int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int8 tcp_flags;
>   int val;
> 
>@@ -770,11 +770,11 @@
>  * Evalute ip_src_port
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
>+int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int16 *src_port;
>   int val;
> 
>@@ -797,11 +797,11 @@
>  * Evalute ip_dst_port
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
>+int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int16 *dst_port;
>   int val;
> 
>@@ -825,11 +825,11 @@
>  * Evalute src_if_index
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
>+int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int16 *src_if_index;
>   int val;
> 
>@@ -852,11 +852,11 @@
>  * Evalute dst_if_index
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
>+int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int16 *dst_if_index;
>   int val;
> 
>@@ -880,11 +880,11 @@
>  * Evalute engine_id
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
>+int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int8 *engine_id;
>   int val;
> 
>@@ -908,11 +908,11 @@
>  * Evalute engine_type
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
>+int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   u_int8 *engine_type;
>   int val;
> 
>@@ -935,11 +935,11 @@
>  * Evalute flows
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
>+int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_counter_rec *ftflcr;
>   u_int32 *flows;
>   int t, match;
>@@ -1000,11 +1000,11 @@
>  * Evalute octets
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
>+int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_counter_rec *ftflcr;
>   u_int32 *octets;
>   int t, match;
>@@ -1065,11 +1065,11 @@
>  * Evalute packets
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
>+int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_counter_rec *ftflcr;
>   u_int32 *packets;
>   int t, match;
>@@ -1130,11 +1130,11 @@
>  * Evalute xtra_packets
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
>+int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_counter_rec *ftflcr;
>   u_int32 *xtra_packets;
>   int t, match;
>@@ -1195,11 +1195,11 @@
>  * Evalute duration
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
>+int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_counter_rec *ftflcr;
>   u_int32 duration, *first, *last;
>   int t, match;
>@@ -1262,11 +1262,11 @@
>  * Evalute start_time_date
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
>+int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_counter_rec *ftflcr;
>   struct fttime ftt;
>   u_int32 *sysUpTime, *unix_secs, *unix_nsecs, *First;
>@@ -1333,11 +1333,11 @@
>  * Evalute end_time_date
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
>+int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_counter_rec *ftflcr;
>   struct fttime ftt;
>   u_int32 *sysUpTime, *unix_secs, *unix_nsecs, *Last;
>@@ -1404,11 +1404,11 @@
>  * Evalute start_time
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_start_time(struct ftfil_lookup_time *lookup,
>+int eval_match_start_time(struct ftfil_lookup_time *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   time_t t1, t2;
>   struct tm *tm;
>   struct ftfil_lookup_time_rec *ftfltmer;
>@@ -1494,11 +1494,11 @@
>  * Evalute end_time
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_end_time(struct ftfil_lookup_time *lookup,
>+int eval_match_end_time(struct ftfil_lookup_time *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   time_t t1, t2;
>   struct tm *tm;
>   struct ftfil_lookup_time_rec *ftfltmer;
>@@ -1584,11 +1584,11 @@
>  * Evalute src_tag as list
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_src_tag_l(struct ftfil_lookup_tag_mask *lookup,
>+int eval_match_src_tag_l(struct ftfil_lookup_tag_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_tag_mask_rec *ftfltmr;
>   u_int32 *src_tag;
>   int match;
>@@ -1622,11 +1622,11 @@
>  * Evalute src_tag as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
>+int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftchash_rec_fil_c32 *ftch_recfc32p;
>   u_int32 *src_tag, hash;
>   int match;
>@@ -1656,11 +1656,11 @@
>  * Evalute dst_tag as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
>+int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftchash_rec_fil_c32 *ftch_recfc32p;
>   u_int32 *dst_tag, hash;
>   int match;
>@@ -1690,11 +1690,11 @@
>  * Evalute dst_tag as list
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_dst_tag_l(struct ftfil_lookup_tag_mask *lookup,
>+int eval_match_dst_tag_l(struct ftfil_lookup_tag_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_tag_mask_rec *ftfltmr;
>   u_int32 *dst_tag;
>   int match;
>@@ -1728,11 +1728,11 @@
>  * Evalute nexthop as list
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_nexthop_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_nexthop_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_mask_rec *ftflipmr;
>   u_int32 *nexthop;
>   int match;
>@@ -1766,11 +1766,11 @@
>  * Evalute nexthop as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_nexthop_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_nexthop_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftchash_rec_fil_c32 *ftch_recfc32p;
>   u_int32 *nexthop, hash;
>   int match;
>@@ -1800,11 +1800,11 @@
>  * Evalute nexthop as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_nexthop_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_nexthop_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_prefix_rec *ftflipprr;
>   struct radix_node_head *rhead;
>   struct radix_sockaddr_in sock1;
>@@ -1837,11 +1837,11 @@
>  * Evalute sc as list
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_sc_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_sc_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_mask_rec *ftflipmr;
>   u_int32 *sc;
>   int match;
>@@ -1875,11 +1875,11 @@
>  * Evalute sc as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_sc_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_sc_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftchash_rec_fil_c32 *ftch_recfc32p;
>   u_int32 *sc, hash;
>   int match;
>@@ -1909,11 +1909,11 @@
>  * Evalute sc as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_sc_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_sc_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_prefix_rec *ftflipprr;
>   struct radix_node_head *rhead;
>   struct radix_sockaddr_in sock1;
>@@ -1946,11 +1946,11 @@
>  * Evalute ip_src_addr as list
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_src_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_src_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_mask_rec *ftflipmr;
>   u_int32 *ip_src_addr;
>   int match;
>@@ -1984,11 +1984,11 @@
>  * Evalute ip_src_addr as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_src_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_src_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftchash_rec_fil_c32 *ftch_recfc32p;
>   u_int32 *ip_src_addr, hash;
>   int match;
>@@ -2018,11 +2018,11 @@
>  * Evalute ip_src_addr as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_src_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_src_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_prefix_rec *ftflipprr;
>   struct radix_node_head *rhead;
>   struct radix_sockaddr_in sock1;
>@@ -2055,11 +2055,11 @@
>  * Evalute ip_dst_addr as list
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_dst_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_dst_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_mask_rec *ftflipmr;
>   u_int32 *ip_dst_addr;
>   int match;
>@@ -2093,11 +2093,11 @@
>  * Evalute ip_dst_addr as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_dst_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_dst_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftchash_rec_fil_c32 *ftch_recfc32p;
>   u_int32 *ip_dst_addr, hash;
>   int match;
>@@ -2127,11 +2127,11 @@
>  * Evalute ip_dst_addr as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_dst_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_dst_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_prefix_rec *ftflipprr;
>   struct radix_node_head *rhead;
>   struct radix_sockaddr_in sock1;
>@@ -2164,11 +2164,11 @@
>  * Evalute ip_exporter_addr as list
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_exporter_addr_l(struct ftfil_lookup_ip_mask *lookup,
>+int eval_match_ip_exporter_addr_l(struct ftfil_lookup_ip_mask *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_mask_rec *ftflipmr;
>   u_int32 *ip_exporter_addr;
>   int match;
>@@ -2202,11 +2202,11 @@
>  * Evalute ip_exporter_addr as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_exporter_addr_h(struct ftfil_lookup_ip_address *lookup,
>+int eval_match_ip_exporter_addr_h(struct ftfil_lookup_ip_address *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftchash_rec_fil_c32 *ftch_recfc32p;
>   u_int32 *ip_exporter_addr, hash;
>   int match;
>@@ -2236,11 +2236,11 @@
>  * Evalute ip_exporter_addr as hash
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_ip_exporter_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>+int eval_match_ip_exporter_addr_r(struct ftfil_lookup_ip_prefix *lookup,
>   char *rec, struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_ip_prefix_rec *ftflipprr;
>   struct radix_node_head *rhead;
>   struct radix_sockaddr_in sock1;
>@@ -2273,11 +2273,11 @@
>  * Evalute Bits Per Second
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_bps(struct ftfil_lookup_double *lookup, char *rec,
>+int eval_match_bps(struct ftfil_lookup_double *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_double_rec *ftfldr;
>   double bps;
>   u_int32 dOctets, Last, First, duration;
>@@ -2347,11 +2347,11 @@
>  * Evalute Packets Per Second
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_pps(struct ftfil_lookup_double *lookup, char *rec,
>+int eval_match_pps(struct ftfil_lookup_double *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   struct ftfil_lookup_double_rec *ftfldr;
>   double pps;
>   u_int32 dPkts, Last, First, duration;
>@@ -2421,11 +2421,11 @@
>  * Evalute random_sample
>  *
>  * returns: FT_FIL_MODE_PERMIT
>  *          FT_FIL_MODE_DENY
>  */
>-inline int eval_match_random_sample(struct ftfil_lookup_rate *lookup, char *rec,
>+int eval_match_random_sample(struct ftfil_lookup_rate *lookup, char *rec,
>   struct fts3rec_offsets *fo)
> {
>   int val;
> 
>   /* val is a random number from 0..lookup->rate-1 */

Actions: View | Diff

Attachments on bug 216317: 179142 | 179207