1.1 --- a/src/mih/mih-transaction.cc	Tue Dec 02 19:25:50 2008 +0100
     1.2 +++ b/src/mih/mih-transaction.cc	Tue Dec 02 19:37:19 2008 +0100
     1.3 @@ -125,7 +125,7 @@
     1.4                                                         Status status,
     1.5                                                         uint32_t validLifetime)
     1.6      {
     1.7 -      NS_ASSERT_MSG (mihfId == m_toMihfId, "Destination transaction MihfId and required one mismatch!");
     1.8 +      NS_ASSERT_MSG (mihfId == m_fromMihfId, "Source transaction MihfId and required one mismatch!");
     1.9        Buffer buffer;
    1.10        Ptr<Packet> packet;
    1.11        // Create room at start of buffer;
    1.12 @@ -135,7 +135,7 @@
    1.13                           (status.GetType () == Status::SUCCESS ? GetTlvSerializedSizeU32 () : 0) );
    1.14        // TLV-Serialize in buffer;
    1.15        m_fromMihfId.TlvSerialize (buffer);
    1.16 -      mihfId.TlvSerialize (buffer);
    1.17 +      m_toMihfId.TlvSerialize (buffer);
    1.18        status.TlvSerialize (buffer);
    1.19        if (status.GetType () == Status::SUCCESS)
    1.20          {
    1.21 @@ -212,12 +212,12 @@
    1.22                                                                             TransportSupportList transportOptions,
    1.23                                                                             MakeBeforeBreakSupportList mbbSupportList)
    1.24      {
    1.25 -      NS_ASSERT_MSG (mihfId == m_toMihfId, "Destination transaction MihfId and required one mismatch!");
    1.26 +      NS_ASSERT_MSG (mihfId == m_fromMihfId, "Source transaction MihfId and required one mismatch!");
    1.27        Buffer buffer;
    1.28        Ptr<Packet> packet;
    1.29        // Create room at start of buffer;
    1.30        buffer.AddAtStart (m_fromMihfId.GetTlvSerializedSize () +
    1.31 -                         mihfId.GetTlvSerializedSize () +
    1.32 +                         m_toMihfId.GetTlvSerializedSize () +
    1.33                           status.GetTlvSerializedSize () +
    1.34                           GetTlvSerializedSize (networkTypeAddresses) +
    1.35                           events.GetTlvSerializedSize () +
    1.36 @@ -293,12 +293,12 @@
    1.37                                                                    LinkIdentifier linkIdentifier,
    1.38                                                                    EventList events)
    1.39      {
    1.40 -      NS_ASSERT_MSG (mihfId == m_toMihfId, "Destination transaction MihfId and required one mismatch!");
    1.41 +      NS_ASSERT_MSG (mihfId == m_fromMihfId, "Source transaction MihfId and required one mismatch!");
    1.42        Buffer buffer;
    1.43        Ptr<Packet> packet;
    1.44        // Create room at start of buffer;
    1.45        buffer.AddAtStart (m_fromMihfId.GetTlvSerializedSize () +
    1.46 -                         mihfId.GetTlvSerializedSize () +
    1.47 +                         m_toMihfId.GetTlvSerializedSize () +
    1.48                           status.GetTlvSerializedSize () +
    1.49                           linkIdentifier.GetTlvSerializedSize () +
    1.50                           events.GetTlvSerializedSize ());