Mercurial > zfc9000 / file diff

--- a/sources/network/rconsession.h	Wed Jan 27 12:41:50 2021 +0200
+++ b/sources/network/rconsession.h	Wed Jan 27 19:48:41 2021 +0200
@@ -1,5 +1,5 @@
 /*
-	Copyright 2014 - 2016 Teemu Piippo
+	Copyright 2014 - 2021 Teemu Piippo
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -101,40 +101,40 @@
 	RCONSession();
 	~RCONSession();
 
-	const IPAddress&            address() const;
+	const net::ip_address&            address() const;
 	void                        bumpLastPing();
-	void                        connect(IPAddress address);
+	void                        connect(net::ip_address address);
 	void                        disconnect();
 	int                         getAdminCount() const;
-	const String&               getLevel() const;
-	UDPSocket*                  getSocket();
+	const std::string&               getLevel() const;
+	net::UDPSocket*                  getSocket();
 	RCONSessionState            getState() const;
-	void                        handlePacket(ByteArray& message);
+	void                        handlePacket(std::vector<unsigned char>& message);
 	bool                        isActive() const;
 	void                        processServerUpdates(Bytestream& packet);
-	void                        requestTabCompletion(const String& part);
+	void                        requestTabCompletion(const std::string& part);
 	void                        requestWatch (const String& cvar);
 	void                        requestWatch (const StringList& cvars);
-	void                        send(const ByteArray& packet);
-	bool                        sendCommand(const String& commandString);
+	bool send(const std::vector<unsigned char>& packet);
+	bool                        sendCommand(const std::string& commandString);
 	void                        sendHello();
 	void                        sendPassword();
 	void                        setInterface(class Interface* interface);
-	void                        setPassword(const String& password);
+	void                        setPassword(const std::string& password);
 	void                        tick();
 
 private:
 	RCONSessionState m_state;
-	IPAddress m_address;
-	UDPSocket m_socket;
+	net::ip_address m_address;
+	net::UDPSocket m_socket;
 	time_t m_lastPing;
-	String m_password;
-	String m_salt;
+	std::string m_password;
+	std::string m_salt;
 	int m_serverProtocol;
-	String m_hostname;
+	std::string m_hostname;
 	int m_adminCount;
-	String m_level;
-	String m_lastTabComplete;
+	std::string m_level;
+	std::string m_lastTabComplete;
 	class Interface* m_interface;
 };