Преглед на файлове

Kernel: Use ProcessID a bit more in Socket

Store the origin and acceptor PID's as ProcessID.
Andreas Kling преди 3 години
родител
ревизия
4ce99e4ab7
променени са 2 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 4 4
      Kernel/GlobalProcessExposed.cpp
  2. 2 2
      Kernel/Net/Socket.h

+ 4 - 4
Kernel/GlobalProcessExposed.cpp

@@ -110,7 +110,7 @@ private:
             obj.add("packets_out", socket.packets_out());
             obj.add("bytes_out", socket.bytes_out());
             if (Process::current().is_superuser() || Process::current().uid() == socket.origin_uid()) {
-                obj.add("origin_pid", socket.origin_pid());
+                obj.add("origin_pid", socket.origin_pid().value());
                 obj.add("origin_uid", socket.origin_uid().value());
                 obj.add("origin_gid", socket.origin_gid().value());
             }
@@ -132,10 +132,10 @@ private:
         LocalSocket::for_each([&array](auto& socket) {
             auto obj = array.add_object();
             obj.add("path", String(socket.socket_path()));
-            obj.add("origin_pid", socket.origin_pid());
+            obj.add("origin_pid", socket.origin_pid().value());
             obj.add("origin_uid", socket.origin_uid().value());
             obj.add("origin_gid", socket.origin_gid().value());
-            obj.add("acceptor_pid", socket.acceptor_pid());
+            obj.add("acceptor_pid", socket.acceptor_pid().value());
             obj.add("acceptor_uid", socket.acceptor_uid().value());
             obj.add("acceptor_gid", socket.acceptor_gid().value());
         });
@@ -160,7 +160,7 @@ private:
             obj.add("peer_address", socket.peer_address().to_string());
             obj.add("peer_port", socket.peer_port());
             if (Process::current().is_superuser() || Process::current().uid() == socket.origin_uid()) {
-                obj.add("origin_pid", socket.origin_pid());
+                obj.add("origin_pid", socket.origin_pid().value());
                 obj.add("origin_uid", socket.origin_uid().value());
                 obj.add("origin_gid", socket.origin_gid().value());
             }

+ 2 - 2
Kernel/Net/Socket.h

@@ -91,10 +91,10 @@ public:
     virtual KResult setsockopt(int level, int option, Userspace<const void*>, socklen_t);
     virtual KResult getsockopt(FileDescription&, int level, int option, Userspace<void*>, Userspace<socklen_t*>);
 
-    pid_t origin_pid() const { return m_origin.pid; }
+    ProcessID origin_pid() const { return m_origin.pid; }
     UserID origin_uid() const { return m_origin.uid; }
     GroupID origin_gid() const { return m_origin.gid; }
-    pid_t acceptor_pid() const { return m_acceptor.pid; }
+    ProcessID acceptor_pid() const { return m_acceptor.pid; }
     UserID acceptor_uid() const { return m_acceptor.uid; }
     GroupID acceptor_gid() const { return m_acceptor.gid; }
     const RefPtr<NetworkAdapter> bound_interface() const { return m_bound_interface; }