From 66ffbdf9338bb58470d4aecfa0e815afbfcdf6a5 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 6 Dec 2018 06:41:34 +0100 Subject: [PATCH] missing: move socket related definitions to missing_socket.h --- src/basic/meson.build | 1 + src/basic/missing.h | 55 +--------------------------------- src/basic/missing_socket.h | 60 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 54 deletions(-) create mode 100644 src/basic/missing_socket.h diff --git a/src/basic/meson.build b/src/basic/meson.build index 764c6c9bc6..17282a9bef 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -109,6 +109,7 @@ basic_sources = files(''' missing_prctl.h missing_resource.h missing_securebits.h + missing_socket.h missing_stat.h missing_syscall.h missing_type.h diff --git a/src/basic/missing.h b/src/basic/missing.h index 3cf8d7c915..8d12cb318d 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -7,26 +7,8 @@ #include #include #include -#include #include -#if HAVE_LINUX_VM_SOCKETS_H -#include -#else -#define VMADDR_CID_ANY -1U -struct sockaddr_vm { - unsigned short svm_family; - unsigned short svm_reserved1; - unsigned int svm_port; - unsigned int svm_cid; - unsigned char svm_zero[sizeof(struct sockaddr) - - sizeof(unsigned short) - - sizeof(unsigned short) - - sizeof(unsigned int) - - sizeof(unsigned int)]; -}; -#endif /* !HAVE_LINUX_VM_SOCKETS_H */ - #ifndef MFD_ALLOW_SEALING #define MFD_ALLOW_SEALING 0x0002U #endif @@ -35,26 +17,10 @@ struct sockaddr_vm { #define MFD_CLOEXEC 0x0001U #endif -#ifndef IP_FREEBIND -#define IP_FREEBIND 15 -#endif - #ifndef TIOCVHANGUP #define TIOCVHANGUP 0x5437 #endif -#ifndef IP_TRANSPARENT -#define IP_TRANSPARENT 19 -#endif - -#ifndef SOL_NETLINK -#define SOL_NETLINK 270 -#endif - -#ifndef SOL_SCTP -#define SOL_SCTP 132 -#endif - #ifndef GRND_NONBLOCK #define GRND_NONBLOCK 0x0001 #endif @@ -111,10 +77,6 @@ struct sockaddr_vm { #define MS_LAZYTIME (1<<25) #endif -#ifndef SCM_SECURITY -#define SCM_SECURITY 0x03 -#endif - #ifndef DM_DEFERRED_REMOVE #define DM_DEFERRED_REMOVE (1 << 17) #endif @@ -135,14 +97,6 @@ struct sockaddr_vm { # define TFD_TIMER_CANCEL_ON_SET (1 << 1) #endif -#ifndef SO_REUSEPORT -# define SO_REUSEPORT 15 -#endif - -#ifndef SO_PEERGROUPS -# define SO_PEERGROUPS 59 -#endif - #ifndef DRM_IOCTL_SET_MASTER # define DRM_IOCTL_SET_MASTER _IO('d', 0x1e) #endif @@ -159,14 +113,6 @@ struct sockaddr_vm { #define RENAME_NOREPLACE (1 << 0) #endif -#ifndef SOL_ALG -#define SOL_ALG 279 -#endif - -#ifndef AF_VSOCK -#define AF_VSOCK 40 -#endif - #ifndef EXT4_IOC_RESIZE_FS # define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64) #endif @@ -203,6 +149,7 @@ struct sockaddr_vm { #include "missing_network.h" #include "missing_prctl.h" #include "missing_resource.h" +#include "missing_socket.h" #include "missing_type.h" #include "missing_syscall.h" diff --git a/src/basic/missing_socket.h b/src/basic/missing_socket.h new file mode 100644 index 0000000000..a5fd457244 --- /dev/null +++ b/src/basic/missing_socket.h @@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ +#pragma once + +#include + +#if HAVE_LINUX_VM_SOCKETS_H +#include +#else +#define VMADDR_CID_ANY -1U +struct sockaddr_vm { + unsigned short svm_family; + unsigned short svm_reserved1; + unsigned int svm_port; + unsigned int svm_cid; + unsigned char svm_zero[sizeof(struct sockaddr) - + sizeof(unsigned short) - + sizeof(unsigned short) - + sizeof(unsigned int) - + sizeof(unsigned int)]; +}; +#endif /* !HAVE_LINUX_VM_SOCKETS_H */ + +#ifndef AF_VSOCK +#define AF_VSOCK 40 +#endif + +#ifndef SO_REUSEPORT +#define SO_REUSEPORT 15 +#endif + +#ifndef SO_PEERGROUPS +#define SO_PEERGROUPS 59 +#endif + +#ifndef SOL_NETLINK +#define SOL_NETLINK 270 +#endif + +#ifndef SOL_ALG +#define SOL_ALG 279 +#endif + +/* Not exposed yet. Defined in include/linux/socket.h. */ +#ifndef SOL_SCTP +#define SOL_SCTP 132 +#endif + +/* Not exposed yet. Defined in include/linux/socket.h */ +#ifndef SCM_SECURITY +#define SCM_SECURITY 0x03 +#endif + +/* netinet/in.h */ +#ifndef IP_FREEBIND +#define IP_FREEBIND 15 +#endif + +#ifndef IP_TRANSPARENT +#define IP_TRANSPARENT 19 +#endif -- 2.25.1