ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-22 14:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,284 Commits 22 Branches 0 Tags 33 MiB
d0317470c1
Commit Graph

474 Commits

Author SHA1 Message Date
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
gardners
7f11e25922 added count to id self/list output to help debug calls from JNI 
in batphone.
 2012-04-27 05:58:31 +09:30
gardners
89c08fa2c3 improved diagnostics for incorrect command line invokations. 
Fixed bug in servalwrap (needed to trim arg[0])
 2012-04-26 16:59:55 +09:30
Andrew Bettison
18eb83ebf4 JNI-ify "keyring list" output 2012-04-26 15:54:40 +09:30
gardners
38c240be58 using cli_delim() where appropriate. more work on "id self" / 
"id list".
 2012-04-26 15:47:05 +09:30
gardners
88ba56b68b work towards "node info" command, and renamed stop/start etc to 
drop node keyword, that in retrospect is not appropriate.
 2012-04-26 07:14:01 +09:30
gardners
d56780852c added "id peers" with maximum reuse of "id self". 2012-04-26 06:06:04 +09:30
gardners
35f231dcb0 preparation for allowing MDP_GETADDRS to return either local IDs, 
or SIDs of peers.
 2012-04-26 05:58:16 +09:30
gardners
cf2216fecf "id self" now correctly does multi-packet lists for when we have 
lots of identities.
 2012-04-26 05:54:54 +09:30
gardners
44a416b969 added "id self" command to get all local SIDs (BatPhone needs this) 2012-04-26 05:48:06 +09:30
gardners
98c3b72cf4 mdp based dna lookup works now, but lacks duplicate suppression. 2012-04-25 20:33:25 +09:30
gardners
a2880ada1e closer to dna lookup working via mdp. 
Bug to be fixed in sending replies.
 2012-04-25 20:14:56 +09:30
gardners
4972da1b58 dna lookup via mdp nearly working. 2012-04-25 15:55:04 +09:30
gardners
f8a1ffc4c9 dna lookup command line utility mostly done. Now to make server 
respond.
 2012-04-25 15:24:21 +09:30
gardners
dfb8d0d482 getting ready for making dna lookup work via mdp 2012-04-25 14:35:44 +09:30
Andrew Bettison
6746fc4e36 Fix commandline.c when undefined HAVE_JNI_H 2012-04-24 18:03:52 +09:30
Andrew Bettison
f9d8536d7d JNI-ize the output of "dna rhizome list" 2012-04-24 17:50:27 +09:30
Andrew Bettison
a496919e8a First real servald JNI command-line test works! 2012-04-24 17:07:20 +09:30
gardners
03004bcfdc added vomp dtmf command line interface to inject DTMF characters 
into a call.  This will be the initial codec/audio xfer app.
 2012-04-24 12:06:28 +09:30
Daniel O'Connor
2188c807b2 Hook up dummy phone app to commandline.c 2012-04-23 20:58:28 +09:30
Andrew Bettison
1494172da6 Trival test of dna JNI command line entry point 2012-04-23 18:25:26 +09:30
Andrew Bettison
a73916e85a Implement JNI command-line interface (untested) 
- argv is (const char *const *) everywhere, to avoid having to strdup() all the
  Java arg strings
- changed (char*) to (const char*) in lots of places to fix cascading compiler
  warnings as a result of argv constness
- fixed a bug in "config get" command when used without 'variable' arg
 2012-04-23 17:18:15 +09:30
Andrew Bettison
551f22092f Make javac and jni.h optional in ./configure 2012-04-23 12:05:00 +09:30
gardners
76a1bec84e Added initial work towards a call status monitoring commandline 
option.
 2012-04-22 18:47:24 +09:30
gardners
29b8454a94 vomp pickup and hangup commandline apps in place and working. 2012-04-22 12:51:58 +09:30
gardners
f4886d0a0a added conditionality to JNI code in commandline.c 2012-04-20 17:21:03 +09:30
gardners
d843e59bd5 vomp status and vomp dial command line apps added. 
now debugging dial operation.
 2012-04-20 17:12:44 +09:30
