Commit 20842598 authored by Glenn Scott's avatar Glenn Scott

Merge pull request #3 from cwood/master

3879-chris-signer-changes
parents 2e747bc7 4f7d75ee
......@@ -301,7 +301,7 @@ CCNxControl *ccnxControl_CreateRemoveRouteRequest(const CPIRouteEntry *route);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/parc/csl/media/thingie");
* CCNxName *name = ccnxName_CreateFromCString("lci:/parc/csl/media/thingie");
*
* CCNxControl *control = ccnxControl_CreateAddRouteToSelfRequest(name);
* ...
......@@ -331,7 +331,7 @@ CCNxControl *ccnxControl_CreateAddRouteToSelfRequest(const CCNxName *name);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/parc/csl/media/thingie");
* CCNxName *name = ccnxName_CreateFromCString("lci:/parc/csl/media/thingie");
*
* CCNxControl *control = ccnxControl_CreateRemoveRouteToSelfRequest(name);
* ...
......@@ -359,7 +359,7 @@ CCNxControl *ccnxControl_CreateRemoveRouteToSelfRequest(const CCNxName *name);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/boose/roo/pie");
* CCNxName *name = ccnxName_CreateFromCString("lci:/boose/roo/pie");
* PARCJSON *cpiRequest = cpiCancelFlow_CreateRequest(name);
* CCNxControl *control = ccnxControl_CreateCPIRequest(cpiRequest);
*
......@@ -493,7 +493,7 @@ CCNxControl *ccnxControl_CreateFlushRequest(void);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/boose/roo/pie");
* CCNxName *name = ccnxName_CreateFromCString("lci:/boose/roo/pie");
* CCNxControl *control = ccnxControl_CreateCancelFlowRequest(name);
*
* ...
......
......@@ -87,7 +87,7 @@ typedef struct cpi_route_entry CPIRouteEntry;
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval lifetime = { 3600, 0 };
......@@ -119,7 +119,7 @@ CPIRouteEntry *cpiRouteEntry_Create(CCNxName *prefix, unsigned interfaceIndex, c
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval lifetime = { 3600, 0 };
* unsigned cost = 200;
......@@ -145,7 +145,7 @@ CPIRouteEntry *cpiRouteEntry_CreateSymbolic(CCNxName *prefix, const char *symbol
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_FromURI("lci:/a/b");
* CCNxName *prefix = ccnxName_FromCString("lci:/a/b");
* CPIRouteEntry *route = cpiRouteEntry_CreateRouteToSelf(prefix);
* ccnxName_Release(&prefix);
* }
......@@ -163,7 +163,7 @@ CPIRouteEntry *cpiRouteEntry_CreateRouteToSelf(const CCNxName *name);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_FromURI("lci:/a/b");
* CCNxName *prefix = ccnxName_FromCString("lci:/a/b");
* CPIRouteEntry *route = cpiRouteEntry_CreateRouteToSelf(prefix);
* ccnxName_Release(&prefix);
*
......@@ -186,7 +186,7 @@ void cpiRouteEntry_Destroy(CPIRouteEntry **routeEntryPtr);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_FromURI("lci:/a/b");
* CCNxName *prefix = ccnxName_FromCString("lci:/a/b");
* CPIRouteEntry *route = cpiRouteEntry_CreateRouteToSelf(prefix);
* ccnxName_Release(&prefix);
*
......@@ -231,11 +231,11 @@ CPIRouteEntry *cpiRouteEntry_Copy(const CPIRouteEntry *routeEntry);
* CPIRouteEntry *bufferA = parcBuffer_Allocate(10);
* CPIRouteEntry *bufferB = parcBuffer_Allocate(10);
*
* CCNxName *prefixA = ccnxName_FromURI("lci:/a/b");
* CCNxName *prefixA = ccnxName_FromCString("lci:/a/b");
* CPIRouteEntry *routeA = cpiRouteEntry_CreateRouteToSelf(prefixA);
* ccnxName_Release(&prefixA);
*
* CCNxName *prefixB = ccnxName_FromURI("lci:/a/b");
* CCNxName *prefixB = ccnxName_FromCString("lci:/a/b");
* CPIRouteEntry *routeB = cpiRouteEntry_CreateRouteToSelf(prefixB);
* ccnxName_Release(&prefixB);
*
......@@ -260,7 +260,7 @@ bool cpiRouteEntry_Equals(const CPIRouteEntry *a, const CPIRouteEntry *b);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = -1; // unknown
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval *lifetimePtr = NULL;
......@@ -285,7 +285,7 @@ void cpiRouteEntry_SetInterfaceIndex(CPIRouteEntry *route, unsigned interfaceInd
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = -1; // unknown
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval *lifetimePtr = NULL;
......@@ -310,7 +310,7 @@ const CCNxName *cpiRouteEntry_GetPrefix(const CPIRouteEntry *route);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval *lifetimePtr = NULL;
......@@ -338,7 +338,7 @@ unsigned cpiRouteEntry_GetInterfaceIndex(const CPIRouteEntry *route);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = NULL;
* struct timeval lifetime = { 3600, 0 };
......@@ -365,7 +365,7 @@ const CPIAddress *cpiRouteEntry_GetNexthop(const CPIRouteEntry *route);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval *lifetimePtr = NULL;
......@@ -393,7 +393,7 @@ bool cpiRouteEntry_HasLifetime(const CPIRouteEntry *route);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval lifetime = { 3600, 0 };
......@@ -420,7 +420,7 @@ struct timeval cpiRouteEntry_GetLifetime(const CPIRouteEntry *route);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval lifetime = { 3600, 0 };
......@@ -447,7 +447,7 @@ CPINameRouteProtocolType cpiRouteEntry_GetRouteProtocolType(const CPIRouteEntry
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval lifetime = { 3600, 0 };
......@@ -474,7 +474,7 @@ CPINameRouteType cpiRouteEntry_GetRouteType(const CPIRouteEntry *route);
* Example:
* @code
* {
* CCNxName * prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName * prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress * nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval lifetime = { 3600, 0 };
......@@ -500,7 +500,7 @@ unsigned cpiRouteEntry_GetCost(const CPIRouteEntry *route);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval lifetime = { 3600, 0 };
......@@ -529,7 +529,7 @@ PARCJSON *cpiRouteEntry_ToJson(const CPIRouteEntry *route);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval lifetime = { 3600, 0 };
......@@ -564,7 +564,7 @@ CPIRouteEntry *cpiRouteEntry_FromJson(PARCJSON *json);
* Example:
* @code
* {
* CCNxName *prefix = ccnxName_CreateFromURI("lci:/howdie/stranger");
* CCNxName *prefix = ccnxName_CreateFromCString("lci:/howdie/stranger");
* unsigned ifidx = 55;
* CPIAddress *nexthop = cpiAddress_CreateFromInet(&(struct sockaddr_in) { .sin_addr.s_addr = 0x01020304 });
* struct timeval lifetime = { 3600, 0 };
......
......@@ -91,7 +91,7 @@ typedef enum {
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *expected = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
* }
* @endcode
......@@ -113,7 +113,7 @@ NotifyStatus *notifyStatus_Create(int apiFd, NotifyStatusCode code, CCNxName *na
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* NotifyStatus *x_2 = notifyStatus_Acquire(status);
......@@ -141,7 +141,7 @@ NotifyStatus *notifyStatus_Acquire(const NotifyStatus *status);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* notifyStatus_Release(&status);
......@@ -162,7 +162,7 @@ void notifyStatus_Release(NotifyStatus **statusPtr);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status1 = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
* NotifyStatus *status2 = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
......@@ -183,7 +183,7 @@ bool notifyStatus_Equals(const NotifyStatus *x, const NotifyStatus *y);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* notifyStatus_Display(status, 0);
......@@ -204,7 +204,7 @@ void notifyStatus_Display(const NotifyStatus *status, int indentation);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* int fd = notifyStatus_GetFiledes(status);
......@@ -223,7 +223,7 @@ int notifyStatus_GetFiledes(const NotifyStatus *status);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* NotifyStatusCode code = notifyStatus_GetStatusCode(status);
......@@ -242,7 +242,7 @@ NotifyStatusCode notifyStatus_GetStatusCode(const NotifyStatus *status);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* NotifyStatusCode code = notifyStatus_GetStatusCode(status);
......@@ -261,7 +261,7 @@ CCNxName *notifyStatus_GetName(const NotifyStatus *status);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* NotifyStatusCode code = notifyStatus_GetStatusCode(status);
......@@ -281,7 +281,7 @@ char *notifyStatus_GetMessage(const NotifyStatus *status);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* PARCJSON *json = notifyStatus_ToJSON(status);
......@@ -301,7 +301,7 @@ PARCJSON *notifyStatus_ToJSON(const NotifyStatus *status);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* PARCJSON *json = notifyStatus_ToJSON(status);
......@@ -323,7 +323,7 @@ NotifyStatus *notifyStatus_ParseJSON(const PARCJSON *json);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* if (notifyStatus_IsConnectionOpen(status)) {
......@@ -345,7 +345,7 @@ bool notifyStatus_IsConnectionOpen(const NotifyStatus *status);
* Example:
* @code
* {
* CCNxName *name = ccnxName_CreateFromURI("lci:/a/b/c");
* CCNxName *name = ccnxName_CreateFromCString("lci:/a/b/c");
* NotifyStatus *status = notifyStatus_Create(1, notifyStatus_CONNECTION_OPEN, name, "Good to go");
*
* if (notifyStatus_IsFlowControlStarted(status)) {
......
set(BASE_HDRS
librta_About.h
set(BASE_HDRS
librta_About.h
)
set(COMMON_HDRS
common/transport.h
common/ccnx_TransportConfig.h
common/transport_Message.h
common/transport_MetaMessage.h
common/ccnx_StackConfig.h
common/ccnx_ConnectionConfig.h
common/transport.h
common/ccnx_TransportConfig.h
common/transport_Message.h
common/transport_MetaMessage.h
common/ccnx_StackConfig.h
common/ccnx_ConnectionConfig.h
)
source_group(common FILES ${COMMON_HDRS})
......@@ -17,7 +17,7 @@ set(RTA_CORE_HDRS
transport_rta/rta_Transport.h
transport_rta/core/components.h
transport_rta/core/rta.h
transport_rta/core/rta_ComponentQueue.h
transport_rta/core/rta_ComponentQueue.h
transport_rta/core/rta_ComponentStats.h
transport_rta/core/rta_Connection.h
transport_rta/core/rta_ConnectionTable.h
......@@ -26,7 +26,7 @@ set(RTA_CORE_HDRS
transport_rta/core/rta_Framework_NonThreaded.h
transport_rta/core/rta_Framework_Services.h
transport_rta/core/rta_Framework_Threaded.h
transport_rta/core/rta_Framework_private.h
transport_rta/core/rta_Framework_private.h
transport_rta/core/rta_Logger.h
transport_rta/core/rta_ProtocolStack.h
test_tools/bent_pipe.h
......@@ -36,7 +36,7 @@ set(RTA_CORE_HDRS
source_group(core FILES ${RTA_CORE_HDRS})
set(TEST_TOOLS_HDRS
test_tools/bent_pipe.h
test_tools/bent_pipe.h
test_tools/traffic_tools.h
)
......@@ -52,17 +52,17 @@ set(RTA_COMMANDS_HDRS
source_group(rta_commands FILES ${RTA_COMMANDS_HDRS})
set(RTA_CONFIG_HDRS
transport_rta/config/config_ApiConnector.h
transport_rta/config/config_Codec_Tlv.h
transport_rta/config/config_CryptoCache.h
transport_rta/config/config_FlowControl_Vegas.h
transport_rta/config/config_Forwarder_Local.h
transport_rta/config/config_Forwarder_Metis.h
transport_rta/config/config_InMemoryVerifier.h
transport_rta/config/config_ProtocolStack.h
transport_rta/config/config_PublicKeySignerPkcs12Store.h
transport_rta/config/config_Signer.h
transport_rta/config/config_SymmetricKeySignerFileStore.h
transport_rta/config/config_ApiConnector.h
transport_rta/config/config_Codec_Tlv.h
transport_rta/config/config_CryptoCache.h
transport_rta/config/config_FlowControl_Vegas.h
transport_rta/config/config_Forwarder_Local.h
transport_rta/config/config_Forwarder_Metis.h
transport_rta/config/config_InMemoryVerifier.h
transport_rta/config/config_ProtocolStack.h
transport_rta/config/config_PublicKeySigner.h
transport_rta/config/config_Signer.h
transport_rta/config/config_SymmetricKeySigner.h
transport_rta/config/config_TestingComponent.h
)
......@@ -86,78 +86,78 @@ set(RTA_COMPONENTS_HDRS
source_group(rta_components FILES ${RTA_COMPONENTS_HDRS})
set(COMMON_SRCS
librta_About.c
common/transport.c
common/ccnx_TransportConfig.c
common/transport_Message.c
common/transport_MetaMessage.c
common/ccnx_StackConfig.c
set(COMMON_SRCS
librta_About.c
common/transport.c
common/ccnx_TransportConfig.c
common/transport_Message.c
common/transport_MetaMessage.c
common/ccnx_StackConfig.c
common/ccnx_ConnectionConfig.c
)
source_group(common FILES ${COMMON_SRCS})
set(RTA_CORE_SRCS
transport_rta/core/rta_ComponentStats.c
transport_rta/core/rta_Component.c
transport_rta/core/rta_Connection.c
transport_rta/core/rta_ConnectionTable.c
transport_rta/core/rta_Framework.c
transport_rta/core/rta_Framework_Commands.c
transport_rta/core/rta_Framework_Services.c
transport_rta/core/rta_Framework_Threaded.c
transport_rta/core/rta_Framework_NonThreaded.c
transport_rta/core/rta_Logger.c
transport_rta/core/rta_ProtocolStack.c
transport_rta/rta_Transport.c
test_tools/bent_pipe.c
set(RTA_CORE_SRCS
transport_rta/core/rta_ComponentStats.c
transport_rta/core/rta_Component.c
transport_rta/core/rta_Connection.c
transport_rta/core/rta_ConnectionTable.c
transport_rta/core/rta_Framework.c
transport_rta/core/rta_Framework_Commands.c
transport_rta/core/rta_Framework_Services.c
transport_rta/core/rta_Framework_Threaded.c
transport_rta/core/rta_Framework_NonThreaded.c
transport_rta/core/rta_Logger.c
transport_rta/core/rta_ProtocolStack.c
transport_rta/rta_Transport.c
test_tools/bent_pipe.c
test_tools/traffic_tools.c
)
source_group(core FILES ${RTA_CORE_SRCS})
set(RTA_COMMANDS_SRCS
transport_rta/commands/rta_Command.c
transport_rta/commands/rta_CommandCloseConnection.c
transport_rta/commands/rta_CommandCreateProtocolStack.c
transport_rta/commands/rta_CommandDestroyProtocolStack.c
transport_rta/commands/rta_CommandOpenConnection.c
transport_rta/commands/rta_Command.c
transport_rta/commands/rta_CommandCloseConnection.c
transport_rta/commands/rta_CommandCreateProtocolStack.c
transport_rta/commands/rta_CommandDestroyProtocolStack.c
transport_rta/commands/rta_CommandOpenConnection.c
transport_rta/commands/rta_CommandTransmitStatistics.c
)
source_group(rta_commands FILES ${RTA_COMMANDS_SRCS})
set(RTA_CONFIG_SRCS
transport_rta/config/config_ApiConnector.c
transport_rta/config/config_Codec_Tlv.c
transport_rta/config/config_FlowControl_Vegas.c
transport_rta/config/config_Forwarder_Local.c
transport_rta/config/config_Forwarder_Metis.c
transport_rta/config/config_TestingComponent.c
transport_rta/config/config_InMemoryVerifier.c
transport_rta/config/config_ProtocolStack.c
transport_rta/config/config_PublicKeySignerPkcs12Store.c
transport_rta/config/config_Signer.c
transport_rta/config/config_SymmetricKeySignerFileStore.c
set(RTA_CONFIG_SRCS
transport_rta/config/config_ApiConnector.c
transport_rta/config/config_Codec_Tlv.c
transport_rta/config/config_FlowControl_Vegas.c
transport_rta/config/config_Forwarder_Local.c
transport_rta/config/config_Forwarder_Metis.c
transport_rta/config/config_TestingComponent.c
transport_rta/config/config_InMemoryVerifier.c
transport_rta/config/config_ProtocolStack.c
transport_rta/config/config_PublicKeySigner.c
transport_rta/config/config_Signer.c
transport_rta/config/config_SymmetricKeySigner.c
)
source_group(rta_config FILES ${RTA_CONFIG_SRCS})
set(RTA_CONNECTORS_SRCS
transport_rta/connectors/connector_Api.c
transport_rta/connectors/rta_ApiConnection.c
transport_rta/connectors/connector_Forwarder_Local.c
set(RTA_CONNECTORS_SRCS
transport_rta/connectors/connector_Api.c
transport_rta/connectors/rta_ApiConnection.c
transport_rta/connectors/connector_Forwarder_Local.c
transport_rta/connectors/connector_Forwarder_Metis.c
)
source_group(rta_connectors FILES ${RTA_CONNECTORS_SRCS})
set(RTA_COMPONENTS_SRCS
transport_rta/components/codec_Signing.c
transport_rta/components/component_Codec_Tlv.c
transport_rta/components/Flowcontrol_Vegas/component_Vegas.c
transport_rta/components/Flowcontrol_Vegas/vegas_Session.c
set(RTA_COMPONENTS_SRCS
transport_rta/components/codec_Signing.c
transport_rta/components/component_Codec_Tlv.c
transport_rta/components/Flowcontrol_Vegas/component_Vegas.c
transport_rta/components/Flowcontrol_Vegas/vegas_Session.c
transport_rta/components/component_Testing.c
)
......@@ -166,10 +166,10 @@ source_group(rta_components FILES ${RTA_COMPONENTS_SRCS})
set(TRANSPORT_RTA_SOURCE_FILES
${BASE_HDRS}
${COMMON_HDRS}
${RTA_CORE_HDRS}
${RTA_CORE_HDRS}
${RTA_CONFIG_HDRS}
${RTA_COMPONENTS_HDRS}
${RTA_CONNECTORS_HDRS}
${RTA_CONNECTORS_HDRS}
${RTA_COMMANDS_HDRS}
${TEST_TOOLS_HDRS}
......@@ -184,9 +184,9 @@ set(TRANSPORT_RTA_SOURCE_FILES
add_library(ccnx_transport_rta STATIC ${TRANSPORT_RTA_SOURCE_FILES})
add_library(ccnx_transport_rta.shared SHARED ${TRANSPORT_RTA_SOURCE_FILES})
set_target_properties(ccnx_transport_rta.shared PROPERTIES
set_target_properties(ccnx_transport_rta.shared PROPERTIES
C_STANDARD 99
SOVERSION 1
SOVERSION 1
VERSION 1.0
OUTPUT_NAME ccnx_transport_rta )
......@@ -206,7 +206,7 @@ install(FILES ${TEST_TOOLS_HDRS} DESTINATION include/ccnx/transport/test_tools )
install(FILES ${RTA_CORE_HDRS} DESTINATION include/ccnx/transport/transport_rta )
install(FILES ${RTA_CONFIG_HDRS} DESTINATION include/ccnx/transport/transport_rta/config )
install(FILES ${RTA_COMMANDS_HDRS} DESTINATION include/ccnx/transport/transport_rta/commands )
add_subdirectory(common/test)
add_subdirectory(transport_rta/test)
add_subdirectory(transport_rta/commands/test)
......
......@@ -39,19 +39,10 @@
#include <ccnx/common/ccnx_NameSegmentNumber.h>
#include <ccnx/transport/transport_rta/core/rta_Component.h>
#include <parc/security/parc_PublicKeySignerPkcs12Store.h>
#include <parc/security/parc_Signer.h>
#include <ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_TlvDictionary.h>
#include <ccnx/common/codec/schema_v1/testdata/v1_interest_nameA.h>
#include <ccnx/common/ccnx_WireFormatMessage.h>
#include <ccnx/common/internal/ccnx_InterestDefault.h>
#include <ccnx/common/ccnx_ContentObject.h>
#include <ccnx/common/ccnx_Interest.h>
#include <ccnx/api/control/cpi_ControlFacade.h>
/**
......
......@@ -185,7 +185,7 @@ LONGBOW_TEST_FIXTURE_TEARDOWN(Local)
static CCNxTlvDictionary *
createSignedContentObject(void)
{
CCNxName *name = ccnxName_CreateFromURI("lci:/some/name");
CCNxName *name = ccnxName_CreateFromCString("lci:/some/name");
PARCBuffer *payload = parcBuffer_Flip(parcBuffer_PutArray(parcBuffer_Allocate(20), 11, (uint8_t *) "the payload"));
CCNxTlvDictionary *contentObject = ccnxContentObject_CreateWithDataPayload(name, payload);
parcBuffer_Release(&payload);
......@@ -283,7 +283,7 @@ LONGBOW_TEST_CASE(Local, vegasSession_GetSegnumFromObject)
};
for (int i = 0; test_vectors[i].uri != NULL; i++) {
CCNxName *name = ccnxName_CreateFromURI(test_vectors[i].uri);
CCNxName *name = ccnxName_CreateFromCString(test_vectors[i].uri);
CCNxTlvDictionary *contentObject = ccnxContentObject_CreateWithDataPayload(name, NULL);
uint64_t testSeqnum = -1;
......@@ -721,4 +721,3 @@ main(int argc, char *argv[])
LongBowRunner *testRunner = LONGBOW_TEST_RUNNER_CREATE(Fc_Vegas);
exit(longBowMain(argc, argv, testRunner, NULL));
}
......@@ -190,7 +190,7 @@ LONGBOW_TEST_FIXTURE_TEARDOWN(Local)
static CCNxTlvDictionary *
createSignedContentObject(void)
{
CCNxName *name = ccnxName_CreateFromURI("lci:/some/name");
CCNxName *name = ccnxName_CreateFromCString("lci:/some/name");
PARCBuffer *payload = parcBuffer_Flip(parcBuffer_PutArray(parcBuffer_Allocate(20), 11, (uint8_t *) "the payload"));
CCNxTlvDictionary *contentObject = ccnxContentObject_CreateWithDataPayload(name, payload);
parcBuffer_Release(&payload);
......@@ -293,7 +293,7 @@ LONGBOW_TEST_CASE(Local, vegasSession_GetSegnumFromObject)
};
for (int i = 0; test_vectors[i].uri != NULL; i++) {
CCNxName *name = ccnxName_CreateFromURI(test_vectors[i].uri);
CCNxName *name = ccnxName_CreateFromCString(test_vectors[i].uri);
CCNxTlvDictionary *contentObject = ccnxContentObject_CreateWithDataPayload(name, NULL);
uint64_t testSeqnum = -1;
......@@ -685,4 +685,3 @@ main(int argc, char *argv[])
LongBowRunner *testRunner = LONGBOW_TEST_RUNNER_CREATE(VegasSession);
exit(longBowMain(argc, argv, testRunner, NULL));
}
......@@ -35,8 +35,12 @@
#include <parc/algol/parc_Memory.h>
#include <parc/security/parc_PublicKeySignerPkcs12Store.h>
#include <parc/security/parc_SymmetricSignerFileStore.h>
#include <parc/security/parc_PublicKeySigner.h>
#include <parc/security/parc_Pkcs12KeyStore.h>
#include <parc/security/parc_SymmetricKeySigner.h>
#include <parc/security/parc_SymmetricKeyStore.h>
#include <parc/security/parc_KeyStore.h>
#include <parc/security/parc_Signer.h>
#include <parc/security/parc_CryptoHashType.h>
#include <ccnx/transport/transport_rta/config/config_Signer.h>
......@@ -50,22 +54,31 @@ component_Codec_GetSigner(RtaConnection *conn)
SignerType signertype = signer_GetImplementationType(rtaConnection_GetParameters(conn));
switch (signertype) {
case SIGNER_SymmetricKeySignerFileStore: {
case SignerType_SymmetricKeySigner: {
struct symmetrickeysigner_params params;
bool success = symmetricKeySignerFileStore_GetConnectionParams(rtaConnection_GetParameters(conn), &params);
assertTrue(success, "Could not retrieve publicKeySignerPkcs12Store_GetConnectionParams");
bool success = symmetricKeySigner_GetConnectionParams(rtaConnection_GetParameters(conn), &params);
assertTrue(success, "Could not retrieve symmetricKeySigner_GetConnectionParams");
signer = parcSigner_Create(parcSymmetricSignerFileStore_OpenFile(params.filename, params.password, PARC_HASH_SHA256));
PARCSymmetricKeyStore *symmetricKeyStore = parcSymmetricKeyStore_OpenFile(params.filename, params.password, PARC_HASH_SHA256);
PARCSymmetricKeySigner *symmetricKeySigner = parcSymmetricKeySigner_Create(symmetricKeyStore, PARC_HASH_SHA256);
parcSymmetricKeyStore_Release(&symmetricKeyStore);
signer = parcSigner_Create(symmetricKeySigner, PARCSymmetricKeySignerAsSigner);
assertNotNull(signer, "got null opening FileKeystore '%s'\n", params.filename);
break;
}
case SIGNER_PublicKeySignerPkcs12Store: {
case SignerType_PublicKeySigner: {
struct publickeysigner_params params;
bool success = publicKeySignerPkcs12Store_GetConnectionParams(rtaConnection_GetParameters(conn), &params);
assertTrue(success, "Could not retrieve publicKeySignerPkcs12Store_GetConnectionParams");
bool success = publicKeySigner_GetConnectionParams(rtaConnection_GetParameters(conn), &params);
assertTrue(success, "Could not retrieve publicKeySigner_GetConnectionParams");
PARCPkcs12KeyStore *pkcs12KeyStore = parcPkcs12KeyStore_Open(params.filename, params.password, PARC_HASH_SHA256);
PARCKeyStore *keyStore = parcKeyStore_Create(pkcs12KeyStore, PARCPkcs12KeyStoreAsKeyStore);
PARCPublicKeySigner *publicKeySigner = parcPublicKeySigner_Create(keyStore, PARCSigningAlgorithm_RSA, PARC_HASH_SHA256);
parcKeyStore_Release(&keyStore);