StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Load file portability code for big endian.

Browse Source 
Warning: only loads, doesn't save.
This commit is contained in:
irungentoo_trip 2014-10-22 21:56:52 -04:00
parent 3c874bcf62
commit 31c17856b8
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
toxcore/util.c
View File

@ -84,6 +84,26 @@ void host_to_net(uint8_t *num, uint16_t numbytes)
return; return;
} }
uint16_t lendian_to_host16(uint16_t lendian)
{
#ifdef WORDS_BIGENDIAN
return (lendian << 8) | (lendian >> 8 );
#else
return lendian;
#endif
}
void lendian_to_host32(uint32_t *dest, const uint8_t *lendian)
{
uint32_t d;
memcpy(&d, lendian, sizeof(uint32_t));
#ifdef WORDS_BIGENDIAN
d = ((d << 8) & 0xFF00FF00 ) | ((d >> 8) & 0xFF00FF );
d = (d << 16) | (d >> 16);
#endif
*dest = d;
}
/* state load/save */ /* state load/save */
int load_state(load_state_callback_func load_state_callback, void *outer, int load_state(load_state_callback_func load_state_callback, void *outer,
const uint8_t *data, uint32_t length, uint16_t cookie_inner) const uint8_t *data, uint32_t length, uint16_t cookie_inner)
@ -101,8 +121,8 @@ int load_state(load_state_callback_func load_state_callback, void *outer,
uint32_t size_head = sizeof(uint32_t) * 2; uint32_t size_head = sizeof(uint32_t) * 2;
while (length >= size_head) { while (length >= size_head) {
memcpy(&length_sub, data, sizeof(length_sub)); lendian_to_host32(&length_sub, data);
memcpy(&cookie_type, data + sizeof(length_sub), sizeof(cookie_type)); lendian_to_host32(&cookie_type, data + sizeof(length_sub));
data += size_head; data += size_head;
length -= size_head; length -= size_head;
@ -114,7 +134,7 @@ int load_state(load_state_callback_func load_state_callback, void *outer,
return -1; return -1;
} }
if ((cookie_type >> 16) != cookie_inner) { if (lendian_to_host16((cookie_type >> 16)) != cookie_inner) {
/* something is not matching up in a bad way, give up */ /* something is not matching up in a bad way, give up */
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "state file garbeled: %04hx != %04hx\n", (cookie_type >> 16), cookie_inner); fprintf(stderr, "state file garbeled: %04hx != %04hx\n", (cookie_type >> 16), cookie_inner);
@ -122,7 +142,7 @@ int load_state(load_state_callback_func load_state_callback, void *outer,
return -1; return -1;
} }
type = cookie_type & 0xFFFF; type = lendian_to_host16(cookie_type & 0xFFFF);
if (-1 == load_state_callback(outer, data, length_sub, type)) if (-1 == load_state_callback(outer, data, length_sub, type))
return -1; return -1;