Merge pull request #4 from cwood/3986-chris-file_repo

Manifest support

Author: Glenn Scott

ccnx/forwarder/metis/core/metis_Forwarder.c

@@ -458,5 +458,3 @@ _keepalive_cb(int fd, PARCEventType what, void *user_data)
     assertTrue(what & PARCEventType_Timeout, "Got unexpected tick_cb: %d", what);
     // function is just a keepalive for Metis, does not do anything
 }
-
-

ccnx/forwarder/metis/core/metis_Message.c

@@ -825,4 +825,3 @@ metisMessage_SetExpiryTimeTicks(MetisMessage *message, uint64_t expiryTimeTicks)
     message->expiryTimeTicks = expiryTimeTicks;
     message->hasExpiryTimeTicks = true;
 }
-

ccnx/forwarder/metis/io/metis_TcpListener.c

@@ -250,5 +250,3 @@ _metisTcpListener_OpsGetEncapType(const MetisListenerOps *ops)
 {
     return METIS_ENCAP_TCP;
 }
-
-

ccnx/forwarder/metis/tlv/metis_TlvSchemaV1.c

@@ -77,6 +77,7 @@ typedef struct __attribute__ ((__packed__)) metis_tlv_fixed_header {
 #define T_VALALG     0x0003
 #define T_VALPAYLOAD 0x0004
 #define T_HOPFRAG_PAYLOAD  0x0005
+#define T_MANIFEST   0x0006
 
 // inside interest
 #define T_KEYIDRES    0x0002
@@ -380,6 +381,7 @@ _parseMessage(const uint8_t *packet, size_t offset, size_t endMessage, struct tl
                     _parseInterestV1(packet, offset, endSubSection, skeleton);
                     break;
 
+                case T_MANIFEST:
                 case T_OBJECT:
                     _parseObjectV1(packet, offset, endSubSection, skeleton);
                     break;

ccnx/forwarder/metis/tlv/metis_TlvSkeleton.c

@@ -111,7 +111,7 @@ metisTlvSkeleton_Parse(MetisTlvSkeleton *opaque, uint8_t *packet, MetisLogger *l
         case 0:
             _initialize(skeleton, &MetisTlvSchemaV0_Ops, packet, logger);
             return MetisTlvSchemaV0_Ops.parse(opaque);
-            
+
         case 1:
             _initialize(skeleton, &MetisTlvSchemaV1_Ops, packet, logger);
             return MetisTlvSchemaV1_Ops.parse(opaque);
@@ -434,4 +434,3 @@ metisTlvSkeleton_GetLogger(const MetisTlvSkeleton *opaque)
     _assertInvariants(skeleton);
     return skeleton->logger;
 }
-