1 files changed, 37 insertions, 43 deletions

diff --git a/scene/main/multiplayer_peer.h b/scene/main/multiplayer_peer.h
index 8a012d7520..4b5909538e 100644
--- a/scene/main/multiplayer_peer.h
+++ b/scene/main/multiplayer_peer.h
@@ -33,6 +33,7 @@
 
 #include "core/io/packet_peer.h"
 
+#include "core/extension/ext_wrappers.gen.inc"
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/script_language.h"
 #include "core/variant/native_ptr.h"
@@ -73,14 +74,20 @@ public:
 	virtual TransferMode get_transfer_mode() const;
 	virtual void set_refuse_new_connections(bool p_enable);
 	virtual bool is_refusing_new_connections() const;
+	virtual bool is_server_relay_supported() const;
 
 	virtual void set_target_peer(int p_peer_id) = 0;
 
 	virtual int get_packet_peer() const = 0;
+	virtual TransferMode get_packet_mode() const = 0;
+	virtual int get_packet_channel() const = 0;
+
+	virtual void disconnect_peer(int p_peer, bool p_force = false) = 0;
 
 	virtual bool is_server() const = 0;
 
 	virtual void poll() = 0;
+	virtual void close() = 0;
 
 	virtual int get_unique_id() const = 0;
 
@@ -103,55 +110,42 @@ protected:
 	PackedByteArray script_buffer;
 
 public:
-	/* PacketPeer */
-	virtual int get_available_packet_count() const override;
+	/* PacketPeer extension */
 	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) override; ///< buffer is GONE after next get_packet
-	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
-	virtual int get_max_packet_size() const override;
-
-	/* MultiplayerPeer */
-	virtual void set_transfer_channel(int p_channel) override;
-	virtual int get_transfer_channel() const override;
-	virtual void set_transfer_mode(TransferMode p_mode) override;
-	virtual TransferMode get_transfer_mode() const override;
-	virtual void set_target_peer(int p_peer_id) override;
-
-	virtual int get_packet_peer() const override;
+	GDVIRTUAL2R(Error, _get_packet, GDNativeConstPtr<const uint8_t *>, GDNativePtr<int>);
+	GDVIRTUAL0R(PackedByteArray, _get_packet_script); // For GDScript.
 
-	virtual bool is_server() const override;
-
-	virtual void poll() override;
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) override;
+	GDVIRTUAL2R(Error, _put_packet, GDNativeConstPtr<const uint8_t>, int);
+	GDVIRTUAL1R(Error, _put_packet_script, PackedByteArray); // For GDScript.
 
-	virtual int get_unique_id() const override;
+	EXBIND0RC(int, get_available_packet_count);
+	EXBIND0RC(int, get_max_packet_size);
 
+	/* MultiplayerPeer extension */
 	virtual void set_refuse_new_connections(bool p_enable) override;
-	virtual bool is_refusing_new_connections() const override;
+	GDVIRTUAL1(_set_refuse_new_connections, bool); // Optional.
 
-	virtual ConnectionStatus get_connection_status() const override;
-
-	/* PacketPeer GDExtension */
-	GDVIRTUAL0RC(int, _get_available_packet_count);
-	GDVIRTUAL2R(int, _get_packet, GDNativeConstPtr<const uint8_t *>, GDNativePtr<int>);
-	GDVIRTUAL2R(int, _put_packet, GDNativeConstPtr<const uint8_t>, int);
-	GDVIRTUAL0RC(int, _get_max_packet_size);
-
-	/* PacketPeer GDScript */
-	GDVIRTUAL0R(PackedByteArray, _get_packet_script);
-	GDVIRTUAL1R(int, _put_packet_script, PackedByteArray);
-
-	/* MultiplayerPeer GDExtension */
-	GDVIRTUAL1(_set_transfer_channel, int);
-	GDVIRTUAL0RC(int, _get_transfer_channel);
-	GDVIRTUAL1(_set_transfer_mode, int);
-	GDVIRTUAL0RC(int, _get_transfer_mode);
-	GDVIRTUAL1(_set_target_peer, int);
-	GDVIRTUAL0RC(int, _get_packet_peer);
-	GDVIRTUAL0RC(bool, _is_server);
-	GDVIRTUAL0R(int, _poll);
-	GDVIRTUAL0RC(int, _get_unique_id);
-	GDVIRTUAL1(_set_refuse_new_connections, bool);
-	GDVIRTUAL0RC(bool, _is_refusing_new_connections);
-	GDVIRTUAL0RC(int, _get_connection_status);
+	virtual bool is_refusing_new_connections() const override;
+	GDVIRTUAL0RC(bool, _is_refusing_new_connections); // Optional.
+
+	virtual bool is_server_relay_supported() const override;
+	GDVIRTUAL0RC(bool, _is_server_relay_supported); // Optional.
+
+	EXBIND1(set_transfer_channel, int);
+	EXBIND0RC(int, get_transfer_channel);
+	EXBIND1(set_transfer_mode, TransferMode);
+	EXBIND0RC(TransferMode, get_transfer_mode);
+	EXBIND1(set_target_peer, int);
+	EXBIND0RC(int, get_packet_peer);
+	EXBIND0RC(TransferMode, get_packet_mode);
+	EXBIND0RC(int, get_packet_channel);
+	EXBIND0RC(bool, is_server);
+	EXBIND0(poll);
+	EXBIND0(close);
+	EXBIND2(disconnect_peer, int, bool);
+	EXBIND0RC(int, get_unique_id);
+	EXBIND0RC(ConnectionStatus, get_connection_status);
 };
 
 #endif // MULTIPLAYER_PEER_H