Andrew Bettison
90a1317822 First cut of JNI entry point to command line 2012-04-20 17:02:29 +09:30
Andrew Bettison
2bfa0ee7d2 Tighten up command line parsing 
- add optional offset and limit args to rhizome list
- validate argument values
 2012-04-19 18:03:04 +09:30
Andrew Bettison
21592a44d0 Rename some command-line functions for consistency 2012-04-19 15:47:23 +09:30
gardners
899cf8fc69 general cleanups and formatting changes to mdp ping 2012-04-19 04:23:39 +09:30
gardners
71f5f9e72c Removed unnecessary code in mdp pin. 2012-04-19 04:23:38 +09:30
Andrew Bettison
866ddea189 Get all rhizome add file test cases passing 
- new test cases to cover new payload with different versions
 - exit status of 2 when duplicate is detected
 - tighten up other test cases
 - fix bug in sqlite_exec_int64()
 2012-04-16 11:46:58 +09:30
gardners
02b253bb29 moved unencrypted broadcast warning outside loop in MDP ping so 
warning appears only once, instead of every second.
 2012-04-16 07:06:22 +09:30
gardners
caab3078e5 substantial work towards public key signing of MDP frames and 
the associated SID:SAS mapping cache and request packets.
 2012-04-15 03:17:36 +09:30
gardners
5f01210353 Added warning to mdp ping to indicate that broadcast pings are 
not encrypted.
 2012-04-15 00:26:26 +09:30
gardners
c3800ff004 mdp ping shows whether replies are encrypted or plain text etc. 2012-04-14 23:18:18 +09:30
gardners
4de6622c68 Fixed bug in "keyring add" command. 
Added opening of keyring in "mdp ping" command.
MDP ping now works with the new keyring framework (but authcryption
is not being attempted it seems).
 2012-04-14 02:44:41 +09:30
gardners
baf9212c20 modified mdp ping to use authcryption when not broadcasting. 2012-04-14 02:37:50 +09:30
Andrew Bettison
de88d3db21 Make "dna rhizome add" work for more test cases 
- adding a bundle using an existing manifest with an incorrect payload should
   fail with an error
 - adding a bundle using an existing manifest to update the payload to a new
   version should succeed
 - improve format of "dna rhizome list" output to one bundle per line
 2012-04-13 18:03:19 +09:30
gardners
5ac83f9ca1 Replaced use of HLR with keyring for phone number lookups and 
other functions.  Not yet tested.
 2012-04-13 09:25:03 +09:30
gardners
7b8d78533d Added commandline interface to set a did. 
Re-enabled payload rotation in keyring PKRs.
Getting and setting dids now works.
keyring list displays SID:DID pairs.
 2012-04-12 23:16:25 +09:30
Andrew Bettison
7b53fd6782 Rhizome add does not add duplicate files 
- If a bundle has the same payload hash and manifest.name as one already in
   the rhizome store, then the "dna rhizome add" command will not add it
 - Now passes fourth test case in tests/dna_rhizome
 2012-04-12 18:33:43 +09:30
Andrew Bettison
6b8f504db4 Fix bugs revealed by dna config tests 2012-04-12 18:33:43 +09:30
gardners
635dd3867e Keyring stuff now works :) 2012-04-12 15:52:41 +09:30
gardners
e89673ee89 Added command line access for simple keyring functions for testing. 
Creating keyring files works.
Writing PKR blocks seems more or less working, but we can't (yet)
read them back.
 2012-04-12 14:00:51 +09:30
Andrew Bettison
a87a78536c Refactor rhizome_add_manifest() 2012-04-11 18:40:10 +09:30
Andrew Bettison
f52db7f406 Fix bugs revealed by rhizome "add manifest" test case 2012-04-10 18:13:05 +09:30
Andrew Bettison
74986a0c30 Implement "rhizome add file" and "rhizome list" 2012-04-02 17:42:40 +09:30
gardners
54da5f3ffc Added output of statistics to MDP PING. 2012-03-29 20:31:01 +10:30
Andrew Bettison
3befe32711 New command "rhizome add", support optional args 2012-03-29 17:51:59 +10:30
Andrew Bettison
b8e3047479 Add 'get' and 'del' commands 2012-03-29 15:21:30 +10:30
Andrew Bettison
e87e80aee7 Create instance directory in "set" and "node start" 2012-03-29 15:03:17 +10:30
Andrew Bettison
a338c2f0f9 Refactor instance path handling 
- handle buffer limits when forming path names within instance dir
 - uniform use of serval_instancepath()
 2012-03-29 14:07:07 +10:30
