Skip to content

Fix compatibility with ELL 0.45 and later #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2022
Merged

Fix compatibility with ELL 0.45 and later #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/id_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
#include <sys/socket.h>
#include <netinet/in.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/hashmap.h>
#include <ell/uintset.h>
#include <ell/util.h>
#pragma GCC diagnostic pop

#include <mptcpd/private/id_manager.h>
#include <mptcpd/id_manager.h>
Expand Down
3 changes: 3 additions & 0 deletions lib/network_monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,15 @@
#include <net/if.h> // For standard network interface flags.
#include <netinet/in.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/netlink.h>
#include <ell/log.h>
#include <ell/util.h>
#include <ell/queue.h>
#include <ell/timeout.h>
#include <ell/rtnl.h>
#pragma GCC diagnostic pop

#include <mptcpd/private/path_manager.h>
#include <mptcpd/network_monitor.h>
Expand Down
3 changes: 3 additions & 0 deletions lib/path_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@

#include <netinet/in.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/genl.h>
#include <ell/queue.h>
#include <ell/util.h> // For L_STRINGIFY needed by l_error().
#include <ell/log.h>
#pragma GCC diagnostic pop

#include <mptcpd/path_manager.h>
#include <mptcpd/private/path_manager.h>
Expand Down
3 changes: 3 additions & 0 deletions lib/plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@
#include <unistd.h>
#include <assert.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/queue.h>
#include <ell/hashmap.h>
#include <ell/util.h>
#include <ell/log.h>
#pragma GCC diagnostic pop

/**
* @todo Remove this preprocessor symbol definition once support for
Expand Down
3 changes: 3 additions & 0 deletions plugins/path_managers/addr_adv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@

#include <errno.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/util.h> // For L_STRINGIFY needed by ELL log macros.
#include <ell/log.h>
#pragma GCC diagnostic pop


#include <mptcpd/private/path_manager.h>
Expand Down
3 changes: 3 additions & 0 deletions plugins/path_managers/sspi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@

#include <netinet/in.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/util.h> // For L_STRINGIFY needed by l_error().
#include <ell/log.h>
#include <ell/queue.h>
#pragma GCC diagnostic pop

#include <mptcpd/network_monitor.h>
#include <mptcpd/path_manager.h>
Expand Down
3 changes: 3 additions & 0 deletions src/commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@

#include <string.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/genl.h>
#include <ell/util.h> // For L_STRINGIFY needed by l_error(), etc.
#include <ell/log.h>
#pragma GCC diagnostic pop

#include "commands.h"

Expand Down
3 changes: 3 additions & 0 deletions src/configuration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@
#include <sys/stat.h>
#include <unistd.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/log.h>
#include <ell/util.h>
#include <ell/settings.h>
#include <ell/queue.h>
#include <ell/string.h>
#pragma GCC diagnostic pop

#include <mptcpd/types.h>

Expand Down
3 changes: 3 additions & 0 deletions src/mptcpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
#include <signal.h>
#include <assert.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/util.h> // For L_STRINGIFY needed by l_error().
#include <ell/log.h>
#include <ell/main.h>
#pragma GCC diagnostic pop

#include <mptcpd/private/configuration.h>

Expand Down
3 changes: 3 additions & 0 deletions src/netlink_pm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
#include <stdbool.h>
#include <stdio.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/log.h>
#include <ell/util.h>
#pragma GCC diagnostic pop

#include "netlink_pm.h"

Expand Down
3 changes: 3 additions & 0 deletions src/netlink_pm_upstream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
#include <errno.h>
#include <sys/socket.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/genl.h>
#include <ell/util.h> // For L_STRINGIFY needed by l_error(), etc.
#include <ell/log.h>
#pragma GCC diagnostic pop

#include <mptcpd/private/mptcp_upstream.h>
#include <mptcpd/private/netlink_pm.h>
Expand Down
3 changes: 3 additions & 0 deletions src/path_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@
#include <arpa/inet.h> // For inet_ntop().
#include <netinet/in.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/genl.h>
#include <ell/log.h>
#include <ell/queue.h>
#include <ell/timeout.h>
#include <ell/util.h>
#pragma GCC diagnostic pop

#include <mptcpd/path_manager.h>
#include <mptcpd/private/path_manager.h>
Expand Down
3 changes: 3 additions & 0 deletions tests/plugins/noop/noop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
* Copyright (c) 2019-2021, Intel Corporation
*/

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/util.h> // For L_STRINGIFY needed by l_error().
#include <ell/log.h>
#pragma GCC diagnostic pop

