merge branch 'th/gitlab-ci-alpine' (part 3)

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/704

Makefile.am

@@ -1523,7 +1523,7 @@ GLIB_GENERATED += \
 nm_enum_types_sources = \
 	$(libnm_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_real)
-nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
+nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include "nm-core-enum-types.h"\n'
 nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
 
 $(dispatcher_nm_dispatcher_OBJECTS):                    $(libnm_lib_h_pub_mkenums)

clients/cli/devices.c

@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <readline/readline.h>
+#include <linux/if_ether.h>
 
 #include "nm-glib-aux/nm-secret-utils.h"
 #include "common.h"

clients/cloud-setup/nm-cloud-setup-utils.c

@@ -4,6 +4,9 @@
 
 #include "nm-cloud-setup-utils.h"
 
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
+
 #include "nm-glib-aux/nm-time-utils.h"
 #include "nm-glib-aux/nm-logging-base.h"
 #include "nm-glib-aux/nm-str-buf.h"

clients/common/nm-meta-setting-desc.c

@@ -9,6 +9,8 @@
 
 #include <stdlib.h>
 #include <arpa/inet.h>
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
 
 #include "nm-libnm-core-intern/nm-common-macros.h"
 #include "nm-glib-aux/nm-enum-utils.h"

clients/tui/nmt-mac-entry.c

@@ -17,6 +17,9 @@
 
 #include "nmt-mac-entry.h"
 
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
+
 #include "nm-libnm-core-intern/nm-common-macros.h"
 
 G_DEFINE_TYPE(NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY)

clients/tui/nmt-page-bond.c

@@ -16,6 +16,9 @@
 
 #include "nmt-page-bond.h"
 
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
+
 #include "nm-libnm-core-intern/nm-libnm-core-utils.h"
 #include "nmt-mac-entry.h"
 #include "nmt-address-list.h"

clients/tui/nmt-page-ethernet.c

@@ -11,6 +11,10 @@
 #include "nm-default.h"
 
 #include "nmt-page-ethernet.h"
+
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
+
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"
 

clients/tui/nmt-page-vlan.c

@@ -12,6 +12,8 @@
 
 #include "nm-editor-bindings.h"
 
+#include <linux/if_ether.h>
+
 #include "nmt-page-vlan.h"
 #include "nmt-device-entry.h"
 #include "nmt-mac-entry.h"

clients/tui/nmt-page-wifi.c

@@ -15,6 +15,7 @@
 #include "nm-default.h"
 
 #include <stdlib.h>
+#include <linux/if_ether.h>
 
 #include "nmt-page-wifi.h"
 #include "nmt-mac-entry.h"

libnm-core/nm-keyfile/nm-keyfile.c

@@ -15,6 +15,8 @@
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <linux/pkt_sched.h>
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
 
 #include "nm-glib-aux/nm-str-buf.h"
 #include "nm-glib-aux/nm-secret-utils.h"

libnm-core/nm-setting-bond.c

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <linux/if_ether.h>
 
 #include "nm-libnm-core-intern/nm-libnm-core-utils.h"
 #include "nm-utils.h"

libnm-core/nm-setting-bridge.c

@@ -9,6 +9,7 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <linux/if_ether.h>
 
 #include "nm-glib-aux/nm-str-buf.h"
 #include "nm-connection-private.h"

libnm-core/nm-setting-infiniband.c

@@ -8,6 +8,7 @@
 #include "nm-setting-infiniband.h"
 
 #include <stdlib.h>
+#include <linux/if_infiniband.h>
 
 #include "nm-utils.h"
 #include "nm-utils-private.h"

libnm-core/nm-setting-olpc-mesh.c

@@ -9,6 +9,8 @@
 
 #include "nm-setting-olpc-mesh.h"
 
+#include <linux/if_ether.h>
+
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"

libnm-core/nm-setting-vlan.h

