Skip to content

activation: split Unix socket type into UnixStream and UnixDgram #56

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

Open
jabedude wants to merge 1 commit into
base: master
Choose a base branch
from
Open

activation: split Unix socket type into UnixStream and UnixDgram #56

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
56 changes: 48 additions & 8 deletions src/activation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use crate::errors::SdError;
use nix::mqueue::mq_getattr;
use nix::sys::socket::getsockname;
use nix::sys::socket::sockopt::SockType;
use nix::sys::socket::SockAddr;
use nix::sys::socket::{self, getsockname, getsockopt};
use nix::sys::stat::fstat;
use std::convert::TryFrom;
use std::env;
Expand All @@ -25,6 +26,12 @@ pub trait IsType {
/// Returns true if a file descriptor is a `PF_UNIX` socket.
fn is_unix(&self) -> bool;

/// Returns true if an INET/6 or UNIX file descriptor is a `SOCK_STREAM` socket.
fn is_stream(&self) -> bool;

/// Returns true if an INET/6 or UNIX file descriptor is a `SOCK_DGRAM` socket.
fn is_dgram(&self) -> bool;

/// Returns true if a file descriptor is a POSIX message queue descriptor.
fn is_mq(&self) -> bool;
}
Expand All @@ -45,8 +52,10 @@ enum SocketFd {
Special(RawFd),
/// A `PF_INET` socket, such as UDP/TCP sockets.
Inet(RawFd),
/// A `PF_UNIX` socket (see `man 7 unix`).
Unix(RawFd),
/// A `PF_UNIX` stream socket (see `man 7 unix`).
UnixStream(RawFd),
/// A `PF_UNIX` datagram socket (see `man 7 unix`).
UnixDgram(RawFd),
/// A POSIX message queue (see `man 7 mq_overview`).
Mq(RawFd),
/// An unknown descriptor (possibly invalid, use with caution).
Expand All @@ -70,7 +79,22 @@ impl IsType for FileDescriptor {

fn is_unix(&self) -> bool {
match self.0 {
SocketFd::Unix(_) => true,
SocketFd::UnixStream(_) => true,
SocketFd::UnixDgram(_) => true,
_ => false,
}
}

fn is_stream(&self) -> bool {
match self.0 {
SocketFd::UnixStream(_) => true,
_ => false,
}
}

fn is_dgram(&self) -> bool {
match self.0 {
SocketFd::UnixDgram(_) => true,
_ => false,
}
}
Expand Down Expand Up @@ -225,6 +249,19 @@ impl IsType for RawFd {
}
}

fn is_stream(&self) -> bool {
if let Ok(sock_type) = getsockopt(*self, SockType) {
sock_type == socket::SockType::Stream
} else {
false
}
}

fn is_dgram(&self) -> bool {
let sock_type = getsockopt(*self, SockType).expect("Getsockopt");
sock_type == socket::SockType::Datagram
}

fn is_mq(&self) -> bool {
mq_getattr(*self).is_ok()
}
Expand All @@ -240,8 +277,10 @@ impl TryFrom<RawFd> for FileDescriptor {
return Ok(FileDescriptor(SocketFd::Special(value)));
} else if value.is_inet() {
return Ok(FileDescriptor(SocketFd::Inet(value)));
} else if value.is_unix() {
return Ok(FileDescriptor(SocketFd::Unix(value)));
} else if value.is_unix() && value.is_stream() {
return Ok(FileDescriptor(SocketFd::UnixStream(value)));
} else if value.is_unix() && value.is_dgram() {
return Ok(FileDescriptor(SocketFd::UnixDgram(value)));
} else if value.is_mq() {
return Ok(FileDescriptor(SocketFd::Mq(value)));
}
Expand All @@ -261,7 +300,8 @@ impl IntoRawFd for FileDescriptor {
SocketFd::Fifo(fd) => fd,
SocketFd::Special(fd) => fd,
SocketFd::Inet(fd) => fd,
SocketFd::Unix(fd) => fd,
SocketFd::UnixStream(fd) => fd,
SocketFd::UnixDgram(fd) => fd,
SocketFd::Mq(fd) => fd,
SocketFd::Unknown(fd) => fd,
}
Expand All @@ -274,7 +314,7 @@ mod tests {

#[test]
fn test_socketype_is_unix() {
let sock = FileDescriptor(SocketFd::Unix(0i32));
let sock = FileDescriptor(SocketFd::UnixStream(0i32));
assert!(sock.is_unix());
}

Expand Down