[Olsr-commit] OLSR.org main repository branch, master, updated. v0.9.0.3-223-gc8a6f9b
(spam-protected)
(spam-protected)
Mon Nov 30 12:48:24 CET 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OLSR.org main repository".
See http://olsr.org/git/?p=olsrd.git;a=commitdiff;h=v0.9.0.3-223-gc8a6f9b
for a web version of the last commit.
The branch, master has been updated
via c8a6f9bc8521c6fd36868142a91ecd03a7a128c4 (commit)
via db614a713efff28c8ce90ccc1d31ee35390ded80 (commit)
via 83cad768ac6059603a6c60bf0a22951723813891 (commit)
via 982fdb9b3f51434ed5259421c19897e93211c32c (commit)
via 12371067c60461870d9ee4465debca98cb2662b6 (commit)
via 5e78c734912c5897d7d29a1337bb68850586d752 (commit)
via fbea6565638fe04a1f7103008cc89e67174c0bd3 (commit)
via e6147f7eb31061014b568a0ebf238085f3238d62 (commit)
via 763334ccb0db5d8436d25190f977477097f2be87 (commit)
via 9a16f894c48a69d7b7e13dcb3444b907509a746e (commit)
via 83aae8e814fd6cfeb51dc8b9b19444b77067c7ae (commit)
via 1d2bcfd13521596267e75495ddd3548b0f74536d (commit)
via b4ce2c92f1385a6ae04d0401a7828e021a32c3b3 (commit)
via ffaa7324a2355f12551a351366d0236e6a4d1532 (commit)
via 8a408f6681acb517c4583bff9f7e1e671827fc59 (commit)
via d1344d004979d9f333ff0ca126f147b578a7a536 (commit)
via cc111b0db38b14e4d3f7696df60a162629fe23c2 (commit)
via 7f06e576f701c225d0a38146bc90fbb3b79baf9b (commit)
via f10eb3ab660104333ff3d4397c361a23d741ec0a (commit)
via 0dc685e5958d9b2ee38fc530e5812f02923717e6 (commit)
via fa6f64ff29007dd78e958095ad153e6276661750 (commit)
via 70d72c6efcb48492001604ea9c4d0987f89e6838 (commit)
via 280d9b3d8eb576999b0f4e8b0c0afbc79cc9745e (commit)
via 0bca1169ed54624d470a49b06c8fa77793f27290 (commit)
via 5fea17ca31d89bf9325dbd27046c4a56f54f31db (commit)
via 282a707d8944c86ab1d7e0b248e11ad4d0bb19a3 (commit)
via 314824b80b227240d7ca228cb339176210d690e4 (commit)
via a2846a7e5dd11ab021ed56c80ea30d9afb4971ed (commit)
via 56ffe3e793d216118d1a1d19e9e29e7a24509513 (commit)
via d55caf72d34c7afd71772892a6cd7472c9fcc968 (commit)
via 9718c992182f7ac24070ea281e98412e85784c0b (commit)
via 2d9a8346902aa764ae38fa09d5a378dc8b4ef7be (commit)
via 3fab698494b8f39fb85d3eb041f3347dd20de5af (commit)
via d466028300c7ee9343dd7ff5e78b0eb20e3b0bd9 (commit)
via 8a34b2988db2ad3504ecc1cd2173b2f9cf79e0fd (commit)
via 4affb1f9482d554fd11a333f531e7bb5a452a48a (commit)
via 415307f814df123bc0d31fdae1a6fddfb9f98ea9 (commit)
via ef250c9b9e8b396bb8dc57b2377db982b9744e7d (commit)
via f307676584d599d977aad2d9a104861658e5e5c8 (commit)
via 22ea6dc7ddc9c059380e384a712894a69f591174 (commit)
via b1d29cad0bd445a999469c203e08bb89b7892aee (commit)
via ef102b6405968f9c26cd3f400d6c28f0c8e5af4e (commit)
via 4563faa79ea545846af9c25e59db94058d7d8bdc (commit)
via 88dd41bd493d2e2aeccef5639257017c437d5b7e (commit)
via c4ac86815bdc79990c5f2b97a8f4fdd243771255 (commit)
via ec55064d1cd858c8b8b0ac5cd1662d9cc18b9e2f (commit)
via 0ea27cd0d773356dd6589689aa44d670f0d7fe88 (commit)
via 05ebe51d78fc6e38a43a46eb49b020a508e22a57 (commit)
via 5286050b78ff53b1e180db82bab602742e198317 (commit)
via 2767225ad932fa3cf2ce3d6b55b4d84da0e044c3 (commit)
via bf7d1f3db487d1926150c281354d44ff6a862219 (commit)
via 83d573b59ff9a4bdfaad89a197ad80eeab9f9a9a (commit)
via 73c50a88ceaac52f01099a536102b3430599bf1c (commit)
via 29b893902306a18bcb2c503eb0c332337e46dabf (commit)
via bca50860bc3fbb772cb7abba943eb0829b5d2394 (commit)
via ba54060f2351e91f00fb13d485a9800f7a4cd9b1 (commit)
via f4a1e544fb66cc0c0b864e9482b76d65a789d0f0 (commit)
via 95c4b67b30fa1142e90c3ead0c28205b0fb4100b (commit)
from 11b6f1f8925e0836fbb0679396cde37bd2b22403 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c8a6f9bc8521c6fd36868142a91ecd03a7a128c4
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 13:58:29 2015 +0100
txtinfo: bring over proper http header support from jsoninfo
Signed-off-by: Ferry Huberts <(spam-protected)>
commit db614a713efff28c8ce90ccc1d31ee35390ded80
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 16:02:38 2015 +0100
jsoninfo: send http headers by default
Make it spec compliant
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 83cad768ac6059603a6c60bf0a22951723813891
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 13:58:45 2015 +0100
jsoninfo: avoid a memcpy: just move the abuf.buf pointer and clear abuf
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 982fdb9b3f51434ed5259421c19897e93211c32c
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 16:04:21 2015 +0100
jsoninfo: also send the (UTF-8) charset in the content type
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 12371067c60461870d9ee4465debca98cb2662b6
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 13:37:41 2015 +0100
jsoninfo: refactor generation of the headers
Just generate the headers at the start, leaving the Content-Length
value empty with a 12-spaces placeholder. Then at the end fill
in the value.
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 5e78c734912c5897d7d29a1337bb68850586d752
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 16:13:03 2015 +0100
txtinfo: avoid a memcpy: just move the abuf.buf pointer and clear abuf
Signed-off-by: Ferry Huberts <(spam-protected)>
commit fbea6565638fe04a1f7103008cc89e67174c0bd3
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 16:12:01 2015 +0100
txtinfo: also send the (UTF-8) charset in the content type
Signed-off-by: Ferry Huberts <(spam-protected)>
commit e6147f7eb31061014b568a0ebf238085f3238d62
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 14:00:54 2015 +0100
txtinfo: remove a pointless assert
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 763334ccb0db5d8436d25190f977477097f2be87
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 12:58:35 2015 +0100
jsoninfo: fixup the Content-Length http header
Make it spec compliant
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 9a16f894c48a69d7b7e13dcb3444b907509a746e
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 12:58:17 2015 +0100
jsoninfo: fixup the Content-Type http header
Make it spec compliant
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 83aae8e814fd6cfeb51dc8b9b19444b77067c7ae
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 12:58:00 2015 +0100
jsoninfo: fixup the Connection http header
Make it spec compliant
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 1d2bcfd13521596267e75495ddd3548b0f74536d
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 12:57:39 2015 +0100
jsoninfo: fixup the Server http header
Signed-off-by: Ferry Huberts <(spam-protected)>
commit b4ce2c92f1385a6ae04d0401a7828e021a32c3b3
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 12:57:27 2015 +0100
jsoninfo: ensure date in http header is in GMT, as advertised
Signed-off-by: Ferry Huberts <(spam-protected)>
commit ffaa7324a2355f12551a351366d0236e6a4d1532
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 13:28:54 2015 +0100
txtinfo: fixup the Content-Type http header
Make it spec compliant
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 8a408f6681acb517c4583bff9f7e1e671827fc59
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 27 10:01:35 2015 +0100
jsoninfo: move json support functions into their own file
Signed-off-by: Ferry Huberts <(spam-protected)>
commit d1344d004979d9f333ff0ca126f147b578a7a536
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 20:21:52 2015 +0100
jsoninfo: move some variables around
Signed-off-by: Ferry Huberts <(spam-protected)>
commit cc111b0db38b14e4d3f7696df60a162629fe23c2
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 20:21:24 2015 +0100
jsoninfo: remove personal copyrights, just check the git log
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 7f06e576f701c225d0a38146bc90fbb3b79baf9b
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 20:14:44 2015 +0100
jsoninfo: fix content type of http headers for /olsr.conf
Signed-off-by: Ferry Huberts <(spam-protected)>
commit f10eb3ab660104333ff3d4397c361a23d741ec0a
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 20:05:47 2015 +0100
jsoninfo: more formatting
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 0dc685e5958d9b2ee38fc530e5812f02923717e6
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 20:05:35 2015 +0100
jsoninfo: rename a function
Signed-off-by: Ferry Huberts <(spam-protected)>
commit fa6f64ff29007dd78e958095ad153e6276661750
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 20:05:10 2015 +0100
jsoninfo: limit the number of in-flight connection to 3, like txtinfo
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 70d72c6efcb48492001604ea9c4d0987f89e6838
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 20:04:27 2015 +0100
jsoninfo: use a smaller (2 CPU pages) initial buffer
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 280d9b3d8eb576999b0f4e8b0c0afbc79cc9745e
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 20:04:03 2015 +0100
jsoninfo: use the plugin name in a malloc call
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 0bca1169ed54624d470a49b06c8fa77793f27290
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 19:59:37 2015 +0100
jsoninfo: move some functions around
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 5fea17ca31d89bf9325dbd27046c4a56f54f31db
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 19:52:12 2015 +0100
jsoninfo: update some comments
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 282a707d8944c86ab1d7e0b248e11ad4d0bb19a3
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 19:51:15 2015 +0100
jsoninfo: initialise outbuffer_count
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 314824b80b227240d7ca228cb339176210d690e4
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 19:49:52 2015 +0100
jsoninfo: use the set_plugin_boolean function
Signed-off-by: Ferry Huberts <(spam-protected)>
commit a2846a7e5dd11ab021ed56c80ea30d9afb4971ed
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 19:35:46 2015 +0100
jsoninfo: use a define to rename TXTINFO_ALLOW_LOCALHOST
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 56ffe3e793d216118d1a1d19e9e29e7a24509513
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 19:32:15 2015 +0100
jsoninfo: use defines for some variables
Signed-off-by: Ferry Huberts <(spam-protected)>
commit d55caf72d34c7afd71772892a6cd7472c9fcc968
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 18:46:55 2015 +0100
jsoninfo: use a define for the plugin name
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 9718c992182f7ac24070ea281e98412e85784c0b
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 20:21:36 2015 +0100
txtinfo: remove personal copyrights, just check the git log
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 2d9a8346902aa764ae38fa09d5a378dc8b4ef7be
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 19:48:01 2015 +0100
txtinfo: expand SIW_RUNTIME_ALL to include all runtime information
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 3fab698494b8f39fb85d3eb041f3347dd20de5af
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 19:43:27 2015 +0100
txtinfo: remove superfluous forward declarations
Signed-off-by: Ferry Huberts <(spam-protected)>
commit d466028300c7ee9343dd7ff5e78b0eb20e3b0bd9
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 18:43:15 2015 +0100
txtinfo: some more formatting
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 8a34b2988db2ad3504ecc1cd2173b2f9cf79e0fd
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 18:41:01 2015 +0100
txtinfo: send everything on an unknown option
Instead of all runtime information
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 4affb1f9482d554fd11a333f531e7bb5a452a48a
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 18:38:51 2015 +0100
txtinfo: the configuration is a special case
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 415307f814df123bc0d31fdae1a6fddfb9f98ea9
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 18:28:58 2015 +0100
txtinfo: renumber SIW_x defines and put them in 'groups'
Signed-off-by: Ferry Huberts <(spam-protected)>
commit ef250c9b9e8b396bb8dc57b2377db982b9744e7d
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 15:26:33 2015 +0100
txtinfo: use a bigger (2 CPU pages) initial buffer
Signed-off-by: Ferry Huberts <(spam-protected)>
commit f307676584d599d977aad2d9a104861658e5e5c8
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 15:24:29 2015 +0100
txtinfo: use HTTP/1.1
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 22ea6dc7ddc9c059380e384a712894a69f591174
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 15:23:23 2015 +0100
txtinfo: http headers must use \r\n line endings
Signed-off-by: Ferry Huberts <(spam-protected)>
commit b1d29cad0bd445a999469c203e08bb89b7892aee
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 15:20:51 2015 +0100
txtinfo: add httpheaders configuration parameter
Signed-off-by: Ferry Huberts <(spam-protected)>
commit ef102b6405968f9c26cd3f400d6c28f0c8e5af4e
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 15:07:48 2015 +0100
txtinfo: simplify some comparisons
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 4563faa79ea545846af9c25e59db94058d7d8bdc
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 15:04:15 2015 +0100
txtinfo: re-order the sent information
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 88dd41bd493d2e2aeccef5639257017c437d5b7e
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 15:00:22 2015 +0100
txtinfo: use the plugin name in a malloc call
Signed-off-by: Ferry Huberts <(spam-protected)>
commit c4ac86815bdc79990c5f2b97a8f4fdd243771255
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:58:59 2015 +0100
txtinfo: rename txtinfo_write_data function
Signed-off-by: Ferry Huberts <(spam-protected)>
commit ec55064d1cd858c8b8b0ac5cd1662d9cc18b9e2f
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:55:20 2015 +0100
txtinfo: move ipc_print_version function up a bit
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 0ea27cd0d773356dd6589689aa44d670f0d7fe88
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:53:49 2015 +0100
txtinfo: move ipc_print_gateways function up a bit
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 05ebe51d78fc6e38a43a46eb49b020a508e22a57
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:51:09 2015 +0100
txtinfo: move ipc_print_mid function up a bit
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 5286050b78ff53b1e180db82bab602742e198317
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:45:34 2015 +0100
txtinfo: rename some SIW_x flags
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 2767225ad932fa3cf2ce3d6b55b4d84da0e044c3
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:43:35 2015 +0100
txtinfo: use a define to rename TXTINFO_ALLOW_LOCALHOST
Signed-off-by: Ferry Huberts <(spam-protected)>
commit bf7d1f3db487d1926150c281354d44ff6a862219
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:40:07 2015 +0100
txtinfo: use defines for some variables
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 83d573b59ff9a4bdfaad89a197ad80eeab9f9a9a
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:35:01 2015 +0100
txtinfo: rename some functions
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 73c50a88ceaac52f01099a536102b3430599bf1c
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:48:15 2015 +0100
txtinfo: use a define for the plugin name
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 29b893902306a18bcb2c503eb0c332337e46dabf
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:26:14 2015 +0100
txtinfo: simplify some send_what checks
Signed-off-by: Ferry Huberts <(spam-protected)>
commit bca50860bc3fbb772cb7abba943eb0829b5d2394
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:23:38 2015 +0100
txtinfo: simplify some string comparisons
Signed-off-by: Ferry Huberts <(spam-protected)>
commit ba54060f2351e91f00fb13d485a9800f7a4cd9b1
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:21:18 2015 +0100
txtinfo: simplify an ifdef
Signed-off-by: Ferry Huberts <(spam-protected)>
commit f4a1e544fb66cc0c0b864e9482b76d65a789d0f0
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:20:57 2015 +0100
txtinfo: use the same c-basic-offset: 2 as jsoninfo
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 95c4b67b30fa1142e90c3ead0c28205b0fb4100b
Author: Ferry Huberts <(spam-protected)>
Date: Thu Nov 26 14:14:14 2015 +0100
txtinfo: format code
Signed-off-by: Ferry Huberts <(spam-protected)>
-----------------------------------------------------------------------
Summary of changes:
lib/jsoninfo/src/olsrd_jsoninfo.c | 364 +++-------
lib/jsoninfo/src/olsrd_jsoninfo.h | 2 -
lib/jsoninfo/src/olsrd_jsoninfo_helpers.c | 220 ++++++
.../{olsrd_jsoninfo.h => olsrd_jsoninfo_helpers.h} | 59 +-
lib/jsoninfo/src/olsrd_plugin.c | 17 +-
lib/txtinfo/README_TXTINFO | 3 +
lib/txtinfo/src/olsrd_plugin.c | 33 +-
lib/txtinfo/src/olsrd_txtinfo.c | 758 +++++++++++----------
lib/txtinfo/src/olsrd_txtinfo.h | 2 +-
9 files changed, 778 insertions(+), 680 deletions(-)
create mode 100644 lib/jsoninfo/src/olsrd_jsoninfo_helpers.c
copy lib/jsoninfo/src/{olsrd_jsoninfo.h => olsrd_jsoninfo_helpers.h} (63%)
hooks/post-receive
--
OLSR.org main repository
More information about the Olsr-commit
mailing list