#ifdef HAVE_CONFIG_H
# include <mptcpd/private/config.h>
Expand Down
3 changes: 3 additions & 0 deletions tests/plugins/priority/one.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
* Copyright (c) 2019-2021, Intel Corporation
*/

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/util.h> // For L_STRINGIFY needed by l_error().
#include <ell/log.h>
#pragma GCC diagnostic pop

#ifdef HAVE_CONFIG_H
# include <mptcpd/private/config.h>
Expand Down
3 changes: 3 additions & 0 deletions tests/plugins/priority/two.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
* Copyright (c) 2019-2021, Intel Corporation
*/

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/util.h> // For L_STRINGIFY needed by l_error().
#include <ell/log.h>
#pragma GCC diagnostic pop

#ifdef HAVE_CONFIG_H
# include <mptcpd/private/config.h>
Expand Down
3 changes: 3 additions & 0 deletions tests/plugins/security/four.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
* Copyright (c) 2019-2021, Intel Corporation
*/

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/util.h> // For L_STRINGIFY needed by l_error().
#include <ell/log.h>
#pragma GCC diagnostic pop

#ifdef HAVE_CONFIG_H
# include <mptcpd/private/config.h>
Expand Down
3 changes: 3 additions & 0 deletions tests/plugins/security/three.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
* Copyright (c) 2019-2021, Intel Corporation
*/

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/util.h> // For L_STRINGIFY needed by l_error().
#include <ell/log.h>
#pragma GCC diagnostic pop

#ifdef HAVE_CONFIG_H
# include <mptcpd/private/config.h>
Expand Down
3 changes: 3 additions & 0 deletions tests/test-commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@
#include <arpa/inet.h>
#include <net/if.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/main.h>
#include <ell/idle.h>
#include <ell/util.h> // Needed by <ell/log.h>
#include <ell/log.h>
#include <ell/netlink.h>
#include <ell/rtnl.h>
#include <ell/test.h>
#pragma GCC diagnostic pop

// Internal Headers
// -----------------
Expand Down
3 changes: 3 additions & 0 deletions tests/test-configuration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
* Copyright (c) 2019, 2021, Intel Corporation
*/

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/main.h>
#include <ell/util.h> // Needed by <ell/log.h>
#include <ell/log.h>
#include <ell/test.h>
#pragma GCC diagnostic pop

#include <mptcpd/private/configuration.h> // INTERNAL!

Expand Down
3 changes: 3 additions & 0 deletions tests/test-network-monitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@
#include <netinet/in.h> // For INET_ADDRSTRLEN and INET6_ADDRSTRLEN.
#include <net/if.h> // For standard network interface flags.

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/main.h>
#include <ell/idle.h>
#include <ell/util.h> // Needed by <ell/log.h>
#include <ell/log.h>
#include <ell/queue.h>
#pragma GCC diagnostic pop

#include <mptcpd/network_monitor.h>

Expand Down
3 changes: 3 additions & 0 deletions tests/test-path-manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@

#include <unistd.h>

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
#include <ell/main.h>
#include <ell/genl.h>
#include <ell/timeout.h>
#include <ell/util.h> // Needed by <ell/log.h>
#include <ell/log.h>
#pragma GCC diagnostic pop

#include "test-util.h"

Expand Down