@@ -11,7 +11,6 @@
 #endif
 
 #include "nm-setting.h"
-#include <linux/if_vlan.h>
 
 G_BEGIN_DECLS
 

libnm-core/nm-utils.c

@@ -16,6 +16,7 @@
 #include <gmodule.h>
 #include <sys/stat.h>
 #include <linux/pkt_sched.h>
+#include <linux/if_infiniband.h>
 
 #include "nm-glib-aux/nm-json-aux.h"
 #include "nm-glib-aux/nm-str-buf.h"

libnm-core/nm-utils.h

@@ -12,12 +12,6 @@
 
 #include <glib.h>
 
-#include <netinet/in.h>
-
-/* For ETH_ALEN and INFINIBAND_ALEN */
-#include <linux/if_ether.h>
-#include <linux/if_infiniband.h>
-
 #include "nm-core-enum-types.h"
 #include "nm-setting-sriov.h"
 #include "nm-setting-tc-config.h"
@@ -185,7 +179,10 @@ gboolean nm_utils_is_uuid(const char *str);
  * for both nm_utils_inet4_ntop() and nm_utils_inet6_ntop().
  **/
 #define NM_UTILS_INET_ADDRSTRLEN INET6_ADDRSTRLEN
-const char *nm_utils_inet4_ntop(in_addr_t inaddr, char *dst);
+
+const char *nm_utils_inet4_ntop(guint32 inaddr, char *dst);
+
+struct in6_addr;
 const char *nm_utils_inet6_ntop(const struct in6_addr *in6addr, char *dst);
 
 gboolean nm_utils_ipaddr_valid(int family, const char *ip);

libnm-core/tests/test-general.c

@@ -10,6 +10,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
 
 #include "nm-std-aux/c-list-util.h"
 #include "nm-glib-aux/nm-enum-utils.h"

libnm/NetworkManager.h

@@ -115,6 +115,17 @@
 
 #include "nm-autoptr.h"
 
+#if !defined(NETWORKMANAGER_COMPILATION) \
+    && (!defined(NM_NO_INCLUDE_EXTRA_HEADERS) || !NM_NO_INCLUDE_EXTRA_HEADERS)
+    /* historically, NetworkManager.h drags in the following system headers.
+     * These are not strictly necessary and the user may wish to opt out from
+     * including them. */
+    #include <linux/if_ether.h>
+    #include <linux/if_infiniband.h>
+    #include <linux/if_vlan.h>
+    #include <netinet/in.h>
+#endif
+
 #undef __NETWORKMANAGER_H_INSIDE__
 
 #endif /* __NETWORKMANAGER_H__ */

libnm/nm-access-point.c

@@ -8,6 +8,8 @@
 
 #include "nm-access-point.h"
 
+#include <linux/if_ether.h>
+
 #include "nm-connection.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wireless.h"

libnm/nm-device-bt.c

@@ -8,6 +8,8 @@
 
 #include "nm-device-bt.h"
 
+#include <linux/if_ether.h>
+
 #include "nm-setting-connection.h"
 #include "nm-setting-bluetooth.h"
 #include "nm-utils.h"

libnm/nm-device-ethernet.c

@@ -8,6 +8,8 @@
 
 #include "nm-device-ethernet.h"
 
+#include <linux/if_ether.h>
+
 #include "nm-libnm-utils.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wired.h"

libnm/nm-device-infiniband.c

@@ -7,6 +7,8 @@
 
 #include "nm-device-infiniband.h"
 
+#include <linux/if_infiniband.h>
+
 #include "nm-setting-connection.h"
 #include "nm-setting-infiniband.h"
 #include "nm-utils.h"

libnm/nm-device-wifi.c

@@ -8,6 +8,8 @@
 
 #include "nm-device-wifi.h"
 
+#include <linux/if_ether.h>
+
 #include "nm-glib-aux/nm-dbus-aux.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wireless.h"

libnm/nm-enum-types.h.template

