moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-07-01 23:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update moonlight-common-c

Browse Source
This commit is contained in:
Iwan Timmer 2016-10-06 12:23:28 +02:00
parent f0a0024aeb
commit d00829b69a
4 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libgamestream/client.c
View File

@ -178,7 +178,6 @@ static int load_server_status(PSERVER_DATA server) {
do { do {
char *pairedText = NULL; char *pairedText = NULL;
char *currentGameText = NULL; char *currentGameText = NULL;
char *versionText = NULL;
char *stateText = NULL; char *stateText = NULL;
char *heightText = NULL; char *heightText = NULL;
char *serverCodecModeSupportText = NULL; char *serverCodecModeSupportText = NULL;
@ -193,7 +192,7 @@ static int load_server_status(PSERVER_DATA server) {
// make another request over HTTP if the HTTPS request fails. We can't just use HTTP // make another request over HTTP if the HTTPS request fails. We can't just use HTTP
// for everything because it doesn't accurately tell us if we're paired. // for everything because it doesn't accurately tell us if we're paired.
sprintf(url, "%s://%s:%d/serverinfo?uniqueid=%s&uuid=%s", sprintf(url, "%s://%s:%d/serverinfo?uniqueid=%s&uuid=%s",
i == 0 ? "https" : "http", server->address, i == 0 ? 47984 : 47989, unique_id, uuid_str); i == 0 ? "https" : "http", server->serverInfo.address, i == 0 ? 47984 : 47989, unique_id, uuid_str);
PHTTP_DATA data = http_create_data(); PHTTP_DATA data = http_create_data();
if (data == NULL) { if (data == NULL) {
@ -212,7 +211,7 @@ static int load_server_status(PSERVER_DATA server) {
if (xml_search(data->memory, data->size, "PairStatus", &pairedText) != GS_OK) if (xml_search(data->memory, data->size, "PairStatus", &pairedText) != GS_OK)
goto cleanup; goto cleanup;
if (xml_search(data->memory, data->size, "appversion", &versionText) != GS_OK) if (xml_search(data->memory, data->size, "appversion", (char**) &server->serverInfo.serverInfoAppVersion) != GS_OK)
goto cleanup; goto cleanup;
if (xml_search(data->memory, data->size, "state", &stateText) != GS_OK) if (xml_search(data->memory, data->size, "state", &stateText) != GS_OK)
@ -227,17 +226,18 @@ static int load_server_status(PSERVER_DATA server) {
if (xml_search(data->memory, data->size, "gputype", &server->gpuType) != GS_OK) if (xml_search(data->memory, data->size, "gputype", &server->gpuType) != GS_OK)
goto cleanup; goto cleanup;
if (xml_search(data->memory, data->size, "GfeVersion", &server->gfeVersion) != GS_OK) if (xml_search(data->memory, data->size, "GfeVersion", (char**) &server->serverInfo.serverInfoGfeVersion) != GS_OK)
goto cleanup; goto cleanup;
// These fields are present on all version of GFE that this client supports // These fields are present on all version of GFE that this client supports
if (!strlen(currentGameText) || !strlen(pairedText) || !strlen(versionText) || !strlen(stateText)) if (!strlen(currentGameText) || !strlen(pairedText) || !strlen(server->serverInfo.serverInfoAppVersion) || !strlen(stateText))
goto cleanup; goto cleanup;
server->paired = pairedText != NULL && strcmp(pairedText, "1") == 0; server->paired = pairedText != NULL && strcmp(pairedText, "1") == 0;
server->currentGame = currentGameText == NULL ? 0 : atoi(currentGameText); server->currentGame = currentGameText == NULL ? 0 : atoi(currentGameText);
server->supports4K = heightText != NULL && serverCodecModeSupportText != NULL && atoi(heightText) >= 2160; server->supports4K = heightText != NULL && serverCodecModeSupportText != NULL && atoi(heightText) >= 2160;
server->serverMajorVersion = atoi(versionText); server->serverMajorVersion = atoi(server->serverInfo.serverInfoAppVersion);
if (strstr(stateText, "_SERVER_AVAILABLE")) { if (strstr(stateText, "_SERVER_AVAILABLE")) {
// After GFE 2.8, current game remains set even after streaming // After GFE 2.8, current game remains set even after streaming
// has ended. We emulate the old behavior by forcing it to zero // has ended. We emulate the old behavior by forcing it to zero
@ -256,9 +256,6 @@ static int load_server_status(PSERVER_DATA server) {
if (currentGameText != NULL) if (currentGameText != NULL)
free(currentGameText); free(currentGameText);
if (versionText != NULL)
free(versionText);
if (heightText != NULL) if (heightText != NULL)
free(heightText); free(heightText);
@ -374,7 +371,7 @@ int gs_unpair(PSERVER_DATA server) {
uuid_generate_random(uuid); uuid_generate_random(uuid);
uuid_unparse(uuid, uuid_str); uuid_unparse(uuid, uuid_str);
sprintf(url, "http://%s:47989/unpair?uniqueid=%s&uuid=%s", server->address, unique_id, uuid_str); sprintf(url, "http://%s:47989/unpair?uniqueid=%s&uuid=%s", server->serverInfo.address, unique_id, uuid_str);
ret = http_request(url, data); ret = http_request(url, data);
http_free_data(data); http_free_data(data);
@ -405,7 +402,7 @@ int gs_pair(PSERVER_DATA server, char* pin) {
uuid_generate_random(uuid); uuid_generate_random(uuid);
uuid_unparse(uuid, uuid_str); uuid_unparse(uuid, uuid_str);
sprintf(url, "http://%s:47989/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&phrase=getservercert&salt=%s&clientcert=%s", server->address, unique_id, uuid_str, salt_hex, cert_hex); sprintf(url, "http://%s:47989/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&phrase=getservercert&salt=%s&clientcert=%s", server->serverInfo.address, unique_id, uuid_str, salt_hex, cert_hex);
PHTTP_DATA data = http_create_data(); PHTTP_DATA data = http_create_data();
if (data == NULL) if (data == NULL)
return GS_OUT_OF_MEMORY; return GS_OUT_OF_MEMORY;
@ -463,7 +460,7 @@ int gs_pair(PSERVER_DATA server, char* pin) {
uuid_generate_random(uuid); uuid_generate_random(uuid);
uuid_unparse(uuid, uuid_str); uuid_unparse(uuid, uuid_str);
sprintf(url, "http://%s:47989/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&clientchallenge=%s", server->address, unique_id, uuid_str, challenge_hex); sprintf(url, "http://%s:47989/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&clientchallenge=%s", server->serverInfo.address, unique_id, uuid_str, challenge_hex);
if ((ret = http_request(url, data)) != GS_OK) if ((ret = http_request(url, data)) != GS_OK)
goto cleanup; goto cleanup;
@ -517,7 +514,7 @@ int gs_pair(PSERVER_DATA server, char* pin) {
uuid_generate_random(uuid); uuid_generate_random(uuid);
uuid_unparse(uuid, uuid_str); uuid_unparse(uuid, uuid_str);
sprintf(url, "http://%s:47989/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&serverchallengeresp=%s", server->address, unique_id, uuid_str, challenge_response_hex); sprintf(url, "http://%s:47989/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&serverchallengeresp=%s", server->serverInfo.address, unique_id, uuid_str, challenge_response_hex);
if ((ret = http_request(url, data)) != GS_OK) if ((ret = http_request(url, data)) != GS_OK)
goto cleanup; goto cleanup;
@ -566,7 +563,7 @@ int gs_pair(PSERVER_DATA server, char* pin) {
uuid_generate_random(uuid); uuid_generate_random(uuid);
uuid_unparse(uuid, uuid_str); uuid_unparse(uuid, uuid_str);
sprintf(url, "http://%s:47989/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&clientpairingsecret=%s", server->address, unique_id, uuid_str, client_pairing_secret_hex); sprintf(url, "http://%s:47989/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&clientpairingsecret=%s", server->serverInfo.address, unique_id, uuid_str, client_pairing_secret_hex);
if ((ret = http_request(url, data)) != GS_OK) if ((ret = http_request(url, data)) != GS_OK)
goto cleanup; goto cleanup;
@ -583,7 +580,7 @@ int gs_pair(PSERVER_DATA server, char* pin) {
uuid_generate_random(uuid); uuid_generate_random(uuid);
uuid_unparse(uuid, uuid_str); uuid_unparse(uuid, uuid_str);
sprintf(url, "https://%s:47984/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&phrase=pairchallenge", server->address, unique_id, uuid_str); sprintf(url, "https://%s:47984/pair?uniqueid=%s&uuid=%s&devicename=roth&updateState=1&phrase=pairchallenge", server->serverInfo.address, unique_id, uuid_str);
if ((ret = http_request(url, data)) != GS_OK) if ((ret = http_request(url, data)) != GS_OK)
goto cleanup; goto cleanup;
@ -623,7 +620,7 @@ int gs_applist(PSERVER_DATA server, PAPP_LIST *list) {
uuid_generate_random(uuid); uuid_generate_random(uuid);
uuid_unparse(uuid, uuid_str); uuid_unparse(uuid, uuid_str);
sprintf(url, "https://%s:47984/applist?uniqueid=%s&uuid=%s", server->address, unique_id, uuid_str); sprintf(url, "https://%s:47984/applist?uniqueid=%s&uuid=%s", server->serverInfo.address, unique_id, uuid_str);
if (http_request(url, data) != GS_OK) if (http_request(url, data) != GS_OK)
ret = GS_IO_ERROR; ret = GS_IO_ERROR;
else if (xml_applist(data->memory, data->size, list) != GS_OK) else if (xml_applist(data->memory, data->size, list) != GS_OK)
@ -660,9 +657,9 @@ int gs_start_app(PSERVER_DATA server, STREAM_CONFIGURATION *config, int appId, b
if (server->currentGame == 0) { if (server->currentGame == 0) {
int channelCounnt = config->audioConfiguration == AUDIO_CONFIGURATION_STEREO ? CHANNEL_COUNT_STEREO : CHANNEL_COUNT_51_SURROUND; int channelCounnt = config->audioConfiguration == AUDIO_CONFIGURATION_STEREO ? CHANNEL_COUNT_STEREO : CHANNEL_COUNT_51_SURROUND;
int mask = config->audioConfiguration == AUDIO_CONFIGURATION_STEREO ? CHANNEL_MASK_STEREO : CHANNEL_MASK_51_SURROUND; int mask = config->audioConfiguration == AUDIO_CONFIGURATION_STEREO ? CHANNEL_MASK_STEREO : CHANNEL_MASK_51_SURROUND;
sprintf(url, "https://%s:47984/launch?uniqueid=%s&uuid=%s&appid=%d&mode=%dx%dx%d&additionalStates=1&sops=%d&rikey=%s&rikeyid=%d&localAudioPlayMode=%d&surroundAudioInfo=%d", server->address, unique_id, uuid_str, appId, config->width, config->height, config->fps, sops, rikey_hex, rikeyid, localaudio, (mask << 16) + channelCounnt); sprintf(url, "https://%s:47984/launch?uniqueid=%s&uuid=%s&appid=%d&mode=%dx%dx%d&additionalStates=1&sops=%d&rikey=%s&rikeyid=%d&localAudioPlayMode=%d&surroundAudioInfo=%d", server->serverInfo.address, unique_id, uuid_str, appId, config->width, config->height, config->fps, sops, rikey_hex, rikeyid, localaudio, (mask << 16) + channelCounnt);
} else } else
sprintf(url, "https://%s:47984/resume?uniqueid=%s&uuid=%s&rikey=%s&rikeyid=%d", server->address, unique_id, uuid_str, rikey_hex, rikeyid); sprintf(url, "https://%s:47984/resume?uniqueid=%s&uuid=%s&rikey=%s&rikeyid=%d", server->serverInfo.address, unique_id, uuid_str, rikey_hex, rikeyid);
if ((ret = http_request(url, data)) == GS_OK) if ((ret = http_request(url, data)) == GS_OK)
server->currentGame = appId; server->currentGame = appId;
@ -697,7 +694,7 @@ int gs_quit_app(PSERVER_DATA server) {
uuid_generate_random(uuid); uuid_generate_random(uuid);
uuid_unparse(uuid, uuid_str); uuid_unparse(uuid, uuid_str);
sprintf(url, "https://%s:47984/cancel?uniqueid=%s&uuid=%s", server->address, unique_id, uuid_str); sprintf(url, "https://%s:47984/cancel?uniqueid=%s&uuid=%s", server->serverInfo.address, unique_id, uuid_str);
if ((ret = http_request(url, data)) != GS_OK) if ((ret = http_request(url, data)) != GS_OK)
goto cleanup; goto cleanup;
@ -717,7 +714,7 @@ int gs_quit_app(PSERVER_DATA server) {
return ret; return ret;
} }
int gs_init(PSERVER_DATA server, const char *keyDirectory) { int gs_init(PSERVER_DATA server, char *address, const char *keyDirectory) {
mkdirtree(keyDirectory); mkdirtree(keyDirectory);
if (load_unique_id(keyDirectory) != GS_OK) if (load_unique_id(keyDirectory) != GS_OK)
return GS_FAILED; return GS_FAILED;
@ -726,5 +723,8 @@ int gs_init(PSERVER_DATA server, const char *keyDirectory) {
return GS_FAILED; return GS_FAILED;
http_init(keyDirectory); http_init(keyDirectory);
LiInitializeServerInformation(&server->serverInfo);
server->serverInfo.address = address;
return load_server_status(server); return load_server_status(server);
} }

4
libgamestream/client.h
View File

@ -31,14 +31,14 @@
typedef struct _SERVER_DATA { typedef struct _SERVER_DATA {
const char* address; const char* address;
char* gpuType; char* gpuType;
char* gfeVersion;
bool paired; bool paired;
bool supports4K; bool supports4K;
int currentGame; int currentGame;
int serverMajorVersion; int serverMajorVersion;
SERVER_INFORMATION serverInfo;
} SERVER_DATA, *PSERVER_DATA; } SERVER_DATA, *PSERVER_DATA;
int gs_init(PSERVER_DATA server, const char *keyDirectory); int gs_init(PSERVER_DATA server, char* address, const char *keyDirectory);
int gs_start_app(PSERVER_DATA server, PSTREAM_CONFIGURATION config, int appId, bool sops, bool localaudio); int gs_start_app(PSERVER_DATA server, PSTREAM_CONFIGURATION config, int appId, bool sops, bool localaudio);
int gs_applist(PSERVER_DATA server, PAPP_LIST *app_list); int gs_applist(PSERVER_DATA server, PAPP_LIST *app_list);
int gs_unpair(PSERVER_DATA server); int gs_unpair(PSERVER_DATA server);

9
src/main.c
View File

@ -100,7 +100,7 @@ static void stream(PSERVER_DATA server, PCONFIGURATION config, enum platform sys
drFlags |= FORCE_HARDWARE_ACCELERATION; drFlags |= FORCE_HARDWARE_ACCELERATION;
printf("Stream %d x %d, %d fps, %d kbps\n", config->stream.width, config->stream.height, config->stream.fps, config->stream.bitrate); printf("Stream %d x %d, %d fps, %d kbps\n", config->stream.width, config->stream.height, config->stream.fps, config->stream.bitrate);
LiStartConnection(server->address, &config->stream, &connection_callbacks, platform_get_video(system), platform_get_audio(system), NULL, drFlags, server->serverMajorVersion); LiStartConnection(&server->serverInfo, &config->stream, &connection_callbacks, platform_get_video(system), platform_get_audio(system), NULL, drFlags);
if (IS_EMBEDDED(system)) { if (IS_EMBEDDED(system)) {
evdev_start(); evdev_start();
@ -217,11 +217,10 @@ int main(int argc, char* argv[]) {
config_file_parse(host_config_file, &config); config_file_parse(host_config_file, &config);
SERVER_DATA server; SERVER_DATA server;
server.address = config.address; printf("Connect to %s...\n", config.address);
printf("Connect to %s...\n", server.address);
int ret; int ret;
if ((ret = gs_init(&server, config.key_dir)) == GS_OUT_OF_MEMORY) { if ((ret = gs_init(&server, config.address, config.key_dir)) == GS_OUT_OF_MEMORY) {
fprintf(stderr, "Not enough memory\n"); fprintf(stderr, "Not enough memory\n");
exit(-1); exit(-1);
} else if (ret == GS_INVALID) { } else if (ret == GS_INVALID) {
@ -237,7 +236,7 @@ int main(int argc, char* argv[]) {
exit(-1); exit(-1);
} }
printf("NVIDIA %s, GFE %s (protocol version %d)\n", server.gpuType, server.gfeVersion, server.serverMajorVersion); printf("NVIDIA %s, GFE %s (protocol version %d)\n", server.gpuType, server.serverInfo.serverInfoGfeVersion, server.serverMajorVersion);
if (strcmp("list", config.action) == 0) { if (strcmp("list", config.action) == 0) {
pair_check(&server); pair_check(&server);

2
third_party/moonlight-common-c vendored

@ -1 +1 @@
Subproject commit 6659e2889daba2f07bd7c0ffd567c8e4d93549dc Subproject commit 6455381382e61c2ea4b063852c76fc3766017b62