Skip to content
This repository was archived by the owner on Apr 13, 2019. It is now read-only.

Copy source MTU when cloning ETH transport link #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Copy source MTU when cloning ETH transport link #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions ccnx/forwarder/athena/athena_TransportLinkModuleETH.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,13 +362,14 @@ _newLink(AthenaTransportLink *athenaTransportLink, _ETHLinkData *newLinkData)
{
// Accept a new tunnel connection.

// Clone a new link from the current listener.
// Clone a new link from the current listener (source).
const char *derivedLinkName = _createNameFromLinkData(&newLinkData->link, false);
AthenaTransportLink *newTransportLink = athenaTransportLink_Clone(athenaTransportLink,
derivedLinkName,
_ETHSend,
_ETHReceiveProxy,
_ETHClose);

if (newTransportLink == NULL) {
parcLog_Error(athenaTransportLink_GetLogger(athenaTransportLink),
"athenaTransportLink_Clone failed");
Expand All @@ -377,6 +378,26 @@ _newLink(AthenaTransportLink *athenaTransportLink, _ETHLinkData *newLinkData)
return NULL;
}

struct _ETHLinkData *sourceLinkData = athenaTransportLink_GetPrivateData(athenaTransportLink);
if (sourceLinkData->fragmenter) {
newLinkData->fragmenter = athenaFragmenter_Create(athenaTransportLink, sourceLinkData->fragmenter->moduleName);
if (newLinkData->fragmenter == NULL) {
parcLog_Error(athenaTransportLink_GetLogger(athenaTransportLink),
"Failed to open/initialize %s fragmenter for new link: %s",
sourceLinkData->fragmenter->moduleName, strerror(errno));
}
}

// We use the source's fd to send, and receive demux'd messages from our source on our queue
newLinkData->athenaEthernet = athenaEthernet_Acquire(sourceLinkData->athenaEthernet);
newLinkData->queue = parcDeque_Create();
assertNotNull(newLinkData->queue, "Could not create data queue for new link");

newLinkData->link.myAddressLength = sourceLinkData->link.myAddressLength;
memcpy(&newLinkData->link.myAddress, &sourceLinkData->link.myAddress, sourceLinkData->link.myAddressLength);

newLinkData->link.mtu = sourceLinkData->link.mtu;

_setConnectLinkState(newTransportLink, newLinkData);

// Send the new link up to be added.
Expand Down Expand Up @@ -431,24 +452,6 @@ _demuxDelivery(AthenaTransportLink *athenaTransportLink, CCNxMetaMessage *ccnxMe
if (demuxLink == NULL) {
_ETHLinkData *newLinkData = _ETHLinkData_Create();

// Use the same fragmentation as our parent
if (linkData->fragmenter) {
newLinkData->fragmenter = athenaFragmenter_Create(athenaTransportLink, linkData->fragmenter->moduleName);
if (newLinkData->fragmenter == NULL) {
parcLog_Error(athenaTransportLink_GetLogger(athenaTransportLink),
"Failed to open/initialize %s fragmenter for new link: %s",
linkData->fragmenter->moduleName, strerror(errno));
}
}

// We use our parents fd to send, and receive demux'd messages from our parent on our queue
newLinkData->athenaEthernet = athenaEthernet_Acquire(linkData->athenaEthernet);
newLinkData->queue = parcDeque_Create();
assertNotNull(newLinkData->queue, "Could not create data queue for new link");

newLinkData->link.myAddressLength = linkData->link.myAddressLength;
memcpy(&newLinkData->link.myAddress, &linkData->link.myAddress, linkData->link.myAddressLength);

newLinkData->link.peerAddressLength = peerAddressLength;
memcpy(&newLinkData->link.peerAddress, peerAddress, peerAddressLength);

Expand Down