moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-04-19 23:00:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix connection problems in libgamestream

Browse Source
This commit is contained in:
Iwan Timmer
2015-08-09 21:33:33 +02:00
parent dc83e8c9a1
commit 503a8982d8
8 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libgamestream/client.c
View File

@@ -130,14 +130,14 @@ static int load_cert(const char* keyDirectory) {
return GS_OK;
}
static int load_server_status(const char *address, PSERVER_DATA server) {
static int load_server_status(PSERVER_DATA server) {
char *pairedText = NULL;
char *currentGameText = NULL;
char *versionText = NULL;
int ret = GS_INVALID;
char url[4096];
sprintf(url, "https://%s:47984/serverinfo?uniqueid=%s", address, unique_id);
sprintf(url, "https://%s:47984/serverinfo?uniqueid=%s", server->address, unique_id);
PHTTP_DATA data = http_create_data();
if (data == NULL) {
@@ -359,7 +359,7 @@ int gs_pair(PSERVER_DATA server, char* pin) {
return ret;
}
int gs_applist(PSERVER_DATA server, PAPP_LIST list) {
int gs_applist(PSERVER_DATA server, PAPP_LIST *list) {
int ret = GS_OK;
char url[4096];
PHTTP_DATA data = http_create_data();
@@ -416,7 +416,7 @@ int gs_quit_app(PSERVER_DATA server) {
return ret;
}
int gs_init(PSERVER_DATA server, const char *address, const char *keyDirectory) {
int gs_init(PSERVER_DATA server, const char *keyDirectory) {
mkdir(keyDirectory, 00755);
if (load_unique_id(keyDirectory) != GS_OK)
return GS_FAILED;
@@ -425,5 +425,5 @@ int gs_init(PSERVER_DATA server, const char *address, const char *keyDirectory)
return GS_FAILED;
http_init(keyDirectory);
return load_server_status(address, server);
return load_server_status(server);
}

4
libgamestream/client.h
View File

@@ -32,8 +32,8 @@ typedef struct _SERVER_DATA {
int serverMajorVersion;
} SERVER_DATA, *PSERVER_DATA;
int gs_init(PSERVER_DATA server, const char *address, const char *keyDirectory);
int gs_init(PSERVER_DATA server, const char *keyDirectory);
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_pair(PSERVER_DATA server, char* pin);
int gs_quit_app(PSERVER_DATA server);

2
libgamestream/http.c
View File

@@ -46,7 +46,7 @@ static size_t _write_curl(void *contents, size_t size, size_t nmemb, void *userp
int http_init(const char* keyDirectory) {
curl = curl_easy_init();
if (curl)
if (!curl)
return GS_FAILED;
char certificateFilePath[4096];

6
libgamestream/xml.c
View File

@@ -49,6 +49,8 @@ static void XMLCALL _xml_start_applist_element(void *userData, const char *name,
if (app == NULL)
return;
app->id = 0;
app->name = NULL;
app->next = (PAPP_LIST) search->data;
search->data = app;
} else if (strcmp("ID", name) == 0 || strcmp("AppTitle", name) == 0) {
@@ -111,7 +113,7 @@ int xml_search(char* data, size_t len, char* node, char** result) {
return GS_OK;
}
int xml_applist(char* data, size_t len, PAPP_LIST app_list) {
int xml_applist(char* data, size_t len, PAPP_LIST *app_list) {
struct xml_query query;
query.memory = calloc(1, 1);
query.size = 0;
@@ -126,7 +128,7 @@ int xml_applist(char* data, size_t len, PAPP_LIST app_list) {
gs_error = XML_ErrorString(code);
return GS_INVALID;
}
app_list = (PAPP_LIST) query.data;
*app_list = (PAPP_LIST) query.data;
return GS_OK;
}

2
libgamestream/xml.h
View File

@@ -27,4 +27,4 @@ typedef struct _APP_LIST {
} APP_LIST, *PAPP_LIST;
int xml_search(char* data, size_t len, char* node, char** result);
int xml_applist(char* data, size_t len, PAPP_LIST app_list);
int xml_applist(char* data, size_t len, PAPP_LIST *app_list);