Merge pull request #347 from neek78/small_changes

Add basic support for Darwin PROX_FDTYPE_NETPOLICY

Author: jiegec

include/lsof.h

@@ -212,6 +212,7 @@ enum lsof_file_type {
                               type */
     LSOF_FILE_SCO_SEMA,    /**< SCO OpenServer Xenix semaphore file */
     LSOF_FILE_SCO_SHARED,  /**< SCO OpenServer Xenix shared data file */
+    LSOF_FILE_NPOLICY,     /**< Darwin Netpolicy */
     LSOF_FILE_UNSUPPORTED, /**< unsupported file type */
 
     /* types from struct vnode */

lib/dialects/darwin/dfile.c

@@ -273,6 +273,20 @@ void process_fsevents(struct lsof_context *ctx, /* context */
     Lf->type = LSOF_FILE_FSEVENTS;
 }
 
+/*
+ *
+ * process_fsevents() -- process a network policy file
+ * see also -
+ https://github.com/apple-opensource/lsof/blob/da09c8c6436286e5bd8c400b42e86b54404f12a7/lsof/dialects/darwin/libproc/dnetpolicy.c
+ */
+
+void process_netpolicy(struct lsof_context *ctx, /* context */
+                       int pid,                  /* PID */
+                       int32_t fp)               /* fd */
+{
+    Lf->type = LSOF_FILE_NPOLICY;
+}
+
 /*
  * process_kqueue() -- process a kernel queue file
  */
@@ -612,3 +626,4 @@ void process_fileport_vnode(struct lsof_context *ctx, /* context */
     process_vnode_common(ctx, &vi);
 }
 #endif /* PROC_PIDLISTFILEPORTS */
+

lib/dialects/darwin/dproc.c

@@ -537,6 +537,9 @@ static void process_fds(struct lsof_context *ctx, /* context */
         case PROX_FDTYPE_VNODE:
             (void)process_vnode(ctx, pid, fdp->proc_fd);
             break;
+        case PROX_FDTYPE_NETPOLICY:
+            (void)process_netpolicy(ctx, pid, fdp->proc_fd);
+            break;
         default:
             (void)snpf(Namech, Namechl - 1, "unknown file type: %d",
                        fdp->proc_fdtype);

lib/dialects/darwin/dproto.h

@@ -52,6 +52,7 @@ extern void process_psem(struct lsof_context *ctx, int pid, int32_t fd);
 extern void process_pshm(struct lsof_context *ctx, int pid, int32_t fd);
 extern void process_socket(struct lsof_context *ctx, int pid, int32_t fd);
 extern void process_vnode(struct lsof_context *ctx, int pid, int32_t fd);
+extern void process_netpolicy(struct lsof_context *ctx, int pid, int32_t fd);
 #if defined(PROC_PIDLISTFILEPORTS)
 extern void process_fileport_pipe(struct lsof_context *ctx, int pid,
                                   uint32_t fileport);

lib/print.c

@@ -394,6 +394,9 @@ void file_type_to_string(enum lsof_file_type type,
     case LSOF_FILE_SCO_SHARED:
         (void)snpf(buf, buf_len, "XSD");
         break;
+    case LSOF_FILE_NPOLICY:
+        (void)snpf(buf, buf_len, "NPOLICY");
+        break;
     case LSOF_FILE_UNSUPPORTED:
         (void)snpf(buf, buf_len, "UNSP");
         break;