From a9855ef839ab99d7e66b9dd8d706b14cc8cd77dd Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Wed, 2 May 2018 12:45:10 +0200 Subject: [PATCH] Flow: Rename IPFIX exporter. Change-Id: I9363cf54b73f7cfd8622af6f1cb250438ea0d3b6 Signed-off-by: Ole Troan --- src/plugins/flowprobe/flowprobe.h | 4 ++-- src/plugins/ioam/analyse/ioam_summary_export.h | 2 +- src/plugins/ioam/export-common/ioam_export.h | 2 +- src/plugins/ioam/ipfixcollector/node.c | 2 +- src/plugins/ioam/udp-ping/udp_ping_export.c | 2 +- src/plugins/nat/nat_ipfix_logging.c | 2 +- src/vnet.am | 18 +++++++++--------- src/vnet/{flow => ipfix-export}/flow_api.c | 6 +++--- src/vnet/{flow => ipfix-export}/flow_report.c | 2 +- src/vnet/{flow => ipfix-export}/flow_report.h | 2 +- src/vnet/{flow => ipfix-export}/flow_report_classify.c | 4 ++-- src/vnet/{flow => ipfix-export}/flow_report_classify.h | 0 .../{flow/flow.api => ipfix-export/ipfix_export.api} | 0 src/vnet/{flow => ipfix-export}/ipfix_info_elements.h | 0 src/vnet/{flow => ipfix-export}/ipfix_packet.h | 2 +- src/vnet/vnet_all_api_h.h | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) rename src/vnet/{flow => ipfix-export}/flow_api.c (98%) rename src/vnet/{flow => ipfix-export}/flow_report.c (99%) rename src/vnet/{flow => ipfix-export}/flow_report.h (98%) rename src/vnet/{flow => ipfix-export}/flow_report_classify.c (99%) rename src/vnet/{flow => ipfix-export}/flow_report_classify.h (100%) rename src/vnet/{flow/flow.api => ipfix-export/ipfix_export.api} (100%) rename src/vnet/{flow => ipfix-export}/ipfix_info_elements.h (100%) rename src/vnet/{flow => ipfix-export}/ipfix_packet.h (99%) diff --git a/src/plugins/flowprobe/flowprobe.h b/src/plugins/flowprobe/flowprobe.h index 02ee053c911..92c3f9063a3 100644 --- a/src/plugins/flowprobe/flowprobe.h +++ b/src/plugins/flowprobe/flowprobe.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include /* Default timers in seconds */ diff --git a/src/plugins/ioam/analyse/ioam_summary_export.h b/src/plugins/ioam/analyse/ioam_summary_export.h index b435506187d..1397f9e8bd4 100755 --- a/src/plugins/ioam/analyse/ioam_summary_export.h +++ b/src/plugins/ioam/analyse/ioam_summary_export.h @@ -16,7 +16,7 @@ #define __included_ip6_ioam_flow_report_h__ #include -#include +#include #define foreach_ioam_ipfix_info_element \ _(ioamPacketSent, 5239, u32) \ diff --git a/src/plugins/ioam/export-common/ioam_export.h b/src/plugins/ioam/export-common/ioam_export.h index 74347683e10..36d71d26716 100644 --- a/src/plugins/ioam/export-common/ioam_export.h +++ b/src/plugins/ioam/export-common/ioam_export.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/plugins/ioam/ipfixcollector/node.c b/src/plugins/ioam/ipfixcollector/node.c index fce997aedb7..ae8ed1e4092 100644 --- a/src/plugins/ioam/ipfixcollector/node.c +++ b/src/plugins/ioam/ipfixcollector/node.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #define foreach_ipfix_collector_error \ _(PROCESSED, "Number of IP-Fix packets processed") \ diff --git a/src/plugins/ioam/udp-ping/udp_ping_export.c b/src/plugins/ioam/udp-ping/udp_ping_export.c index 91cbb4bd157..2b3a4de11a4 100644 --- a/src/plugins/ioam/udp-ping/udp_ping_export.c +++ b/src/plugins/ioam/udp-ping/udp_ping_export.c @@ -13,7 +13,7 @@ * limitations under the License. */ -#include +#include #include #include #include diff --git a/src/plugins/nat/nat_ipfix_logging.c b/src/plugins/nat/nat_ipfix_logging.c index 70d8d6b1c62..b4b940e7f92 100644 --- a/src/plugins/nat/nat_ipfix_logging.c +++ b/src/plugins/nat/nat_ipfix_logging.c @@ -15,7 +15,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/src/vnet.am b/src/vnet.am index 058948dce0e..adf93398648 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -828,26 +828,26 @@ API_FILES += vnet/srmpls/sr_mpls.api # IPFIX / netflow v10 ######################################## libvnet_la_SOURCES += \ - vnet/flow/flow_report.c \ - vnet/flow/flow_api.c + vnet/ipfix-export/flow_report.c \ + vnet/ipfix-export/flow_api.c nobase_include_HEADERS += \ - vnet/flow/flow_report.h \ - vnet/flow/ipfix_info_elements.h \ - vnet/flow/ipfix_packet.h \ - vnet/flow/flow.api.h + vnet/ipfix-export/flow_report.h \ + vnet/ipfix-export/ipfix_info_elements.h \ + vnet/ipfix-export/ipfix_packet.h \ + vnet/ipfix-export/ipfix_export.api.h -API_FILES += vnet/flow/flow.api +API_FILES += vnet/ipfix-export/ipfix_export.api ######################################## # IPFIX classify code ######################################## libvnet_la_SOURCES += \ - vnet/flow/flow_report_classify.c + vnet/ipfix-export/flow_report_classify.c nobase_include_HEADERS += \ - vnet/flow/flow_report_classify.h + vnet/ipfix-export/flow_report_classify.h ######################################## # lawful intercept diff --git a/src/vnet/flow/flow_api.c b/src/vnet/ipfix-export/flow_api.c similarity index 98% rename from src/vnet/flow/flow_api.c rename to src/vnet/ipfix-export/flow_api.c index d1eb2c008c5..e6446ef7033 100644 --- a/src/vnet/flow/flow_api.c +++ b/src/vnet/ipfix-export/flow_api.c @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include @@ -358,7 +358,7 @@ static void setup_message_id_table (api_main_t * am) { #define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_flow; + foreach_vl_msg_name_crc_ipfix_export; #undef _ } diff --git a/src/vnet/flow/flow_report.c b/src/vnet/ipfix-export/flow_report.c similarity index 99% rename from src/vnet/flow/flow_report.c rename to src/vnet/ipfix-export/flow_report.c index 4b890728a8a..793eedaeb38 100644 --- a/src/vnet/flow/flow_report.c +++ b/src/vnet/ipfix-export/flow_report.c @@ -15,7 +15,7 @@ /* * flow_report.c */ -#include +#include #include flow_report_main_t flow_report_main; diff --git a/src/vnet/flow/flow_report.h b/src/vnet/ipfix-export/flow_report.h similarity index 98% rename from src/vnet/flow/flow_report.h rename to src/vnet/ipfix-export/flow_report.h index b26345b86ed..b45ce06a880 100644 --- a/src/vnet/flow/flow_report.h +++ b/src/vnet/ipfix-export/flow_report.h @@ -29,7 +29,7 @@ #include #include -#include +#include /* Used to build the rewrite */ typedef struct diff --git a/src/vnet/flow/flow_report_classify.c b/src/vnet/ipfix-export/flow_report_classify.c similarity index 99% rename from src/vnet/flow/flow_report_classify.c rename to src/vnet/ipfix-export/flow_report_classify.c index 163ce10a369..46813ee6e1b 100644 --- a/src/vnet/flow/flow_report_classify.c +++ b/src/vnet/ipfix-export/flow_report_classify.c @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include +#include +#include #include /* Common prefix of tcp and udp headers diff --git a/src/vnet/flow/flow_report_classify.h b/src/vnet/ipfix-export/flow_report_classify.h similarity index 100% rename from src/vnet/flow/flow_report_classify.h rename to src/vnet/ipfix-export/flow_report_classify.h diff --git a/src/vnet/flow/flow.api b/src/vnet/ipfix-export/ipfix_export.api similarity index 100% rename from src/vnet/flow/flow.api rename to src/vnet/ipfix-export/ipfix_export.api diff --git a/src/vnet/flow/ipfix_info_elements.h b/src/vnet/ipfix-export/ipfix_info_elements.h similarity index 100% rename from src/vnet/flow/ipfix_info_elements.h rename to src/vnet/ipfix-export/ipfix_info_elements.h diff --git a/src/vnet/flow/ipfix_packet.h b/src/vnet/ipfix-export/ipfix_packet.h similarity index 99% rename from src/vnet/flow/ipfix_packet.h rename to src/vnet/ipfix-export/ipfix_packet.h index a50d86ea379..8b026e4db27 100644 --- a/src/vnet/flow/ipfix_packet.h +++ b/src/vnet/ipfix-export/ipfix_packet.h @@ -15,7 +15,7 @@ #ifndef __included_ipfix_packet_h__ #define __included_ipfix_packet_h__ -#include +#include /* From RFC-7011: * https://tools.ietf.org/html/rfc7011 diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h index 5c7c4869c91..9d416e92e4e 100644 --- a/src/vnet/vnet_all_api_h.h +++ b/src/vnet/vnet_all_api_h.h @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include -- 2.16.6