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

Commit 9019262

Browse files
author
kfox
committed
remerge
1 parent 909f358 commit 9019262

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

ccnx/forwarder/athena/athena_InterestControl.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -555,17 +555,11 @@ _FIB_Command(Athena *athena, CCNxInterest *interest, PARCBitVector *ingress)
555555
}
556556

557557
if (result == true) {
558-
if (prefixName) {
559-
char *routePrefix = ccnxName_ToString(prefixName);
560-
const char *linkIdName = athenaTransportLinkAdapter_LinkIdToName(athena->athenaTransportLinkAdapter, linkId);
561-
responseMessage = _create_response(athena, ccnxName, "%s route %s -> %s", command, routePrefix, linkIdName);
562-
athenaInterestControl_LogConfigurationChange(athena, ccnxName, "%s %s", routePrefix, linkIdName);
563-
parcMemory_Deallocate(&routePrefix);
564-
} else {
565-
const char *linkIdName = athenaTransportLinkAdapter_LinkIdToName(athena->athenaTransportLinkAdapter, linkId);
566-
responseMessage = _create_response(athena, ccnxName, "%s route <empty> -> %s", command, linkIdName);
567-
athenaInterestControl_LogConfigurationChange(athena, ccnxName, "<empty> %s", linkIdName);
568-
}
558+
char *routePrefix = ccnxName_ToString(prefixName);
559+
const char *linkIdName = athenaTransportLinkAdapter_LinkIdToName(athena->athenaTransportLinkAdapter, parcBitVector_NextBitSet(linkVector, 0));
560+
responseMessage = _create_response(athena, ccnxName, "%s route %s -> %s", command, routePrefix, linkIdName);
561+
athenaInterestControl_LogConfigurationChange(athena, ccnxName, "%s %s", routePrefix, linkIdName);
562+
parcMemory_Deallocate(&routePrefix);
569563
} else {
570564
responseMessage = _create_response(athena, ccnxName, "%s failed", command);
571565
}

0 commit comments

Comments
 (0)