ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-21 14:07:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,394 Commits 22 Branches 0 Tags 33 MiB
66e0711d6b
Commit Graph

224 Commits

Author SHA1 Message Date
Daniel O'Connor
8ad51554b4 Use the right variable to display the PID. 2012-06-25 14:11:16 +09:30
Daniel O'Connor
b0dad81b0c Don't call daemon as the parent can't exit in JNI otherwise bad things will happen. 
Copy the code for daemon from FreeBSD 8.x instead of the flying circus that was there before.
 2012-06-25 14:01:50 +09:30
Daniel O'Connor
5103176d39 Remove server_probe() and use daemon() instead of a hand rolled version. 
- server_probe() assumes abstract name space sockets.
- The hand rolled daemon doesn't work properly on BSD.
 2012-06-22 16:05:43 +09:30
Andrew Bettison
274e5c007c Merge branch 'master' into andrew 
Conflicts:
	log.c
 2012-06-22 11:18:48 +09:30
gardners
0254ca0ab8 made dnaprotocol test more rigorous to ensure it really returns 
results from each SID/servald instance.
Fixed bug in "keyring list" that was returning keyrings in
lower case instead of normalised form using overlay_render_sid()
 2012-06-21 16:36:38 +09:30
gardners
2cb84bb8db various fixes to new DNA URI response relating to parsing replies 
that lacked DID and/or name field.
 2012-06-21 16:36:37 +09:30
gardners
e5394dd143 added stubs for DNA lookup helper app (not yet complete). 
cleaned up some unused variables.
 2012-06-21 16:35:28 +09:30
gardners
3281f2c652 fixed introduced bug where "node info" failed to provide automatic 
resolution of DIDs and names for local identities.
 2012-06-21 11:45:20 +09:30
gardners
30e254560a node info now understands new dna response packet format. 2012-06-21 11:45:07 +09:30
gardners
8ea37af64d servald now can return arbitrary URIs in response to DNA requests. 2012-06-21 11:44:49 +09:30
gardners
b48fdb6567 added deeper timing checks to reveal that rhizome advertisements 
are the slowest part -- need to add caching of manifests so that
we don't hit the database every interface tick.
 2012-06-21 11:33:43 +09:30
Andrew Bettison
50ed301ccc Fix failing tests from addition of rhizome list '_selfsigned' column 2012-06-12 11:48:15 +09:30
Andrew Bettison
7be0d9d00d Pass author SID parameters in binary, not hex 2012-06-08 18:32:14 +09:30
Andrew Bettison
637ef02f30 Add _selfsigned column to "rhizome list" output 
Add <pin,pin...> arg1 to "rhizome list" command, so it can open the keyring

Some tests in tests/rhizome fail
 2012-06-08 18:25:43 +09:30
Andrew Bettison
7a71a521f8 Pass author SID parameters in binary, not hex 2012-06-08 15:27:15 +09:30
Andrew Bettison
a9ad1b6afc Add <bsk> optional arg to "rhizome add file" 
Improve regular expressions for common data types in test scripts

Revert column count field delimiter in "rhizome list" from ":" to "\n"

Add a few more test cases
 2012-06-05 13:58:59 +09:30
Andrew Bettison
304db6e5f4 Fix SEGV bug in "rhizome extract file" command 
Add optional <key> argument, validate and parse it properly.
 2012-06-01 18:12:59 +09:30
Daniel O'Connor
8f409cc7c5 Remove unused variables. 2012-05-29 09:45:24 +09:30
Jeremy Lakeman
b3819835ca Allow for huge result sets 2012-05-27 15:04:37 +09:30
gardners
4b96860535 prevent segfault in libserval.so 2012-05-26 15:46:08 +02:00
gardners
cf42cf08a4 cleanup some debugging. 2012-05-26 14:56:58 +02:00
gardners
b1e1a36898 fixed typo. 2012-05-26 14:36:00 +02:00
gardners
94d17a9260 more work on encrypting bundles. code passes all 23 rhizome tests. 2012-05-26 11:36:19 +02:00
gardners
2de6bb025a rhizome_extract_file can now decrypt a file, and also uses 
progressive blob operations so that we can extract files of
unlimited size.
 2012-05-26 11:36:19 +02:00
gardners
5c40edb55d Fixed bugs with importing files using user-supplied manifest 
(was not decoding BKs)
 2012-05-26 11:36:18 +02:00
