github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-20 13:33:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Discovery and Wakeup for PS5

Browse source
This commit is contained in:
Florian Märkl 2020-12-25 14:48:09 +01:00
commit 8904c86a6d
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
9 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cli/src/discover.c
View file

@ -142,7 +142,7 @@ CHIAKI_EXPORT int chiaki_cli_cmd_discover(ChiakiLog *log, int argc, char *argv[]
return 1; return 1;
} }
((struct sockaddr_in *)host_addr)->sin_port = htons(CHIAKI_DISCOVERY_PORT); // TODO: IPv6 ((struct sockaddr_in *)host_addr)->sin_port = htons(CHIAKI_DISCOVERY_PORT_PS4); // TODO: IPv6, PS5, should probably use the service
ChiakiDiscoveryPacket packet; ChiakiDiscoveryPacket packet;
memset(&packet, 0, sizeof(packet)); memset(&packet, 0, sizeof(packet));
@ -151,7 +151,7 @@ CHIAKI_EXPORT int chiaki_cli_cmd_discover(ChiakiLog *log, int argc, char *argv[]
chiaki_discovery_send(&discovery, &packet, host_addr, host_addr_len); chiaki_discovery_send(&discovery, &packet, host_addr, host_addr_len);
while(1) while(1)
sleep(1); sleep(1); // TODO: wtf
return 0; return 0;
} }

2
cli/src/wakeup.c
View file

@ -73,5 +73,5 @@ CHIAKI_EXPORT int chiaki_cli_cmd_wakeup(ChiakiLog *log, int argc, char *argv[])
uint64_t credential = (uint64_t)strtoull(arguments.registkey, NULL, 16); uint64_t credential = (uint64_t)strtoull(arguments.registkey, NULL, 16);
return chiaki_discovery_wakeup(log, NULL, arguments.host, credential); return chiaki_discovery_wakeup(log, NULL, arguments.host, credential, false);
} }

2
gui/include/discoverymanager.h
View file

@ -44,7 +44,7 @@ class DiscoveryManager : public QObject
void SetActive(bool active); void SetActive(bool active);
void SendWakeup(const QString &host, const QByteArray &regist_key); void SendWakeup(const QString &host, const QByteArray &regist_key, bool ps5);
const QList<DiscoveryHost> GetHosts() const { return hosts; } const QList<DiscoveryHost> GetHosts() const { return hosts; }

5
gui/src/discoverymanager.cpp
View file

