valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 09:58:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed open sockets on OS X

Browse Source 
Minimal fix
This commit is contained in:
Mitchell Grenier 2015-02-06 14:36:04 -08:00
parent 8c5a12424f
commit 898c0933e6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osquery/tables/system/darwin/process_open_descriptors.cpp
View File

@ -103,7 +103,6 @@ void genSocketDescriptor(int pid, int descriptor, QueryData &results) {
PROC_PIDFDSOCKETINFO_SIZE) <= 0) {
return;
}
if (si.psi.soi_kind == SOCKINFO_IN || si.psi.soi_kind == SOCKINFO_TCP) {
Row r;
@ -130,7 +129,6 @@ void genSocketDescriptor(int pid, int descriptor, QueryData &results) {
}
void genOpenDescriptors(int pid, descriptor_type type, QueryData &results) {
// std::vector<OpenFile> open_files;
int bufsize = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, 0, 0);
if (bufsize == -1) {
VLOG(1) << "Could not list descriptors for pid: " << pid;
@ -139,13 +137,14 @@ void genOpenDescriptors(int pid, descriptor_type type, QueryData &results) {
// Allocate structs for each descriptor.
proc_fdinfo fds[bufsize / PROC_PIDLISTFD_SIZE];
proc_pidinfo(pid, PROC_PIDLISTFDS, 0, fds, bufsize);
for (auto fd_info : fds) {
if (type == DESCRIPTORS_TYPE_VNODE &&
fd_info.proc_fdtype == PROX_FDTYPE_VNODE) {
genFileDescriptor(pid, fd_info.proc_fd, results);
} else if (type == DESCRIPTORS_TYPE_SOCKET &&
fd_info.proc_fdtype == PROX_FDTYPE_SOCKET) {
fd_info.proc_fdtype == PROX_FDTYPE_SOCKET) {
genSocketDescriptor(pid, fd_info.proc_fd, results);
}
}
@ -160,7 +159,6 @@ QueryData genOpenSockets(QueryContext &context) {
// Optimize by not searching when a pid is a constraint.
continue;
}
genOpenDescriptors(pid, DESCRIPTORS_TYPE_SOCKET, results);
}