fix: extend pid field to 32-bit (getpid returns 32-bit on modern systems)

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Александр Попов

.gitignore

@@ -1,2 +1,4 @@
 objs
 dep
+proxy-secret
+proxy-multi.conf

common/pid.c

@@ -38,9 +38,7 @@ npid_t PID;
 
 void init_common_PID (void) {
   if (!PID.pid) {
-    int p = getpid ();
-    assert (!(p & 0xffff0000));
-    PID.pid = p;
+    PID.pid = (unsigned) getpid ();
   }
   if (!PID.utime) {
     PID.utime = time (0);
@@ -80,8 +78,8 @@ int process_id_is_newer (struct process_id *a, struct process_id *b) {
   assert (!memcmp (a, b, 6));
   if (a->utime < b->utime) { return 0; }
   if (a->utime > b->utime) { return 1; }
-  int x = (a->pid - b->pid) & 0x7fff;
-  if (x && x <= 0x3fff) { return 1; }
+  unsigned x = (a->pid - b->pid) & 0x7fffffff;
+  if (x && x <= 0x3fffffff) { return 1; }
   return 0;
 }
 

common/pid.h

@@ -29,14 +29,14 @@
 struct process_id {
   unsigned ip;
   short port;
-  unsigned short pid;
+  unsigned pid;  /* was unsigned short; getpid() returns 32-bit on modern systems */
   int utime;
 };
 
 struct process_id_ext {
   unsigned ip;
   short port;
-  unsigned short pid;
+  unsigned pid;
   int utime;
   int actor_id;
 };

common/tl-parse.c

@@ -770,7 +770,7 @@ static inline int __tl_store_init (struct tl_out_state *tlio_out, void *out, voi
 
 int tls_init_raw_msg (struct tl_out_state *tlio_out, struct process_id *pid, long long qid) {
   if (pid) {
-    memcpy (&tlio_out->out_pid_buf, pid, 12);
+    memcpy (&tlio_out->out_pid_buf, pid, sizeof (struct process_id));
     TL_OUT_PID = &tlio_out->out_pid_buf;
   } else {
     TL_OUT_PID = 0;

net/net-rpc-targets.c

@@ -23,6 +23,7 @@
 */
 
 #include <assert.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -40,7 +41,7 @@
 #include "common/mp-queue.h"
 #include "common/server-functions.h"
 
-#define rpc_target_cmp(a,b) (RPC_TARGET_INFO(a)->PID.port ? memcmp (&RPC_TARGET_INFO(a)->PID, &RPC_TARGET_INFO(b)->PID, 6) : memcmp (&RPC_TARGET_INFO(a)->PID, &RPC_TARGET_INFO(b)->PID, 8)) 
+#define rpc_target_cmp(a,b) (RPC_TARGET_INFO(a)->PID.port ? memcmp (&RPC_TARGET_INFO(a)->PID, &RPC_TARGET_INFO(b)->PID, 6) : memcmp (&RPC_TARGET_INFO(a)->PID, &RPC_TARGET_INFO(b)->PID, offsetof (struct process_id, utime))) 
 
 //DEFINE_TREE(rpc_target, rpc_target_job_t, rpc_target_cmp, MALLOC)
 

net/net-tcp-rpc-client.c

@@ -299,7 +299,7 @@ static int tcp_rpcc_process_handshake_packet (connection_job_t C, struct raw_mes
   }
   assert (rwm_fetch_data (msg, &P, packet_len) == packet_len);  
   if (!matches_pid (&P.sender_pid, &D->remote_pid) && !(TCP_RPCC_FUNC(C)->mode_flags & TCP_RPC_IGNORE_PID)) {
-    vkprintf (1, "PID mismatch during client RPC handshake: local %08x:%d:%d:%d, remote %08x:%d:%d:%d\n",
+    vkprintf (1, "PID mismatch during client RPC handshake: local %08x:%d:%u:%d, remote %08x:%d:%u:%d\n",
                  D->remote_pid.ip, D->remote_pid.port, D->remote_pid.pid, D->remote_pid.utime, P.sender_pid.ip, P.sender_pid.port, P.sender_pid.pid, P.sender_pid.utime);
     tcp_rpcc_send_handshake_error_packet (C, -6);
     return -6;

net/net-tcp-rpc-server.c

@@ -287,7 +287,7 @@ static int tcp_rpcs_process_handshake_packet (connection_job_t C, struct raw_mes
   assert (rwm_fetch_data (msg, &P, packet_len) == packet_len);
   memcpy (&D->remote_pid, &P.sender_pid, sizeof (struct process_id));
   if (!matches_pid (&PID, &P.peer_pid) && !(TCP_RPCS_FUNC(C)->mode_flags & TCP_RPC_IGNORE_PID)) {
-    vkprintf (1, "PID mismatch during handshake: local %08x:%d:%d:%d, remote %08x:%d:%d:%d\n",
+    vkprintf (1, "PID mismatch during handshake: local %08x:%d:%u:%d, remote %08x:%d:%u:%d\n",
                  PID.ip, PID.port, PID.pid, PID.utime, P.peer_pid.ip, P.peer_pid.port, P.peer_pid.pid, P.peer_pid.utime);
     tcp_rpcs_send_handshake_error_packet (C, -4);
     return -4;

vv/vv-io.h

@@ -23,10 +23,10 @@
 #include <stdio.h>
 #include <arpa/inet.h>
 
-#define PID_PRINT_STR "[" IP_PRINT_STR ":%d:%d:%d]"
+#define PID_PRINT_STR "[" IP_PRINT_STR ":%d:%u:%d]"
 #define IP_PRINT_STR "%d.%d.%d.%d"
 
-#define PID_TO_PRINT(a) IP_TO_PRINT((a)->ip), (int)(a)->port, (int)(a)->pid, (a)->utime
+#define PID_TO_PRINT(a) IP_TO_PRINT((a)->ip), (int)(a)->port, (unsigned)(a)->pid, (a)->utime
 #define IP_TO_PRINT(a) ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff
 
 #define IPV6_PRINT_STR "%s"