@@ -2,7 +2,7 @@
 #ifndef __NM_ENUM_TYPES_H__
 #define __NM_ENUM_TYPES_H__
 
-#include <nm-core-enum-types.h>
+#include "nm-core-enum-types.h"
 #include <glib-object.h>
 
 G_BEGIN_DECLS

src/NetworkManagerUtils.c

@@ -10,6 +10,7 @@
 
 #include <linux/fib_rules.h>
 #include <linux/pkt_sched.h>
+#include <linux/if_ether.h>
 
 #include "nm-glib-aux/nm-c-list.h"
 

src/devices/bluetooth/nm-bluez-manager.c

@@ -10,6 +10,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <gmodule.h>
+#include <linux/if_ether.h>
 
 #include "nm-glib-aux/nm-dbus-aux.h"
 #include "nm-glib-aux/nm-c-list.h"

src/devices/bluetooth/nm-device-bt.c

@@ -8,6 +8,7 @@
 #include "nm-device-bt.h"
 
 #include <stdio.h>
+#include <linux/if_ether.h>
 
 #include "nm-core-internal.h"
 #include "nm-bluez-common.h"

src/devices/nm-acd-manager.c

@@ -10,6 +10,7 @@
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <linux/if_ether.h>
 
 #include "platform/nm-platform.h"
 #include "nm-utils.h"

src/devices/nm-device-bridge.c

@@ -8,6 +8,7 @@
 #include "nm-device-bridge.h"
 
 #include <stdlib.h>
+#include <linux/if_ether.h>
 
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"

src/devices/nm-device-ethernet.c

@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <libudev.h>
+#include <linux/if_ether.h>
 
 #include "nm-device-private.h"
 #include "nm-act-request.h"

src/devices/nm-device-ip-tunnel.c

@@ -12,6 +12,7 @@
 #include <linux/ip.h>
 #include <linux/if_tunnel.h>
 #include <linux/ip6_tunnel.h>
+#include <linux/if_ether.h>
 
 #include "nm-device-private.h"
 #include "nm-manager.h"

src/devices/nm-device-macsec.c

@@ -7,6 +7,8 @@
 
 #include "nm-device-macsec.h"
 
+#include <linux/if_ether.h>
+
 #include "nm-act-request.h"
 #include "nm-device-private.h"
 #include "platform/nm-platform.h"

src/devices/nm-device.c

@@ -19,6 +19,8 @@
 #include <linux/if_addr.h>
 #include <linux/if_arp.h>
 #include <linux/rtnetlink.h>
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
 
 #include "nm-std-aux/unaligned.h"
 #include "nm-glib-aux/nm-dedup-multi.h"

src/devices/tests/test-acd.c

@@ -7,6 +7,8 @@
 
 #include "n-acd/src/n-acd.h"
 
+#include <linux/if_ether.h>
+
 #include "devices/nm-acd-manager.h"
 #include "platform/tests/test-common.h"
 

src/devices/wifi/nm-device-iwd.c

@@ -7,6 +7,8 @@
 
 #include "nm-device-iwd.h"
 
+#include <linux/if_ether.h>
+
 #include "devices/nm-device-private.h"
 #include "devices/nm-device.h"
 #include "nm-act-request.h"

src/devices/wifi/nm-device-wifi.c

@@ -10,6 +10,7 @@
 
 #include <netinet/in.h>
 #include <unistd.h>
+#include <linux/if_ether.h>
 
 #include "nm-glib-aux/nm-ref-string.h"
 #include "nm-glib-aux/nm-c-list.h"

src/devices/wifi/nm-wifi-ap.c

@@ -9,6 +9,7 @@
 #include "nm-wifi-ap.h"
 
 #include <stdlib.h>
+#include <linux/if_ether.h>
 
 #include "NetworkManagerUtils.h"
 #include "devices/nm-device.h"

