ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 13:17:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,347 Commits 22 Branches 0 Tags 33 MiB
008f296026
Commit Graph

158 Commits

Author SHA1 Message Date
gardners
d3f5c6e598 Merged rhizome direct httpd back into main rhizome httpd server. 
bundles can be imported via HTTP POST multi-part form. #9
 2012-09-06 13:21:13 +09:30
gardners
dc15ac5a34 Make simple http response clear request type so that it always 
works. #9
 2012-09-06 06:09:16 +09:30
Paul Gardner-Stephen
bba6839656 Initial stab at porting to Solaris. 
It compiles without warning (with CC=gcc) but doesn't link
because NaCL doesn't build yet.
 2012-09-05 20:42:50 +09:30
gardners
ecbe8e4f8c improve HTTP server response code handling, including fixing 
iching calculator bug - unknown response codes not more than four
no longer result in "a suffusion of yellow".
Also stopped dropping HTTP requests on empty reads when parsing
a multi-part POST.
 2012-09-05 16:35:08 +09:30
gardners
4cab16598c added code to rhizome http request client poll routine to call 
multi-part form data parser.
 2012-09-05 15:53:16 +09:30
Jeremy Lakeman
df0e20408c Close sockets on poll errors 2012-08-31 15:04:06 +09:30
gardners
9d2aa61792 Refactoring of Rhizome http server code so that we can supply a 
different request parser, but otherwise share code between
rhizome transfers and rhizome direct. #9
 2012-08-31 13:01:28 +09:30
gardners
bde9d1c56a Rhizome http server now allows specification of client socket callback 
when starting, so that same server code can be shared for rhizome transfers
and rhizome direct. #9
 2012-08-31 13:01:28 +09:30
Andrew Bettison
41680ff663 Move functions from testdefs.sh to testdefs_rhizome.sh 
... where they should have been in the first place.

Also, clean up the RHIZOME HTTP SERVER START log message.

Issue #9.
 2012-08-27 17:07:44 +09:30
Andrew Bettison
3f1e0dd763 Finish sleep-retry on locked Rhizome db 
Closes #2.

Rewrite all Rhizome db query code using new retry primitives defined in
"rhizome.h": sqlite_step_retry(), sqlite_retry(), sqlite_retry_done(), etc.
Replace all calls to sqlite3_prepare_v2() with sqlite_prepare() which does
proper error logging.

Fix bug: re-invoking sqlite3_blob_close() on SQLITE_BUSY return causes process
to abort.  Use an explicit BEGIN...COMMIT around the blob writing code instead.

Tested using repeated invocations of batphone/tests/meshms1.

Delete deprecated Rhizome db code in rhizome_crypto.c that has been replaced
with keyring file.
 2012-08-24 15:38:39 +09:30
Andrew Bettison
385e2bdb4e Improve Rhizome INFO messages 2012-08-17 19:42:11 +09:30
Jeremy Lakeman
7705676a9e Move str functions to c file to enable reuse 2012-08-09 13:30:52 +09:30
Andrew Bettison
12d8bc0c12 Use new typedef time_ms_t everywhere 2012-08-09 12:14:32 +09:30
Andrew Bettison
240be25793 Replace overlay_gettime_ms() with gettime_ms() 2012-07-30 17:22:38 +09:30
Andrew Bettison
04b95d2590 Merge branch 'andrew' into 'master' 2012-07-25 18:04:16 +09:30
Andrew Bettison
0e5c5e0e98 More work on dnahelper, almost done 
Servald starts DNA helper, receives startup ACK, sends requests, receives
responses, handles malformed helper responses, echoes dnahelper stderr lines to
log, sends MDP reply packet, waits for dead helper process, all asynchronously.
Shuts down helper process during servald shutdown.

Remaining issues:
 - Does not impose a timeout on helper responses.
 - Only the first URI is reported by the "dna lookup" command.
 2012-07-20 18:17:43 +09:30
Jeremy Lakeman
1d53726b7b Merge remote-tracking branch 'origin/master' 
Conflicts:
	rhizome_fetch.c
	rhizome_http.c
	testframework.sh
 2012-07-17 15:39:55 +09:30
Andrew Bettison
c791ba94d0 Refactor HTTP response parsing 
Remove need to nul-terminate the received buffers in HTTP fetch reply handling
and HTTP server request parsing.

Remove redundant copying of data.

More rigorous parsing code, probably less vulnerable to overrun exploits.

Better debug logging of requests and responses.
 2012-07-13 18:06:55 +09:30
Andrew Bettison
dd225bbb7f Refactor rhizome HTTP response headers 2012-07-13 12:31:10 +09:30
Jeremy Lakeman
27c24f377e Add deadline time for alarm prioritisation 2012-07-13 12:18:45 +09:30
Andrew Bettison
41f3228300 Refactor rhizome HTTP request parsing 
Replace DEBUG_RHIZOMESYNC with DEBUG_RHIZOME_TX
 2012-07-13 11:06:10 +09:30
Andrew Bettison
e378a8dc82 Improve logging from rhizome HTTP server 2012-07-12 16:42:41 +09:30
Andrew Bettison
d111f763c7 Fix bugs revealed by 'rhizomeprotocol' test 
Was not transmitting actual HTTP server port in rhizome announcements, was
always transmitting port 4110.

When trying for a free HTTP server port, sometimes bind() succeeds but listen()
fails with EADDRINUSE, so new logic to deal with that.
 2012-07-12 12:10:59 +09:30
Andrew Bettison
4eb3910dc1 Fix bug in Rhizome fetch - byte order of sin_port 
Also improve some debug logging
 2012-07-11 14:21:49 +09:30