@ -58,7 +58,6 @@ void DiscoveryManager::SetActive(bool active)
sockaddr_in addr = {}; sockaddr_in addr = {};
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(CHIAKI_DISCOVERY_PORT);
addr.sin_addr.s_addr = 0xffffffff; // 255.255.255.255 addr.sin_addr.s_addr = 0xffffffff; // 255.255.255.255
options.send_addr = reinterpret_cast<sockaddr *>(&addr); options.send_addr = reinterpret_cast<sockaddr *>(&addr);
options.send_addr_size = sizeof(addr); options.send_addr_size = sizeof(addr);
@ -80,7 +79,7 @@ void DiscoveryManager::SetActive(bool active)
} }
void DiscoveryManager::SendWakeup(const QString &host, const QByteArray &regist_key) void DiscoveryManager::SendWakeup(const QString &host, const QByteArray &regist_key, bool ps5)
{ {
QByteArray key = regist_key; QByteArray key = regist_key;
for(size_t i=0; i<key.size(); i++) for(size_t i=0; i<key.size(); i++)
@ -100,7 +99,7 @@ void DiscoveryManager::SendWakeup(const QString &host, const QByteArray &regist_
throw Exception("Invalid regist key"); throw Exception("Invalid regist key");
} }
ChiakiErrorCode err = chiaki_discovery_wakeup(&log, service_active ? &service.discovery : nullptr, host.toUtf8().constData(), credential); ChiakiErrorCode err = chiaki_discovery_wakeup(&log, service_active ? &service.discovery : nullptr, host.toUtf8().constData(), credential, ps5);
if(err != CHIAKI_ERR_SUCCESS) if(err != CHIAKI_ERR_SUCCESS)
throw Exception(QString("Failed to send Packet: %1").arg(chiaki_error_string(err))); throw Exception(QString("Failed to send Packet: %1").arg(chiaki_error_string(err)));

3
gui/src/mainwindow.cpp
View file

@ -212,7 +212,8 @@ void MainWindow::SendWakeup(const DisplayServer *server)
try try
{ {
discovery_manager.SendWakeup(server->GetHostAddr(), server->registered_host.GetRPRegistKey()); discovery_manager.SendWakeup(server->GetHostAddr(), server->registered_host.GetRPRegistKey(),
chiaki_target_is_ps5(server->registered_host.GetTarget()));
} }
catch(const Exception &e) catch(const Exception &e)
{ {

8
lib/include/chiaki/discovery.h
View file

@ -21,8 +21,10 @@ typedef unsigned short sa_family_t;
extern "C" { extern "C" {
#endif #endif
#define CHIAKI_DISCOVERY_PORT 987 #define CHIAKI_DISCOVERY_PORT_PS4 987
#define CHIAKI_DISCOVERY_PROTOCOL_VERSION "00020020" #define CHIAKI_DISCOVERY_PROTOCOL_VERSION_PS4 "00020020"
#define CHIAKI_DISCOVERY_PORT_PS5 9302
#define CHIAKI_DISCOVERY_PROTOCOL_VERSION_PS5 "00030010"
typedef enum chiaki_discovery_cmd_t typedef enum chiaki_discovery_cmd_t
{ {
@ -101,7 +103,7 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_thread_stop(ChiakiDiscoveryThread
* Convenience function to send a wakeup packet * Convenience function to send a wakeup packet
* @param discovery Discovery to send the packet on. May be NULL, in which case a new temporary Discovery will be created * @param discovery Discovery to send the packet on. May be NULL, in which case a new temporary Discovery will be created
*/ */
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_wakeup(ChiakiLog *log, ChiakiDiscovery *discovery, const char *host, uint64_t user_credential); CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_wakeup(ChiakiLog *log, ChiakiDiscovery *discovery, const char *host, uint64_t user_credential, bool ps5);
#ifdef __cplusplus #ifdef __cplusplus
} }

14
lib/src/discovery.c
View file

@ -34,12 +34,13 @@ const char *chiaki_discovery_host_state_string(ChiakiDiscoveryHostState state)
CHIAKI_EXPORT int chiaki_discovery_packet_fmt(char *buf, size_t buf_size, ChiakiDiscoveryPacket *packet) CHIAKI_EXPORT int chiaki_discovery_packet_fmt(char *buf, size_t buf_size, ChiakiDiscoveryPacket *packet)
{ {
const char *version_str = packet->protocol_version ? packet->protocol_version : CHIAKI_DISCOVERY_PROTOCOL_VERSION; if(!packet->protocol_version)
return -1;
switch(packet->cmd) switch(packet->cmd)
{ {
case CHIAKI_DISCOVERY_CMD_SRCH: case CHIAKI_DISCOVERY_CMD_SRCH:
return snprintf(buf, buf_size, "SRCH * HTTP/1.1\ndevice-discovery-protocol-version:%s\n", return snprintf(buf, buf_size, "SRCH * HTTP/1.1\ndevice-discovery-protocol-version:%s\n",
version_str); packet->protocol_version);
case CHIAKI_DISCOVERY_CMD_WAKEUP: case CHIAKI_DISCOVERY_CMD_WAKEUP:
return snprintf(buf, buf_size, return snprintf(buf, buf_size,
"WAKEUP * HTTP/1.1\n" "WAKEUP * HTTP/1.1\n"
@ -49,7 +50,7 @@ CHIAKI_EXPORT int chiaki_discovery_packet_fmt(char *buf, size_t buf_size, Chiaki
"app-type:r\n" "app-type:r\n"
"user-credential:%llu\n" "user-credential:%llu\n"
"device-discovery-protocol-version:%s\n", "device-discovery-protocol-version:%s\n",
(unsigned long long)packet->user_credential, version_str); (unsigned long long)packet->user_credential, packet->protocol_version);
default: default:
return -1; return -1;
} }
@ -179,6 +180,8 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_send(ChiakiDiscovery *discovery,
if((size_t)len >= sizeof(buf)) if((size_t)len >= sizeof(buf))
return CHIAKI_ERR_BUF_TOO_SMALL; return CHIAKI_ERR_BUF_TOO_SMALL;
CHIAKI_LOGV(discovery->log, "Discovery sending:");
chiaki_log_hexdump(discovery->log, CHIAKI_LOG_VERBOSE, (const uint8_t *)buf, (size_t)len + 1);
int rc = sendto_broadcast(discovery->log, discovery->socket, buf, (size_t)len + 1, 0, addr, addr_size); int rc = sendto_broadcast(discovery->log, discovery->socket, buf, (size_t)len + 1, 0, addr, addr_size);
if(rc < 0) if(rc < 0)
{ {
@ -280,7 +283,7 @@ static void *discovery_thread_func(void *user)
return NULL; return NULL;
} }
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_wakeup(ChiakiLog *log, ChiakiDiscovery *discovery, const char *host, uint64_t user_credential) CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_wakeup(ChiakiLog *log, ChiakiDiscovery *discovery, const char *host, uint64_t user_credential, bool ps5)
{ {
struct addrinfo *addrinfos; struct addrinfo *addrinfos;
int r = getaddrinfo(host, NULL, NULL, &addrinfos); // TODO: this blocks, use something else int r = getaddrinfo(host, NULL, NULL, &addrinfos); // TODO: this blocks, use something else
@ -311,10 +314,11 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_wakeup(ChiakiLog *log, ChiakiDisc
return CHIAKI_ERR_UNKNOWN; return CHIAKI_ERR_UNKNOWN;
} }
((struct sockaddr_in *)&addr)->sin_port = htons(CHIAKI_DISCOVERY_PORT); ((struct sockaddr_in *)&addr)->sin_port = htons(ps5 ? CHIAKI_DISCOVERY_PORT_PS5 : CHIAKI_DISCOVERY_PORT_PS4);
ChiakiDiscoveryPacket packet = { 0 }; ChiakiDiscoveryPacket packet = { 0 };
packet.cmd = CHIAKI_DISCOVERY_CMD_WAKEUP; packet.cmd = CHIAKI_DISCOVERY_CMD_WAKEUP;
packet.protocol_version = ps5 ? CHIAKI_DISCOVERY_PROTOCOL_VERSION_PS5 : CHIAKI_DISCOVERY_PROTOCOL_VERSION_PS4;
packet.user_credential = user_credential; packet.user_credential = user_credential;
ChiakiErrorCode err; ChiakiErrorCode err;

20
lib/src/discoveryservice.c
View file

@ -135,9 +135,27 @@ static void discovery_service_ping(ChiakiDiscoveryService *service)
CHIAKI_LOGV(service->log, "Discovery Service sending ping"); CHIAKI_LOGV(service->log, "Discovery Service sending ping");
ChiakiDiscoveryPacket packet = { 0 }; ChiakiDiscoveryPacket packet = { 0 };
packet.cmd = CHIAKI_DISCOVERY_CMD_SRCH; packet.cmd = CHIAKI_DISCOVERY_CMD_SRCH;
packet.protocol_version = CHIAKI_DISCOVERY_PROTOCOL_VERSION_PS4;
if(service->options.send_addr->sa_family == AF_INET)
((struct sockaddr_in *)service->options.send_addr)->sin_port = htons(CHIAKI_DISCOVERY_PORT_PS4);
else if(service->options.send_addr->sa_family == AF_INET6)
((struct sockaddr_in6 *)service->options.send_addr)->sin6_port = htons(CHIAKI_DISCOVERY_PORT_PS4);
else
{
CHIAKI_LOGE(service->log, "Discovery Service send_addr has unknown sa_family");
return;
}
err = chiaki_discovery_send(&service->discovery, &packet, service->options.send_addr, service->options.send_addr_size); err = chiaki_discovery_send(&service->discovery, &packet, service->options.send_addr, service->options.send_addr_size);
if(err != CHIAKI_ERR_SUCCESS) if(err != CHIAKI_ERR_SUCCESS)
CHIAKI_LOGE(service->log, "Discovery Service failed to send ping"); CHIAKI_LOGE(service->log, "Discovery Service failed to send ping for PS4");
packet.protocol_version = CHIAKI_DISCOVERY_PROTOCOL_VERSION_PS5;
if(service->options.send_addr->sa_family == AF_INET)
((struct sockaddr_in *)service->options.send_addr)->sin_port = htons(CHIAKI_DISCOVERY_PORT_PS5);
else // if(service->options.send_addr->sa_family == AF_INET6)
((struct sockaddr_in6 *)service->options.send_addr)->sin6_port = htons(CHIAKI_DISCOVERY_PORT_PS5);
err = chiaki_discovery_send(&service->discovery, &packet, service->options.send_addr, service->options.send_addr_size);
if(err != CHIAKI_ERR_SUCCESS)
CHIAKI_LOGE(service->log, "Discovery Service failed to send ping for PS5");
} }
static void discovery_service_drop_old_hosts(ChiakiDiscoveryService *service) static void discovery_service_drop_old_hosts(ChiakiDiscoveryService *service)

1
switch/src/discoverymanager.cpp
View file

@ -63,7 +63,6 @@ void DiscoveryManager::SetService(bool enable)
sockaddr_in addr = {}; sockaddr_in addr = {};
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons(CHIAKI_DISCOVERY_PORT);
addr.sin_addr.s_addr = GetIPv4BroadcastAddr(); addr.sin_addr.s_addr = GetIPv4BroadcastAddr();
options.send_addr = reinterpret_cast<sockaddr *>(&addr); options.send_addr = reinterpret_cast<sockaddr *>(&addr);
options.send_addr_size = sizeof(addr); options.send_addr_size = sizeof(addr);