Andrew Bettison
2c379fadb1
Merge branch 'naf2-logging' into 'development'
...
Conflicts:
commandline.c
tests/rhizomeprotocol
2013-04-05 17:39:23 +10:30
Andrew Bettison
ab162bbc99
Fix Makefile broken by recent version string changes
2013-03-28 15:37:19 +10:30
Andrew Bettison
95b0c028f2
Log to file, Android and stderr simultaneously
...
Indepent configuration of show_pid, show_time and log level for each
destination
Update test scripts for new config options
Include xprintf.c in MDP client source files (now used by log.c)
2013-03-27 16:17:38 +10:30
Andrew Bettison
1cfedb19e4
Fix broken 'make directory_service'
2013-03-18 15:35:13 +10:30
Andrew Bettison
b17f5a6f63
Servald version string from git describe
2013-03-12 14:03:33 +10:30
Andrew Bettison
48fd3d2322
Remove some unnecessary executable mode bits
2013-01-23 17:18:51 +10:30
Andrew Bettison
1e38ff717e
Fix link error in libmonitorclient.so
2012-12-10 09:39:15 +10:30
Andrew Bettison
8425882ffc
Merge branch 'newconfig' into 'master'
...
Conflicts:
commandline.c
conf.h
dataformats.c
log.h
overlay_address.c
overlay_interface.c
packetformats.c
rhizome.c
serval.h
tests/directory_service
vomp_console.c
2012-12-07 14:09:55 +10:30
Andrew Bettison
caa209fc1d
Integrate new config into servald
...
Not passing any tests yet, but compiles and links and simple uses do not
SEGV.
2012-12-04 14:12:28 +10:30
Andrew Bettison
d3c2205d44
Add os.c and "os.h", replacing mkdirs.c
...
The new header "os.h" defines a supplemental API around existing basic
operating system services (system calls and standard library functions).
Moved some function prototypes from serval.h and net.h into os.h.
This allows non-servald executables to take advantage of this API without
having to include serval.h and bringing in all the other servald link-time
baggage.
2012-12-04 10:12:35 +10:30
Andrew Bettison
5139d8d34d
Add mem.c and "mem.h" with emalloc() etc.
2012-12-04 10:03:32 +10:30
Andrew Bettison
ef03eb1a3e
Re-organise Makefile header dependencies
...
Add str.h to list of Serval header files. Make the NaCl objects not dependent
on Serval header files, so that the entire NaCl source does not get re-built
when editing serval.h or str.h etc.
2012-11-22 18:18:00 +10:30
Andrew Bettison
0e435683f7
Move toprint functions from log.h to str.h
...
Move alloca_sockaddr() to strbuf_helpers.h
So that stand-alone executables can use them without pulling in the entire
logging framework.
2012-11-20 18:10:08 +10:30
Andrew Bettison
d38ce66c95
Improve test framework: create_file()
...
New executable in Makefile 'all' target: tfw_createfile.
New str.h function: str_to_ll_scaled().
2012-10-31 18:13:33 +10:30
gardners
be3b529504
refactored Makefile.in and Anrdoid.mk so that source file lists are
...
included into each from separate .mk files. #32
2012-10-25 04:30:14 +10:30
Jeremy Lakeman
f93216f369
Remove dead code
2012-10-19 15:02:22 +10:30
Jeremy Lakeman
f1b0374b97
Extract crypto signing primitives from mdp processing
2012-10-19 14:54:41 +10:30
gardners
a40fcfec66
cleaned up NaCl build to just compile using make. #17
2012-10-18 17:26:52 +10:30
Andrew Bettison
89343c69cd
Merge branch 'rhizomedirect' into 'master'
2012-10-05 17:45:30 +09:30
Jeremy Lakeman
fa7719fbe8
Write simple vomp console client
2012-09-28 15:23:50 +09:30
Andrew Bettison
14721fab19
Merge branch 'solaris' into rhizomedirect
...
All test cases pass on Solaris (see issue #16 ) except the 'jni' tests because
there is no Java compiler available on Solaris, and the new 'rhizomeprotocol'
tests from the rhizomedirect branch, which have always failed.
2012-09-27 17:38:16 +09:30
Jeremy Lakeman
ac3864ff20
Reuse command line parsing framework with monitor interface
2012-09-25 13:31:34 +09:30
Jeremy Lakeman
7c73ca7a78
Finish test and implementation of directory service
2012-09-18 12:30:15 +09:30
Jeremy Lakeman
ac8d9b93e6
Add stub directory service
2012-09-14 11:50:45 +09:30
Jeremy Lakeman
6483d9e0ae
Split client mdp functions so they can be built separately
2012-09-14 11:47:48 +09:30
gardners
d796a482b7
refactored rhizome direct code to separate http transport specific
...
code from general rhizome direct BAR buffer gathering and processing.
2012-09-09 13:50:09 +09:30
Daniel O'Connor
1deb092a5f
Add OSX magic so we can use things like u_short (which is off for POSIX source which is presumably turned on by _XOPEN_SOURCE).
2012-09-06 14:32:17 +09:30
Paul Gardner-Stephen
0562367b23
Try detecting ALSA better.
2012-09-06 12:43:06 +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
Jeremy Lakeman
545c05fddb
Relay broadcast payloads via olsr plugin
2012-09-01 12:41:50 +09:30
Jeremy Lakeman
e05806f25e
Separate routing calculation from resulting rules, refactor more code to use subscriber structure
2012-08-31 15:11:18 +09:30
Jeremy Lakeman
f6c899e107
Refactor overlay buffer interface to support simple parsing
2012-08-31 15:03:07 +09:30
Jeremy Lakeman
90cbf8df7e
Add new subscriber storage
2012-08-31 15:03:06 +09:30
gardners
2b29893a02
Initial work towards rhizome direct syncrhonisation functions #9
2012-08-31 12:58:37 +09:30
gardners
bae2e2e4c2
Updated non-Android build process to work again (sqlite3 include path fixed,
...
also improved so that sqlite3.c doesn't need to exist as a symlink to the
real file).
2012-08-27 17:03:50 +09:30
Andrew Bettison
27a0a6eeb5
Introduce struct __sourceloc
...
Replaces (const char *file, unsigned int line, const char *function) arguments
to all logging functions, simplifies malloc/free tracking code in
overlay_buffer.c and Rhizome manifest alloc/free tracking in rhizome_bundle.c.
Use __HERE__ macro instead of (__FILE__, __LINE__, __FUNCTION__) everywhere.
Special __NOWHERE__ macro is equivalent to (NULL, 0, NULL).
Declare net.c functions in new "net.h" header, so log.c doesn't have to pull
in the entire "serval.h" just to use write_str().
Facilitates progress on issue #2 .
2012-08-23 12:31:07 +09:30
Daniel O'Connor
d77e5b7c62
Add strlcpy as it appears some systems (Ubuntu and probably Debian) don't have it.
...
This is a public domain version from http://cantrip.org/strlcpy.c
2012-08-13 18:24:19 +09:30
Daniel O'Connor
75889355fa
Build static library version of libmonitorclient.
2012-08-10 14:36:46 +09:30
Jeremy Lakeman
7705676a9e
Move str functions to c file to enable reuse
2012-08-09 13:30:52 +09:30
Daniel O'Connor
e3bef80965
Fix compilation of shared library on 64 bit ELF platforms (only tested on Linux so far) by using -fPIC.
2012-08-06 17:03:00 +09:30
Andrew Bettison
03da89225d
Add xprintf() extensible stream formatter
...
Use it to replace open_memstream(3) in logServalPacket() -- not available on
Mac OS X
2012-08-03 16:44:05 +09:30
Andrew Bettison
2bd7c38483
Remove unused trans_cache.c
2012-07-31 18:12:20 +09:30
Daniel O'Connor
c241d3630c
Move debug options to Makefile.dbg so we don't have to re-run configure.
...
Remove DO_TIMING_CHECK since it's no longer used
2012-07-29 14:55:10 +09:30
Daniel O'Connor
5e43c81214
Sort source files
2012-07-29 13:09:13 +09:30
Daniel O'Connor
3907eb3842
Use variables for source/object files.
2012-07-29 13:04:03 +09:30
gardners
93449d380e
various fixes for libmonitorclient and commits made by others
...
inbetween. Hopefully I have captured all the changes.
2012-07-29 12:35:53 +09:30
Andrew Bettison
0dee99dec2
Remove old command-line support
2012-07-27 11:44:20 +09:30
Andrew Bettison
c7488de510
Add strbuf_helpers.[ch]
...
Functions to help assemble strbuf contents.
2012-07-11 14:11:59 +09:30
Andrew Bettison
86eb482ed9
Replace macros with functions
...
SET_NONBLOCKING(), SET_BLOCKING(), WRITE_STR() are now set_nonblock(),
set_block() and write_str() respectively, all of which log an error before
returning -1. There are other useful methods: write_all() treats anything less
than all bytes written as an error; write_nonblock() treats EAGAIN and EINTR as
zero bytes written, and a combination: write_all_nonblock().
2012-07-10 16:33:39 +09:30
Andrew Bettison
ab64b08ceb
Rewrite config file code
...
Gets rid of rotor in confValueGet() and duplicate config file parsing code
Currently fails three tests
2012-07-04 18:57:02 +09:30