[Flow-tools] 0.68.4-rc3
Simon Leinen
simon.leinen at switch.ch
Thu Mar 27 19:18:14 EDT 2008
Paul P Komkoff writes:
> Hi!
> The last one before I push the button:
> http://flow-tools.googlecode.com/files/flow-tools-0.68.4-rc3.tar.bz2
> Please test it on *BSD and some Solaris.
I tried to compile this under Solaris 9 using Sun's compiler
(SunStudio 12), and I found that I had to turn some "inline" function
definitions to "static inline"; otherwise I would get undefined
symbols during linkage. I'm including a patch.
With the patch, flow-tools compiles more or less cleanly - there are
some type mismatch warnings (mostly for function types), and some
"initializer out of range" warnings ("unsigned char" rather than just
"char" would often help). Unfortunately I cannot easily test whether
the resulting binaries work properly.
Regards,
--
Simon.
*** /tmp/T0sxaiNn Fri Mar 28 00:14:19 2008
--- flow-tools-0.68.4-rc3/lib/ftfil.c Fri Mar 28 00:08:12 2008
***************
*** 355,459 ****
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,
struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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
*lookup, char *rec, struct fts3rec_offsets *fo);
! inline 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,
struct fts3rec_offsets *fo);
! inline 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,
struct fts3rec_offsets *fo);
! inline 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,
struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
! inline 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,
char *rec, struct fts3rec_offsets *fo);
static int resolve_primitives(struct ftfil *ftfil);
--- 355,459 ----
static int parse_primitive_type_rate(struct line_parser *lp,
struct ftfil *ftfil);
! static inline int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
struct fts3rec_offsets *fo);
! static inline int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
struct fts3rec_offsets *fo);
! static inline int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len
*lookup, char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len
*lookup, char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
struct fts3rec_offsets *fo);
! static inline int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo);
! static inline int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo);
! static inline int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo);
! static inline int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo);
! static inline int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_start_time(struct ftfil_lookup_time *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_end_time(struct ftfil_lookup_time *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_src_tag_l(struct ftfil_lookup_tag_mask *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_dst_tag_l(struct ftfil_lookup_tag_mask *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_sc_addr_l(struct ftfil_lookup_ip_mask *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_sc_addr_h(struct ftfil_lookup_ip_address *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_sc_addr_r(struct ftfil_lookup_ip_prefix *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_nexthop_addr_l(struct ftfil_lookup_ip_mask *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_nexthop_addr_h(struct ftfil_lookup_ip_address *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_nexthop_addr_r(struct ftfil_lookup_ip_prefix *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_src_addr_l(struct ftfil_lookup_ip_mask *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_src_addr_h(struct ftfil_lookup_ip_address *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_src_addr_r(struct ftfil_lookup_ip_prefix *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_dst_addr_l(struct ftfil_lookup_ip_mask *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_dst_addr_h(struct ftfil_lookup_ip_address *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_dst_addr_r(struct ftfil_lookup_ip_prefix *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_exporter_addr_l(struct ftfil_lookup_ip_mask *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_exporter_addr_h(struct ftfil_lookup_ip_address *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_ip_exporter_addr_r(struct ftfil_lookup_ip_prefix *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_pps(struct ftfil_lookup_double *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_bps(struct ftfil_lookup_double *lookup,
char *rec, struct fts3rec_offsets *fo);
! static inline int eval_match_random_sample(struct ftfil_lookup_rate *lookup,
char *rec, struct fts3rec_offsets *fo);
static int resolve_primitives(struct ftfil *ftfil);
***************
*** 543,549 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
struct fts3rec_offsets *fo)
{
uint16_t *src_as;
--- 543,549 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_src_as(struct ftfil_lookup_as *lookup, char *rec,
struct fts3rec_offsets *fo)
{
uint16_t *src_as;
***************
*** 570,576 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
struct fts3rec_offsets *fo)
{
uint16_t *dst_as;
--- 570,576 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_dst_as(struct ftfil_lookup_as *lookup, char *rec,
struct fts3rec_offsets *fo)
{
uint16_t *dst_as;
***************
*** 598,604 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
struct fts3rec_offsets *fo)
{
uint8_t *ip_prot;
--- 598,604 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_ip_prot(struct ftfil_lookup_ip_prot *lookup, char *rec,
struct fts3rec_offsets *fo)
{
uint8_t *ip_prot;
***************
*** 626,632 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t *src_mask;
--- 626,632 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_ip_src_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t *src_mask;
***************
*** 654,660 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t *dst_mask;
--- 654,660 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_ip_dst_prefix_len(struct ftfil_lookup_ip_prefix_len *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t *dst_mask;
***************
*** 682,688 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t tos;
--- 682,688 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_ip_tos(struct ftfil_lookup_ip_tos *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t tos;
***************
*** 710,716 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t marked_tos;
--- 710,716 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_ip_marked_tos(struct ftfil_lookup_ip_tos *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t marked_tos;
***************
*** 739,745 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t tcp_flags;
--- 739,745 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_ip_tcp_flags(struct ftfil_lookup_ip_tcp_flags *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t tcp_flags;
***************
*** 768,774 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint16_t *src_port;
--- 768,774 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_ip_src_port(struct ftfil_lookup_ip_port *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint16_t *src_port;
***************
*** 795,801 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint16_t *dst_port;
--- 795,801 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_ip_dst_port(struct ftfil_lookup_ip_port *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint16_t *dst_port;
***************
*** 823,829 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint16_t *src_if_index;
--- 823,829 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_src_if_index(struct ftfil_lookup_if_index *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint16_t *src_if_index;
***************
*** 850,856 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint16_t *dst_if_index;
--- 850,856 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_dst_if_index(struct ftfil_lookup_if_index *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint16_t *dst_if_index;
***************
*** 878,884 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t *engine_id;
--- 878,884 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_engine_id(struct ftfil_lookup_engine *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t *engine_id;
***************
*** 906,912 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t *engine_type;
--- 906,912 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_engine_type(struct ftfil_lookup_engine *lookup,
char *rec, struct fts3rec_offsets *fo)
{
uint8_t *engine_type;
***************
*** 933,939 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
--- 933,939 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_flows(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
***************
*** 998,1004 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
--- 998,1004 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_octets(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
***************
*** 1063,1069 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
--- 1063,1069 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_packets(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
***************
*** 1128,1134 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
--- 1128,1134 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_xtra_packets(struct ftfil_lookup_counter *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
***************
*** 1193,1199 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
--- 1193,1199 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_duration(struct ftfil_lookup_counter *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
***************
*** 1260,1266 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
--- 1260,1266 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_start_time_date(struct ftfil_lookup_counter *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
***************
*** 1331,1337 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
--- 1331,1337 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_end_time_date(struct ftfil_lookup_counter *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftfil_lookup_counter_rec *ftflcr;
***************
*** 1402,1408 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_start_time(struct ftfil_lookup_time *lookup,
char *rec, struct fts3rec_offsets *fo)
{
time_t t1, t2;
--- 1402,1408 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_start_time(struct ftfil_lookup_time *lookup,
char *rec, struct fts3rec_offsets *fo)
{
time_t t1, t2;
***************
*** 1492,1498 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_end_time(struct ftfil_lookup_time *lookup,
char *rec, struct fts3rec_offsets *fo)
{
time_t t1, t2;
--- 1492,1498 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_end_time(struct ftfil_lookup_time *lookup,
char *rec, struct fts3rec_offsets *fo)
{
time_t t1, t2;
***************
*** 1582,1588 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1582,1588 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 1620,1626 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftchash_rec_fil_c32 *ftch_recfc32p;
--- 1620,1626 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_src_tag_h(struct ftfil_lookup_tag *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftchash_rec_fil_c32 *ftch_recfc32p;
***************
*** 1654,1660 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftchash_rec_fil_c32 *ftch_recfc32p;
--- 1654,1660 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_dst_tag_h(struct ftfil_lookup_tag *lookup,
char *rec, struct fts3rec_offsets *fo)
{
struct ftchash_rec_fil_c32 *ftch_recfc32p;
***************
*** 1688,1694 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1688,1694 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 1726,1732 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1726,1732 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 1764,1770 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1764,1770 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 1798,1804 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1798,1804 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 1835,1841 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1835,1841 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 1873,1879 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1873,1879 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 1907,1913 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1907,1913 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 1944,1950 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1944,1950 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 1982,1988 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 1982,1988 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 2016,2022 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 2016,2022 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 2053,2059 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 2053,2059 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 2091,2097 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 2091,2097 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 2125,2131 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 2125,2131 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 2162,2168 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 2162,2168 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 2200,2206 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 2200,2206 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 2234,2240 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline 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;
--- 2234,2240 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline 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;
***************
*** 2271,2277 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_bps(struct ftfil_lookup_double *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_double_rec *ftfldr;
--- 2271,2277 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_bps(struct ftfil_lookup_double *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_double_rec *ftfldr;
***************
*** 2345,2351 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_pps(struct ftfil_lookup_double *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_double_rec *ftfldr;
--- 2345,2351 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_pps(struct ftfil_lookup_double *lookup, char *rec,
struct fts3rec_offsets *fo)
{
struct ftfil_lookup_double_rec *ftfldr;
***************
*** 2419,2425 ****
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! inline int eval_match_random_sample(struct ftfil_lookup_rate *lookup, char *rec,
struct fts3rec_offsets *fo)
{
int val;
--- 2419,2425 ----
* returns: FT_FIL_MODE_PERMIT
* FT_FIL_MODE_DENY
*/
! static inline int eval_match_random_sample(struct ftfil_lookup_rate *lookup, char *rec,
struct fts3rec_offsets *fo)
{
int val;
More information about the Flow-tools
mailing list