[Olsr-commit] OLSR.org main repository branch, master, updated. v0.6.4-305-gec03eb4
(spam-protected)
(spam-protected)
Thu Dec 13 13:32:41 CET 2012
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.6.4-305-gec03eb4
for a web version of the last commit.
The branch, master has been updated
via ec03eb4f394268d126fa93321498f612a65d207e (commit)
via 725a8e4b3b2eed4350358bb097435ecd0f2e6105 (commit)
via 43b9caaa2cdc7954f60d3cf262995ecc1481cc98 (commit)
via 834a7e86f07a2b7c1023f0e0257fe24a83946961 (commit)
via 53c549bff6589d0b0e73382ca586735695ede2e2 (commit)
via 31ce64e6243d2fb7b488274224d48f96c36b0e03 (commit)
via a94848292a05a42290f4f36da65c7ad7a7218992 (commit)
via 91eada17934dad70140cdc15a6ee19be2fdbdf3c (commit)
via 6b4d181a7f12f8b5783dd04c310983e798e64324 (commit)
via f1ed351f57c2e13aaa5edc5600821808649e371a (commit)
via d1497a70cc62b1f33d1edf8d8420348956a6e677 (commit)
via 57da37b79f492bedf2829634f3e428d63c966686 (commit)
via 071dc73309f86d823d47f56055dcc231206ca769 (commit)
via 20320fdf11431ef0397b662aa642bb9458b7eb28 (commit)
via 0e144aff2007033c7a3e5f7874cbb64d3c983a14 (commit)
via 6a5a6aa516352cf249f0d5a9dba9a6f8d7edfa44 (commit)
via ea69ff16de35097bc2b47a9c9564108a2f5258f3 (commit)
via b73e5d8069316cf076ebc390cb0c177ff9b9afec (commit)
via eb71374f3dfb6bf394d9e5ad55506f522c337d00 (commit)
via 4249b3f14341a420f80a088cdee3ef078ee1096b (commit)
via 5ea7c8586681feb3a00fdac8797a5b2b99b71c98 (commit)
via fb8be06a5cb2fe9d10dde27b3a2e7d2c2e143b75 (commit)
via 359185b55aa4d6ddc0fb99d38752cd19bf496753 (commit)
via ae9ddd490118c0826e33ee1d4e9b6d152660b5ba (commit)
via 9cd8aaa0e6e28d7c928aa7945709d9f60f5fa169 (commit)
via 723abf226c9cea487d556c98b3eec28b0acc0a4c (commit)
from 492af958cca7a59dd0e3d8e1e99a643089b91572 (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 ec03eb4f394268d126fa93321498f612a65d207e
Merge: 492af95 725a8e4
Author: Ferry Huberts <(spam-protected)>
Date: Thu Dec 13 13:32:30 2012 +0100
Merge branch 'multigw'
* multigw: (25 commits)
kernel_route: olsr_os_inetgw_tunnel_route now needs the table explicitly
gateway: convert some defines into inline functions
gateway: enable multi-gateway mode
gateway: introduce and use MULTI_GW_MODE define
gateway: setup/cleanup multi-gateway mode during startup/shutdown of olsrd
gateway: setup and clear table specific default routes in/for multi-gateway mode
gateway: use fixed tunnel names in/for multi-gateway mode
gateway: initialise the egress interface names in/for multi-gateway mode
gateway: initialise a set of fixed tunnel names in/for multi-gateway mode
gateway: add SmartGatewayPolicyRoutingScript configuration parameter
gateway: add SmartGatewayMarkOffset{Egress,Tunnels} configuration parameters
gateway: add SmartGatewayEgressInterfaces configuration parameter
gateway: use SmartGatewayUseCount setting the the gateway lists
gateway: add SmartGatewayUseCount configuration parameter
gateway: remove the worst gateway before adding new one
gateway: let the gateway code determine the tunnel name
kernel_route: olsr_os_inetgw_tunnel_route can now take the table
json_info: only output smart gateway info on Linux
gateway: keep track of the active gateways in a list
gateway: add gateway_list.{c,h}
...
commit 725a8e4b3b2eed4350358bb097435ecd0f2e6105
Author: Ferry Huberts <(spam-protected)>
Date: Thu Dec 13 13:30:42 2012 +0100
kernel_route: olsr_os_inetgw_tunnel_route now needs the table explicitly
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 43b9caaa2cdc7954f60d3cf262995ecc1481cc98
Author: Ferry Huberts <(spam-protected)>
Date: Thu Dec 13 12:51:57 2012 +0100
gateway: convert some defines into inline functions
And inline some other defines.
Henning doesn't seem to like defines ;-)
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 834a7e86f07a2b7c1023f0e0257fe24a83946961
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 11:37:23 2012 +0100
gateway: enable multi-gateway mode
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 53c549bff6589d0b0e73382ca586735695ede2e2
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 13:37:17 2012 +0100
gateway: introduce and use MULTI_GW_MODE define
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 31ce64e6243d2fb7b488274224d48f96c36b0e03
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 14:20:50 2012 +0100
gateway: setup/cleanup multi-gateway mode during startup/shutdown of olsrd
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit a94848292a05a42290f4f36da65c7ad7a7218992
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 13:22:56 2012 +0100
gateway: setup and clear table specific default routes in/for multi-gateway mode
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 91eada17934dad70140cdc15a6ee19be2fdbdf3c
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 13:18:33 2012 +0100
gateway: use fixed tunnel names in/for multi-gateway mode
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 6b4d181a7f12f8b5783dd04c310983e798e64324
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 13:04:48 2012 +0100
gateway: initialise the egress interface names in/for multi-gateway mode
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit f1ed351f57c2e13aaa5edc5600821808649e371a
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 13:03:53 2012 +0100
gateway: initialise a set of fixed tunnel names in/for multi-gateway mode
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit d1497a70cc62b1f33d1edf8d8420348956a6e677
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 12:56:19 2012 +0100
gateway: add SmartGatewayPolicyRoutingScript configuration parameter
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 57da37b79f492bedf2829634f3e428d63c966686
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 12:48:14 2012 +0100
gateway: add SmartGatewayMarkOffset{Egress,Tunnels} configuration parameters
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 071dc73309f86d823d47f56055dcc231206ca769
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 12:41:17 2012 +0100
gateway: add SmartGatewayEgressInterfaces configuration parameter
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 20320fdf11431ef0397b662aa642bb9458b7eb28
Author: Ferry Huberts <(spam-protected)>
Date: Tue Nov 20 12:07:53 2012 +0100
gateway: use SmartGatewayUseCount setting the the gateway lists
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 0e144aff2007033c7a3e5f7874cbb64d3c983a14
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 12:25:07 2012 +0100
gateway: add SmartGatewayUseCount configuration parameter
We can now configure multiple 'active' gateways (although we only
allow 1 for now until the functionality is complete).
Multiple active gateways are used to reduce breaking connections
in a dynamic network.
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit 6a5a6aa516352cf249f0d5a9dba9a6f8d7edfa44
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 11:28:31 2012 +0100
gateway: remove the worst gateway before adding new one
when the gateway list is full, so that we never overrun
the list.
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit ea69ff16de35097bc2b47a9c9564108a2f5258f3
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 10:50:35 2012 +0100
gateway: let the gateway code determine the tunnel name
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit b73e5d8069316cf076ebc390cb0c177ff9b9afec
Author: Ferry Huberts <(spam-protected)>
Date: Tue Nov 27 13:33:31 2012 +0100
kernel_route: olsr_os_inetgw_tunnel_route can now take the table
as an optional parameter.
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
commit eb71374f3dfb6bf394d9e5ad55506f522c337d00
Author: Ferry Huberts <(spam-protected)>
Date: Tue Dec 4 15:45:54 2012 +0100
json_info: only output smart gateway info on Linux
Since it's only available on Linux
Signed-off-by: Ferry Huberts <(spam-protected)>
Reviewed-by: Henning Rogge <(spam-protected)>
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 +
Makefile.inc | 1 +
README-Olsr-Extensions | 31 ++-
files/olsrd.conf.default.full | 38 ++
files/olsrd.conf.default.lq | 38 ++
files/olsrd.conf.default.lq-fisheye | 38 ++
files/sgw_policy_routing_setup.sh | 174 +++++++++
lib/jsoninfo/src/olsrd_jsoninfo.c | 21 ++
src/bsd/dummy.c | 5 +-
src/cfgparser/cfgfile_gen.c | 60 ++++
src/cfgparser/olsrd_conf.c | 124 +++++++
src/cfgparser/oparse.y | 112 ++++++
src/cfgparser/oscan.lex | 25 ++
src/gateway.c | 660 +++++++++++++++++++++++++++++++----
src/gateway.h | 12 +-
src/gateway_default_handler.c | 77 +++--
src/gateway_list.c | 187 ++++++++++
src/gateway_list.h | 152 ++++++++
src/kernel_routes.h | 2 +-
src/kernel_tunnel.h | 2 +-
src/linux/kernel_routes_nl.c | 4 +-
src/linux/kernel_tunnel.c | 20 +-
src/main.c | 10 +
src/olsr_cfg.h | 20 +
src/win32/dummy.c | 5 +-
25 files changed, 1689 insertions(+), 135 deletions(-)
create mode 100755 files/sgw_policy_routing_setup.sh
create mode 100644 src/gateway_list.c
create mode 100644 src/gateway_list.h
hooks/post-receive
--
OLSR.org main repository
More information about the Olsr-commit
mailing list