branch merge

2010-02-23 12:18:35 -08:00
parent 292b1d993f b5c8940956
commit 8b4770ff79
47 changed files with 2707 additions and 1217 deletions
--- a/src/internet-stack/tcp-l4-protocol.h
+++ b/src/internet-stack/tcp-l4-protocol.h
@@ -90,6 +90,7 @@ public:
   * \param daddr The destination Ipv4Address
   * \param sport The source port number
   * \param dport The destination port number
+   * \param oif The output interface bound. Defaults to null (unspecified).
   */
  void Send (Ptr<Packet> packet,
             Ipv4Address saddr, Ipv4Address daddr,