src/devices/wifi/nm-wifi-p2p-peer.c

@@ -8,6 +8,7 @@
 #include "nm-wifi-p2p-peer.h"
 
 #include <stdlib.h>
+#include <linux/if_ether.h>
 
 #include "NetworkManagerUtils.h"
 #include "devices/nm-device.h"

src/dhcp/nm-dhcp-dhclient-utils.c

@@ -10,6 +10,7 @@
 #include <ctype.h>
 #include <arpa/inet.h>
 #include <net/if.h>
+#include <linux/if_ether.h>
 
 #include "nm-glib-aux/nm-dedup-multi.h"
 

src/initrd/nmi-cmdline-reader.c

@@ -5,6 +5,9 @@
 
 #include "nm-default.h"
 
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
+
 #include "nm-core-internal.h"
 #include "nm-initrd-generator.h"
 #include "systemd/nm-sd-utils-shared.h"

src/initrd/nmi-dt-reader.c

@@ -8,6 +8,7 @@
 #include "nm-initrd-generator.h"
 
 #include <arpa/inet.h>
+#include <linux/if_ether.h>
 
 #include "nm-core-internal.h"
 

src/initrd/nmi-ibft-reader.c

@@ -15,6 +15,7 @@
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+#include <linux/if_ether.h>
 
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"

src/nm-l3-ipv4ll.c

@@ -5,6 +5,7 @@
 #include "nm-l3-ipv4ll.h"
 
 #include <net/if.h>
+#include <linux/if_ether.h>
 
 #include "n-acd/src/n-acd.h"
 #include "nm-core-utils.h"

src/nm-l3cfg.c

@@ -6,6 +6,7 @@
 
 #include <net/if.h>
 #include <linux/if_addr.h>
+#include <linux/if_ether.h>
 #include <linux/rtnetlink.h>
 
 #include "platform/nm-platform.h"

src/nm-manager.c

@@ -7450,10 +7450,11 @@ auth_mgr_changed(NMAuthManager *auth_manager, gpointer user_data)
 #define KERN_RFKILL_TYPE_WLAN     1
 #define KERN_RFKILL_TYPE_WWAN     5
 struct rfkill_event {
-    __u32 idx;
-    __u8  type;
-    __u8  op;
-    __u8  soft, hard;
+    uint32_t idx;
+    uint8_t  type;
+    uint8_t  op;
+    uint8_t  soft;
+    uint8_t  hard;
 } _nm_packed;
 
 static void

src/platform/nm-linux-platform.c

@@ -19,6 +19,7 @@
 #include <linux/if_link.h>
 #include <linux/if_tun.h>
 #include <linux/if_tunnel.h>
+#include <linux/if_vlan.h>
 #include <linux/ip6_tunnel.h>
 #include <linux/tc_act/tc_mirred.h>
 #include <netinet/icmp6.h>

src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c

@@ -16,6 +16,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <linux/rtnetlink.h>
+#include <linux/if_ether.h>
 
 #include "nm-glib-aux/nm-secret-utils.h"
 #include "nm-connection.h"

src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c

@@ -14,6 +14,8 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
 
 #include "nm-glib-aux/nm-json-aux.h"
 #include "nm-utils.h"

src/settings/plugins/keyfile/tests/test-keyfile-settings.c

@@ -12,6 +12,8 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <linux/pkt_sched.h>
+#include <linux/if_ether.h>
+#include <linux/if_infiniband.h>
 
 #include "nm-core-internal.h"
 

src/supplicant/nm-supplicant-interface.c

@@ -9,6 +9,7 @@
 #include "nm-supplicant-interface.h"
 
 #include <stdio.h>
+#include <linux/if_ether.h>
 
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"

src/tests/test-utils.c

@@ -6,6 +6,7 @@
 #include "nm-default.h"
 
 #include <arpa/inet.h>
+#include <linux/if_ether.h>
 
 #include "nm-test-utils-core.h"