gardners
942605d247 Removed some debugging, improved MDP PING client output. 2012-03-28 13:26:14 +10:30
gardners
aeee2f993c MDP ping client now shows pings coming in with their transit times. 
(no TTLs etc, but hey, it is the first working use of MDP)
 2012-03-28 13:16:06 +10:30
gardners
61920238d5 Fixed overlay_mdp_dispatch() versus overlay_mdp_send() confusion 
bug in MDP ping client.
 2012-03-28 13:10:55 +10:30
gardners
8fbbdc5087 More work on MDP. 
Swapped functions of overlay_mdp_send() and overlay_mdp_dispatch()
to match normal socket operations and thus avoid programmer confusion.
 2012-03-28 11:28:04 +10:30
gardners
8bd0153b0f Modified MDP ping code to set source address correctly. 2012-03-27 19:45:52 +10:30
gardners
aa543e1766 Various fixes and work towards MDP ping working. 
MDP clients can now request the set of local addresses.
Framework is improved to avoid info leaks by sending more bytes
in an MDP frame than are necessary, but without having to bzero
almost 2KB each time.
 2012-03-27 19:25:38 +10:30
gardners
30e2540470 Various fixes and work towards sending MDP frames. 
Broadcast and unicast addresses are accepted.  Some frame headers
are set.  Payload is yet to be set, and ciphered &/or signed as required,
and queueing is not yet verified.
 2012-03-21 12:57:24 +10:30
gardners
c71ddbbd18 MDP ping getting closer: ping loop showing server-returned error 
messages now works.  Server currently reports error when trying to
send MDP_TX frames (since it is not yet implemented), which the
client successfully displays. Onto making the server handle the
MDP_TX frames.
 2012-03-21 03:55:13 +10:30
gardners
6e3fe903d9 Improved shutdown behaviour to properly handle client mode (don't 
delete server socket if you are a client).  Also added main MDP
ping loop of sending packets.  Reading returned packets not yet
implemented.  Server handling of MDP_TX packets also not yet
implemented.
 2012-03-21 03:27:47 +10:30
gardners
8e6f6ee925 Work towards getting MDP working. Still some fun and games with 
getting unix domain sockets to play nicely.  Some superfluous debug
code is present while working this through.
 2012-03-20 17:11:58 +10:30
gardners
70497df7b5 More work on MDP. Removed some debug fluff. 
Added framework for MDP ping, and some work towards MDP port binding
and sending packets with option to wait for reply.  MDP server
doesn't yet support port binding, and client doesn't yet support
reading replies.
 2012-03-19 16:06:34 +10:30
gardners
302c9e70fb Added "set var value" command line option. 2012-03-19 14:26:14 +10:30
gardners
9a957dbda7 Added initial code towards adding mdp ping command to new command 
line framework.  Will use this to test MDP.
 2012-03-19 09:27:06 +10:30
gardners
b8d66bf19b Improved instance path handling so that there is a simple function 
to get the current instance path, regardless of how it was determined.
 2012-03-17 09:28:49 +10:30
gardners
ec8a81c206 Rhizome now uses serval.conf to get rhizome database size limit. 2012-03-15 10:57:37 +10:30
gardners
2a2e520ef5 Various fixes and additions to enable "dna node start" and "dna node stop" 
command line options to work.
 2012-03-15 10:57:37 +10: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
be1d75dfbc fixed some bugs with new command line parsing structure. 
Now can call use-case functions.
 2012-02-23 12:38:19 +10:30
gardners
878d9fab06 Added code to show status of serval process (pid file) among others. 
Some reformatting.
 2012-02-23 11:55:39 +10:30
gardners
2620203015 Further preparatory work for new command line interface. 2012-02-17 01:06:08 +10:30
gardners
1918ed7965 Added new files for revamped command line interface (work in progress) 
and dna identity cache (also work in progress)
 2012-02-17 00:35:28 +10:30