allow changing packet sharing behavior in old p2p networking via ini config

Author: a

dll/dll/p2p_manager.hpp

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "base.h"
+#include <tuple>
 
 
 class P2p_Manager
@@ -31,8 +32,15 @@ class P2p_Manager
 
     struct Packet_t
     {
+    private:
+        std::chrono::high_resolution_clock::time_point time_created = std::chrono::high_resolution_clock::now();
+
+    public:
         bool is_processed = false;
         std::vector<char> data{};
+        EP2PSend send_type = EP2PSend::k_EP2PSendUnreliable;
+
+        const std::chrono::high_resolution_clock::time_point& get_time_created() const;
     };
 
     struct Channel_t
@@ -69,7 +77,17 @@ class P2p_Manager
 
     // true if the connection was already accepted,
     // false otherwise.
-    bool store_packet(CSteamID my_id, CSteamID steamIDRemote, const void *pubData, uint32 cubData, int nChannel);
+    bool store_packet(
+        CSteamID my_id, CSteamID steamIDRemote,
+        const void *pubData, uint32 cubData, int nChannel,
+        EP2PSend send_type
+    );
+
+    std::optional<std::tuple<
+        decltype(connections)::iterator,
+        decltype(Connection_t::channels)::iterator,
+        decltype(Channel_t::packets)::iterator
+    >> get_next_packet(CSteamID my_id, int nChannel);
 
     void periodic_handle_connections(const std::chrono::high_resolution_clock::time_point &now);
     void periodic_handle_channels(const std::chrono::high_resolution_clock::time_point &now);

dll/dll/settings.h

@@ -200,6 +200,32 @@ struct Branch_Info {
     bool active = false;
 };
 
+struct OldP2pBehavior {
+    enum class EPacketShareMode {
+        // if the sending type is unreliable (UDP), share packets between gameserver and client
+        // otherwise, don't share packets
+        DEFAULT,
+
+        // always share packets between gameserver and client
+        ALWAYS_SHARE,
+
+        // never share packets between gameserver and client
+        NEVER_SHARE,
+
+        _LAST,
+    };
+
+    static EPacketShareMode to_share_mode(int val) {
+        if (val < 0 || val >= (unsigned)EPacketShareMode::_LAST) {
+            return EPacketShareMode::DEFAULT;
+        }
+
+        return (EPacketShareMode)val;
+    }
+
+    EPacketShareMode mode = EPacketShareMode::DEFAULT;
+};
+
 class Settings {
 private:
     CSteamID steam_id{}; // user id
@@ -373,6 +399,9 @@ class Settings {
     // free weekend
     bool free_weekend = false;
 
+    // old P2P (ISteamNetworking) behavior
+    OldP2pBehavior old_p2p_behavior{};
+
     // voice chat
     bool enable_voice_chat = false;
 

dll/net.proto

@@ -81,15 +81,15 @@ message Low_Level {
 }
 
 message Network_pb {
-    int32 channel = 1;
-    bytes data = 2;
-
     enum Types {
         DATA = 0;
         FAILED_CONNECT = 1;
     }
 
-    Types type = 3;
+    Types type = 1;
+    int32 channel = 2;
+    bytes data = 3;
+    uint32 send_type = 4; // EP2PSend
 }
 
 message Network_Old {