gardners
04cc05d6e1 refactored manifest verification into a separate function 
that is called only when needed, and marks a manifest as finalised
if the verifcation fails.  reading a manifest now never sets
finalised flag, as either _finalise() or _verify() must be called.
 2012-05-26 11:36:18 +02:00
gardners
9c62f07154 fixed some bugs with manifest preperation in new factored 
manifest handling sequence.
 2012-05-26 11:36:18 +02:00
gardners
e473e5b6df some fixes to new refactored bundle handling code. 2012-05-26 11:36:18 +02:00
gardners
b0dca7e03f merged in latest changes from team. 2012-05-26 11:36:18 +02:00
Andrew Bettison
8ec2fe53d4 Silence 'status unused' compiler warning 2012-05-25 15:59:57 +09:30
Andrew Bettison
49aec4d331 Improve rhizome manifest debugging 
Move rhizome_new_manifest() out of rhizome_read_manifest_file() so that the
out-of-manifest report shows the names of the functions where the manifests
were really allocated.
 2012-05-25 15:38:13 +09:30
Andrew Bettison
1af238a4f9 Rhizome extract commands handle missing pathnames properly 2012-05-25 11:52:49 +09:30
Jeremy Lakeman
26f3966002 Ignore node info results from incorrect sid's 2012-05-25 09:55:56 +09:30
Andrew Bettison
0ec3feaa29 Expunge setReason() 
Replace with WHY() or WHYF() everywhere

Improve logMessage() to handle file/line/function printing internally

Mainly so that log messages from manifest alloc/free in rhizome_bundle.c
can make it into the Android log
 2012-05-24 17:11:55 +09:30
Andrew Bettison
59e58da2f4 More fixes for varargs stuff 
But still no luck on Android
 2012-05-23 16:07:52 +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
Andrew Bettison
29502d8c81 Varargs and strbuf fixes 
Add missing va_end() for all va_copy()
strbuf_sprintf() adds precautionary nul to end of string after vsnprintf()
 2012-05-22 14:58:05 +09:30
gardners
740a64ed51 "servald stop" now checks monitor interface, and can kill the PID 
even if there is no PID file, and the server process is stuck.
Now to find out how the process gets stuck to begin with ...
 2012-05-21 20:57:31 +09:30
gardners
165ac03c7a added use of server_probe() to "servald start" command. 
Tries to kill existing server if present, and will abort if
there is an existing instance.
Old pid code not cleaned out.
 2012-05-21 20:54:17 +09:30
gardners
e44294ea66 implemented server_probe(int *pid) that used monitor interface 
to probe server status.  Also returns PID if running (Linux only).
 2012-05-21 20:45:07 +09:30
Andrew Bettison
f4293e8ab3 Add "rhizome hash file" command 
Also fixed a file descriptor leak in rhizome_hash_file() -- missing fclose()
 2012-05-21 14:42:53 +09:30
Daniel O'Connor
990a8f3057 Add support for srtuct ucred on BSD. 
This requires building with _GNU_SOURCE to get access to struct ucred on Linux. Previously the test failed on every platform except glibc <2.8 or so.

Building with _GNU_SOURCE causes TRUE to be defined so we can't use this as a variable anymore, and MIN/MAX so don't define our own.
 2012-05-21 12:22:50 +09:30
Andrew Bettison
ddd17db1c4 Make "rhizome add file" work for MeshMS 2012-05-21 00:09:14 +09:30
Andrew Bettison
e6575cb369 Introduce macro constants for Rhizome service names 
Use "MeshMS1" instead of "MeshMS"... version 2 won't be far away
 2012-05-20 16:07:22 +09:30
Andrew Bettison
41583c1011 Fix bug in "rhizome add file" command 
Was not opening keyring file properly
 2012-05-20 15:25:19 +09:30
Andrew Bettison
345b2c1c4c Fix SEGV bug using new strbuf operations 2012-05-20 13:02:41 +09:30
Andrew Bettison
4b5e179841 Start support for MeshMS manifests 2012-05-19 14:09:50 +09:30
Andrew Bettison
0f65028a0b Clean up keyring_open_with_pins() error reporting 2012-05-19 10:38:29 +09:30
Andrew Bettison
5ae14ad7bc Fix bugs in rhizome_opendb() 
Was calling exit() instead of returning -1 on error, which was causing
the serval app to exit in the JNI "start" command if rhizome could not
create its db file.

Use DEBUGF() instead of fprintf(stderr) in many places.

confValueGet() was not stripping \r\n off end of returned string.

