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

Commit f40f34e

Browse files
Glenn ScottGlenn Scott
Glenn Scott
authored and
Glenn Scott
committed
Modified for new CCNxName scheme.
1 parent 1949985 commit f40f34e

13 files changed

+57
-58
lines changed

‎ccnx/forwarder/metis/config/metisControl_AddRoute.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ _metisControlAddRoute_Execute(MetisCommandParser *parser, MetisCommandOps *ops,
148148
return MetisCommandReturn_Failure;
149149
}
150150

151-
CCNxName *prefix = ccnxName_CreateFromURI(prefixString);
151+
CCNxName *prefix = ccnxName_CreateFromCString(prefixString);
152152
if (prefix == NULL) {
153153
printf("ERROR: could not parse prefix '%s'\n", prefixString);
154154
return MetisCommandReturn_Failure;

‎ccnx/forwarder/metis/config/test/test_metisControl_ListRoutes.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ customWriteReadResponse(void *userdata, CCNxMetaMessage *messageToWrite)
131131
{
132132
CPIRouteEntryList *routeEntryList = cpiRouteEntryList_Create();
133133
CPIAddress *nexthop = cpiAddress_CreateFromInterface(10);
134-
CPIRouteEntry *route = cpiRouteEntry_Create(ccnxName_CreateFromURI("lci:/foo"),
134+
CPIRouteEntry *route = cpiRouteEntry_Create(ccnxName_CreateFromCString("lci:/foo"),
135135
1,
136136
nexthop,
137137
cpiNameRouteProtocolType_STATIC,

‎ccnx/forwarder/metis/config/test/test_metis_Configuration.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ LONGBOW_TEST_CASE(Global, metisConfiguration_Receive)
204204
MetisIoOperations *ops = _addIngressMockConnection(metis, mockConnectionId);
205205
MockIoOperationsData *data = metisIoOperations_GetClosure(ops);
206206

207-
CCNxName *prefix = ccnxName_CreateFromURI("lci:/foo");
207+
CCNxName *prefix = ccnxName_CreateFromCString("lci:/foo");
208208
CPIRouteEntry *routeEntry = cpiRouteEntry_Create(prefix, mockConnectionId, NULL,
209209
cpiNameRouteProtocolType_STATIC,
210210
cpiNameRouteType_LONGEST_MATCH, NULL, 4);
@@ -336,7 +336,7 @@ LONGBOW_TEST_CASE(Local, metisConfiguration_ProcessRegisterPrefix)
336336
// Add a connection to apply the route to
337337
unsigned mockConnectionId = 7000;
338338

339-
CCNxName *prefix = ccnxName_CreateFromURI("lci:/foo");
339+
CCNxName *prefix = ccnxName_CreateFromCString("lci:/foo");
340340
CPIRouteEntry *routeEntry = cpiRouteEntry_Create(prefix, mockConnectionId, NULL, cpiNameRouteProtocolType_STATIC, cpiNameRouteType_LONGEST_MATCH, NULL, 4);
341341
CCNxControl *request = ccnxControl_CreateAddRouteRequest(routeEntry);
342342
cpiRouteEntry_Destroy(&routeEntry);
@@ -368,7 +368,7 @@ LONGBOW_TEST_CASE(Local, metisConfiguration_ProcessRegisterPrefix_Symbolic)
368368
// hack in the symbolic name because _addIngressMockConnection does not do that
369369
metisSymbolicNameTable_Add(metisForwarder_GetConfiguration(metis)->symbolicNameTable, "foo0", mockConnectionId);
370370

371-
CCNxName *prefix = ccnxName_CreateFromURI("lci:/foo");
371+
CCNxName *prefix = ccnxName_CreateFromCString("lci:/foo");
372372
CPIRouteEntry *routeEntry = cpiRouteEntry_CreateSymbolic(prefix, "foo0", cpiNameRouteProtocolType_STATIC, cpiNameRouteType_LONGEST_MATCH, NULL, 4);
373373
CCNxControl *request = ccnxControl_CreateAddRouteRequest(routeEntry);
374374
cpiRouteEntry_Destroy(&routeEntry);
@@ -403,7 +403,7 @@ LONGBOW_TEST_CASE(Local, metisConfiguration_ProcessRegistrationList)
403403
unsigned mockup_id = 7;
404404

405405
// Add a route to the forwarding table
406-
CCNxName *prefix = ccnxName_CreateFromURI("lci:/pancakes/for/all");
406+
CCNxName *prefix = ccnxName_CreateFromCString("lci:/pancakes/for/all");
407407
CPIRouteEntry *route = cpiRouteEntry_Create(prefix, 3, NULL, cpiNameRouteProtocolType_STATIC, cpiNameRouteType_LONGEST_MATCH, NULL, 2);
408408
metisForwarder_AddOrUpdateRoute(metis, route);
409409
cpiRouteEntry_Destroy(&route);

‎ccnx/forwarder/metis/config/test/test_metis_ControlState.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,13 @@ LONGBOW_TEST_CASE(Global, metisControlState_WriteRead)
194194
char hello[] = "hello";
195195
MetisControlState *state = metisControlState_Create(hello, _testWriteRead);
196196

197-
CCNxName *appleName = ccnxName_CreateFromURI("lci:/apple");
197+
CCNxName *appleName = ccnxName_CreateFromCString("lci:/apple");
198198
CCNxInterest *appleInterest = ccnxInterest_CreateSimple(appleName);
199199
_testReadMessage = ccnxMetaMessage_CreateFromInterest(appleInterest);
200200
ccnxInterest_Release(&appleInterest);
201201
ccnxName_Release(&appleName);
202202

203-
CCNxName *pieName = ccnxName_CreateFromURI("lci:/pie");
203+
CCNxName *pieName = ccnxName_CreateFromCString("lci:/pie");
204204
CCNxInterest *pieInterest = ccnxInterest_CreateSimple(pieName);
205205
CCNxMetaMessage *writeMessage = ccnxMetaMessage_CreateFromInterest(pieInterest);;
206206
ccnxInterest_Release(&pieInterest);

‎ccnx/forwarder/metis/processor/test/test_metis_FIB.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ LONGBOW_TEST_CASE(Global, metisFib_AddOrUpdate_Add)
9696
MetisFIB *fib = metisFIB_Create(logger);
9797
metisLogger_Release(&logger);
9898

99-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
99+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
100100
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
101101
unsigned interfaceIndex = 22;
102102
CPIAddress *nexthop = NULL;
@@ -127,7 +127,7 @@ LONGBOW_TEST_CASE(Global, metisFib_AddOrUpdate_Update)
127127
MetisFIB *fib = metisFIB_Create(logger);
128128
metisLogger_Release(&logger);
129129

130-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
130+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
131131
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
132132
unsigned interfaceIndex_1 = 22;
133133
CPIAddress *nexthop = NULL;
@@ -183,7 +183,7 @@ LONGBOW_TEST_CASE(Global, metisFib_Match_Exists)
183183
MetisLogger *logger = metisLogger_Create(reporter, parcClock_Wallclock());
184184
parcLogReporter_Release(&reporter);
185185
MetisFIB *fib = metisFIB_Create(logger);
186-
CCNxName *ccnxNameToAdd = ccnxName_CreateFromURI("lci:/2=hello/0xF000=ouch");
186+
CCNxName *ccnxNameToAdd = ccnxName_CreateFromCString("lci:/2=hello/0xF000=ouch");
187187
MetisMessage *interest = metisMessage_CreateFromArray(metisTestDataV0_InterestWithName, sizeof(metisTestDataV0_InterestWithName), 1, 2, logger);
188188
metisLogger_Release(&logger);
189189

@@ -223,8 +223,8 @@ LONGBOW_TEST_CASE(Global, metisFib_Match_ExcludeIngress)
223223
parcLogReporter_Release(&reporter);
224224
MetisFIB *fib = metisFIB_Create(logger);
225225

226-
CCNxName *nameFoo = ccnxName_CreateFromURI("lci:/foo");
227-
CCNxName *nameFooBar = ccnxName_CreateFromURI("lci:/foo/bar");
226+
CCNxName *nameFoo = ccnxName_CreateFromCString("lci:/foo");
227+
CCNxName *nameFooBar = ccnxName_CreateFromCString("lci:/foo/bar");
228228

229229
uint8_t encodedInterest[] = {
230230
0x01, 0x00, 0x00, 37, // ver = 1, type = interest, length = 37
@@ -286,7 +286,7 @@ LONGBOW_TEST_CASE(Global, metisFib_Match_NotExists)
286286
MetisLogger *logger = metisLogger_Create(reporter, parcClock_Wallclock());
287287
parcLogReporter_Release(&reporter);
288288
MetisFIB *fib = metisFIB_Create(logger);
289-
CCNxName *ccnxNameToAdd = ccnxName_CreateFromURI("lci:/2=hello/0xF000=ouch");
289+
CCNxName *ccnxNameToAdd = ccnxName_CreateFromCString("lci:/2=hello/0xF000=ouch");
290290

291291
MetisMessage *interest = metisMessage_CreateFromArray(metisTestDataV0_InterestWithOtherName, sizeof(metisTestDataV0_InterestWithOtherName), 1, 2, logger);
292292
metisLogger_Release(&logger);
@@ -326,8 +326,8 @@ LONGBOW_TEST_CASE(Global, metisFib_Remove_NoEntry)
326326
MetisFIB *fib = metisFIB_Create(logger);
327327
metisLogger_Release(&logger);
328328

329-
CCNxName *ccnxNameToAdd = ccnxName_CreateFromURI("lci:/foo/bar");
330-
CCNxName *ccnxNameToRemove = ccnxName_CreateFromURI("lci:/baz");
329+
CCNxName *ccnxNameToAdd = ccnxName_CreateFromCString("lci:/foo/bar");
330+
CCNxName *ccnxNameToRemove = ccnxName_CreateFromCString("lci:/baz");
331331
MetisTlvName *tlvNameToCheck = metisTlvName_CreateFromCCNxName(ccnxNameToAdd);
332332
unsigned interfaceIndex_1 = 22;
333333
CPIAddress *nexthop = NULL;
@@ -366,8 +366,8 @@ LONGBOW_TEST_CASE(Global, metisFib_Remove_ExistsNotLast)
366366
MetisFIB *fib = metisFIB_Create(logger);
367367
metisLogger_Release(&logger);
368368

369-
CCNxName *ccnxNameToAdd = ccnxName_CreateFromURI("lci:/foo/bar");
370-
CCNxName *ccnxNameToRemove = ccnxName_CreateFromURI("lci:/foo/bar");
369+
CCNxName *ccnxNameToAdd = ccnxName_CreateFromCString("lci:/foo/bar");
370+
CCNxName *ccnxNameToRemove = ccnxName_CreateFromCString("lci:/foo/bar");
371371
MetisTlvName *tlvNameToCheck = metisTlvName_CreateFromCCNxName(ccnxNameToAdd);
372372
unsigned interfaceIndex_1 = 11;
373373
unsigned interfaceIndex_2 = 22;
@@ -414,8 +414,8 @@ LONGBOW_TEST_CASE(Global, metisFib_Remove_ExistsIsLast)
414414
MetisFIB *fib = metisFIB_Create(logger);
415415
metisLogger_Release(&logger);
416416

417-
CCNxName *ccnxNameToAdd = ccnxName_CreateFromURI("lci:/foo/bar");
418-
CCNxName *ccnxNameToRemove = ccnxName_CreateFromURI("lci:/foo/bar");
417+
CCNxName *ccnxNameToAdd = ccnxName_CreateFromCString("lci:/foo/bar");
418+
CCNxName *ccnxNameToRemove = ccnxName_CreateFromCString("lci:/foo/bar");
419419
MetisTlvName *tlvNameToCheck = metisTlvName_CreateFromCCNxName(ccnxNameToAdd);
420420
unsigned interfaceIndex_1 = 22;
421421
CPIAddress *nexthop = NULL;
@@ -450,8 +450,8 @@ LONGBOW_TEST_CASE(Global, metisFIB_Length)
450450
parcLogReporter_Release(&reporter);
451451
MetisFIB *fib = metisFIB_Create(logger);
452452

453-
// CCNxName *ccnxNameToAdd = ccnxName_CreateFromURI("lci:/%02=hello/%F0%00=ouch");
454-
CCNxName *ccnxNameToAdd = ccnxName_CreateFromURI("lci:/2=hello/0xF000=ouch");
453+
// CCNxName *ccnxNameToAdd = ccnxName_CreateFromCString("lci:/%02=hello/%F0%00=ouch");
454+
CCNxName *ccnxNameToAdd = ccnxName_CreateFromCString("lci:/2=hello/0xF000=ouch");
455455
MetisMessage *interest = metisMessage_CreateFromArray(metisTestDataV0_InterestWithName, sizeof(metisTestDataV0_InterestWithName), 1, 2, logger);
456456
metisLogger_Release(&logger);
457457

@@ -502,7 +502,7 @@ LONGBOW_TEST_FIXTURE_TEARDOWN(Local)
502502

503503
LONGBOW_TEST_CASE(Local, _hashTableFunction_FibEntryDestroyer)
504504
{
505-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
505+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
506506
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
507507
MetisFibEntry *fibEntry = metisFibEntry_Create(tlvName);
508508

@@ -515,7 +515,7 @@ LONGBOW_TEST_CASE(Local, _hashTableFunction_FibEntryDestroyer)
515515

516516
LONGBOW_TEST_CASE(Local, _hashTableFunction_TlvNameDestroyer)
517517
{
518-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
518+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
519519
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
520520

521521
_hashTableFunction_TlvNameDestroyer((void **) &tlvName);
@@ -526,7 +526,7 @@ LONGBOW_TEST_CASE(Local, _hashTableFunction_TlvNameDestroyer)
526526

527527
LONGBOW_TEST_CASE(Local, _metisFIB_CreateFibEntry)
528528
{
529-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
529+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
530530
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
531531
PARCLogReporter *reporter = parcLogReporterTextStdout_Create();
532532
MetisLogger *logger = metisLogger_Create(reporter, parcClock_Wallclock());

‎ccnx/forwarder/metis/processor/test/test_metis_FibEntry.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ LONGBOW_TEST_FIXTURE_TEARDOWN(Global)
7979

8080
LONGBOW_TEST_CASE(Global, metisFibEntry_AddNexthop)
8181
{
82-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
82+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
8383
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
8484
MetisFibEntry *fibEntry = metisFibEntry_Create(tlvName);
8585

@@ -97,7 +97,7 @@ LONGBOW_TEST_CASE(Global, metisFibEntry_AddNexthop)
9797

9898
LONGBOW_TEST_CASE(Global, metisFibEntry_Create_Destroy)
9999
{
100-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
100+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
101101
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
102102

103103
size_t beforeMemory = parcMemory_Outstanding();
@@ -113,7 +113,7 @@ LONGBOW_TEST_CASE(Global, metisFibEntry_Create_Destroy)
113113

114114
LONGBOW_TEST_CASE(Global, metisFibEntry_GetNexthops)
115115
{
116-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
116+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
117117
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
118118
MetisFibEntry *fibEntry = metisFibEntry_Create(tlvName);
119119

@@ -130,7 +130,7 @@ LONGBOW_TEST_CASE(Global, metisFibEntry_GetNexthops)
130130

131131
LONGBOW_TEST_CASE(Global, metisFibEntry_NexthopCount)
132132
{
133-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
133+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
134134
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
135135
MetisFibEntry *fibEntry = metisFibEntry_Create(tlvName);
136136

@@ -146,7 +146,7 @@ LONGBOW_TEST_CASE(Global, metisFibEntry_NexthopCount)
146146

147147
LONGBOW_TEST_CASE(Global, metisFibEntry_RemoveNexthop)
148148
{
149-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
149+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
150150
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
151151
MetisFibEntry *fibEntry = metisFibEntry_Create(tlvName);
152152

‎ccnx/forwarder/metis/processor/test/test_metis_MessageProcessor.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ LONGBOW_TEST_CASE(Global, metisMessageProcessor_AddOrUpdateRoute)
248248
MetisForwarder *metis = metisForwarder_Create(NULL);
249249
MetisMessageProcessor *processor = metisMessageProcessor_Create(metis);
250250

251-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
251+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
252252
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
253253
unsigned interfaceIndex = 22;
254254
CPIAddress *nexthop = NULL;
@@ -274,7 +274,7 @@ LONGBOW_TEST_CASE(Global, metisMessageProcessor_RemoveRoute)
274274
MetisForwarder *metis = metisForwarder_Create(NULL);
275275
MetisMessageProcessor *processor = metisMessageProcessor_Create(metis);
276276

277-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/foo/bar");
277+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/foo/bar");
278278
MetisTlvName *tlvName = metisTlvName_CreateFromCCNxName(ccnxName);
279279
unsigned interfaceIndex = 22;
280280
CPIAddress *nexthop = NULL;
@@ -1089,7 +1089,7 @@ LONGBOW_TEST_CASE(Local, metisMessageProcessor_ReceiveInterest_InFib)
10891089

10901090
// ----- Add Route
10911091
CCNxName *ccnxNameToAdd =
1092-
ccnxName_CreateFromURI("lci:/2=hello/0xF000=ouch");
1092+
ccnxName_CreateFromCString("lci:/2=hello/0xF000=ouch");
10931093
unsigned interfaceIndex_1 = 22;
10941094
CPIAddress *nexthop = NULL;
10951095
struct timeval *lifetime = NULL;
@@ -1319,7 +1319,7 @@ LONGBOW_TEST_CASE(Local, metisMessageProcessor_ForwardViaFib_IsNotInFib)
13191319

13201320
// ----- Add
13211321
CCNxName *ccnxNameToAdd =
1322-
ccnxName_CreateFromURI("lci:/2=hello/0xF000=ouch");
1322+
ccnxName_CreateFromCString("lci:/2=hello/0xF000=ouch");
13231323

13241324
unsigned interfaceIndex_1 = 22;
13251325
CPIAddress *nexthop = NULL;
@@ -1356,7 +1356,7 @@ LONGBOW_TEST_CASE(Local, metisMessageProcessor_ForwardViaFib_IsInFib_EmptyEgress
13561356

13571357
// ----- Add Route
13581358
CCNxName *ccnxNameToAdd =
1359-
ccnxName_CreateFromURI("lci:/2=hello/0xF000=ouch");
1359+
ccnxName_CreateFromCString("lci:/2=hello/0xF000=ouch");
13601360
unsigned interfaceIndex_1 = 22;
13611361
CPIAddress *nexthop = NULL;
13621362
struct timeval *lifetime = NULL;

‎ccnx/forwarder/metis/test/test_sys_EtherEndToEnd.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ _commonSetup(const LongBowTestCase *testCase)
171171

172172
// Add a FIB entry out the receiver connection (testNotifierData.connectionid will be set to the "fake1" connection id
173173
// because it was the last thing to get a missive sent)
174-
CCNxName *ccnxNameToAdd = ccnxName_CreateFromURI("lci:/2=hello/0xF000=ouch");
174+
CCNxName *ccnxNameToAdd = ccnxName_CreateFromCString("lci:/2=hello/0xF000=ouch");
175175
CPIRouteEntry *routeAdd = cpiRouteEntry_Create(ccnxNameToAdd, testNotifierData.connectionid, NULL, cpiNameRouteProtocolType_STATIC, cpiNameRouteType_LONGEST_MATCH, NULL, 1);
176176
metisForwarder_AddOrUpdateRoute(data->metis, routeAdd);
177177
cpiRouteEntry_Destroy(&routeAdd);

‎ccnx/forwarder/metis/test/test_sys_TcpEndToEnd.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ setupTcp(void)
158158

159159
// Add a FIB entry out the receiver connection
160160
CCNxName *ccnxNameToAdd =
161-
ccnxName_CreateFromURI("lci:/2=hello/0xF000=ouch");
161+
ccnxName_CreateFromCString("lci:/2=hello/0xF000=ouch");
162162

163163
CPIRouteEntry *routeAdd = cpiRouteEntry_Create(ccnxNameToAdd, receiverConnectionId, NULL, cpiNameRouteProtocolType_STATIC, cpiNameRouteType_LONGEST_MATCH, NULL, 1);
164164
metisForwarder_AddOrUpdateRoute(globalState.metis, routeAdd);

‎ccnx/forwarder/metis/test/test_sys_TcpTunnel.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ LONGBOW_TEST_CASE(Global, tcpTunnel)
183183
// ===============================================
184184
/* 4) setup route to /foo from a to b */
185185

186-
CCNxName *ccnxName = ccnxName_CreateFromURI("lci:/2=hello");
186+
CCNxName *ccnxName = ccnxName_CreateFromCString("lci:/2=hello");
187187
CPIRouteEntry *route = cpiRouteEntry_Create(ccnxName, ops->getConnectionId(ops), NULL, cpiNameRouteProtocolType_STATIC, cpiNameRouteType_LONGEST_MATCH, NULL, 1);
188188
bool success = metisForwarder_AddOrUpdateRoute(metis_a, route);
189189
cpiRouteEntry_Destroy(&route);
@@ -236,7 +236,7 @@ LONGBOW_TEST_CASE(Global, tcpTunnel)
236236
// ===============================================
237237
/* 7) Setup route to /foo from metis B to client 2. */
238238

239-
ccnxName = ccnxName_CreateFromURI("lci:/2=hello");
239+
ccnxName = ccnxName_CreateFromCString("lci:/2=hello");
240240
route = cpiRouteEntry_Create(ccnxName, client2_ConnectionId, NULL, cpiNameRouteProtocolType_STATIC, cpiNameRouteType_LONGEST_MATCH, NULL, 1);
241241
success = metisForwarder_AddOrUpdateRoute(metis_b, route);
242242
cpiRouteEntry_Destroy(&route);

0 commit comments

Comments
 (0)