Merge branch 'master' into 'master'

Linux build script enhanced

See merge request Mr_Goldberg/goldberg_emulator!3

.gitlab-ci.yml

@@ -69,6 +69,9 @@ build_windows:
       - 7za x protobuf_x86-windows-static.7z -oprotobuf_x86-windows-static
       - 7za x protobuf_x64-windows-static.7z -oprotobuf_x64-windows-static
       - 7za x sdk_standalone.7z -osdk_standalone
+      - DLL_FILES="$(ls dll/*.cpp | tr "\n" " ")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat
+      - DLL_FILES="$(ls dll/*.proto | tr "\n" " " | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat
+      - sed "s| /MP12 | /MP4 |g" -i *.bat
       - python generate_build_win_bat.py
       - export WINEDEBUG=-all
       - wine cmd /c build_win_release_test.bat

build_linux.sh

@@ -1,2 +1,43 @@
+#!/bin/sh
+HERE="$(dirname "$(readlink -f "${0}")")"
+
+# get distribution
+if [ -e "/etc/os-release" ]
+then
+    DISTRO=$(grep "^ID=" "/etc/os-release" | cut -d"=" -f2| sed 's/"//g')
+    DISTRO_VERSION=$(grep "^VERSION_ID=" "/etc/os-release" | cut -d"=" -f2)
+else
+    echo "Linux distribution not found."
+    echo "Maybe the file \"/etc/os-release\" is just missing."
+    echo "Or your linux distribution is too old. Cannot check requirements."
+    echo ""
+fi
+
+opensuse_requirements(){
+    if ! which "protoc" > /dev/null 2>&1
+    then
+        echo "protoc isn't installed."
+        echo "Please install \"protobuf-devel\" package and try again"
+        exit 1
+    fi
+    if ! which "clang++" > /dev/null 2>&1
+    then
+        echo "clang++ isn't installed."
+        echo "Please install \"clang5\" package and try again"
+        exit 1
+    fi
+}
+
+if [ -n "${DISTRO}" ]
+then
+    case "${DISTRO}" in
+        opensuse|opensuse-leap)
+            opensuse_requirements
+            ;;
+        *)
+            ;;
+    esac
+fi
+
 protoc -I./dll/ --cpp_out=./dll/ ./dll/*.proto
 clang++ -shared -fPIC -o libsteam_api.so dll/*.cpp dll/*.cc -g3 -Wno-return-type -fsanitize=address -lasan -lprotobuf-lite -std=c++14 && echo built 

dll/common_includes.h

@@ -117,6 +117,7 @@ inline void reset_LastError()
     #include <sys/time.h>
 
     #include <netinet/in.h>
+    #include <netinet/tcp.h>
     #include <linux/netdevice.h>
 
     #include <fcntl.h>

dll/network.cpp

@@ -27,6 +27,8 @@ static uint32_t upper_range_ips[MAX_BROADCASTS];
 #define HEARTBEAT_TIMEOUT 20.0
 #define USER_TIMEOUT 20.0
 
+#define MAX_UDP_SIZE 16384
+
 #if defined(STEAM_WIN32)
 
 //windows xp support
@@ -215,6 +217,11 @@ static int set_socket_nonblocking(sock_t sock)
 #endif
 }
 
+static bool disable_nagle(sock_t sock)
+{
+    int set = 1;
+    return (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (char *)&set, sizeof(set)) == 0);
+}
 
 static void kill_socket(sock_t sock)
 {
@@ -920,7 +927,7 @@ void Networking::Run()
     }
 
     IP_PORT ip_port;
-    char data[2048];
+    char data[MAX_UDP_SIZE];
     int len;
 
     PRINT_DEBUG("RECV UDP\n");
@@ -978,6 +985,7 @@ void Networking::Run()
         struct TCP_Socket socket;
         if (set_socket_nonblocking(sock)) {
             PRINT_DEBUG("SET NONBLOCK\n");
+            disable_nagle(sock);
             socket.sock = sock;
             socket.received_data = true;
             socket.last_heartbeat_received = std::chrono::high_resolution_clock::now();
@@ -1031,6 +1039,7 @@ void Networking::Run()
             sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
             if (is_socket_valid(sock) && set_socket_nonblocking(sock)) {
                 PRINT_DEBUG("NEW SOCKET %u %u\n", sock, conn.tcp_socket_outgoing.sock);
+                disable_nagle(sock);
                 connect_socket(sock, conn.tcp_ip_port);
                 conn.tcp_socket_outgoing.sock = sock;
                 conn.tcp_socket_outgoing.last_heartbeat_received = std::chrono::high_resolution_clock::now();
@@ -1171,7 +1180,7 @@ bool Networking::sendTo(Common_Message *msg, bool reliable, Connection *conn)
     if (!enabled) return false;
 
     size_t size = msg->ByteSizeLong();
-    if (size >= 65000) reliable = true; //too big for UDP
+    if (size >= MAX_UDP_SIZE) reliable = true; //too big for UDP
 
     bool ret = false;
     CSteamID dest_id((uint64)msg->dest_id());

dll/steam_networking_sockets.h

@@ -752,7 +752,7 @@ EResult SendMessageToConnection( HSteamNetConnection hConn, const void *pData, u
     if (connect_socket == s->connect_sockets.end()) return k_EResultInvalidParam;
     if (connect_socket->second.status == CONNECT_SOCKET_CLOSED) return k_EResultNoConnection;
     if (connect_socket->second.status == CONNECT_SOCKET_TIMEDOUT) return k_EResultNoConnection;
-    if (connect_socket->second.status != CONNECT_SOCKET_CONNECTED) return k_EResultInvalidState;
+    if (connect_socket->second.status != CONNECT_SOCKET_CONNECTED && connect_socket->second.status != CONNECT_SOCKET_CONNECTING) return k_EResultInvalidState;
 
     Common_Message msg;
     msg.set_source_id(connect_socket->second.created_by.ConvertToUint64());
@@ -2084,10 +2084,16 @@ void Callback(Common_Message *msg)
         } else if (msg->networking_sockets().type() == Networking_Sockets::DATA) {
             auto connect_socket = s->connect_sockets.find(msg->networking_sockets().connection_id());
             if (connect_socket != s->connect_sockets.end()) {
-                if (connect_socket->second.remote_identity.GetSteamID64() == msg->source_id() && connect_socket->second.status == CONNECT_SOCKET_CONNECTED) {
+                if (connect_socket->second.remote_identity.GetSteamID64() == msg->source_id() && (connect_socket->second.status == CONNECT_SOCKET_CONNECTED)) {
                     PRINT_DEBUG("Steam_Networking_Sockets: got data len %u on connection %u\n", msg->networking_sockets().data().size(), connect_socket->first);
                     connect_socket->second.data.push(msg->networking_sockets());
                 }
+            } else {
+                connect_socket = std::find_if(s->connect_sockets.begin(), s->connect_sockets.end(), [msg](const auto &in) {return in.second.remote_identity.GetSteamID64() == msg->source_id() && (in.second.status == CONNECT_SOCKET_NOT_ACCEPTED || in.second.status == CONNECT_SOCKET_CONNECTED) && in.second.remote_id == msg->networking_sockets().connection_id_from();});
+                if (connect_socket != s->connect_sockets.end()) {
+                    PRINT_DEBUG("Steam_Networking_Sockets: got data len %u on not accepted connection %u\n", msg->networking_sockets().data().size(), connect_socket->first);
+                    connect_socket->second.data.push(msg->networking_sockets());
+                }
             }
         } else if (msg->networking_sockets().type() == Networking_Sockets::CONNECTION_END) {
             auto connect_socket = s->connect_sockets.find(msg->networking_sockets().connection_id());

overlay_experimental/steam_overlay.cpp

@@ -568,7 +568,7 @@ void Steam_Overlay::BuildFriendWindow(Friend const& frd, friend_window_state& st
             }
         }
 
-        ImGui::InputTextMultiline("##chat_history", &state.chat_history[0], state.chat_history.length(), { -1.0f, 0 }, ImGuiInputTextFlags_ReadOnly);
+        ImGui::InputTextMultiline("##chat_history", &state.chat_history[0], state.chat_history.length(), { -1.0f, -2.0f * ImGui::GetFontSize() }, ImGuiInputTextFlags_ReadOnly);
         // TODO: Fix the layout of the chat line + send button.
         // It should be like this: chat input should fill the window size minus send button size (button size is fixed)
         // |------------------------------|
@@ -597,6 +597,7 @@ void Steam_Overlay::BuildFriendWindow(Friend const& frd, friend_window_state& st
         if (ImGui::InputText("##chat_line", state.chat_input, max_chat_len, ImGuiInputTextFlags_EnterReturnsTrue))
         {
             send_chat_msg = true;
+            ImGui::SetKeyboardFocusHere(-1);
         }
         ImGui::PopItemWidth();
 
@@ -987,7 +988,7 @@ void Steam_Overlay::Callback(Common_Message *msg)
         {
             Steam_Messages const& steam_message = msg->steam_messages();
             // Change color to cyan for friend
-            friend_info->second.chat_history.append(steam_message.message()).append("\n", 1);
+            friend_info->second.chat_history.append(friend_info->first.name() + ": " + steam_message.message()).append("\n", 1);
             if (!(friend_info->second.window_state & window_state_show))
             {
                 friend_info->second.window_state |= window_state_need_attention;
@@ -1113,7 +1114,7 @@ void Steam_Overlay::RunCallbacks()
                     msg.set_dest_id(friend_id);
                     network->sendTo(&msg, true);
 
-                    friend_info->second.chat_history.append(input).append("\n", 1);
+                    friend_info->second.chat_history.append(get_steam_client()->settings_client->get_local_name()).append(": ").append(input).append("\n", 1);
                 }
                 *input = 0; // Reset the input field
                 friend_info->second.window_state &= ~window_state_send_message;