rhizome_set_datastore_path() was keeping the pointer it was given (from
conValueGet()'s rotor) instead of making a strdup() copy.
 2012-05-18 18:55:52 +09:30
gardners
80e013739d improved error message reporting. 2012-05-18 17:08:45 +09:30
gardners
c9a58937ca other bug fixes and cleanups for "dna lookup" 2012-05-18 12:55:56 +09:30
Andrew Bettison
9a51c76dfb Insist on 'service' field in all manifests 
The "rhizome file add" command assumes service=file if no manifest supplied
or the manifest lacks a service field.

The "rhizome extract manifest" command includes the service in its CLI output.
 2012-05-17 17:00:14 +09:30
Andrew Bettison
2434d51bee Remove "rhizome add authored file" command 
Now "rhizome add file" takes SID and PIN args, and if SID is empty, an
unauthored bundle (no BK field) is created

Updated dna_rhizome test cases
 2012-05-17 12:01:25 +09:30
gardners
74e0d69cb9 fixed various bugs with rhizome manifest extraction. 2012-05-16 15:55:03 +09:30
gardners
d51545b87a fixed some bugs with BK handling. keyring gets loaded when 
adding authored bundle so that we can lookup RS.
BK variable name case harmonised.
 2012-05-16 15:41:41 +09:30
Andrew Bettison
33f7ea7103 Add three optional args to "rhizome list" command 
service, sender_sid, recipient_sid - not yet implemented
 2012-05-16 13:47:58 +09:30
gardners
39be8a0b75 added new command line option for adding rhizome bundle with authorship 
so that it includes a BK.
All good, except the BK isn't being added. Yet to find out why.
 2012-05-15 22:15:13 +09:30
gardners
0eafc34970 BK encoding and decoding complete, but untested. 2012-05-15 20:04:41 +09:30
gardners
525d3c4154 substantial work towards implementing BK field in rhizome manifests. 2012-05-15 17:24:25 +09:30
Andrew Bettison
f90b21ec78 Implement rhizome config options 
rhizome.datastore_path - if not set, reverts to serval instance path
rhizome.enable - if not set, defaults to true
 2012-05-15 12:56:10 +09:30
Andrew Bettison
d11258cefc Overhaul debug flags 
Config debug flags are now represented as individual items, eg:
   servald config set debug.verbose yes
   servald config set debug.rhizome yes
instead of aggregated, eg:
   servald config set debug verbose,rhizome  <-- no longer works

Added a debug flag "debug.all" that can be set and cleared, over which
individual flag sets/clears take priority.

Slimmed down dna.c by moving some globals and functions to the files where they
are used.

Default command line (help message) is now the new style, not the deprecated
style.
 2012-05-14 18:37:32 +09:30
Andrew Bettison
e746557a08 Fix bug in overlay_gettime_ms() 
The sequence start time was only getting set in overlay_interface_init(), which
was not always called, or was called after overlay_gettime_ms() had already
been used.

Added FATALF(), FATAL() and FATAL_perror() macros.

Removed a bunch of debug statements no longer needed in monitor.c and server.c.
 2012-05-11 10:38:46 +09:30
Andrew Bettison
881576212c Fix all trivial compiler warnings 2012-05-10 18:08:59 +09:30
Andrew Bettison
0fa40973ec Make 'start' command call setpgrp() when detaching 2012-05-10 12:46:40 +09:30
Andrew Bettison
da9fe6fdca Fix 'start' command bug when invoked via JNI 
Child process was using return not exit(), which was unrolling the
JNI call stack in a sub-process and causing havoc.
 2012-05-08 16:35:14 +09:30
Andrew Bettison
8dd9a70852 Fix 'stop' command 
Do not fail with error if servald.pid is nonexistent/inaccessible
 2012-05-08 14:53:34 +09:30
gardners
596b20b5e8 interactive servald monitor cli command implemented. 2012-05-08 14:41:21 +09:30
Andrew Bettison
391e8d7056 Fix broken stopfile logic 
'start' command removes stopfile just before starting
'stop' command removes stopfile after stopping
 2012-05-08 12:53:59 +09:30
Andrew Bettison
329189ec8c Fix bodgy server start/stop logic 
Rename pidfile 'serval.pid' to 'servald.pid'
Rename stopfile 'doshutdown' to 'servald.stop'
Reinstate checking of stopfile on signals and in main loops
Correct delay loops in 'start' and 'stop' commands
Move some code from commandline.c to server.c
 2012-05-08 12:19:52 +09:30
Andrew Bettison
6376baf8b8 Follow-up fixes to serval.pid clobber termination 2012-05-08 11:27:07 +09:30
Andrew Bettison
acc5e48f4f Terminate server process if serval.pid clobbered 2012-05-08 11:23:43 +09:30
Andrew Bettison
27f2d00d5e Minor code refactor 2012-05-07 19:14:53 +09:30
Andrew Bettison
09f8434a21 Improve "start" command 
Add "start exec <exec path>" variants for background mode
Add background startup wait logic, so that pid can be reported to caller
 2012-05-07 19:14:52 +09:30
gardners
171eb75d48 fixed packet size calculation bug. 2012-05-07 16:50:49 +09:30
gardners
98607360f4 attempt at fixing wrong number in peerlist display bug in "node info" 
command.
 2012-05-07 15:29:31 +09:30
Andrew Bettison
cbc367b1f5 Rewrite server start/status/stop commands 
Now correctly probes for server process existence using kill(pid, 0)
Status command does not dump config (use "config get" instead)
Output uses JNI cli output fields
Stop command uses 5 Hz wakeup, not busy wait while server exits
 2012-05-07 13:49:38 +09:30
Andrew Bettison
97884ba069 Fix bug in output from "rhizome add file" 
When a duplicate is detected, the 'manifestid' field must contain the public
key of the existing manifest.
 2012-05-04 15:59:58 +09:30
Andrew Bettison
f31c326871 CLI output from "rhizome add file", with tests 2012-05-04 15:31:03 +09:30
Andrew Bettison
eab6dafcc7 Make commandline.c error messages appear on Android log 2012-05-03 14:50:14 +09:30
Andrew Bettison
5b85520f75 Fix JNI command-line interface; return 255 instead of -1 2012-05-03 12:17:49 +09:30
gardners
f3d288b10e fixed accidental typo. 2012-05-03 11:36:44 +09:30
gardners
03bfa6e0c7 removed dna resolution poll failure error messages. 2012-05-03 11:25:27 +09:30
Andrew Bettison
7ba15ccdd7 Add "rhizome extract file" command with tests 2012-05-02 17:57:35 +09:30
Andrew Bettison
6e959fd34c More tests for "rhizome extract manifest" 
Proper handling of unknown and invalid manifest IDs
 2012-05-02 16:24:27 +09:30
Andrew Bettison
146eb7cdfd Add "rhizome extract manifest" command 2012-05-02 16:03:09 +09:30
gardners
6464ae8100 "dna lookup" now displays name 2012-05-01 14:42:15 +09:30
gardners
14e4af6392 DNA replies now include name. "set did" now accepts name. 
Keyring now stores name. "node info resolvedid" now returns name.
 2012-05-01 14:38:09 +09:30
gardners
4234cb3ed5 changed bcmp to memcmp 2012-05-01 13:41:22 +09:30
gardners
92192654d0 cli_puts()ify "dna lookup". Add duplicate suppression to dna lookup 2012-05-01 13:39:43 +09:30
gardners
44d0feb575 improved "stop" functionality to better realise when a process 
is no longer running.
 2012-05-01 07:05:02 +09:30
gardners
590b53975c added some more debugging for finding out why numbers wont resolve 
from servald in java interface.
 2012-04-30 21:06:40 +09:30
gardners
cfe5f303e7 added cleaning up of client socket when ending command line 
execution so that multiple calls from java can succeed.
 2012-04-30 20:07:22 +09:30
Andrew Bettison
7e7ab30808 Refactor JNI command-line interface 
Does not depend on ServalDResult class - appends output fields to a supplied
list instead, and returns the integer status

Does not depend on ServalDReentranceError class - uses
java.lang.IllegalStateException instead
 2012-04-30 17:45:24 +09:30
gardners
e38854d4c0 improved "stop" command to try several times. 2012-04-30 15:34:41 +09:30
gardners
808ef53d0f "node info" command can now do DNA lookups to get phone # 2012-04-30 15:12:31 +09:30
gardners
1ebe63a470 cleaned up some debug output introduced during previous bug fixes. 2012-04-30 06:25:54 +09:30
gardners
c3fe7ee8e3 "id peers" now returns something! 2012-04-30 06:16:03 +09:30
gardners
6fad530b28 fixed some bugs with node info and set sid 2012-04-27 14:17:41 +09:30
gardners
47f15bf259 converted node info to return each record as a set of strings to 
make it easier to parse from Java.
 2012-04-27 08:27:55 +09:30
gardners
ef6f2ef3d3 cleaned up id_self() output. 2012-04-27 07:17:50 +09:30