Merge pull request #154 from amosproj/149-pids-to-uint32

Change int32 pids to uint32
amosproj · Dec 10, 2024 · f8bcf97 · f8bcf97
2 parents 959808b + dcf2dd8
commit f8bcf97
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/frontend/client/src/main/java/de/amosproj3/ziofa/client/Client.kt b/frontend/client/src/main/java/de/amosproj3/ziofa/client/Client.kt
@@ -18,7 +18,7 @@ data class VfsWriteConfig(val entries: Map<UInt, ULong>)
 
 data class SysSendmsgConfig(val entries: Map<UInt, ULong>)
 
-data class UprobeConfig(val fnName: String, val offset: ULong, var target: String, val pid: Int?)
+data class UprobeConfig(val fnName: String, val offset: ULong, var target: String, val pid: UInt?)
 
 data class JniReferencesConfig(val pids: List<UInt>)
 
@@ -54,7 +54,7 @@ sealed class Event {
     }
 }
 
-data class Process(val pid: Int, val ppid: Int, val state: String, val cmd: Command?)
+data class Process(val pid: UInt, val ppid: UInt, val state: String, val cmd: Command?)
 
 data class StringResponse(val name: String)
 

diff --git a/frontend/client/src/mock/java/de/amosproj3/ziofa/client/RustClient.kt b/frontend/client/src/mock/java/de/amosproj3/ziofa/client/RustClient.kt
@@ -63,8 +63,8 @@ object RustClient : Client {
     private val processes =
         alphabet.indices.map {
             Process(
-                pid = Random.nextUInt(1000u).toInt(),
-                ppid = Random.nextUInt(1000u).toInt(),
+                pid = Random.nextUInt(1000u),
+                ppid = Random.nextUInt(1000u),
                 state = "R",
                 cmd = Command.Comm("/bin/sh/${alphabet.substring(it, it + 1)}"),
             )

diff --git a/rust/backend/daemon/src/procfs_utils.rs b/rust/backend/daemon/src/procfs_utils.rs
@@ -29,15 +29,15 @@ pub fn list_processes() -> Result<ProcessList, ProcError> {
                 let cmdline = process.cmdline();
                 match cmdline {
                     Ok(c) if !c.is_empty() => Some(ziofa::Process {
-                        pid: stat.pid,
-                        ppid: stat.ppid,
+                        pid: u32::try_from(stat.pid).unwrap(),
+                        ppid: u32::try_from(stat.ppid).unwrap(),
                         cmd: Some(Cmd::Cmdline(CmdlineData { args: c })),
                         state: stat.state.to_string(),
                     }),
                     // fallback to stat.comm if cmdline is empty
                     _ => Some(ziofa::Process {
-                        pid: stat.pid,
-                        ppid: stat.ppid,
+                        pid: u32::try_from(stat.pid).unwrap(),
+                        ppid: u32::try_from(stat.ppid).unwrap(),
                         cmd: Some(Cmd::Comm(stat.comm)),
                         state: stat.state.to_string(),
                     }),

diff --git a/rust/shared/proto/config.proto b/rust/shared/proto/config.proto
@@ -14,7 +14,7 @@ message UprobeConfig {
   string fn_name = 1;
   uint64 offset = 2;                      // offset of the aya attach function
   string target = 3;                      // target of the aya attach function
-  optional int32 pid = 4;                 // pid of the aya attach function
+  optional uint32 pid = 4;                 // pid of the aya attach function
 }
 
 message Configuration {

diff --git a/rust/shared/proto/ziofa.proto b/rust/shared/proto/ziofa.proto
@@ -50,8 +50,8 @@ message ProcessList {
 }
 
 message Process {
-    int32 pid = 1;
-    int32 ppid = 2;
+    uint32 pid = 1;
+    uint32 ppid = 2;
     oneof cmd {
         CmdlineData cmdline = 3;
         string comm = 4;