[Ns-commits] ns-3-dev

[code@nsnam-code.ece.gatech.edu]

---- Backed out changeset 055ff23aa034 (Tom does not like it turns out OLSR does not need it)
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: src/internet-node/udp-socket.cc
url: http://code.nsnam.org/ns-3-dev/rev/518187ed457c


---- OLSR: get main address of the peer from the UDP source address and the 'interface association' table; this way the UDP source address need not be the same as the main address.
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: src/routing/olsr/olsr-agent-impl.cc
url: http://code.nsnam.org/ns-3-dev/rev/6f947d8c8f41


---- merge
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: src/routing/olsr/olsr-agent-impl.cc
url: http://code.nsnam.org/ns-3-dev/rev/2e115ea02b46


---- OLSR: remove the 'Link tuple has no corresponding neighbor tuple' assertion; it happens now because MID messages may occasionally not arrive in time, but it's normal.
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: src/routing/olsr/olsr-agent-impl.cc
url: http://code.nsnam.org/ns-3-dev/rev/7c34ef595e3e