Skip to content

Commit ead77a8

Browse files
authored
Merge pull request #132 from francescomessina/veth_library
Add veth library
2 parents c7229d5 + 65572db commit ead77a8

28 files changed

Lines changed: 842 additions & 24 deletions

src/polycubed/src/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,15 @@ set(polycubed_sources
5353
extiface.cpp
5454
extiface_tc.cpp
5555
extiface_xdp.cpp
56-
extiface_info.cpp
57-
netlink.cpp
5856
service_controller.cpp
5957
patchpanel.cpp
6058
datapath_log.cpp
61-
utils.cpp
6259
id_generator.cpp
60+
utils/extiface_info.cpp
61+
utils/ns.cpp
62+
utils/veth.cpp
63+
utils/netlink.cpp
64+
utils/utils.cpp
6365
${server_sources}
6466
${CMAKE_CURRENT_BINARY_DIR}/load_services.cpp
6567
${CMAKE_CURRENT_BINARY_DIR}/version.cpp)

src/polycubed/src/controller.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "cube_tc.h"
2121
#include "cube_xdp.h"
2222
#include "datapath_log.h"
23-
#include "netlink.h"
2423
#include "patchpanel.h"
24+
#include "utils/netlink.h"
2525

2626
#include "polycube/services/utils.h"
2727

src/polycubed/src/extiface.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@
1717
#include "extiface.h"
1818
#include "bcc_mutex.h"
1919
#include "exceptions.h"
20-
#include "netlink.h"
20+
#include "extiface_tc.h"
2121
#include "patchpanel.h"
2222
#include "port.h"
23-
24-
#include "extiface_tc.h"
23+
#include "utils/netlink.h"
2524

2625
#include <iostream>
2726

src/polycubed/src/extiface_tc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "extiface_tc.h"
1919
#include "bcc_mutex.h"
2020
#include "exceptions.h"
21-
#include "netlink.h"
2221
#include "patchpanel.h"
22+
#include "utils/netlink.h"
2323

2424
#include <iostream>
2525

src/polycubed/src/extiface_xdp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include "bcc_mutex.h"
2020
#include "exceptions.h"
2121
#include "extiface_tc.h"
22-
#include "netlink.h"
2322
#include "patchpanel.h"
23+
#include "utils/netlink.h"
2424

2525
#include <iostream>
2626

src/polycubed/src/polycubed.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828

2929
#include "config.h"
3030
#include "polycube/services/json.hpp"
31-
#include "netlink.h"
3231
#include "rest_server.h"
33-
#include "utils.h"
3432
#include "version.h"
33+
#include "utils/netlink.h"
34+
#include "utils/utils.h"
3535

3636
#include <spdlog/sinks/rotating_file_sink.h>
3737
#include <spdlog/sinks/stdout_sinks.h>

src/polycubed/src/polycubed_core.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "polycubed_core.h"
1818
#include "config.h"
1919
#include "rest_server.h"
20+
#include "utils/netlink.h"
2021

2122
#include "server/Resources/Body/ListResource.h"
2223
#include "server/Resources/Body/ParentResource.h"

src/polycubed/src/polycubed_core.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
#include "service_controller.h"
3030

3131
#include "cube_factory_impl.h"
32-
#include "extiface_info.h"
33-
#include "netlink.h"
32+
//#include "extiface_info.h"
3433

3534
using json = nlohmann::json;
3635

src/polycubed/src/port_xdp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616

1717
#include "port_xdp.h"
18-
#include "netlink.h"
1918

2019
#include "cube_xdp.h"
20+
#include "utils/netlink.h"
2121

2222
namespace polycube {
2323
namespace polycubed {

src/polycubed/src/rest_server.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "polycubed_core.h"
2222
#include "service_controller.h"
2323
#include "version.h"
24+
#include "utils/netlink.h"
2425

2526
#include "polycube/services/response.h"
2627
#include "server/Resources/Data/AbstractFactory.h"

0 commit comments

Comments
 (0)