Rim/iw7-mod
Rim/iw7-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

experiments pt4

Browse Source
This commit is contained in:
quaK 2022-09-24 23:07:59 +03:00
parent e0da509cae
commit b801eb796d
3 changed files with 63 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/component/auth.cpp
View File

@ -5,6 +5,8 @@
#include "game/game.hpp" #include "game/game.hpp"
#include "steam/steam.hpp" #include "steam/steam.hpp"
#include "command.hpp"
#include <utils/hook.hpp> #include <utils/hook.hpp>
#include <utils/string.hpp> #include <utils/string.hpp>
#include <utils/smbios.hpp> #include <utils/smbios.hpp>
@ -82,12 +84,12 @@ namespace auth
uint64_t get_guid() uint64_t get_guid()
{ {
if (game::environment::is_dedi()) //if (game::environment::is_dedi())
{ {
return 0x110000100000000 | (::utils::cryptography::random::get_integer() & ~0x80000000); return 0x110000100000000 | (::utils::cryptography::random::get_integer() & ~0x80000000);
} }
return get_key().get_hash(); //return get_key().get_hash();
} }
class component final : public component_interface class component final : public component_interface
@ -95,7 +97,10 @@ namespace auth
public: public:
void post_unpack() override void post_unpack() override
{ {
command::add("guid", []()
{
printf("Your guid: %llX\n", steam::SteamUser()->GetSteamID().bits);
});
} }
}; };
} }

118
src/client/component/network.cpp
View File

