mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

move http_get to its own file; fix copyright

Browse Source
This commit is contained in:
Andre Leiradella 2015-10-23 20:08:05 -02:00
parent 33fc0cc803
commit 64dd5c46be
6 changed files with 141 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.common
View File

@ -846,11 +846,13 @@ ifeq ($(HAVE_NETWORKING), 1)
OBJ += netplay.o
endif
# Retro Achievements
# Retro Achievements (also depends on threads)
ifeq ($(HAVE_CHEEVOS), 1)
DEFINES += -DHAVE_CHEEVOS
OBJ += cheevos.o libretro-common/utils/md5.o
ifeq ($(HAVE_THREADS), 1)
DEFINES += -DHAVE_CHEEVOS
OBJ += cheevos.o http_get.o libretro-common/utils/md5.o
endif
endif
endif

100
cheevos.c
View File

@ -1,6 +1,5 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2015 - Daniel De Matteis
* Copyright (C) 2015 - Andre Leiradella
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
@ -22,7 +21,6 @@
#include <configuration.h>
#include <formats/jsonsax.h>
#include <net/net_http.h>
#include <rhash.h>
#include <performance.h>
#include <runloop.h>
@ -30,6 +28,7 @@
#include "cheevos.h"
#include "dynamic.h"
#include "http_get.h"
enum
{
@ -708,6 +707,9 @@ int cheevos_load( const char* json )
NULL
};
unsigned core_count, unofficial_count;
cheevos_readud_t ud;
if ( !config_get_ptr()->cheevos.enable )
{
/* Just return OK if cheevos are disabled. */
@ -716,9 +718,6 @@ int cheevos_load( const char* json )
/* Count the number of achievements in the JSON file. */
unsigned core_count, unofficial_count;
cheevos_readud_t ud;
if ( count_cheevos( json, &core_count, &unofficial_count ) != JSONSAX_OK )
{
return -1;
@ -1130,89 +1129,6 @@ void cheevos_unload( void )
Load achievements from retroachievements.org.
*****************************************************************************/
static int cheevos_http_get(const char **result, size_t *size, const char *url, retro_time_t *timeout)
{
struct http_connection_t* conn = NULL;
struct http_t* http = NULL;
int ret = -1;
retro_time_t t0;
uint8_t* data;
size_t length;
char* res;
*result = NULL;
t0 = retro_get_time_usec();
conn = net_http_connection_new(url);
/* Error creating the connection descriptor. */
if (!conn)
goto error;
/* Don't bother with timeouts here, it's just a string scan. */
while (!net_http_connection_iterate(conn)) {}
/* Error finishing the connection descriptor. */
if (!net_http_connection_done(conn))
goto error;
http = net_http_new(conn);
/* Error connecting to the endpoint. */
if (!http)
goto error;
while (!net_http_update(http, NULL, NULL))
{
/* Timeout error. */
if (timeout && (retro_get_time_usec() - t0) > *timeout)
goto error;
}
data = net_http_data(http, &length, false);
if (data)
{
res = (char*)malloc(length + 1);
/* Allocation error. */
if ( !res )
goto error;
memcpy((void*)res, (void*)data, length);
res[length] = 0;
*result = res;
}
else
{
length = 0;
*result = NULL;
}
if (size)
*size = length;
ret = 0;
error:
if ( http )
net_http_delete( http );
if ( conn )
net_http_connection_free( conn );
if (timeout)
{
t0 = retro_get_time_usec() - t0;
if (t0 < *timeout)
*timeout -= t0;
else
*timeout = 0;
}
return ret;
}
typedef struct
{
unsigned key_hash;
@ -1323,7 +1239,7 @@ static int cheevos_login( retro_time_t* timeout )
request[ sizeof( request ) - 1 ] = 0;
if ( !cheevos_http_get( &json, NULL, request, timeout ) )
if ( !http_get( &json, NULL, request, timeout ) )
{
res = cheevos_get_value( json, 0x0e2dbd26U /* Token */, token, sizeof( token ) );
free( (void*)json );
@ -1361,7 +1277,7 @@ static int cheevos_get_by_game_id( const char** json, unsigned game_id, retro_ti
request[ sizeof( request ) - 1 ] = 0;
if ( !cheevos_http_get( json, NULL, request, timeout ) )
if ( !http_get( json, NULL, request, timeout ) )
{
RARCH_LOG( "CHEEVOS got achievements for game id %u\n", game_id );
return 0;
@ -1392,7 +1308,7 @@ static unsigned cheevos_get_game_id( unsigned char* hash, retro_time_t* timeout
request[ sizeof( request ) - 1 ] = 0;
if ( !cheevos_http_get( &json, NULL, request, timeout ) )
if ( !http_get( &json, NULL, request, timeout ) )
{
res = cheevos_get_value( json, 0xb4960eecU /* GameID */, game_id, sizeof( game_id ) );
free( (void*)json );

3
cheevos.h
View File

@ -1,6 +1,5 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2015 - Daniel De Matteis
* Copyright (C) 2015 - Andre Leiradella
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-

1
griffin/griffin.c
View File

@ -86,6 +86,7 @@ ACHIEVEMENTS
#include "../libretro-common/formats/json/jsonsax.c"
#include "../libretro-common/utils/md5.c"
#include "../http_get.c"
#include "../cheevos.c"
#endif

101
http_get.c Normal file
View File

@ -0,0 +1,101 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2015 - Andre Leiradella
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <net/net_http.h>
#include "http_get.h"
int http_get(const char **result, size_t *size, const char *url, retro_time_t *timeout)
{
struct http_connection_t* conn = NULL;
struct http_t* http = NULL;
int ret = -1;
retro_time_t t0;
uint8_t* data;
size_t length;
char* res;
*result = NULL;
t0 = retro_get_time_usec();
conn = net_http_connection_new(url);
/* Error creating the connection descriptor. */
if (!conn)
goto error;
/* Don't bother with timeouts here, it's just a string scan. */
while (!net_http_connection_iterate(conn)) {}
/* Error finishing the connection descriptor. */
if (!net_http_connection_done(conn))
goto error;
http = net_http_new(conn);
/* Error connecting to the endpoint. */
if (!http)
goto error;
while (!net_http_update(http, NULL, NULL))
{
/* Timeout error. */
if (timeout && (retro_get_time_usec() - t0) > *timeout)
goto error;
}
data = net_http_data(http, &length, false);
if (data)
{
res = (char*)malloc(length + 1);
/* Allocation error. */
if ( !res )
goto error;
memcpy((void*)res, (void*)data, length);
res[length] = 0;
*result = res;
}
else
{
length = 0;
*result = NULL;
}
if (size)
*size = length;
ret = 0;
error:
if ( http )
net_http_delete( http );
if ( conn )
net_http_connection_free( conn );
if (timeout)
{
t0 = retro_get_time_usec() - t0;
if (t0 < *timeout)
*timeout -= t0;
else
*timeout = 0;
}
return ret;
}

25
http_get.h Normal file
View File

@ -0,0 +1,25 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2015 - Andre Leiradella
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __RARCH_HTTP_GET_H
#define __RARCH_HTTP_GET_H
#include <stdlib.h>
#include <performance.h>
int http_get(const char **result, size_t *size, const char *url, retro_time_t *timeout);
#endif /* __RARCH_HTTP_GET_H */