Andrew Bettison
42744da371 Improve log diagnostics related to rhizome HTTP 2012-07-10 19:59:46 +09:30
Andrew Bettison
8020ea3b74 Merge branch 'eventscheduler' into master 
Conflicts:
	commandline.c
	monitor.c
	overlay.c
	overlay_interface.c
	overlay_packetformats.c
	rhizome_fetch.c
	rhizome_http.c
	rhizome_packetformats.c
	serval.h
	server.c
	testdefs.sh
	testframework.sh
	tests/dnaprotocol
	tests/server
 2012-07-03 10:26:22 +09:30
Andrew Bettison
08a8ec13e8 Start rhizome HTTP server on first available port 2012-07-02 16:24:07 +09:30
Jeremy Lakeman
132d3a6f9b rename profiling structure 2012-07-02 16:04:00 +09:30
Jeremy Lakeman
e705696896 separate statistics gathering from the scheduler structure 2012-07-02 15:20:30 +09:30
Jeremy Lakeman
89566e4d3d Refactor how functions are scheduled or file handes are watched 2012-07-02 13:19:54 +09:30
Jeremy Lakeman
89d3923557 Reduce log spam 2012-06-28 11:13:52 +09:30
Jeremy Lakeman
29cba17891 Fix rhizome transfers 2012-06-27 16:54:42 +09:30
Andrew Bettison
981afb795e Overhaul rhizome HTTP server start code 2012-06-26 11:07:01 +09:30
gardners
b40a468276 Merge branch 'eventscheduler' 
Conflicts:
	monitor.c
	serval.h
 2012-06-25 16:50:23 +09:30
Daniel O'Connor
930280a17d Move signal handler setup to main so it's only done once. 2012-06-25 16:24:33 +09:30
Andrew Bettison
208b9c15fd Factor out rhizome_hex_to_bytes() and chartonybl() 2012-06-25 14:51:21 +09:30
gardners
5dc6d122a5 significant progress towards clean callback scheduler for poll() 
events and timed callbacks.
 2012-06-22 16:05:49 +09:30
gardners
dceeed8d35 more work on dna helper interface. 
Also added missing dna_helper.c file from previous changes.
moved sigpipe/sigio detection code to own file.
 2012-06-21 16:35:28 +09:30
Andrew Bettison
86c7819f97 Remove spurious ERROR messsages 
Tests assert that stderr contains no ERROR: lines after a successful exit

Rewrote sqlite_exec_int64() to separate error outcomes from legitimate
result values

Changed several WHY() calls to DEBUG()

Improved test framework
 2012-06-08 13:13:26 +09:30
Andrew Bettison
1af9125392 All rhizome database keys are uppercase hex 
FILES.id, MANIFESTS.id, FILEMANIFESTS.fileid, FILEMANIFESTS.manifestid
Named constants for hex and binary ID sizes
 2012-05-23 16:04:00 +09:30
gardners
8e9396419c adding ignored manifest list to let us ignore repeated offerings 
of broken manifests without wasting effort.
 2012-05-22 14:15:35 +09:30
gardners
29bb86d9e7 first cut at supressing rhizome activity during calls. 2012-05-22 13:05:29 +09:30
gardners
bf6172f7ca clean up and use WHY() macros for all output. 2012-05-22 10:01:57 +09:30
gardners
1eb4c34015 Renamed mphlr.h to serval.h 
(also some temporary debugging has been added in some places)
 2012-02-23 12:45:42 +10:30
gardners
cdf1c45da4 Rhizome fetching over http now receives files and imports them. 
Still some wrinkles to work out.
 2012-01-13 21:13:17 +10:30
gardners
f862ba0af6 Rhizome file transfer via http getting close 
(send side needs to send file body)
 2012-01-13 17:21:06 +10:30
gardners
7bcc852279 Fixed bug with non-blocking call to connect() for integrated http client. 
Cleaned up some debugging stuff.
 2012-01-12 17:02:22 +10:30
gardners
bf9f8559f1 Various debug fiddles and conversion from select() to poll() 
(although poll() still doesn't let us monitor ordinary files
which is silly.)
 2012-01-12 16:47:24 +10:30
gardners
800f8d41eb Revamped debug/verbosity control to use flags for functions of interest 
instead of general verbosity ramp.
 2012-01-10 15:56:40 +10:30
gardners
4e6ef2e69e Various fixes to Rhizome web server and BAR generation. 
Can now present a set of BARs via HTTP.
 2012-01-03 16:35:02 +10:30
gardners
6231e8784c Added ability to de-hex result rows when streaming results of sql 
query.
 2012-01-03 14:54:32 +10:30
gardners
c380ab0450 More work on rhizome web server. 
Can now serve lists of manifest/file IDs.
 2012-01-03 14:45:50 +10:30
gardners
9c8ea5908c Various fixes towards working internal web server. 2012-01-03 08:57:52 +10:30
gardners
d29efac21f More work on getting Rhizome web server working. 
Can now produce parsable http responses as well as parse requests.
Now to actually implement some of the requests ...
 2011-12-29 10:11:03 +10:30
gardners
ccf26e1fe0 Rhizome web server can now serve a 400 error message, which means 
that lots of the underlying stuff is now in place.
 2011-12-23 04:25:18 +10:30
gardners
ad88045ca6 Rhizome web server progress. Still not working, but poll() now is 
doing what it should, and we are detecting closed sockets.
Now to add some parsing etc.
 2011-12-22 21:58:18 +10:30
gardners
16fb3a3f61 Added missing GPL license statements. 2011-12-21 20:25:05 +10:30
gardners
cbd0cf6117 Began work on rhizome integrated web server. 2011-12-21 16:28:08 +10:30