Commit 7cf0a4f
committed
Bgp: move the BGP timers from the config XML to module parameters
The BGP timers were configured in a single global <TimerParams> element in the
bgpConfig XML, applied to every router. They are per-router behavior knobs, not
topology, so move them to Bgp module parameters: connectRetryTime (default
120s), holdTime (180s), keepAliveTime (60s) and startDelay (1s) -- all @Unit(s)
and overridable from the ini (e.g. **.bgp.holdTime = 90s), consistent with the
existing startupTime / ExternalPeerStartDelayOffset parameters.
BgpConfigReader now reads the timers from the module parameters and rejects a
<TimerParams> element with an informative error that explains how to convert it
to module parameters (including the element's source location).
<TimerParams> is removed from every BGPConfig*.xml under examples/bgpv4 and
tutorials/bgp; each example/tutorial sets the equivalent parameters in its
omnetpp.ini where they differ from the new defaults (holdTime=120s in
BgpAndOspf, keepAliveTime=680s in BgpOpen, and the various startDelay values).
The BGP.xsd schema and the BGP section of the User Guide are updated as well.
The timer values are unchanged, so all bgpv4 and tutorials/bgp fingerprints
stay byte-identical (verified).
The timers are intentionally NOT added to the IBgp moduleinterface, matching
how the other Bgp behavior parameters (ebgpMultihop, connectedCheck,
ExternalPeerStartDelayOffset) are kept off the interface.1 parent 9756925 commit 7cf0a4f
34 files changed
Lines changed: 56 additions & 193 deletions
File tree
- doc
- schemas
- src/users-guide
- examples/bgpv4
- Bgp2RoutersInAS
- Bgp3Routers
- BgpAndOspfSimple
- BgpAndOspf
- BgpCompleteTest
- BgpIpv6Basic
- BgpLifecycle
- BgpOpen
- BgpUpdate
- src/inet/routing/bgpv4
- tutorials/bgp
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | 67 | | |
79 | 68 | | |
80 | 69 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
166 | 166 | | |
167 | 167 | | |
168 | 168 | | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
| 169 | + | |
| 170 | + | |
174 | 171 | | |
175 | 172 | | |
176 | 173 | | |
| |||
179 | 176 | | |
180 | 177 | | |
181 | 178 | | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
182 | 191 | | |
183 | 192 | | |
184 | 193 | | |
185 | 194 | | |
186 | 195 | | |
187 | | - | |
188 | | - | |
189 | | - | |
190 | | - | |
191 | | - | |
192 | | - | |
193 | | - | |
194 | 196 | | |
195 | 197 | | |
196 | 198 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | 5 | | |
13 | 6 | | |
14 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | 5 | | |
13 | 6 | | |
14 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | 5 | | |
13 | 6 | | |
14 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
| 27 | + | |
26 | 28 | | |
27 | 29 | | |
28 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | 5 | | |
13 | 6 | | |
14 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
0 commit comments