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

Progress towards overlay mode advertising rhizome bundles.

Browse Source 
(but some evil memory corruption error if overlay mode and
rhizome are both enabled.)
This commit is contained in:
gardners 2012-01-09 04:57:13 +10:30
parent 0868e30caa
commit ba645687f6
3 changed files with 89 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mphlr.h
View File

@ -658,6 +658,7 @@ int overlay_interface_args(char *arg);
int overlay_get_nexthop(unsigned char *d,unsigned char *nexthop,int *nexthoplen, int overlay_get_nexthop(unsigned char *d,unsigned char *nexthop,int *nexthoplen,
int *interface); int *interface);
int overlay_sendto(struct sockaddr_in *recipientaddr,unsigned char *bytes,int len); int overlay_sendto(struct sockaddr_in *recipientaddr,unsigned char *bytes,int len);
int overlay_rhizome_add_advertisements(int interface_number,overlay_buffer *e);
extern int overlay_interface_count; extern int overlay_interface_count;

3
overlay_interface.c
View File

@ -605,6 +605,8 @@ int overlay_tick_interface(int i, long long now)
ob_limitsize(e,overlay_interfaces[i].mtu*3/4); ob_limitsize(e,overlay_interfaces[i].mtu*3/4);
/* Add advertisements for ROUTES not Rhizome bundles.
Rhizome bundle advertisements are lower priority */
overlay_route_add_advertisements(i,e); overlay_route_add_advertisements(i,e);
ob_limitsize(e,overlay_interfaces[i].mtu); ob_limitsize(e,overlay_interfaces[i].mtu);
@ -612,6 +614,7 @@ int overlay_tick_interface(int i, long long now)
/* 4. XXX Add lower-priority queued data */ /* 4. XXX Add lower-priority queued data */
/* 5. XXX Fill the packet up to a suitable size with anything that seems a good idea */ /* 5. XXX Fill the packet up to a suitable size with anything that seems a good idea */
overlay_rhizome_add_advertisements(i,e);
/* Now send the frame. This takes the form of a special DNA packet with a different /* Now send the frame. This takes the form of a special DNA packet with a different
service code, which we setup earlier. */ service code, which we setup earlier. */

84
rhizome.c
View File

@ -1388,3 +1388,87 @@ int rhizome_manifest_extract_signature(rhizome_manifest *m,int *ofs)
(*ofs)+=len; (*ofs)+=len;
return 0; return 0;
} }
int bundles_available=-1;
int bundle_offset=0;
int overlay_rhizome_add_advertisements(int interface_number,overlay_buffer *e)
{
int bytes=e->sizeLimit-e->length;
int overhead=1+1+3+32+1+1; /* maximum overhead */
int slots=(bytes-overhead)/8;
if (slots>30) slots=30;
int slots_used=0;
if (slots<1) return WHY("No room for node advertisements");
if (!rhizome_db) return WHY("Rhizome not enabled");
if (ob_append_byte(e,OF_TYPE_RHIZOME_ADVERT))
return WHY("could not add rhizome bundle advertisement header");
ob_append_byte(e,1); /* TTL */
int rfs_offset=e->length; /* remember where the RFS byte gets stored
so that we can patch it later */
ob_append_byte(e,1+1+1+8*slots_used/* RFS */);
/* Stuff in dummy address fields */
ob_append_byte(e,OA_CODE_BROADCAST);
ob_append_byte(e,OA_CODE_BROADCAST);
ob_append_byte(e,OA_CODE_SELF);
/* XXX Should add priority bundles here.
XXX Should prioritise bundles for subscribed groups, Serval-authorised files
etc over common bundles. */
/* Get number of bundles available if required */
if (bundles_available==-1||(bundle_offset>=bundles_available)) {
bundles_available=sqlite_exec_int64("SELECT COUNT(BAR) FROM MANIFESTS;");
bundle_offset=0;
}
sqlite3_stmt *statement;
char query[1024];
snprintf(query,1024,"SELECT BAR,ROWID FROM MANIFESTS LIMIT %d,%d",bundle_offset,slots);
switch (sqlite3_prepare_v2(rhizome_db,query,-1,&statement,NULL))
{
case SQLITE_OK: case SQLITE_DONE: case SQLITE_ROW:
break;
default:
sqlite3_finalize(statement);
sqlite3_close(rhizome_db);
rhizome_db=NULL;
WHY(query);
WHY(sqlite3_errmsg(rhizome_db));
return WHY("Could not prepare sql statement for fetching BARs for advertisement.");
}
while((slots_used<slots)&&(sqlite3_step(statement)==SQLITE_ROW)&&
(e->length+RHIZOME_BAR_BYTES<=e->sizeLimit))
{
sqlite3_blob *blob;
int column_type=sqlite3_column_type(statement, 0);
switch(column_type) {
case SQLITE_BLOB:
if (sqlite3_blob_open(rhizome_db,"main","manifests","bar",
sqlite3_column_int64(statement,1) /* rowid */,
0 /* read only */,&blob)!=SQLITE_OK)
{
WHY("Couldn't open blob");
continue;
}
if (sqlite3_blob_read(blob,&e->bytes[e->length],RHIZOME_BAR_BYTES,0)
!=SQLITE_OK) {
WHY("Couldn't read from blob");
sqlite3_blob_close(blob);
continue;
}
e->length+=RHIZOME_BAR_BYTES;
sqlite3_blob_close(blob);
}
}
e->bytes[rfs_offset]=1+1+1+8*slots_used;
return 0;
}