@ -47,34 +47,16 @@ namespace network
namespace namespace
{ {
utils::hook::detour cl_main_connectionless_packet_connect_handshake_hook; utils::hook::detour cl_dispatch_connectionless_packet_hook;
bool cl_main_connectionless_packet_connect_handshake_stub(int client_num, game::netadr_s* from, game::msg_t* msg, int time, const char* c) bool cl_dispatch_connectionless_packet_stub(int client_num, game::netadr_s* from, game::msg_t* msg, int time)
{ {
if (handle_command(from, c, msg)) printf("connectionless packet: type: %d, adr: %s\n", from->type, net_adr_to_string(*from));
if (handle_command(from, game::Cmd_Argv(0), msg))
{ {
return true; return true;
} }
return cl_main_connectionless_packet_connect_handshake_hook.invoke<bool>(client_num, from, msg, time, c); return cl_dispatch_connectionless_packet_hook.invoke<bool>(client_num, from, msg, time);
}
int sys_send_packet_stub(const int size, const char* src, game::netadr_s* to)
{
console::info("Sys_SendPacket: type: %i, query_socket: %p\n", to->type, *game::query_socket);
if (to->type == game::NA_BROADCAST || to->type == game::NA_IP)
{
if (*game::query_socket)
{
sockaddr s = {};
game::NetadrToSockadr(to, &s);
return sendto(*game::query_socket, src, size, 0, &s, sizeof(sockaddr)) >= 0;
}
}
else
{
game::Com_Error(game::ERR_DROP, "Sys_SendPacket: bad address type %i", to->type);
}
return 0;
} }
void sockadr_to_netadr(const sockaddr* s, game::netadr_s* a) void sockadr_to_netadr(const sockaddr* s, game::netadr_s* a)
@ -82,53 +64,50 @@ namespace network
if (s->sa_family == 2) if (s->sa_family == 2)
{ {
a->type = game::NA_IP; a->type = game::NA_IP;
*a->ip = *&s->sa_data[2]; *(int*)&a->ip = *(int*)&s->sa_data[2];
a->port = ntohs(*s->sa_data); a->port = *(unsigned short*)(&s->sa_data[0]);
} }
} }
int sys_get_packet_stub(game::netadr_s* net_from, game::msg_t* net_message) int dw_send_to_stub(const int length, const char* data, game::netadr_s* to)
{ {
int ret; if (!*game::query_socket || *game::query_socket == INVALID_SOCKET)
int fromlen;
sockaddr from;
int datalen;
if (!*game::query_socket)
{ {
return 0; printf("query socket is not initialized\n");
} }
sockaddr s = {};
game::NetadrToSockadr(to, &s);
return sendto(*game::query_socket, data, length, 0, &s, sizeof(sockaddr)) >= 0;
}
fromlen = sizeof(sockaddr); int dw_recv_from_stub(game::netadr_s* from, char* data, int maxsize)
ret = recvfrom(*game::query_socket, net_message->data, net_message->maxsize, 0, &from, &fromlen); {
sockaddr s = {};
int slen = sizeof(sockaddr);
int ret;
int datalen;
ret = recvfrom(*game::query_socket, data, maxsize, 0, &s, &slen);
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
return 0; return 0;
} }
sockadr_to_netadr(&s, from);
printf("%s\n", std::string(net_message->data, ret).data()); if (from->type == game::NA_IP)
{
sockadr_to_netadr(&from, net_from); //printf("recv: %s\n", std::string(data, ret).data());
net_message->readcount = 0; }
datalen = ret; datalen = ret;
if (!datalen) if (!datalen)
{ {
console::warn("Sys_GetPacket: Empty or discarded packet from %s\n", net_adr_to_string(*net_from)); console::warn("Sys_GetPacket: Empty or discarded packet from %s\n", net_adr_to_string(*from));
return 0; return 0;
} }
if (datalen == net_message->maxsize) if (datalen == maxsize)
{ {
console::warn("Sys_GetPacket: Oversize packet from %s\n", net_adr_to_string(*net_from)); console::warn("Sys_GetPacket: Oversize packet from %s\n", net_adr_to_string(*from));
return 0; return 0;
} }
return datalen - 2; // dunno why -2
net_message->cursize = datalen - 1;
net_message->targetLocalNetID = static_cast<game::netsrc_t>(net_message->data[net_message->cursize] >> 4);
net_from->localNetID = static_cast<game::netsrc_t>(net_message->data[net_message->cursize] & 0xF);
return 1;
} }
int net_compare_base_address(const game::netadr_s* a, const game::netadr_s* b) int net_compare_base_address(const game::netadr_s* a, const game::netadr_s* b)
@ -187,27 +166,27 @@ namespace network
if (sock == INVALID_SOCKET) if (sock == INVALID_SOCKET)
{ {
console::warn("WARNING: UDP_OpenSocket: socket"); console::warn("WARNING: UDP_OpenSocket: socket\n");
return INVALID_SOCKET; return INVALID_SOCKET;
} }
u_long arg = 1; u_long arg = 1;
if (ioctlsocket(sock, FIONBIO, &arg) == SOCKET_ERROR) if (ioctlsocket(sock, FIONBIO, &arg) == SOCKET_ERROR)
{ {
console::warn("WARNING: UDP_OpenSocket: ioctl FIONBIO"); console::warn("WARNING: UDP_OpenSocket: ioctl FIONBIO\n");
return INVALID_SOCKET; return INVALID_SOCKET;
} }
char optval[4] = { 0 }; char optval[4] = { 0 };
optval[0] = 1; optval[0] = 1;
if (setsockopt(sock, 0xFFFF, SO_BROADCAST, optval, 4) == SOCKET_ERROR) if (setsockopt(sock, 0xFFFF, SO_BROADCAST, optval, 4) == SOCKET_ERROR)
{ {
console::warn("WARNING: UDP_OpenSocket: setsockopt SO_BROADCAST"); console::warn("WARNING: UDP_OpenSocket: setsockopt SO_BROADCAST\n");
return INVALID_SOCKET; return INVALID_SOCKET;
} }
if (bind(sock, reinterpret_cast<sockaddr*>(&address), sizeof(address)) == SOCKET_ERROR) if (bind(sock, reinterpret_cast<sockaddr*>(&address), sizeof(address)) == SOCKET_ERROR)
{ {
console::warn("WARNING: UDP_OpenSocket: bind"); console::warn("WARNING: UDP_OpenSocket: bind\n");
closesocket(sock); closesocket(sock);
return INVALID_SOCKET; return INVALID_SOCKET;
} }
@ -225,18 +204,19 @@ namespace network
{ {
*game::query_socket = create_socket( *game::query_socket = create_socket(
net_ip->current.string, net_port->current.integer + port_diff, IPPROTO_UDP); net_ip->current.string, net_port->current.integer + port_diff, IPPROTO_UDP);
if (*game::query_socket) if (*game::query_socket != INVALID_SOCKET)
{ {
break; break;
} }
} }
if (!*game::query_socket) if (*game::query_socket == INVALID_SOCKET)
{ {
console::warn("WARNING: Couldn't allocate IP/UDP port, LAN discovery will not work!\n"); console::warn("WARNING: Couldn't allocate IP/UDP port, LAN discovery will not work!\n");
return; return;
} }
printf("net_port: %d\n", port_diff);
game::Dvar_SetInt(net_port, net_port->current.integer + port_diff); game::Dvar_SetInt(net_port, net_port->current.integer + port_diff);
} }
@ -245,6 +225,11 @@ namespace network
init_socket(); init_socket();
utils::hook::invoke<void>(0xD57A00_b); utils::hook::invoke<void>(0xD57A00_b);
} }
int get_protocol_version_stub()
{
return PROTOCOL;
}
} }
void send(const game::netadr_s& address, const std::string& command, const std::string& data, const char separator) void send(const game::netadr_s& address, const std::string& command, const std::string& data, const char separator)
@ -273,6 +258,7 @@ namespace network
} }
else else
{ {
printf("send_data: type: %d, data: %s\n", address.type, data.data());
game::Sys_SendPacket(size, data.data(), &address); game::Sys_SendPacket(size, data.data(), &address);
} }
} }
@ -312,15 +298,14 @@ namespace network
public: public:
void post_unpack() override void post_unpack() override
{ {
// redirect packet sends to our stub // redirect dw packet sends to our stub
utils::hook::jump(game::Sys_SendPacket, sys_send_packet_stub); utils::hook::jump(0xD942C0_b, dw_send_to_stub);
// redirect packet receives to our stub // redirect dw packet receives to our stub
utils::hook::jump(game::Sys_GetPacket, sys_get_packet_stub); utils::hook::jump(0xD93D70_b, dw_recv_from_stub);
// intercept command handling // intercept command handling
cl_main_connectionless_packet_connect_handshake_hook.create(0x9AFF90_b, cl_dispatch_connectionless_packet_hook.create(0x9B2250_b, cl_dispatch_connectionless_packet_stub);
cl_main_connectionless_packet_connect_handshake_stub);
// handle xuid without secure connection // handle xuid without secure connection
utils::hook::nop(0xC53315_b, 2); utils::hook::nop(0xC53315_b, 2);
@ -332,6 +317,7 @@ namespace network
utils::hook::set<uint8_t>(0x9DBFDD_b, 0xEB); utils::hook::set<uint8_t>(0x9DBFDD_b, 0xEB);
utils::hook::set<uint8_t>(0x9DC47D_b, 0xEB); utils::hook::set<uint8_t>(0x9DC47D_b, 0xEB);
utils::hook::set<uint8_t>(0x9DDC79_b, 0xEB); utils::hook::set<uint8_t>(0x9DDC79_b, 0xEB);
utils::hook::set<uint8_t>(0x9AA9F9_b, 0xEB);
// ignore unregistered connection // ignore unregistered connection
utils::hook::jump(0xC4F200_b, 0xC4F1AB_b); utils::hook::jump(0xC4F200_b, 0xC4F1AB_b);
@ -357,7 +343,7 @@ namespace network
//utils::hook::set<uint8_t>(0x0, 0); //utils::hook::set<uint8_t>(0x0, 0);
// don't read checksum // don't read checksum
//utils::hook::set(0xCE6E60_b, 0xC301B0); utils::hook::set(0xCE6E60_b, 0xC301B0);
// don't try to reconnect client // don't try to reconnect client
//utils::hook::call(0x0, reconnect_migratated_client); //utils::hook::call(0x0, reconnect_migratated_client);
@ -388,7 +374,11 @@ namespace network
// why? no idea // why? no idea
//utils::hook::jump(0x0, create_socket); //utils::hook::jump(0x0, create_socket);
// initialize query_socket
utils::hook::jump(0xD57C7E_b, net_init_stub); utils::hook::jump(0xD57C7E_b, net_init_stub);
// use our own protocol version
utils::hook::jump(0xCE8290_b, get_protocol_version_stub);
} }
}; };
} }

2
src/client/steam/interfaces/user.cpp
View File

@ -12,7 +12,7 @@ namespace steam
steam_id generate_steam_id() steam_id generate_steam_id()
{ {
steam_id id{}; steam_id id{};
id.bits = 76561197960287930; id.bits = auth::get_guid();
return id; return id;
} }
} }