ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-18 02:39:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add version to conversation payload, shrink size

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-07-31 10:33:46 +09:30
parent e4882f175b
commit 2fa1cb3aec
2 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
meshms.c
View File

@ -458,12 +458,10 @@ static int update_conversations(const sid_t *my_sid, struct conversations *conv)
}
// read our cached conversation list from our rhizome payload
// if we can't load the existing data correctly, just ignore it.
static int read_known_conversations(rhizome_manifest *m, const sid_t *their_sid, struct conversations **conv){
if (m->haveSecret==NEW_BUNDLE_ID){
if (config.debug.meshms)
DEBUGF("Ignoring new bundle?");
if (m->haveSecret==NEW_BUNDLE_ID)
return 0;
}
struct rhizome_read read;
bzero(&read, sizeof(read));
@ -474,6 +472,13 @@ static int read_known_conversations(rhizome_manifest *m, const sid_t *their_sid,
if (ret<0)
goto end;
unsigned char version=0xFF;
ret=rhizome_read_buffered(&read, &buff, &version, 1);
if (version!=1){
WARN("Expected version 1");
goto end;
}
while (1){
sid_t sid;
ret=rhizome_read_buffered(&read, &buff, sid.binary, sizeof(sid));
@ -485,19 +490,32 @@ static int read_known_conversations(rhizome_manifest *m, const sid_t *their_sid,
continue;
struct conversations *ptr = add_conv(conv, &sid);
if (!ptr)
return -1;
goto end;
unsigned char details[8*3];
ret=rhizome_read_buffered(&read, &buff, details, sizeof(details));
if (ret<sizeof(details))
ret = rhizome_read_buffered(&read, &buff, details, sizeof(details));
if (ret<0)
break;
int bytes=ret;
int ofs=0;
ret=unpack_uint(details, bytes, &ptr->their_last_message);
if (ret<0)
break;
ofs+=ret;
ptr->their_last_message = read_uint64(details);
ptr->read_offset = read_uint64(details+8);
ptr->their_size = read_uint64(details+16);
ret=unpack_uint(details+ofs,bytes-ofs, &ptr->read_offset);
if (ret<0)
break;
ofs+=ret;
ret=unpack_uint(details+ofs,bytes-ofs, &ptr->their_size);
if (ret<0)
break;
ofs+=ret;
read.offset += ofs - bytes;
}
end:
rhizome_read_close(&read);
return ret;
return 0;
}
static int write_conversation(struct rhizome_write *write, struct conversations *conv){
@ -509,20 +527,24 @@ static int write_conversation(struct rhizome_write *write, struct conversations
if (write)
bcopy(conv->them.binary, buffer, sizeof(conv->them));
len+=sizeof(conv->them);
if (write)
write_uint64(&buffer[len], conv->their_last_message);
len+=8;
if (write)
write_uint64(&buffer[len], conv->read_offset);
len+=8;
if (write)
write_uint64(&buffer[len], conv->their_size);
len+=8;
if (write){
len+=pack_uint(&buffer[len], conv->their_last_message);
len+=pack_uint(&buffer[len], conv->read_offset);
len+=pack_uint(&buffer[len], conv->their_size);
int ret=rhizome_write_buffer(write, buffer, len);
if (ret<0)
return ret;
}else{
len+=measure_packed_uint(conv->their_last_message);
len+=measure_packed_uint(conv->read_offset);
len+=measure_packed_uint(conv->their_size);
}
DEBUGF("len %s, %"PRId64", %"PRId64", %"PRId64" = %d",
alloca_tohex_sid(conv->them.binary),
conv->their_last_message,
conv->read_offset,
conv->their_size,
len);
}
// write the two child nodes
int ret=write_conversation(write, conv->_left);
@ -553,11 +575,14 @@ static int write_known_conversations(rhizome_manifest *m, struct conversations *
// then write it
m->version++;
rhizome_manifest_set_ll(m,"version",m->version);
m->fileLength = len;
m->fileLength = len+1;
rhizome_manifest_set_ll(m,"filesize",m->fileLength);
if (rhizome_write_open_manifest(&write, m))
goto end;
unsigned char version=1;
if (rhizome_write_buffer(&write, &version, 1)<0)
goto end;
if (write_conversation(&write, conv)<0)
goto end;
if (rhizome_finish_write(&write))

6
overlay_buffer.c
View File

@ -277,11 +277,11 @@ int ob_append_ui64(struct overlay_buffer *b, uint64_t v)
}
int measure_packed_uint(uint64_t v){
int ret=1;
while(v){
int ret=0;
do{
v>>=7;
ret++;
}
}while(v);
return ret;
}