[Olsr-commit] OLSR.org main repository branch, master, updated. v0.6.7.1-55-g5157226
(spam-protected)
(spam-protected)
Fri Nov 14 10:42:25 CET 2014
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.7.1-55-g5157226
for a web version of the last commit.
The branch, master has been updated
via 5157226e88838f93fe5dcc2770dc13ca3131e7ff (commit)
via 9210af536c319eb71b67bf740a5b0d0f298afd0d (commit)
via 6fa19e44a9ee962ec5616f7a15a72d6ad2225a40 (commit)
via 50f175c122c70603d2d7be3485ab4657ecfa5b65 (commit)
via 38101dfdfb3a306ea968084ffa7264f0b1400059 (commit)
via 13afe1080409f47a0c82d6da85d6c6950c73d3b4 (commit)
via 63d56c88b183e4a170a23b65be67243c4cf47ebe (commit)
via de0734315303204b20ff61c556c8128d3be666c3 (commit)
via d311fc95e5696bdc05be7c4d29094888c262b7f8 (commit)
via 40f0aa38d976596362038856feae05157edb03d5 (commit)
via 259d9873005f8a5883c9317a1c671efc18f12487 (commit)
via f93af49e2b237e0a006c4bb0808b0c128f6ab6e8 (commit)
via 806a7e6ef935797731c59b17c531bcdb371569df (commit)
via 5db52f6254c7b57f69cec7a146d2f9bff6511937 (commit)
via cc6a07a8b3043febb2b6d1444f55c83652ee0b09 (commit)
via 8f857e66925e67165fbfb75cabf7758deddd3446 (commit)
via 9a0b2569e6f774214477bac3396b0d0400054482 (commit)
via 87d8512dccea787ca48eed82ee46f24d751880b6 (commit)
via e31412af2bee947abf19a4e015ec1a16d6d22a6c (commit)
via 6776b8c0873f0ca9f46c43b7af2cd3e746886bed (commit)
via ffcb7b5aa61b55f1c7612f6389337f9cc721f6ea (commit)
via 20703dfc1836e2bc0a757384e413852fc5423137 (commit)
via cdd3bc912f62d2fd3fb2ef97271cb1a893e8043c (commit)
via 7c85bc384f2169dca52bc8009568111c75008382 (commit)
from 5a99f8860c37bda51021c73e97805f7df671f159 (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 5157226e88838f93fe5dcc2770dc13ca3131e7ff
Merge: 5a99f88 9210af5
Author: Ferry Huberts <(spam-protected)>
Date: Fri Nov 14 10:38:05 2014 +0100
Merge branch 'msgw'
* msgw: (23 commits)
sgw: do not prematurely exit doRoutesMultiGw
sgw: reset cached egress file timestamp on file access errors
sgw: show all sgw tunnels in the output file instead of only the active one
sgw: lazily determine the sgw costs weights
sgw: initialise the egress interfaces earlier
sgw: fix default path costs for egress interfaces
sgwdynspeed: only allow the plugin in single-sgw mode
sgw: program egress link routes
sgw: program best egress link route
sgw: program best overall link routes
sgw: add reportNewGateway function
sgw: add the smart gateway status file writer
sgw: add SmartGatewayStatusFile setting
sgw: determine best overall link in doRoutesMultiGw
sgw: determine best exit link in doRoutesMultiGw
sgw: introduce function to process multi-sgw changes
sgw: use the smartgw_tunnel_monitor to track up/down of egress interfaces
sgw: track the up status of an egress interface
sgw: track the interface index of an egress interface
sgw: add egress file reader
...
commit 9210af536c319eb71b67bf740a5b0d0f298afd0d
Author: Ferry Huberts <(spam-protected)>
Date: Wed Nov 12 18:27:44 2014 +0100
sgw: do not prematurely exit doRoutesMultiGw
Some change happen so the status file must be written
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 6fa19e44a9ee962ec5616f7a15a72d6ad2225a40
Author: Ferry Huberts <(spam-protected)>
Date: Wed Nov 12 17:21:28 2014 +0100
sgw: reset cached egress file timestamp on file access errors
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 50f175c122c70603d2d7be3485ab4657ecfa5b65
Author: Ferry Huberts <(spam-protected)>
Date: Wed Nov 12 15:55:15 2014 +0100
sgw: show all sgw tunnels in the output file instead of only the active one
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 38101dfdfb3a306ea968084ffa7264f0b1400059
Author: Ferry Huberts <(spam-protected)>
Date: Wed Nov 12 14:14:03 2014 +0100
sgw: lazily determine the sgw costs weights
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 13afe1080409f47a0c82d6da85d6c6950c73d3b4
Author: Ferry Huberts <(spam-protected)>
Date: Wed Nov 12 14:12:31 2014 +0100
sgw: initialise the egress interfaces earlier
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 63d56c88b183e4a170a23b65be67243c4cf47ebe
Author: Ferry Huberts <(spam-protected)>
Date: Mon Nov 10 13:18:13 2014 +0100
sgw: fix default path costs for egress interfaces
Signed-off-by: Ferry Huberts <(spam-protected)>
commit de0734315303204b20ff61c556c8128d3be666c3
Author: Ferry Huberts <(spam-protected)>
Date: Fri Aug 15 12:51:19 2014 +0200
sgwdynspeed: only allow the plugin in single-sgw mode
Signed-off-by: Ferry Huberts <(spam-protected)>
commit d311fc95e5696bdc05be7c4d29094888c262b7f8
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 13:08:11 2014 +0100
sgw: program egress link routes
When an egress interface has a network then a network route is
programmed in the table corresponding to the egress interface.
A default route is always programmed in that same table.
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 40f0aa38d976596362038856feae05157edb03d5
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 13:05:42 2014 +0100
sgw: program best egress link route
This is a default route in the routing table corresponding to the
best egress link. If there is no such link, then a blackhole route
is programmed to prevent accidental looping of sgw tunnel traffic.
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 259d9873005f8a5883c9317a1c671efc18f12487
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 12:57:35 2014 +0100
sgw: program best overall link routes
These are a set of 2 /1 routes to override any default gateway
routes that are setup through other means such as a DHCP client.
Signed-off-by: Ferry Huberts <(spam-protected)>
commit f93af49e2b237e0a006c4bb0808b0c128f6ab6e8
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 12:50:30 2014 +0100
sgw: add reportNewGateway function
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 806a7e6ef935797731c59b17c531bcdb371569df
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 12:48:50 2014 +0100
sgw: add the smart gateway status file writer
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 5db52f6254c7b57f69cec7a146d2f9bff6511937
Author: Ferry Huberts <(spam-protected)>
Date: Wed Oct 29 15:40:31 2014 +0100
sgw: add SmartGatewayStatusFile setting
The status file writer will be added later on.
Signed-off-by: Ferry Huberts <(spam-protected)>
commit cc6a07a8b3043febb2b6d1444f55c83652ee0b09
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 12:45:37 2014 +0100
sgw: determine best overall link in doRoutesMultiGw
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 8f857e66925e67165fbfb75cabf7758deddd3446
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 12:43:17 2014 +0100
sgw: determine best exit link in doRoutesMultiGw
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 9a0b2569e6f774214477bac3396b0d0400054482
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 12:33:12 2014 +0100
sgw: introduce function to process multi-sgw changes
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 87d8512dccea787ca48eed82ee46f24d751880b6
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 12:29:33 2014 +0100
sgw: use the smartgw_tunnel_monitor to track up/down of egress interfaces
Signed-off-by: Ferry Huberts <(spam-protected)>
commit e31412af2bee947abf19a4e015ec1a16d6d22a6c
Author: Ferry Huberts <(spam-protected)>
Date: Wed Oct 29 14:00:41 2014 +0100
sgw: track the up status of an egress interface
We need this later.
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 6776b8c0873f0ca9f46c43b7af2cd3e746886bed
Author: Ferry Huberts <(spam-protected)>
Date: Wed Oct 29 13:52:38 2014 +0100
sgw: track the interface index of an egress interface
We need this later.
Signed-off-by: Ferry Huberts <(spam-protected)>
commit ffcb7b5aa61b55f1c7612f6389337f9cc721f6ea
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 12:26:05 2014 +0100
sgw: add egress file reader
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 20703dfc1836e2bc0a757384e413852fc5423137
Author: Ferry Huberts <(spam-protected)>
Date: Wed Oct 29 11:22:55 2014 +0100
sgw: add egress file reader settings
* SmartGatewayEgressFile: the file with egress bandwidths and network
configurations.
* SmartGatewayEgressFilePeriod: the period on which to check & process
the SmartGatewayEgressFile.
The egress file reader will be added later on.
Signed-off-by: Ferry Huberts <(spam-protected)>
commit cdd3bc912f62d2fd3fb2ef97271cb1a893e8043c
Author: Ferry Huberts <(spam-protected)>
Date: Fri Oct 31 12:11:49 2014 +0100
sgw: store table & rule numbers in the sgw_egress_if structure
Signed-off-by: Ferry Huberts <(spam-protected)>
commit 7c85bc384f2169dca52bc8009568111c75008382
Author: Ferry Huberts <(spam-protected)>
Date: Tue Oct 28 14:18:47 2014 +0100
sgw: move 'struct sgw_egress_if' type into a separate include file
Some egress types will be added later on and the global types file
doesn't really need the types anyway.
Signed-off-by: Ferry Huberts <(spam-protected)>
-----------------------------------------------------------------------
Summary of changes:
README-Olsr-Extensions | 45 +-
files/olsrd.conf.default.full | 21 +
files/olsrd.conf.default.lq | 21 +
files/olsrd.conf.default.lq-fisheye | 21 +
lib/jsoninfo/src/olsrd_jsoninfo.c | 1 +
lib/sgwdynspeed/src/sgwDynSpeed.c | 7 +
src/cfgparser/cfgfile_gen.c | 47 ++
src/cfgparser/olsrd_conf.c | 15 +
src/cfgparser/oparse.y | 31 ++
src/cfgparser/oscan.lex | 15 +
src/egressFile.c | 700 ++++++++++++++++++++++++++
src/egressFile.h | 30 ++
src/egressTypes.h | 115 +++++
src/gateway.c | 941 ++++++++++++++++++++++++++++++++++-
src/gateway.h | 12 +
src/olsr_cfg.h | 12 +-
16 files changed, 1998 insertions(+), 36 deletions(-)
create mode 100644 src/egressFile.c
create mode 100644 src/egressFile.h
create mode 100644 src/egressTypes.h
hooks/post-receive
--
OLSR.org main repository
More information about the Olsr-commit
mailing list