diff options
Diffstat (limited to 'kppp')
-rw-r--r-- | kppp/opener.cpp | 8 | ||||
-rw-r--r-- | kppp/requester.cpp | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/kppp/opener.cpp b/kppp/opener.cpp index 5d90cc0e..7628681b 100644 --- a/kppp/opener.cpp +++ b/kppp/opener.cpp @@ -342,7 +342,13 @@ void Opener::mainLoop() { // int Opener::sendFD(int fd, struct ResponseHeader *response) { - struct { struct cmsghdr cmsg; int fd; } control; + union { + struct { + char _cmsg[sizeof(struct cmsghdr)]; + char data[sizeof(int)]; // int fd field + }; + struct cmsghdr cmsg; + } control; struct msghdr msg; struct iovec iov; diff --git a/kppp/requester.cpp b/kppp/requester.cpp index b5450929..016d72fa 100644 --- a/kppp/requester.cpp +++ b/kppp/requester.cpp @@ -80,7 +80,13 @@ Requester::~Requester() { // Receive file name and file descriptors from envoy // int Requester::recvFD() { - struct { struct cmsghdr cmsg; int fd; } control; + union { + struct { + char _cmsg[sizeof(struct cmsghdr)]; + char data[sizeof(int)]; // int fd field + }; + struct cmsghdr cmsg; + } control; struct msghdr msg; struct ResponseHeader response; |