From 9c8e276ec3f4a3368ec1cb7f713543d46d8ad23a Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 19 Dec 2011 14:18:00 -0800 Subject: [PATCH] netflow: Move packet definitions to header file. An upcoming commit will introduce code outside of ofproto/netflow.c that works with NetFlow packets, so we need the protocol definitions in a common location. Signed-off-by: Ben Pfaff --- lib/automake.mk | 1 + lib/netflow.h | 80 +++++++++++++++++++++++++++++++++++++++++++++++ ofproto/netflow.c | 57 ++------------------------------- ofproto/netflow.h | 4 +-- 4 files changed, 85 insertions(+), 57 deletions(-) create mode 100644 lib/netflow.h diff --git a/lib/automake.mk b/lib/automake.mk index c0cc9065a..7153e9301 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -85,6 +85,7 @@ lib_libopenvswitch_a_SOURCES = \ lib/netdev-provider.h \ lib/netdev.c \ lib/netdev.h \ + lib/netflow.h \ lib/netlink.c \ lib/netlink.h \ lib/nx-match.c \ diff --git a/lib/netflow.h b/lib/netflow.h new file mode 100644 index 000000000..49202d981 --- /dev/null +++ b/lib/netflow.h @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef NETFLOW_H +#define NETFLOW_H 1 + +/* NetFlow v5 protocol definitions. */ + +#include +#include "openvswitch/types.h" +#include "util.h" + +#define NETFLOW_V5_VERSION 5 + +/* Every NetFlow v5 message contains the header that follows. This is + * followed by up to thirty records that describe a terminating flow. + * We only send a single record per NetFlow message. + */ +struct netflow_v5_header { + ovs_be16 version; /* NetFlow version is 5. */ + ovs_be16 count; /* Number of records in this message. */ + ovs_be32 sysuptime; /* System uptime in milliseconds. */ + ovs_be32 unix_secs; /* Number of seconds since Unix epoch. */ + ovs_be32 unix_nsecs; /* Number of residual nanoseconds + after epoch seconds. */ + ovs_be32 flow_seq; /* Number of flows since sending + messages began. */ + uint8_t engine_type; /* Engine type. */ + uint8_t engine_id; /* Engine id. */ + ovs_be16 sampling_interval; /* Set to zero. */ +}; +BUILD_ASSERT_DECL(sizeof(struct netflow_v5_header) == 24); + +/* A NetFlow v5 description of a terminating flow. It is preceded by a + * NetFlow v5 header. + */ +struct netflow_v5_record { + ovs_be32 src_addr; /* Source IP address. */ + ovs_be32 dst_addr; /* Destination IP address. */ + ovs_be32 nexthop; /* IP address of next hop. Set to 0. */ + ovs_be16 input; /* Input interface index. */ + ovs_be16 output; /* Output interface index. */ + ovs_be32 packet_count; /* Number of packets. */ + ovs_be32 byte_count; /* Number of bytes. */ + ovs_be32 init_time; /* Value of sysuptime on first packet. */ + ovs_be32 used_time; /* Value of sysuptime on last packet. */ + + /* The 'src_port' and 'dst_port' identify the source and destination + * port, respectively, for TCP and UDP. For ICMP, the high-order + * byte identifies the type and low-order byte identifies the code + * in the 'dst_port' field. */ + ovs_be16 src_port; + ovs_be16 dst_port; + + uint8_t pad1; + uint8_t tcp_flags; /* Union of seen TCP flags. */ + uint8_t ip_proto; /* IP protocol. */ + uint8_t ip_tos; /* IP TOS value. */ + ovs_be16 src_as; /* Source AS ID. Set to 0. */ + ovs_be16 dst_as; /* Destination AS ID. Set to 0. */ + uint8_t src_mask; /* Source mask bits. Set to 0. */ + uint8_t dst_mask; /* Destination mask bits. Set to 0. */ + uint8_t pad[2]; +}; +BUILD_ASSERT_DECL(sizeof(struct netflow_v5_record) == 48); + +#endif /* lib/netflow.h */ diff --git a/ofproto/netflow.c b/ofproto/netflow.c index 6e2ddb848..994f92867 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -23,9 +23,10 @@ #include "byte-order.h" #include "collectors.h" #include "flow.h" -#include "netflow.h" +#include "lib/netflow.h" #include "ofpbuf.h" #include "ofproto.h" +#include "ofproto/netflow.h" #include "packets.h" #include "poll-loop.h" #include "socket-util.h" @@ -35,60 +36,6 @@ VLOG_DEFINE_THIS_MODULE(netflow); -#define NETFLOW_V5_VERSION 5 - -/* Every NetFlow v5 message contains the header that follows. This is - * followed by up to thirty records that describe a terminating flow. - * We only send a single record per NetFlow message. - */ -struct netflow_v5_header { - ovs_be16 version; /* NetFlow version is 5. */ - ovs_be16 count; /* Number of records in this message. */ - ovs_be32 sysuptime; /* System uptime in milliseconds. */ - ovs_be32 unix_secs; /* Number of seconds since Unix epoch. */ - ovs_be32 unix_nsecs; /* Number of residual nanoseconds - after epoch seconds. */ - ovs_be32 flow_seq; /* Number of flows since sending - messages began. */ - uint8_t engine_type; /* Engine type. */ - uint8_t engine_id; /* Engine id. */ - ovs_be16 sampling_interval; /* Set to zero. */ -}; -BUILD_ASSERT_DECL(sizeof(struct netflow_v5_header) == 24); - -/* A NetFlow v5 description of a terminating flow. It is preceded by a - * NetFlow v5 header. - */ -struct netflow_v5_record { - ovs_be32 src_addr; /* Source IP address. */ - ovs_be32 dst_addr; /* Destination IP address. */ - ovs_be32 nexthop; /* IP address of next hop. Set to 0. */ - ovs_be16 input; /* Input interface index. */ - ovs_be16 output; /* Output interface index. */ - ovs_be32 packet_count; /* Number of packets. */ - ovs_be32 byte_count; /* Number of bytes. */ - ovs_be32 init_time; /* Value of sysuptime on first packet. */ - ovs_be32 used_time; /* Value of sysuptime on last packet. */ - - /* The 'src_port' and 'dst_port' identify the source and destination - * port, respectively, for TCP and UDP. For ICMP, the high-order - * byte identifies the type and low-order byte identifies the code - * in the 'dst_port' field. */ - ovs_be16 src_port; - ovs_be16 dst_port; - - uint8_t pad1; - uint8_t tcp_flags; /* Union of seen TCP flags. */ - uint8_t ip_proto; /* IP protocol. */ - uint8_t ip_tos; /* IP TOS value. */ - ovs_be16 src_as; /* Source AS ID. Set to 0. */ - ovs_be16 dst_as; /* Destination AS ID. Set to 0. */ - uint8_t src_mask; /* Source mask bits. Set to 0. */ - uint8_t dst_mask; /* Destination mask bits. Set to 0. */ - uint8_t pad[2]; -}; -BUILD_ASSERT_DECL(sizeof(struct netflow_v5_record) == 48); - struct netflow { uint8_t engine_type; /* Value of engine_type to use. */ uint8_t engine_id; /* Value of engine_id to use. */ diff --git a/ofproto/netflow.h b/ofproto/netflow.h index daabbace5..2c57f2f46 100644 --- a/ofproto/netflow.h +++ b/ofproto/netflow.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef NETFLOW_H -#define NETFLOW_H 1 +#ifndef OFPROTO_NETFLOW_H +#define OFPROTO_NETFLOW_H 1 #include #include "flow.h" -- 2.43.0