126d125
< Packet::SenderState* senderState = pkt->senderState;
129c128
< pkt->senderState = new AddrMapperSenderState(senderState, orig_addr);
---
> pkt->pushSenderState(new AddrMapperSenderState(orig_addr));
140,141c139
< delete pkt->senderState;
< pkt->senderState = senderState;
---
> delete pkt->popSenderState();
161c159
< pkt->senderState = receivedState->origSenderState;
---
> pkt->senderState = receivedState->predecessor;