|
Bugzilla – Full Text Bug Listing |
| Summary: | Adjusting OLSR HelloInterval Attribute Results in No Links | ||
|---|---|---|---|
| Product: | ns-3 | Reporter: | Andrew Stanton <acstanton515> |
| Component: | olsr | Assignee: | Gustavo J. A. M. Carneiro <gjcarneiro> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | acstanton515, ns-bugs, suresh.lalith |
| Priority: | P5 | ||
| Version: | pre-release | ||
| Hardware: | PC | ||
| OS: | Linux | ||
| Attachments: |
The output with HelloInterval as 10
Proposed patch for bug 1615 |
||
|
Description
Andrew Stanton
2013-03-29 12:01:08 UTC
Ok, the simulation I ran was for a HelloInterval of 20, but I messed up and named the files and talked about it like I did a HelloInterval of 10. What the HI is, does not matter as long as it is more than 6 since the validity timers never go above 6 seconds. Alright, I think I have the correct patch for this bug now. I don't need to convert the m_helloInterval to Seconds like I attempted to do before. Since, there is a special macro for the refresh interval which is based on the hello interval, I did the following instead which in my limited testing works fine. Patch: hg diff src/olsr/model/olsr-routing-protocol.cc diff -r b0ff09517a0e src/olsr/model/olsr-routing-protocol.cc --- a/src/olsr/model/olsr-routing-protocol.cc Fri Dec 21 15:50:25 2012 -0800 +++ b/src/olsr/model/olsr-routing-protocol.cc Sun Mar 31 15:57:43 2013 -0700 @@ -66,7 +66,7 @@ /// /// We only use this value in order to define OLSR_NEIGHB_HOLD_TIME. /// -#define OLSR_REFRESH_INTERVAL Seconds (2) +#define OLSR_REFRESH_INTERVAL m_helloInterval I have tested with a HelloInterval value of 40 and properly saw the validity timer having a value of 120. It would be the equivalent of: #define OLSR_NEIGHB_HOLD_TIME Time (3 * m_helloInterval) Which then matches with how it is done for other intervals: #define OLSR_TOP_HOLD_TIME Time (3 * m_tcInterval) I also attached this patch. I also verified this change is not present in latest dev changeset. See: http://code.nsnam.org/ns-3-dev/file/ef5b324097d0/src/olsr/model/olsr-routing-protocol.cc Created attachment 1549 [details] Proposed patch for bug 1615 Hi Andrew, Thanks for the patch. I'll look into this later tonight or tomorrow. (In reply to comment #3) > Created attachment 1549 [details] > Proposed patch for bug 1615 Thanks! Committed. changeset: 9693:ac4c36378f5c tag: tip user: Andrew Stanton <acstanton515@gmail.com> date: Sun Apr 14 22:32:21 2013 +0200 summary: Bug 1615 - Adjusting OLSR HelloInterval Attribute Results in No Links |