> +#define NETFLOW_H
According to CodingStyle, this should be "#define NETFLOW_H 1". Why
do we need to add the "1" btw? are there some compilers that choke
without it?
I didn't read the header file closely, just verified that it's the
same as it was in the old location.
Looks good,
Ethan
> +
> +/* NetFlow v5 protocol definitions. */
> +
> +#include <stdint.h>
> +#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 6e2ddb8..994f928 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 daabbac..2c57f2f 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 <stdint.h>
> #include "flow.h"
> --
> 1.7.4.4
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
