diff --git a/csrc/ccnd/android_main.c b/csrc/ccnd/android_main.c
index 19809f6072..884f4b61b9 100644
--- a/csrc/ccnd/android_main.c
+++ b/csrc/ccnd/android_main.c
@@ -20,7 +20,7 @@
 
 #include <stdarg.h>
 #include <android/log.h>
-#include <ccnd_private.h>
+#include "ccnd_private.h"
 
 static int
 logger(void *loggerdata, const char *format, va_list ap)
diff --git a/csrc/ccnd/ccnd.c b/csrc/ccnd/ccnd.c
index 7a897a34ed..136733ff0e 100644
--- a/csrc/ccnd/ccnd.c
+++ b/csrc/ccnd/ccnd.c
@@ -1,4 +1,5 @@
 /*
+ *
  * ccnd/ccnd.c
  *
  * Main program of ccnd - the CCNx Daemon
@@ -83,6 +84,9 @@ static struct face *get_dgram_source(struct ccnd_handle *h, struct face *face,
                                      int why);
 static struct content_entry *content_from_accession(struct ccnd_handle *h,
                                                     ccn_cookie accession);
+static struct content_entry *content_from_accession_qos(struct ccnd_handle *h, 
+                                                        ccn_cookie accession, 
+                                                        enum controlpacketid control);
 static int is_stale(struct ccnd_handle *h, struct content_entry *content);
 static void mark_stale(struct ccnd_handle *h,
                        struct content_entry *content);
@@ -143,8 +147,11 @@ static void strategy_callout(struct ccnd_handle *h,
                              struct interest_entry *ie,
                              enum ccn_strategy_op op,
                              unsigned faceid);
+void
+content_queue_destroy(struct ccnd_handle *h, struct content_queue **pq);
 
 #ifndef CCND_WTHZ
+
 /**
  * Frequency of wrapped timer
  *
@@ -161,7 +168,7 @@ static void strategy_callout(struct ccnd_handle *h,
 /**
  * Allow a few extra entries in the cache to allow for output queuing
  */
-#define CCND_CACHE_MARGIN 10
+#define CCND_CACHE_MARGIN 3
 #endif
 
 #ifndef CCND_MAX_MATCH_PROBES
@@ -394,6 +401,10 @@ choose_face_delay(struct ccnd_handle *h, struct face *face, enum cq_delay_class
     
     if (c == CCN_CQ_ASAP)
         return(1);
+    /* <!--kuwayama */
+    if (c == CCN_CQ_GUARANTEE)
+      return(CCN_CQ_GUARANTEE);
+    /*  kuwayama--> */
     if ((face->flags & CCN_FACE_MCAST) != 0) {
         shift = (c == CCN_CQ_SLOW) ? 2 : 0;
         micros = (h->data_pause_microsec) << shift;
@@ -412,16 +423,36 @@ content_queue_create(struct ccnd_handle *h, struct face *face, enum cq_delay_cla
     unsigned usec;
     q = calloc(1, sizeof(*q));
     if (q != NULL) {
-        usec = choose_face_delay(h, face, c);
+        //usec = choose_face_delay(h, face, c)a;
+	usec = 1;
         q->burst_nsec = (usec <= 500 ? 500 : 150000); // XXX - needs a knob
         q->min_usec = usec;
         q->rand_usec = 2 * usec;
         q->nrun = 0;
         q->send_queue = ccn_indexbuf_create();
-        if (q->send_queue == NULL) {
+        q->control_queue = ccn_indexbuf_create();
+	//add by Fumiya
+	q->content_name = ccn_charbuf_create();
+	q->bandwidth = 800000000;
+        q->remaining_bandwidth = q->bandwidth;
+        struct timeval create;
+        gettimeofday(&create,NULL);
+        q->last_use = create;
+	q->bw_flag = 0;
+	q->use_flag = 1;
+	//add by Fumiya End
+	if (q->send_queue == NULL) {
+            free(q);
+            return(NULL);
+        }
+        if (q->control_queue == NULL) {
             free(q);
             return(NULL);
         }
+	if (q->content_name == NULL) {
+	    free(q);
+	    return(NULL);
+	}
         q->sender = NULL;
     }
     return(q);
@@ -430,29 +461,35 @@ content_queue_create(struct ccnd_handle *h, struct face *face, enum cq_delay_cla
 /**
  * Destroy a queue.
  */
-static void
+void
 content_queue_destroy(struct ccnd_handle *h, struct content_queue **pq)
 {
     struct content_queue *q;
     struct ccn_indexbuf *s;
+    struct ccn_indexbuf *x;
     struct content_entry *c;
     int i;
     
     if (*pq != NULL) {
         q = *pq;
         s = q->send_queue;
+        x = q->control_queue;
+        
         if (s != NULL) {
             for (i = 0; i < s->n; i++) {
-                c = content_from_accession(h, s->buf[i]);
+                c = content_from_accession_qos(h, s->buf[i], x->buf[i]);
                 if (c != NULL)
                     c->refs--;
             }
         }
         ccn_indexbuf_destroy(&q->send_queue);
+        ccn_indexbuf_destroy(&q->control_queue);
         if (q->sender != NULL) {
             ccn_schedule_cancel(h->sched, q->sender);
             q->sender = NULL;
         }
+
+	ccn_charbuf_destroy(&q->content_name);
         free(q);
         *pq = NULL;
     }
@@ -698,6 +735,8 @@ finalize_face(struct hashtb_enumerator *e)
         }
         for (c = 0; c < CCN_CQ_N; c++)
             content_queue_destroy(h, &(face->q[c]));
+        for (c = 0; c < QOS_QUEUE; c++)
+            content_queue_destroy(h, &(face->qos_q[c]));
         ccn_charbuf_destroy(&face->inbuf);
         ccn_charbuf_destroy(&face->outbuf);
         ccnd_msg(h, "%s face id %u (slot %u)",
@@ -895,12 +934,41 @@ content_from_accession(struct ccnd_handle *h, ccn_cookie accession)
 {
     struct content_entry *ans = NULL;
     struct ccny *y;
-    
+   
+    // modified by xu  
+    // modified by xu for g content store 
     y = ccny_from_cookie(h->content_tree, accession);
+
+    //  -->
     if (y != NULL)
         ans = ccny_payload(y);
     return(ans);
 }
+/**
+ * Convert an accession to its associated content handle.
+ *
+ * @returns content handle, or NULL if it is no longer available.
+ */
+static struct content_entry *
+content_from_accession_qos(struct ccnd_handle *h, ccn_cookie accession, enum controlpacketid control)
+{
+    struct content_entry *ans = NULL;
+    struct ccny *y;
+   
+    // modified by xu  
+    // modified by xu for g content store 
+    if(control == GUARANTEE)
+    y = ccny_from_cookie(h->content_tree_g, accession);
+    else
+    y = ccny_from_cookie(h->content_tree, accession);
+
+
+    //  -->
+    if (y != NULL)
+        ans = ccny_payload(y);
+    return(ans);
+}
+
 
 /**
  * Find the first candidate that might match the given interest.
@@ -939,14 +1007,17 @@ find_first_match_candidate(struct ccnd_handle *h,
                     ccn_flatname_append_from_ccnb(namebuf,
                                                   interest_msg + ex1start,
                                                   ex1end - ex1start, 0, 1);
-//                    if (h->debug & 8)
-//                        ccnd_debug_ccnb(h, __LINE__, "fastex", NULL,
-//                                        namebuf->buf, namebuf->length);
                 }
             }
         }
     }
-    y = ccn_nametree_look_ge(h->content_tree, namebuf->buf, namebuf->length);
+    // modified by xu 
+    // modified by xu for g content store 
+    if (pi->control == GUARANTEE)
+        y = ccn_nametree_look_ge(h->content_tree_g, namebuf->buf, namebuf->length);
+    else
+        y = ccn_nametree_look_ge(h->content_tree, namebuf->buf, namebuf->length);
+    // -->
     charbuf_release(h, namebuf);
     if (y == NULL)
         return(NULL);
@@ -963,8 +1034,13 @@ content_matches_prefix(struct ccnd_handle *h,
 {
     struct ccny *y = NULL;
     int res;
-    
-    y = ccny_from_cookie(h->content_tree, content->accession);
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE)
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+    else
+        y = ccny_from_cookie(h->content_tree, content->accession);
+
+
     res = ccn_flatname_compare(flat->buf, flat->length,
                                ccny_key(y), ccny_keylen(y));
     return (res == CCN_STRICT_PREFIX || res == 0);
@@ -979,7 +1055,15 @@ content_next(struct ccnd_handle *h, struct content_entry *content)
     struct ccny *y = NULL;
     if (content == NULL)
         return(NULL);
-    y = ccny_from_cookie(h->content_tree, content->accession);
+
+
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE)
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+    else
+        y = ccny_from_cookie(h->content_tree, content->accession);
+
+
     if (y == NULL)
         return(NULL);
     y = ccny_next(y);
@@ -1044,14 +1128,22 @@ content_enqueuex(struct ccnd_handle *h, struct content_entry *content)
     int tts;
     
     tts = content->staletime;
-    if (content->nextx != NULL || content->accession == 0 || tts < 0) abort();    
+    if (content->control == GUARANTEE){
+        if(content->nextx != NULL) {
+            ccnd_msg(h, "conent g next != NULL");
+        }
+        
+        if (content->nextx != NULL || content->accession_g == 0 || tts < 0) abort();    
+    }
+    else
+        if (content->nextx != NULL || content->accession == 0 || tts < 0) abort();    
     prev = h->headx->prevx;
     if (prev->staletime > tts) {
         y = ccn_nametree_look_le(h->ex_index, NULL, tts);
         if (y == NULL)
             prev = h->headx;
         else
-            prev = content_from_accession(h, ccny_info(y));
+            prev = content_from_accession_qos(h, ccny_info(y), content->control);
         // if prev is NULL, we forgot to remove an entry
     }
     if (prev->nextx->staletime <= tts && prev->nextx != h->headx) abort();
@@ -1065,10 +1157,21 @@ content_enqueuex(struct ccnd_handle *h, struct content_entry *content)
     content->nextx = next;
     content->prevx = prev;
     next->prevx = prev->nextx = content;
-    if (next != h->headx)
-        update_ex_index(h, content->staletime, content->accession);
-    else if (prev != h->headx && prev->staletime < tts)
-        update_ex_index(h, prev->staletime, prev->accession);
+    if (next != h->headx){
+        if( content->control == GUARANTEE){
+            update_ex_index(h, content->staletime, content->accession_g);
+        }
+        else{
+            update_ex_index(h, content->staletime, content->accession);
+        }
+    }
+    else if (prev != h->headx && prev->staletime < tts){
+       if(prev->control == GUARANTEE){  
+          update_ex_index(h, prev->staletime, prev->accession_g);
+       }else{
+          update_ex_index(h, prev->staletime, prev->accession);
+       }
+   }
 }
 
 /**
@@ -1090,8 +1193,13 @@ content_dequeuex(struct ccnd_handle *h, struct content_entry *content)
     content->nextx = content->prevx = NULL;
     if (content->staletime != next->staletime) {
         /* On average, we get here no more than once per second */
-        if (content->staletime == prev->staletime)
-            update_ex_index(h, prev->staletime, prev->accession);
+        if (content->staletime == prev->staletime){
+            if(prev->control == GUARANTEE){
+                update_ex_index(h, prev->staletime, prev->accession_g);
+            }else{
+                update_ex_index(h, prev->staletime, prev->accession);
+            }
+        }
         else
             update_ex_index(h, content->staletime, 0);
     }
@@ -1127,6 +1235,9 @@ ccnd_n_stale(struct ccnd_handle *h)
         return(0);
     now = h->sec - h->starttime;
     if (p->staletime <= now)
+        // modified by xu for g content store 
+        // todo: here should return summizaiton of content tree (g, n..)
+        //return(h->content_tree->n); /* Everything is stale */
         return(h->content_tree->n); /* Everything is stale */
     /* We know there is an entry with staletime > now, so this terminates. */
     for (p = h->headx->nextx; p->staletime <= now; p = p->nextx)
@@ -1175,11 +1286,11 @@ consume_interest(struct ccnd_handle *h, struct interest_entry *ie)
     struct hashtb_enumerator ee;
     struct hashtb_enumerator *e = &ee;
     int res;
-    
     hashtb_start(h->interest_tab, e);
     res = hashtb_seek(e, ie->interest_msg, ie->size - 1, 1);
-    if (res != HT_OLD_ENTRY)
+    if (res != HT_OLD_ENTRY){
         abort();
+    }
     hashtb_delete(e);
     hashtb_end(e);
 }    
@@ -1394,7 +1505,7 @@ create_local_listener(struct ccnd_handle *h, const char *sockname, int backlog)
     sock = socket(AF_UNIX, SOCK_STREAM, 0);
     if (sock == -1)
         return(sock);
-    savedmask = umask(0111); /* socket should be R/W by anybody */
+    savedmask = umask(0000); /* socket should be R/W by anybody */
     res = bind(sock, (struct sockaddr *)&a, sizeof(a));
     umask(savedmask);
     if (res == -1) {
@@ -1499,6 +1610,12 @@ record_connection(struct ccnd_handle *h, int fd,
         face->recv_fd = fd;
         face->sendface = CCN_NOFACEID;
         face->addrlen = e->extsize;
+	/*add by Fumiya*/
+	face->amount_size_of_guarantee = 0;
+	face->send_size_of_guarantee = 0;
+	face->number_of_default_queue = 0;
+	face->number_of_guarantee_queue = 0;
+	/*add by Fumiya*/
         addrspace = ((unsigned char *)e->key) + e->keysize;
         face->addr = (struct sockaddr *)addrspace;
         memcpy(addrspace, who, e->extsize);
@@ -1749,6 +1866,74 @@ shutdown_client_fd(struct ccnd_handle *h, int fd)
     check_comm_file(h);
 }
 
+/**<!-- add by xu
+ * Insert Control Packet ID into the Content Object
+ *
+ * if no Control Packet ID in the content object
+ * 
+ * Return the pointer of the new content entry 
+ * if insert sucessfully
+ * or 
+ * return the orginal pointer of content entry
+ * if failed   
+*/
+struct content_entry *
+insert_controlpacketid_contentobject(struct ccnd_handle *h, 
+                                     struct content_entry *content, 
+                                       enum controlpacketid control)
+{
+    if (-1 == content->control || 
+         0 > content->control ||
+         4 <= content->control)
+    {
+        //ccnd_msg(h, "Content Object has no control ID");
+	struct ccn_charbuf *c = ccn_charbuf_create();
+	unsigned char *dst;
+        size_t size;
+        size = content->size;
+	/*Remove the end closer of this ContentObject*/
+        //ccnd_msg(h, "Remove the end closer");
+        dst = ccn_charbuf_reserve(c, size - 1);
+	    memcpy(dst, content->ccnb, size - 1); 
+	    c->length += (size-1);
+
+	    /**Append ControlPacketID
+	     * Here the NOTICE should be dynamic according to real situation
+	    */
+        //ccnd_msg(h, "Append control packet id");
+	    ccnb_tagged_putf(c, CCN_DTAG_ControlPacketID, "%d", control);
+	    /**Append closer */
+        //ccnd_msg(h, "Append closer");
+	    ccnb_element_end(c);
+
+        if (NULL != c->buf){
+            /**Release the original ContentObject memory*/
+	        free(content->ccnb);
+	        /**Assign a new memory with size of c->length*/
+	        content->ccnb = malloc(c->length);
+	        content->size = c->length;
+                content->control = control;
+	        /**Copy the content of c->buf to content->ccnb
+	         * The header addresses of c->buf and content->ccnb are same 
+	        */
+	        content->ccnb = c->buf;
+	        memcpy(content->ccnb, c->buf, c->length);   
+            return (content);
+        }
+        else{
+            free(c);
+            ccnd_msg(h, "ERROR: Insert ControlPacketID Failed");
+            return (content);
+        }
+ 
+    }
+    else{
+        /*The content has already a control packet id*/
+        return (content);
+    }
+}
+/* add by xu end -->*/
+
 /**
  * Send a ContentObject
  *
@@ -1759,15 +1944,24 @@ static void
 send_content(struct ccnd_handle *h, struct face *face, struct content_entry *content)
 {
     size_t size;
-    
+
     if ((face->flags & CCN_FACE_NOSEND) != 0) {
         // XXX - should count this.
         return;
     }
+
+    /*<!-- add by xu */
+    /* Insert a Control Packet ID into Content Object
+     * if the content has already a Control Packet ID,
+     * the content remained no change.
+     */
+    content = insert_controlpacketid_contentobject(h, content, NOTICE);
+    /* add by xu end -->*/
     size = content->size;
     if (h->debug & 4)
         ccnd_debug_content(h, __LINE__, "content_to", face, content);
     stuff_and_send(h, face, content->ccnb, size, NULL, 0, 0, 0);
+
     ccnd_meter_bump(h, face->meter[FM_DATO], 1);
     h->content_items_sent += 1;
 }
@@ -1779,8 +1973,13 @@ static enum cq_delay_class
 choose_content_delay_class(struct ccnd_handle *h, unsigned faceid, int content_flags)
 {
     struct face *face = face_from_faceid(h, faceid);
+    
     if (face == NULL)
         return(CCN_CQ_ASAP); /* Going nowhere, get it over with */
+    /* <!--kuwayama */
+    if (content_flags == CCN_CQ_GUARANTEE)
+      return(CCN_CQ_GUARANTEE);
+    /*  kuwayama--> */
     if ((face->flags & (CCN_FACE_LINK | CCN_FACE_MCAST)) != 0) /* udplink or such, delay more */
         return((content_flags & CCN_CONTENT_ENTRY_SLOWSEND) ? CCN_CQ_SLOW : CCN_CQ_NORMAL);
     if ((face->flags & CCN_FACE_DGRAM) != 0)
@@ -1850,13 +2049,14 @@ content_sender(struct ccn_schedule *sched,
         q->ready = q->send_queue->n;
     nsec = 0;
     burst_nsec = q->burst_nsec;
-    burst_max = 2;
+    //burst_max = 2;
+    burst_max = 4;//modified by xu
     if (q->ready < burst_max)
         burst_max = q->ready;
     if (burst_max == 0)
         q->nrun = 0;
     for (i = 0; i < burst_max && nsec < 1000000; i++) {
-        content = content_from_accession(h, q->send_queue->buf[i]);
+        content = content_from_accession_qos(h, q->send_queue->buf[i], q->control_queue->buf[i]);
         if (content == NULL)
             q->nrun = 0;
         else {
@@ -1872,9 +2072,12 @@ content_sender(struct ccn_schedule *sched,
     if (q->ready < i) abort();
     q->ready -= i;
     /* Update queue */
-    for (j = 0; i < q->send_queue->n; i++, j++)
+    for (j = 0; i < q->send_queue->n; i++, j++) {
         q->send_queue->buf[j] = q->send_queue->buf[i];
+        q->control_queue->buf[j] = q->control_queue->buf[i];
+    }
     q->send_queue->n = j;
+    q->control_queue->n = j;
     /* Do a poll before going on to allow others to preempt send. */
     delay = (nsec + 499) / 1000 + 1;
     if (q->ready > 0) {
@@ -1895,7 +2098,7 @@ content_sender(struct ccn_schedule *sched,
     }
     /* Determine when to run again */
     for (i = 0; i < q->send_queue->n; i++) {
-        content = content_from_accession(h, q->send_queue->buf[i]);
+        content = content_from_accession_qos(h, q->send_queue->buf[i], q->control_queue->buf[i]);
         if (content != NULL) {
             q->nrun = 0;
             delay = randomize_content_delay(h, q);
@@ -1906,11 +2109,209 @@ content_sender(struct ccn_schedule *sched,
         }
     }
     q->send_queue->n = q->ready = 0;
+    q->control_queue->n = q->ready = 0;
 Bail:
     q->sender = NULL;
     return(0);
 }
 
+/**
+ * Scheduled event for sending from a queue.
+ * content sender をDRR仕様に書き換える
+ * この中では送出するコンテンツ数に限りは設けないで以下の二点で送出を止める
+ * ・nsecが一定時間を迎える（一つのキューに時間を取られ過ぎるわけにはいかない）
+ * ・送出したコンテンツのサイズが帯域幅を使い尽くす(こうなったらbw_flagを1にする)
+ */
+static int
+content_sender_qos(struct ccn_schedule *sched,
+               void *clienth,
+               struct ccn_scheduled_event *ev,
+               int flags)
+{
+    int i, j;
+    int delay;
+    int nsec;
+    int burst_nsec;
+    int burst_max;
+    struct ccnd_handle *h = clienth;
+    struct content_entry *content = NULL;
+    unsigned faceid = ev->evint;
+    struct face *face = NULL;
+    struct content_queue *q = ev->evdata;
+    (void)sched;
+
+    if ((flags & CCN_SCHEDULE_CANCEL) != 0)
+        goto Bail;
+    face = face_from_faceid(h, faceid);
+    if (face == NULL)
+        goto Bail;
+    if (q->send_queue == NULL)
+        goto Bail;
+    if ((face->flags & CCN_FACE_NOSEND) != 0)
+        goto Bail;
+    /* Send the content at the head of the queue */
+    if (q->ready > q->send_queue->n ||
+        (q->ready == 0 && q->nrun >= 12 && q->nrun < 120))
+        q->ready = q->send_queue->n;
+    nsec = 0;
+    burst_nsec = q->burst_nsec;
+    burst_max = q->ready;
+    if (burst_max == 0)
+        q->nrun = 0;
+    for (i = 0; i < burst_max && nsec < 1000000; i++) {
+        if (q->bw_flag == 1){
+            break;
+        }
+        content = content_from_accession_qos(h, q->send_queue->buf[i], q->control_queue->buf[i]);
+        if (content == NULL)
+            q->nrun = 0;
+        else {
+            if (q->remaining_bandwidth - content->size * 8 < 0){
+                q->bw_flag = 1;
+                break;
+            }
+            q->remaining_bandwidth -= content->size * 8;
+	    if(content->control == GUARANTEE){
+                face->send_size_of_guarantee += content->size;
+            }
+	    ccnd_msg(h,"送信済:%d 未送信:%d 現帯域幅:%d",face->send_size_of_guarantee,face->amount_size_of_guarantee,q->bandwidth);
+            send_content(h, face, content);
+	    struct timeval last;
+    	    gettimeofday(&last,NULL);
+    	    q->last_use = last;
+            content->refs--;
+            /* face may have vanished, bail out if it did */
+            if (face_from_faceid(h, faceid) == NULL)
+                goto Bail;
+            nsec += burst_nsec * (unsigned)((content->size + 1023) / 1024);
+            q->nrun++;
+        }
+    }
+    if (q->ready < i) abort();
+    q->ready -= i;
+    /* Update queue */
+    for (j = 0; i < q->send_queue->n; i++, j++) {
+        q->send_queue->buf[j] = q->send_queue->buf[i];
+        q->control_queue->buf[j] = q->control_queue->buf[i];
+    }
+    q->send_queue->n = j;
+    q->control_queue->n = j;
+    /* Do a poll before going on to allow others to preempt send. */
+    delay = (nsec + 499) / 1000 + 1;
+    if (q->ready > 0) {
+        if (h->debug & 8)
+            ccnd_msg(h, "face %u ready %u delay %i nrun %u",
+                     faceid, q->ready, delay, q->nrun, face->surplus);
+        return(delay);
+    }
+    q->ready = j;
+    if (q->nrun >= 12 && q->nrun < 120) {
+        /* We seem to be a preferred provider, forgo the randomized delay */
+        if (j == 0)
+            delay += burst_nsec / 50;
+        if (h->debug & 8)
+            ccnd_msg(h, "face %u ready %u delay %i nrun %u surplus %u",
+                     (unsigned)ev->evint, q->ready, delay, q->nrun, face->surplus);
+        return(delay);
+    }
+    /* Determine when to run again */
+    for (i = 0; i < q->send_queue->n; i++) {
+        content = content_from_accession_qos(h, q->send_queue->buf[i], q->control_queue->buf[i]);
+        if (content != NULL) {
+            q->nrun = 0;
+            delay = randomize_content_delay(h, q);
+            if (h->debug & 8)
+                ccnd_msg(h, "face %u queued %u delay %i",
+                         (unsigned)ev->evint, q->ready, delay);
+            return(delay);
+        }
+    }
+    //以下は全てのコンテンツを送信し終えた時の場合, 今回の場合, その状況は稀であると考えられるのでこうするわけにはいかない.
+    q->send_queue->n = q->ready = 0;
+    q->control_queue->n = q->ready = 0;
+    Bail:
+    q->sender = NULL;
+    return(0);
+}
+
+//add by Fumiya
+static int
+face_send_queue_insert_qos(struct ccnd_handle *h,struct face *face, struct content_entry *content)
+{
+    if (face == NULL || content == NULL || (face->flags & CCN_FACE_NOSEND) != 0)
+        return(-1);
+
+    struct ccn_charbuf *flatname = NULL;
+    flatname = ccn_charbuf_create();
+    ccn_flatname_from_ccnb(flatname,content->ccnb,content->size);
+
+    int i;
+    struct content_queue *q;
+    enum cq_delay_class c;
+
+    for(i = 0;i<QOS_QUEUE;i++){
+        if (face->qos_q[i] == NULL) {
+            c = choose_content_delay_class(h, face->faceid, content->flags);
+            if (content->control == GUARANTEE) {
+                face->number_of_guarantee_queue++;
+		face->qos_q[i] = content_queue_create(h, face, c);
+                ccn_charbuf_append_charbuf(face->qos_q[i]->content_name, flatname);
+                q = face->qos_q[i];
+		q->queue_type = CQ_GUARANTEE;
+		q->bandwidth_of_face = 800000000;
+            } else {
+                face->number_of_default_queue++;
+		face->qos_q[i] = content_queue_create(h, face, c);
+                ccn_charbuf_append_charbuf(face->qos_q[i]->content_name, flatname);
+                q = face->qos_q[i];
+                q->queue_type = CQ_DEFAULT;
+		q->bandwidth_of_face = 800000000;
+            }
+            break;
+        }
+        if (strcmp(face->qos_q[i]->content_name->buf,flatname->buf) == 0){
+            q = face->qos_q[i];
+	    if(q->use_flag == 0){
+	    	if(q->queue_type == CQ_GUARANTEE){
+			face->number_of_guarantee_queue++;
+		}else{
+			face->number_of_default_queue++;
+		}
+	    }
+	    q->use_flag = 1;
+            break;
+        }
+    }
+    if (q == NULL) {
+        return -1;
+    }
+    ccn_charbuf_destroy(&flatname);
+
+    int ans;
+    int n;
+    int delay;
+
+    n = q->send_queue->n;
+    if(content->control == GUARANTEE){
+        face->amount_size_of_guarantee += content->size;
+        ans = ccn_indexbuf_set_insert(q->send_queue, content->accession_g);
+    }else
+        ans = ccn_indexbuf_set_insert(q->send_queue, content->accession);
+    if(q->control_queue->n <= ans)
+        ccn_indexbuf_append_element(q->control_queue, content->control);
+    if (n != q->send_queue->n)
+        content->refs++;
+    if (q->sender == NULL) {
+        //そのフラグと一つのキューに与えられる帯域幅, remaining bandwidthの更新はmain loopの中に更新の関数を入れてやる
+        q->ready = q->send_queue->n;
+        delay = 1; //add by xu. fix the delay to 1 that all contents are sent as ASAP
+        q->sender = ccn_schedule_event(h->sched, delay,
+                                       content_sender_qos, q, face->faceid);
+    }
+    return (ans);
+}
+//add by Fumiya End
+
 /**
  * Queue a ContentObject to be sent on a face.
  */
@@ -1936,7 +2337,10 @@ face_send_queue_insert(struct ccnd_handle *h,
     /* Check the other queues first, it might be in one of them */
     for (k = 0; k < CCN_CQ_N; k++) {
         if (k != c && face->q[k] != NULL) {
-            ans = ccn_indexbuf_member(face->q[k]->send_queue, content->accession);
+            if(content->control == GUARANTEE)
+              ans = ccn_indexbuf_member(face->q[k]->send_queue, content->accession_g);
+            else
+              ans = ccn_indexbuf_member(face->q[k]->send_queue, content->accession);
             if (ans >= 0) {
                 if (h->debug & 8)
                     ccnd_debug_content(h, __LINE__, "content_otherq", face,
@@ -1946,14 +2350,24 @@ face_send_queue_insert(struct ccnd_handle *h,
         }
     }
     n = q->send_queue->n;
-    ans = ccn_indexbuf_set_insert(q->send_queue, content->accession);
+    if(content->control == GUARANTEE){
+	/*add by Fumiya*/
+        face->amount_size_of_guarantee += content->size;
+	ans = ccn_indexbuf_set_insert(q->send_queue, content->accession_g);
+	/*add by Fumiya*/
+    }else
+        ans = ccn_indexbuf_set_insert(q->send_queue, content->accession);
+    if(q->control_queue->n <= ans) 
+        ccn_indexbuf_append_element(q->control_queue, content->control);
     if (n != q->send_queue->n)
         content->refs++;
     if (q->sender == NULL) {
-        delay = randomize_content_delay(h, q);
+        //delay = randomize_content_delay(h, q);
         q->ready = q->send_queue->n;
+        delay = 1; //add by xu. fix the delay to 1 that all contents are sent as ASAP
         q->sender = ccn_schedule_event(h->sched, delay,
-                                       content_sender, q, face->faceid);
+                                         content_sender, q, face->faceid);
+
         if (h->debug & 8)
             ccnd_msg(h, "face %u q %d delay %d usec", face->faceid, c, delay);
     }
@@ -1969,7 +2383,6 @@ is_pending_on(struct ccnd_handle *h, struct interest_entry *ie, unsigned faceid)
     struct pit_face_item *x;
     
     for (x = ie->strategy.pfl; x != NULL; x = x->next) {
-        if (x->faceid == faceid && (x->pfi_flags & CCND_PFI_PENDING) != 0)
             return(1);
         // XXX - depending on how list is ordered, an early out might be possible
         // For now, we assume no particular ordering
@@ -2018,17 +2431,17 @@ consume_matching_interests(struct ccnd_handle *h,
             if (content_face != NULL)
                 strategy_callout(h, p, CCNST_SATISFIED, content_face->faceid);
             for (x = p->strategy.pfl; x != NULL; x = x->next) {
-                if ((x->pfi_flags & CCND_PFI_PENDING) != 0)
-                    face_send_queue_insert(h, face_from_faceid(h, x->faceid),
-                                           content);
+                if ((x->pfi_flags & CCND_PFI_PENDING) != 0) {
+		    face_send_queue_insert_qos(h, face_from_faceid(h, x->faceid),content);
+                    //face_send_queue_insert(h, face_from_faceid(h, x->faceid),content);
+		}
             }
-            matches += 1;
+	    matches += 1;
             consume_interest(h, p);
         }
     }
-    return(matches);
+return(matches);
 }
-
 /**
  * Find and consume interests that match given content.
  *
@@ -2054,7 +2467,14 @@ match_interests(struct ccnd_handle *h, struct content_entry *content,
     struct nameprefix_entry *npe = NULL;
     struct ccny *y = NULL;
     
-    y = ccny_from_cookie(h->content_tree, content->accession);
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE){
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+    }
+    else{
+        y = ccny_from_cookie(h->content_tree, content->accession);
+    }
+
     if (y == NULL) abort();
     name = charbuf_obtain(h);
     ccn_name_init(name);
@@ -2071,6 +2491,7 @@ match_interests(struct ccnd_handle *h, struct content_entry *content,
     }
     charbuf_release(h, name);
     name = NULL;
+
     indexbuf_release(h, namecomps);
     namecomps = NULL;
     for (; npe != NULL; npe = npe->parent) {
@@ -2086,6 +2507,7 @@ match_interests(struct ccnd_handle *h, struct content_entry *content,
     return(n_matched);
 }
 
+
 /**
  * Send a message in a PDU, possibly stuffing other interest messages into it.
  * The message may be in two pieces.
@@ -2134,6 +2556,7 @@ stuff_and_send(struct ccnd_handle *h, struct face *face,
     return;
 }
 
+
 /**
  * Append a link-check interest if appropriate.
  *
@@ -2275,8 +2698,8 @@ process_incoming_link_message(struct ccnd_handle *h,
                 return(0);
             }
             if (s > face->rseq && s - face->rseq < 255) {
-                ccnd_msg(h, "seq_gap %u %ju to %ju",
-                         face->faceid, face->rseq, s);
+                //ccnd_msg(h, "seq_gap %u %ju to %ju",
+                //         face->faceid, face->rseq, s);
                 face->rseq = s;
                 face->rrun = 1;
                 return(0);
@@ -2288,7 +2711,7 @@ process_incoming_link_message(struct ccnd_handle *h,
                 }
                 if (face->rseq - s < 255) {
                     /* Received out of order */
-                    ccnd_msg(h, "seq_ooo %u %ju", face->faceid, s);
+                    //ccnd_msg(h, "seq_ooo %u %ju", face->faceid, s);
                     if (s == face->rseq - face->rrun) {
                         face->rrun++;
                         return(0);
@@ -2475,8 +2898,12 @@ reap(
 static void
 reap_needed(struct ccnd_handle *h, int init_delay_usec)
 {
-    if (h->reaper == NULL)
+    if (h->reaper == NULL) {
         h->reaper = ccn_schedule_event(h->sched, init_delay_usec, reap, NULL, 0);
+        /* <!--kuwayama */
+        //commented by xu//ccn_schedule_event(h->drr, init_delay_usec, reap, NULL, 0);
+        /*  kuwayama--> */
+    }
 }
 
 /**
@@ -2486,19 +2913,37 @@ static int
 remove_content(struct ccnd_handle *h, struct content_entry *content)
 {
     struct ccny *y = NULL;
-    
+    int flag = 0;
     if (content == NULL)
         return(-1);
-    y = ccny_from_cookie(h->content_tree, content->accession);
+
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE){
+        flag = 0;
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+    }
+    else{
+        flag = 1;
+        y = ccny_from_cookie(h->content_tree, content->accession);
+    }
+
+
     if (y == NULL)
         return(-1);
     if (content->refs != 0)
         ccnd_debug_content(h, __LINE__, "remove_queued_content", NULL, content);
     else if (h->debug & 4)
         ccnd_debug_content(h, __LINE__, "remove", NULL, content);
-    ccny_remove(h->content_tree, y);
-    content = NULL;
-    ccny_destroy(h->content_tree, &y); /* releases content as well */
+    // modified by xu for g content store 
+    if(flag == 0){
+        ccny_remove(h->content_tree_g, y);
+        content = NULL;
+        ccny_destroy(h->content_tree_g, &y); /* releases content as well */
+    } else {
+        ccny_remove(h->content_tree, y);
+        content = NULL;
+        ccny_destroy(h->content_tree, &y); /* releases content as well */
+    }
     return(0);
 }
 
@@ -3633,6 +4078,14 @@ send_interest(struct ccnd_handle *h, struct interest_entry *ie,
     ccn_charbuf_reset(c);
     if (lifetime != default_life)
         ccnb_append_tagged_binary_number(c, CCN_DTAG_InterestLifetime, lifetime);
+    /* <!-- add by xu */
+    /* There may be a bug that if the orginal interest has a ControlPacketID field,
+     * more than one ControlPacketID may be appended.
+     * This situation may occur when a node is forwarding an Interest packet.
+     */
+    if (h->interest_control_flag != -1)
+        ccnb_tagged_putf(c, CCN_DTAG_ControlPacketID, "%d", h->interest_control_flag);//add by xu
+    /* add by xu end -->*/
     noncesize = p->pfi_flags & CCND_PFI_NONCESZ;
     if (noncesize != 0)
         ccnb_append_tagged_blob(c, CCN_DTAG_Nonce, p->nonce, noncesize);
@@ -4217,6 +4670,10 @@ propagate_interest(struct ccnd_handle *h,
         ((unsigned char *)(intptr_t)ie->interest_msg)[ie->size - 1] = 0;
         xres = ccn_parse_interest(ie->interest_msg, ie->size, &xpi, NULL);
         if (xres < 0) abort();
+    
+    /*<-- add by xu*/
+    /*nothing for current*/
+    /*add by xu -->*/
     }
     lifetime = ccn_interest_lifetime(msg, pi);
     outbound = get_outbound_faces(h, face, msg, pi, npe);
@@ -4403,7 +4860,13 @@ next_child_at_level(struct ccnd_handle *h,
         return(NULL);
     name = charbuf_obtain(h);
     ccn_name_init(name);
-    y = ccny_from_cookie(h->content_tree, content->accession);
+
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE)
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+    else
+        y = ccny_from_cookie(h->content_tree, content->accession);
+
     res = ccn_name_append_flatname(name, ccny_key(y), ccny_keylen(y), 0, level + 1);
     if (res < level)
         goto Bail;
@@ -4420,8 +4883,14 @@ next_child_at_level(struct ccnd_handle *h,
                         name->buf, name->length);
     flatname = ccn_charbuf_create();
     ccn_flatname_from_ccnb(flatname, name->buf, name->length);
-    y = ccn_nametree_look_ge(h->content_tree,
-                             flatname->buf, flatname->length);
+
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE)
+        y = ccn_nametree_look_ge(h->content_tree_g, flatname->buf, flatname->length);
+    else
+        y = ccn_nametree_look_ge(h->content_tree, flatname->buf, flatname->length);
+
+
     if (y != NULL)
         next = ccny_payload(y);
 Bail:
@@ -4483,15 +4952,24 @@ process_incoming_interest(struct ccnd_handle *h, struct face *face,
     struct content_entry *next = NULL;
     struct ccn_charbuf *flatname = NULL;
     struct ccn_indexbuf *comps = indexbuf_obtain(h);
-    if (size > 65535)
+
+    if (size > 65535) {
         res = -__LINE__;
-    else
+    } else { 
         res = ccn_parse_interest(msg, size, pi, comps);
+    }
     if (res < 0) {
         ccnd_msg(h, "error parsing Interest - code %d", res);
         ccn_indexbuf_destroy(&comps);
         return;
     }
+    flatname = ccn_charbuf_create();
+    ccn_flatname_append_from_ccnb(flatname, msg, size, 0, -1);
+    if (strstr(flatname->buf, "GUARANTEE") != NULL) {
+        pi->control = GUARANTEE;
+    }
+    ccn_charbuf_destroy(&flatname);
+
     ccnd_meter_bump(h, face->meter[FM_INTI], 1);
     if (pi->scope >= 0 && pi->scope < 2 &&
              (face->flags & CCN_FACE_GG) == 0) {
@@ -4528,6 +5006,8 @@ process_incoming_interest(struct ccnd_handle *h, struct face *face,
             if (drop_nonlocal_interest(h, npe, face, msg, size))
                 return;
             propagate_interest(h, face, msg, pi, npe);
+            //Noted by xu: This means that the content name is in PIT. 
+            //            Thus propagate the interest
             return;
         }
         if (h->debug & 16) {
@@ -4598,12 +5078,31 @@ process_incoming_interest(struct ccnd_handle *h, struct face *face,
                 content = last_match;
             if (content != NULL) {
                 /* Check to see if we are planning to send already */
+                /*Noted by xu:
+                     Here means this node found the content in its cs */
                 enum cq_delay_class c;
                 for (c = 0, k = -1; c < CCN_CQ_N && k == -1; c++)
-                    if (face->q[c] != NULL)
-                        k = ccn_indexbuf_member(face->q[c]->send_queue, content->accession);
+                    if (face->q[c] != NULL){
+                        if(content->control == GUARANTEE)
+                            k = ccn_indexbuf_member(face->q[c]->send_queue, content->accession_g);
+                        else
+                            k = ccn_indexbuf_member(face->q[c]->send_queue, content->accession);
+
+                    }
                 if (k == -1) {
-                    k = face_send_queue_insert(h, face, content);
+                    /* <!--kuwayama */
+                    //if (pi->control == GUARANTEE || strstr(flatname->buf, "GUARANTEE") != NULL) {
+                    if (strstr(flatname->buf, "GUARANTEE") != NULL) {
+                      content->flags = CCN_CQ_GUARANTEE;
+                      content->control = GUARANTEE;//add by xu
+                    }
+                    else {
+                      content->control = DEFAULT;//add by xu
+                    }
+
+                    /*  add by xu end -->*/
+                    /*  kuwayama--> */
+                    k = face_send_queue_insert_qos(h, face, content);
                     if (k >= 0) {
                         if (h->debug & (32 | 8))
                             ccnd_debug_ccnb(h, __LINE__, "consume", face, msg, size);
@@ -4616,8 +5115,9 @@ process_incoming_interest(struct ccnd_handle *h, struct face *face,
                 matched = 1;
             }
         }
-        if (!matched && npe != NULL && (pi->answerfrom & CCN_AOK_EXPIRE) == 0)
+        if (!matched && npe != NULL && (pi->answerfrom & CCN_AOK_EXPIRE) == 0){
             propagate_interest(h, face, msg, pi, npe);
+        }
     Bail:
         hashtb_end(e);
     }
@@ -4779,34 +5279,117 @@ content_tree_trim(struct ccnd_handle *h) {
     int tries;
     struct content_entry *c;
     struct content_entry *nextx;
-    
+
     if (h->content_tree->n <= h->capacity)
         return;
-    tries = 30;
+    tries = 3000;
+    for (c = h->headx->nextx; c != h->headx; c = nextx) {
+        nextx = c->nextx;
+        //ccnd_msg(h, "TRIM_G: ##########content type: %d", c->control);
+        if(c->control != GUARANTEE){
+            content_dequeuex(h, c);
+            remove_content(h, c);
+            if (h->content_tree->n <= h->capacity)
+                return;
+        }
+    }
+
+
+    /*
+
     for (c = h->headx->nextx; c != h->headx; c = nextx) {
         nextx = c->nextx;
-        if (c->refs == 0) {
+        if(c->control == GUARANTEE){
+          // continue;
+        }        
+
+        if (c->refs == 0 && c->control != GUARANTEE ) {
+            content_dequeuex(h, c);
             remove_content(h, c);
             if (h->content_tree->n <= h->capacity)
                 return;
         }
         else if (!is_stale(h, c)) {
+     */
             /* add to no new queues so it will drain eventually */
-            mark_stale(h, c);
+      /*      mark_stale(h, c);
             if (h->debug & 4)
                 ccnd_debug_content(h, __LINE__, "force_stale", NULL, c);
             break;
         }
         else if (--tries <= 0)
             break;
-    }
+    }*/
     if (h->content_tree->n > h->content_tree->limit) {
         /* we've tried and failed to preserve queued content */
         c = h->headx->nextx;
-        if (c != h->headx)
+        if (c != h->headx && c->control != GUARANTEE)
             remove_content(h, c); /* logs remove_queued_content */
     }
 }
+/**
+ * Discard content as needed to enforce capacity limit
+ */
+void
+content_tree_g_trim(struct ccnd_handle *h) {
+    int tries;
+    struct content_entry *c;
+    struct content_entry *nextx;
+
+    if (h->content_tree_g->n <= h->capacity_g)
+        return;
+    tries = 3000;
+    for (c = h->headx->nextx; c != h->headx; c = nextx) {
+        nextx = c->nextx;
+        //ccnd_msg(h, "TRIM_G: ##########content type: %d", c->control);
+        if(c->control == GUARANTEE){
+            content_dequeuex(h, c);
+            remove_content(h, c);
+            if (h->content_tree_g->n <= h->capacity_g)
+                return;
+
+        }
+    }
+    /*
+    for (c = h->headx->nextx; c != h->headx; c = nextx) {
+        nextx = c->nextx;
+        ccnd_msg(h, "TRIM_G: content type: %d", c->control);
+        if(c->control == GUARANTEE){
+          // continue;
+        }        
+
+        ccnd_msg(h, "TRIM_G:c->refs: %d", c->refs);
+
+        if (c->refs == 0 && c->control == GUARANTEE) {
+        
+            ccnd_msg(h, "TRIM_G:@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ GUARANTEE");
+            content_dequeuex(h, c);
+            remove_content(h, c);
+            if (h->content_tree_g->n <= h->capacity_g)
+                return;
+        }
+        else if (!is_stale(h, c)) {*/
+            /* add to no new queues so it will drain eventually */
+   /*
+            ccnd_msg(h, "TRIM_G: mark stale");
+            mark_stale(h, c);
+            if (h->debug & 4)
+                ccnd_debug_content(h, __LINE__, "force_stale", NULL, c);
+            break;
+        }
+        else if (--tries <= 0){
+            ccnd_msg(h, "TRIM_G: break");
+            break;}
+    }*/
+    if (h->content_tree_g->n > h->content_tree_g->limit) {
+        ccnd_msg(h, "TRIM_G: n is still greater than limit content type: %d", c->control);
+        /* we've tried and failed to preserve queued content */
+        c = h->headx->nextx;
+        if (c != h->headx && c->control == GUARANTEE)
+            remove_content(h, c); /* logs remove_queued_content */
+    }
+}
+
 
 /**
  * Process an arriving ContentObject.
@@ -4840,10 +5423,8 @@ process_incoming_content(struct ccnd_handle *h, struct face *face,
     struct ccn_charbuf *f = charbuf_obtain(h);
     struct ccny *y = NULL;
     ccn_cookie ocookie;
-    
     msg = wire_msg;
-    size = wire_size;
-    
+    size = wire_size;    
     res = ccn_parse_ContentObject(msg, size, &obj, comps);
     if (res < 0) {
         ccnd_msg(h, "error parsing ContentObject - code %d", res);
@@ -4868,6 +5449,11 @@ process_incoming_content(struct ccnd_handle *h, struct face *face,
         if (h->content_tree->limit < h->capacity + CCND_CACHE_MARGIN)
             ccn_nametree_grow(h->content_tree);
     }
+    // modified by xu for g content store 
+    if (h->content_tree_g->n >= h->content_tree_g->limit) {
+        if (h->content_tree_g->limit < h->capacity_g + CCND_CACHE_MARGIN)
+            ccn_nametree_grow(h->content_tree_g);
+    }
     ccn_flatname_append_from_ccnb(f, msg, size, 0, -1);
     ccn_flatname_append_component(f, obj.digest, obj.digest_bytes);
     y = ccny_create(nrand48(h->seed), sizeof(*content));
@@ -4877,11 +5463,36 @@ process_incoming_content(struct ccnd_handle *h, struct face *face,
         goto Bail;
     }
     content = ccny_payload(y); /* Allocated by ccny_create */
-    ocookie = ccny_enroll(h->content_tree, y);
+    content->control = obj.control;//add by xu
+    int c;
+    if (strstr(f->buf, "GUARANTEE") != NULL) {
+        content->control = GUARANTEE;//add by xu
+        obj.control = GUARANTEE;
+        ocookie = ccny_enroll(h->content_tree_g, y);  
+        c = ccny_cookie(y);
+    }else{
+        content->control = DEFAULT;//add by xu
+        obj.control = DEFAULT;
+        ocookie = ccny_enroll(h->content_tree, y); 
+        c = ccny_cookie(y);
+    }
+
+    //ccnd_msg(h, "content tree: %d, %d", h->content_tree->n, h->content_tree_g->n);
+    //ccnd_msg(h, "ccny enroll OCOOKIE:if not 0, has aready present %d", ocookie); 
+    //ccnd_msg(h, "ccny cookie OCOOKIE:if 0, drop  %d", c); 
     if (ocookie != 0) {
         /* An entry was already present */
-        ccny_destroy(h->content_tree, &y);
-        content = ccny_payload(ccny_from_cookie(h->content_tree, ocookie));
+        // modified by xu for g content store 
+        //if (content->control == GUARANTEE || obj.control == GUARANTEE || strstr(f->buf, "GUARANTEE") != NULL) {
+        if (strstr(f->buf, "GUARANTEE") != NULL) {
+            ccny_destroy(h->content_tree_g, &y);
+        // modified by xu for g content store 
+        // todo: handle multiple content trees
+            content = ccny_payload(ccny_from_cookie(h->content_tree_g, ocookie));
+        }else{
+            ccny_destroy(h->content_tree, &y);
+            content = ccny_payload(ccny_from_cookie(h->content_tree, ocookie));
+        }
         if (is_stale(h, content)) {
             /* When old content arrives after it has gone stale, freshen it */
             // XXX - ought to do mischief checks before this
@@ -4906,12 +5517,18 @@ process_incoming_content(struct ccnd_handle *h, struct face *face,
     }
     else {
         res = -__LINE__;
-        content->accession = ccny_cookie(y);
+        //if (obj.control == GUARANTEE || strstr(f->buf, "GUARANTEE") != NULL) {
+        if (strstr(f->buf, "GUARANTEE") != NULL) {
+            content->accession_g = ccny_cookie(y);
+        }else{
+            content->accession = ccny_cookie(y);
+        }
         content->arrival_faceid = face->faceid;
         content->ncomps = comps->n + 1;
         content->ccnb = malloc(size);
-        if (content->ccnb == NULL)
+        if (content->ccnb == NULL){
             goto Bail;
+        }
         content->size = size;
         memcpy(content->ccnb, msg, size);
         set_content_timer(h, content, &obj);
@@ -4921,20 +5538,42 @@ process_incoming_content(struct ccnd_handle *h, struct face *face,
         res = 1;
     }
 Bail:
-    indexbuf_release(h, comps);
-    charbuf_release(h, f);
-    f = NULL;
     if (res < 0) {
+        indexbuf_release(h, comps);
         ccnd_debug_ccnb(h, -res, "content_dropped", face, msg, size);
-        ccny_destroy(h->content_tree, &y);
+        // modified by xu for g content store 
+        // todo: handle multiple content trees
+        
+        if (strstr(f->buf, "GUARANTEE") != NULL) {
+            ccny_destroy(h->content_tree_g, &y);
+        }else{
+            ccny_destroy(h->content_tree, &y);
+        }
+        ccnd_msg(h, "obj %d", obj.control);
+        ccnd_msg(h, "f:%s", f->buf);
+        if(content != NULL)
+            ccnd_msg(h, "GUARANTEE: %d", -5409);
         if (content != NULL) abort();
     }
     else {
         int n_matches;
         enum cq_delay_class c;
         struct content_queue *q;
-        if (content == NULL) abort();
-        n_matches = match_interests(h, content, &obj, NULL, face);
+
+        if (content == NULL){
+	    ccnd_msg(h,"content null");
+	    abort();
+	}
+        if (strstr(f->buf, "GUARANTEE") != NULL) {
+          content->flags = CCN_CQ_GUARANTEE;  
+          content->control = GUARANTEE;//add by xu
+          n_matches = match_interests(h, content, &obj, NULL, face); //send out 
+        }
+        else {
+          content->control = DEFAULT;//add by xu
+	  n_matches = match_interests(h, content, &obj, NULL, face);
+        }
+        indexbuf_release(h, comps);
         if (res == 1) {
             if (n_matches < 0) {
                 remove_content(h, content);
@@ -4963,7 +5602,17 @@ process_incoming_content(struct ccnd_handle *h, struct face *face,
                 }
             }
         }
-        content_tree_trim(h);
+        // todo: handle multiple content tree
+        //       consider whether the handle should be inside or outside of content_tree_trim
+
+
+        if ( strstr(f->buf, "GUARANTEE") != NULL) {
+            content_tree_g_trim(h);
+        }else{
+            content_tree_trim(h);
+        }
+        charbuf_release(h, f);
+        f = NULL;
     }
 }
 
@@ -5063,7 +5712,7 @@ ccnd_new_face_msg(struct ccnd_handle *h, struct face *face)
         peer = inet_ntop(addr->sa_family, rawaddr, printable, sizeof(printable));
     if (peer == NULL)
         peer = "(unknown)";
-    ccnd_msg(h,
+	ccnd_msg(h,
              "accepted datagram client id=%d (flags=0x%x) %s port %d",
              face->faceid, face->flags, peer, port);
 }
@@ -5587,8 +6236,11 @@ ccnd_run(struct ccnd_handle *h)
     int prev_timeout_ms = -1;
     int usec;
     for (h->running = 1; h->running;) {
-        process_internal_client_buffer(h);
-        usec = ccn_schedule_run(h->sched);
+	process_internal_client_buffer(h);
+        /* <!--kuwayama */
+        //commented by xu//usec = ccn_schedule_run_qos(h->sched, h->drr);
+        /*  kuwayama--> */
+        usec = ccn_schedule_run(h->sched);//add by xu
         timeout_ms = (usec < 0) ? -1 : ((usec + 960) / 1000);
         if (timeout_ms == 0 && prev_timeout_ms == 0)
             timeout_ms = 1;
@@ -5988,6 +6640,57 @@ ccnd_parse_uri_list(struct ccnd_handle *h, const char *what, const char *uris)
     return(ans);
 }
 
+
+/* <!--kuwayama */
+/* <!-- commented by xu
+struct reserve_list *rlist_create(void) {
+    struct reserve_list *p;
+    
+    p = (struct reserve_list *)malloc(sizeof(struct reserve_list));
+    p->flatname = ccn_charbuf_create();
+    p->faceid = 0;
+    p->next = NULL;
+    p->prev = NULL;
+    return p;
+}
+
+void rlist_destroy(struct ccnd_handle *h, struct reserve_list *p) {
+    struct reserve_list *next, *prev;
+
+    if (p == NULL || h->rlist_head == NULL)
+        return;
+    next = p->next;
+    prev = p->prev;
+    if (p == h->rlist_head)
+        h->rlist_head = next;
+    ccn_charbuf_destroy(p->flatname);
+    free(p);
+    if (next != NULL)
+        next->prev = prev;
+    if (prev != NULL)
+        prev->next = next;
+}
+
+void rlist_append(struct ccnd_handle *h, struct reserve_list *p) {
+    struct reserve_list *tail;
+
+    if (p == NULL || h->rlist_head == NULL)
+        return;
+    tail = h->rlist_head;
+    while (tail->next != NULL)
+        tail = tail->next;
+    tail->next = p;
+    p->prev = tail;
+}
+
+void rlist_clear(struct ccnd_handle *h) {
+    while (h->rlist_head != NULL)
+        rlist_destroy(h, h->rlist_head);
+}
+  commented by xu end -->*/
+/*  kuwayama--> */
+
+
 /**
  * Start a new ccnd instance
  * @param progname - name of program binary, used for locating helpers
@@ -6001,6 +6704,7 @@ ccnd_create(const char *progname, ccnd_logger logger, void *loggerdata)
     const char *portstr;
     const char *debugstr;
     const char *entrylimit;
+    const char *entrylimit_g;
     const char *mtu;
     const char *data_pause;
     const char *tts_default;
@@ -6012,6 +6716,7 @@ ccnd_create(const char *progname, ccnd_logger logger, void *loggerdata)
     struct ccnd_handle *h;
     struct hashtb_param param = {0};
     unsigned cap;
+    unsigned cap_g;
     
     sockname = ccnd_get_local_sockname();
     h = calloc(1, sizeof(*h));
@@ -6048,12 +6753,21 @@ ccnd_create(const char *progname, ccnd_logger logger, void *loggerdata)
     h->headx->nextx = h->headx->prevx = h->headx;
     h->ex_index = ccn_nametree_create(1);
     h->ex_index->compare = &ex_index_cmp;
+    ccnd_msg(h, "=======================ex index n: %d", h->ex_index->n);
+    ccnd_msg(h, "=======================ex index l: %d", h->ex_index->limit);
     h->send_interest_scratch = ccn_charbuf_create();
     h->ticktock.descr[0] = 'C';
     h->ticktock.micros_per_base = 1000000;
     h->ticktock.gettime = &ccnd_gettime;
     h->ticktock.data = h;
     h->sched = ccn_schedule_create(h, &h->ticktock);
+
+    //add by Fumiya
+    struct ccn_timeval start;
+    h->ticktock.gettime(&h->ticktock,&start);
+    h->last_update_qos = start;
+    //add by Fumiya End
+
     h->starttime = h->sec;
     h->starttime_usec = h->usec;
     h->wtnow = 0xFFFF0000; /* provoke a rollover early on */
@@ -6067,21 +6781,39 @@ ccnd_create(const char *progname, ccnd_logger logger, void *loggerdata)
     }
     else
         h->debug = 1;
-    portstr = getenv(CCN_LOCAL_PORT_ENVNAME);
+    portstr = getenv("CCN_LOCAL_PORT_ENVNAME");
     if (portstr == NULL || portstr[0] == 0 || strlen(portstr) > 10)
         portstr = CCN_DEFAULT_UNICAST_PORT;
     h->portstr = portstr;
     entrylimit = getenv("CCND_CAP");
-    h->capacity = (~0U)/2;
+    entrylimit_g = getenv("CCND_CAP_G");
+    h->capacity = (~0U)/2; 
+    h->capacity_g = (~0U)/2; 
     if (entrylimit != NULL && entrylimit[0] != 0)
         h->capacity = strtoul(entrylimit, NULL, 10);
+    if (entrylimit_g != NULL && entrylimit_g[0] != 0)
+        h->capacity_g = strtoul(entrylimit_g, NULL, 10);
+
     ccnd_msg(h, "CCND_DEBUG=%d CCND_CAP=%lu", h->debug, h->capacity);
-    cap = 100000; /* Don't try to allocate an insanely high number */
+    ccnd_msg(h, "CCND_DEBUG=%d CCND_CAP_G=%lu", h->debug, h->capacity_g);
+    //cap = 100000; /* Don't try to allocate an insanely high number */
+    cap = 1000000;//modified by xu /* Don't try to allocate an insanely high number */
+    cap_g = 1000000;//modified by xu /* Don't try to allocate an insanely high number */
     cap = h->capacity < cap ? h->capacity : cap;
+    cap_g = h->capacity_g < cap_g ? h->capacity_g : cap_g;
+
     h->content_tree = ccn_nametree_create(cap);
     h->content_tree->data = h;
     h->content_tree->pre_remove = &content_preremove;
     h->content_tree->finalize = &content_finalize;
+
+    // modified by xu for g content store 
+    h->content_tree_g = ccn_nametree_create(cap_g);
+    h->content_tree_g->data = h;
+    h->content_tree_g->pre_remove = &content_preremove;
+    h->content_tree_g->finalize = &content_finalize;
+
+    // todo: may need a contetn tree for DEFAULT contents
     h->mtu = 0;
     mtu = getenv("CCND_MTU");
     if (mtu != NULL && mtu[0] != 0) {
@@ -6221,6 +6953,9 @@ ccnd_destroy(struct ccnd_handle **pccnd)
         h->face_limit = h->face_gen = 0;
     }
     ccn_nametree_destroy(&h->content_tree);
+    // modified by xu for g content store 
+    ccn_nametree_destroy(&h->content_tree_g);
+
     ccn_nametree_destroy(&h->ex_index);
     ccn_charbuf_destroy(&h->send_interest_scratch);
     ccn_charbuf_destroy(&h->scratch_charbuf);
@@ -6242,3 +6977,112 @@ ccnd_destroy(struct ccnd_handle **pccnd)
     free(h);
     *pccnd = NULL;
 }
+
+// add by xu
+
+/**
+* @brief Init queue.
+* @param[out] q Queue structure
+* @param[in] capacity Initial queue capacity
+* @return None
+*/
+void queue_init(queue_t *q, const int capacity) {
+    q->front = 0;
+    q->rear = 0;
+    q->capacity = capacity;
+    q->elems = (queue_elem_t*)malloc(capacity * sizeof(queue_elem_t));
+}
+
+/**
+* @brief Release queue.
+* @param[inout] q Queue structure
+* @return None
+*/
+void queue_uninit(queue_t *q) {
+    q->front = 0;
+    q->rear = 0;
+    q->capacity = 0;
+    free(q->elems);
+    q->elems = NULL;
+}
+
+/**
+* @brief if the queue is empty.
+* @param[in] q Queue structure
+* @return Empty return TRUE,NOT empty return FALSE
+*/
+bool queue_empty(const queue_t *q) {
+    return q->front == q->rear;
+}
+
+/**
+* @brief Get the number of elements.
+* @param[in] q Queue structure
+* @return number of elements
+*/
+long int queue_size(const queue_t *q) {
+    return (q->rear - q->front + q->capacity) % q->capacity;
+}
+
+/**
+* @brief Append an element to the tail of the queue
+* @param[in] q Queue structure
+* @param[in] x the element to be appended
+* @return None
+*/
+void queue_push(queue_t *q, const queue_elem_t x) {
+    if ((q->rear + 1) % q->capacity == q->front)
+    {
+        // Queue is full, rellocate memory
+        queue_elem_t* tmp = (queue_elem_t*)malloc(q->capacity * 2 * sizeof(queue_elem_t));
+        if (q->front < q->rear)
+        {
+            memcpy(tmp, q->elems + q->front, (q->rear - q->front) * sizeof(queue_elem_t));
+            q->rear -= q->front;
+            q->front = 0;
+        }
+        else if (q->front > q->rear)
+        {
+            /* Copy data between q->front and q->capacity */
+            memcpy(tmp, q->elems + q->front, (q->capacity - q->front) * sizeof(queue_elem_t));
+            /* Copy data between q->data[0] and q->data[rear] */
+            memcpy(tmp + (q->capacity - q->front), q->elems, q->rear * sizeof(queue_elem_t));
+            q->rear += q->capacity - q->front;
+            q->front = 0;
+        }
+        free(q->elems);
+        q->elems = tmp;
+        q->capacity *= 2;
+    }
+    q->elems[q->rear] = x;
+    q->elems[q->rear] = x;
+    q->rear = (q->rear + 1) % q->capacity;
+}
+
+
+/**
+* @brief Delete an element from the head of the queue.
+* @param[in] q Queue structure
+* @return None
+*/
+void queue_pop(queue_t *q) {
+    q->front = (q->front + 1) % q->capacity;
+}
+
+/**
+* @brief Get first element of the queue, not pop.
+* @param[in] q Queue structure
+* @return Firest element of the queue
+*/
+queue_elem_t queue_front(const queue_t *q) {
+    return q->elems[q->front];
+}
+
+/**
+* @brief Get last element of the queue.
+* @param[in] q Queue structure
+* @return Last element of the queue
+*/
+queue_elem_t queue_back(const queue_t *q) {
+    return q->elems[q->rear - 1];
+}
diff --git a/csrc/ccnd/ccnd.c2 b/csrc/ccnd/ccnd.c2
new file mode 100644
index 0000000000..ae19fdc5de
--- /dev/null
+++ b/csrc/ccnd/ccnd.c2
@@ -0,0 +1,7076 @@
+/*
+ *
+ * ccnd/ccnd.c
+ *
+ * Main program of ccnd - the CCNx Daemon
+ *
+ * Copyright (C) 2008-2013 Palo Alto Research Center, Inc.
+ *
+ * This work is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ * This work is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details. You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+/**
+ * Main program of ccnd - the CCNx Daemon
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <netdb.h>
+#include <poll.h>
+#include <signal.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+
+#if defined(NEED_GETADDRINFO_COMPAT)
+    #include "getaddrinfo.h"
+    #include "dummyin6.h"
+#endif
+
+#include <ccn/bloom.h>
+#include <ccn/ccn.h>
+#include <ccn/ccn_private.h>
+#include <ccn/ccnd.h>
+#include <ccn/charbuf.h>
+#include <ccn/face_mgmt.h>
+#include <ccn/flatname.h>
+#include <ccn/hashtb.h>
+#include <ccn/indexbuf.h>
+#include <ccn/nametree.h>
+#include <ccn/schedule.h>
+#include <ccn/reg_mgmt.h>
+#include <ccn/strategy_mgmt.h>
+#include <ccn/uri.h>
+
+#include "ccnd_private.h"
+
+static void cleanup_at_exit(void);
+static void unlink_at_exit(const char *path);
+static int create_local_listener(struct ccnd_handle *h, const char *sockname, int backlog);
+static struct face *record_connection(struct ccnd_handle *h,
+                                      int fd,
+                                      struct sockaddr *who,
+                                      socklen_t wholen,
+                                      int setflags);
+static void process_input_message(struct ccnd_handle *h, struct face *face,
+                                  unsigned char *msg, size_t size, int pdu_ok);
+static void process_input(struct ccnd_handle *h, int fd);
+static int ccn_stuff_interest(struct ccnd_handle *h,
+                              struct face *face, struct ccn_charbuf *c);
+static void do_deferred_write(struct ccnd_handle *h, int fd);
+static struct face *get_dgram_source(struct ccnd_handle *h, struct face *face,
+                                     struct sockaddr *addr, socklen_t addrlen,
+                                     int why);
+static struct content_entry *content_from_accession(struct ccnd_handle *h,
+                                                    ccn_cookie accession);
+static struct content_entry *content_from_accession_qos(struct ccnd_handle *h, 
+                                                        ccn_cookie accession, 
+                                                        enum controlpacketid control);
+static int is_stale(struct ccnd_handle *h, struct content_entry *content);
+static void mark_stale(struct ccnd_handle *h,
+                       struct content_entry *content);
+static struct content_entry *content_next(struct ccnd_handle *h,
+                                          struct content_entry *content);
+static void reap_needed(struct ccnd_handle *h, int init_delay_usec);
+static void check_comm_file(struct ccnd_handle *h);
+static int nameprefix_seek(struct ccnd_handle *h,
+                           struct hashtb_enumerator *e,
+                           const unsigned char *msg,
+                           struct ccn_indexbuf *comps,
+                           int ncomps);
+static void register_new_face(struct ccnd_handle *h, struct face *face);
+static void update_forward_to(struct ccnd_handle *h,
+                              struct nameprefix_entry *npe);
+static void stuff_and_send(struct ccnd_handle *h, struct face *face,
+                           const unsigned char *data1, size_t size1,
+                           const unsigned char *data2, size_t size2,
+                           const char *tag, int lineno);
+/*<!-- add by xu*/
+static void stuff_and_send_qos(struct ccnd_handle *h, struct face *face,
+                           const unsigned char *data1, size_t size1,
+                           const unsigned char *data2, size_t size2,
+                           const char *tag, int lineno, enum controlpacketid control);
+/*add by xu end -->*/
+static void ccn_link_state_init(struct ccnd_handle *h, struct face *face);
+static void ccn_append_link_stuff(struct ccnd_handle *h,
+                                  struct face *face,
+                                  struct ccn_charbuf *c);
+static int process_incoming_link_message(struct ccnd_handle *h,
+                                         struct face *face, enum ccn_dtag dtag,
+                                         unsigned char *msg, size_t size);
+static void process_internal_client_buffer(struct ccnd_handle *h);
+static int nonce_ok(struct ccnd_handle *h, struct face *face,
+                    const unsigned char *interest_msg,
+                    struct ccn_parsed_interest *pi,
+                    const unsigned char *nonce, size_t noncesize);
+static void
+pfi_destroy(struct ccnd_handle *h, struct interest_entry *ie,
+            struct pit_face_item *p);
+static struct pit_face_item *
+pfi_set_nonce(struct ccnd_handle *h, struct interest_entry *ie,
+             struct pit_face_item *p,
+             const unsigned char *nonce, size_t noncesize);
+static int
+pfi_nonce_matches(struct pit_face_item *p,
+                  const unsigned char *nonce, size_t size);
+static struct pit_face_item *
+pfi_copy_nonce(struct ccnd_handle *h, struct interest_entry *ie,
+             struct pit_face_item *p, const struct pit_face_item *src);
+static int
+pfi_unique_nonce(struct ccnd_handle *h, struct interest_entry *ie,
+                 struct pit_face_item *p);
+static int wt_compare(ccn_wrappedtime, ccn_wrappedtime);
+static void
+update_npe_children(struct ccnd_handle *h, struct nameprefix_entry *npe, unsigned faceid);
+static void
+pfi_set_expiry_from_lifetime(struct ccnd_handle *h, struct interest_entry *ie,
+                             struct pit_face_item *p, intmax_t lifetime);
+static struct pit_face_item *
+pfi_seek(struct ccnd_handle *h, struct interest_entry *ie,
+         unsigned faceid, unsigned pfi_flag);
+static void strategy_callout(struct ccnd_handle *h,
+                             struct interest_entry *ie,
+                             enum ccn_strategy_op op,
+                             unsigned faceid);
+
+#ifndef CCND_WTHZ
+/**
+ * Frequency of wrapped timer
+ *
+ * This should divide 1000000 evenly.  Making this too large reduces the
+ * maximum supported interest lifetime, and making it too small makes the
+ * timekeeping too coarse.
+ */
+#define CCND_WTHZ 1000U
+#endif
+
+#define WTHZ ((unsigned)(CCND_WTHZ))
+
+#ifndef CCND_CACHE_MARGIN
+/**
+ * Allow a few extra entries in the cache to allow for output queuing
+ */
+#define CCND_CACHE_MARGIN 3
+#endif
+
+#ifndef CCND_MAX_MATCH_PROBES
+/**
+ * Maximum number of probes when searching the cache for a match
+ */
+#define CCND_MAX_MATCH_PROBES 50000
+#endif
+
+/**
+ * Name of our unix-domain listener
+ *
+ * This tiny bit of global state is needed so that the unix-domain listener
+ * can be removed at shutdown.
+ */
+static const char *unlink_this_at_exit = NULL;
+
+static void
+cleanup_at_exit(void)
+{
+    if (unlink_this_at_exit != NULL) {
+        unlink(unlink_this_at_exit);
+        unlink_this_at_exit = NULL;
+    }
+}
+
+static void
+handle_fatal_signal(int sig)
+{
+    cleanup_at_exit();
+    _exit(sig);
+}
+
+/**
+ * Record the name of the unix-domain listener
+ *
+ * Sets up signal handlers in case we are stopping due to a signal.
+ */
+static void
+unlink_at_exit(const char *path)
+{
+    if (unlink_this_at_exit == NULL) {
+        static char namstor[sizeof(struct sockaddr_un)];
+        strncpy(namstor, path, sizeof(namstor));
+        unlink_this_at_exit = namstor;
+        signal(SIGTERM, &handle_fatal_signal);
+        signal(SIGINT, &handle_fatal_signal);
+        signal(SIGHUP, &handle_fatal_signal);
+        atexit(&cleanup_at_exit);
+    }
+}
+
+/**
+ * Check to see if the unix-domain listener has been unlinked
+ *
+ * @returns 1 if the file is there, 0 if not.
+ */
+static int
+comm_file_ok(void)
+{
+    struct stat statbuf;
+    int res;
+    if (unlink_this_at_exit == NULL)
+        return(1);
+    res = stat(unlink_this_at_exit, &statbuf);
+    if (res == -1)
+        return(0);
+    return(1);
+}
+
+/**
+ * Obtain a charbuf for short-term use
+ */
+static struct ccn_charbuf *
+charbuf_obtain(struct ccnd_handle *h)
+{
+    struct ccn_charbuf *c = h->scratch_charbuf;
+    if (c == NULL)
+        return(ccn_charbuf_create());
+    h->scratch_charbuf = NULL;
+    c->length = 0;
+    return(c);
+}
+
+/**
+ * Release a charbuf for reuse
+ */
+static void
+charbuf_release(struct ccnd_handle *h, struct ccn_charbuf *c)
+{
+    c->length = 0;
+    if (h->scratch_charbuf == NULL)
+        h->scratch_charbuf = c;
+    else
+        ccn_charbuf_destroy(&c);
+}
+
+/**
+ * Obtain an indexbuf for short-term use
+ */
+static struct ccn_indexbuf *
+indexbuf_obtain(struct ccnd_handle *h)
+{
+    struct ccn_indexbuf *c = h->scratch_indexbuf;
+    if (c == NULL)
+        return(ccn_indexbuf_create());
+    h->scratch_indexbuf = NULL;
+    c->n = 0;
+    return(c);
+}
+
+/**
+ * Release an indexbuf for reuse
+ */
+static void
+indexbuf_release(struct ccnd_handle *h, struct ccn_indexbuf *c)
+{
+    c->n = 0;
+    if (h->scratch_indexbuf == NULL)
+        h->scratch_indexbuf = c;
+    else
+        ccn_indexbuf_destroy(&c);
+}
+
+/**
+ * Looks up a face based on its faceid (private).
+ */
+static struct face *
+face_from_faceid(struct ccnd_handle *h, unsigned faceid)
+{
+    unsigned slot = faceid & MAXFACES;
+    struct face *face = NULL;
+    if (slot < h->face_limit) {
+        face = h->faces_by_faceid[slot];
+        if (face != NULL && face->faceid != faceid)
+            face = NULL;
+    }
+    return(face);
+}
+
+/**
+ * Looks up a face based on its faceid.
+ */
+struct face *
+ccnd_face_from_faceid(struct ccnd_handle *h, unsigned faceid)
+{
+    return(face_from_faceid(h, faceid));
+}
+
+/** Accessor for faceid */
+unsigned
+face_faceid(struct face *face)
+{
+    if (face == NULL)
+        return(CCN_NO_FACEID);
+    return(face->faceid);
+}
+
+/** Accessor for number of pending interests received on a face */
+int
+face_pending_interests(struct face *face)
+{
+    if (face == NULL)
+        return(0);
+    return(face->pending_interests);
+}
+
+/** Accessor for number of outstanding interests sent on a face */
+int
+face_outstanding_interests(struct face *face)
+{
+    if (face == NULL)
+        return(0);
+    return(face->outstanding_interests);
+}
+
+/**
+ * Assigns the faceid for a nacent face,
+ * calls register_new_face() if successful.
+ */
+static int
+enroll_face(struct ccnd_handle *h, struct face *face)
+{
+    unsigned i;
+    unsigned n = h->face_limit;
+    struct face **a = h->faces_by_faceid;
+    for (i = h->face_rover; i < n; i++)
+        if (a[i] == NULL) goto use_i;
+    for (i = 0; i < n; i++)
+        if (a[i] == NULL) {
+            /* bump gen only if second pass succeeds */
+            h->face_gen += MAXFACES + 1;
+            goto use_i;
+        }
+    i = (n + 1) * 3 / 2;
+    if (i > MAXFACES) i = MAXFACES;
+    if (i <= n)
+        return(-1); /* overflow */
+    a = realloc(a, i * sizeof(struct face *));
+    if (a == NULL)
+        return(-1); /* ENOMEM */
+    h->face_limit = i;
+    while (--i > n)
+        a[i] = NULL;
+    h->faces_by_faceid = a;
+use_i:
+    a[i] = face;
+    h->face_rover = i + 1;
+    face->faceid = i | h->face_gen;
+    face->meter[FM_BYTI] = ccnd_meter_create(h, "bytein");
+    face->meter[FM_BYTO] = ccnd_meter_create(h, "byteout");
+    face->meter[FM_INTI] = ccnd_meter_create(h, "intrin");
+    face->meter[FM_INTO] = ccnd_meter_create(h, "introut");
+    face->meter[FM_DATI] = ccnd_meter_create(h, "datain");
+    face->meter[FM_DATO] = ccnd_meter_create(h, "dataout");
+    register_new_face(h, face);
+    return (face->faceid);
+}
+
+/**
+ * Decide how much to delay the content sent out on a face.
+ *
+ * Units are microseconds. 
+ */
+static int
+choose_face_delay(struct ccnd_handle *h, struct face *face, enum cq_delay_class c)
+{
+    int micros;
+    int shift;
+    
+    if (c == CCN_CQ_ASAP)
+        return(1);
+    /* <!--kuwayama */
+    if (c == CCN_CQ_GUARANTEE)
+      return(CCN_CQ_GUARANTEE);
+    /*  kuwayama--> */
+    if ((face->flags & CCN_FACE_MCAST) != 0) {
+        shift = (c == CCN_CQ_SLOW) ? 2 : 0;
+        micros = (h->data_pause_microsec) << shift;
+        return(micros); /* multicast, delay more */
+    }
+    return(1);
+}
+
+/**
+ * Create a queue for sending content.
+ */
+static struct content_queue *
+content_queue_create(struct ccnd_handle *h, struct face *face, enum cq_delay_class c)
+{
+    struct content_queue *q;
+    unsigned usec;
+    q = calloc(1, sizeof(*q));
+    if (q != NULL) {
+        usec = choose_face_delay(h, face, c);
+        q->burst_nsec = (usec <= 500 ? 500 : 150000); // XXX - needs a knob
+        q->min_usec = usec;
+        q->rand_usec = 2 * usec;
+        q->nrun = 0;
+        q->send_queue = ccn_indexbuf_create();
+        q->control_queue = ccn_indexbuf_create();
+        if (q->send_queue == NULL) {
+            free(q);
+            return(NULL);
+        }
+        if (q->control_queue == NULL) {
+            free(q);
+            return(NULL);
+        }
+        q->sender = NULL;
+    }
+    return(q);
+}
+
+/**
+ * Destroy a queue.
+ */
+static void
+content_queue_destroy(struct ccnd_handle *h, struct content_queue **pq)
+{
+    struct content_queue *q;
+    struct ccn_indexbuf *s;
+    struct ccn_indexbuf *x;
+    struct content_entry *c;
+    int i;
+    
+    if (*pq != NULL) {
+        q = *pq;
+        s = q->send_queue;
+        x = q->control_queue;
+        
+        if (s != NULL) {
+            for (i = 0; i < s->n; i++) {
+                c = content_from_accession_qos(h, s->buf[i], x->buf[i]);
+                if (c != NULL)
+                    c->refs--;
+            }
+        }
+        ccn_indexbuf_destroy(&q->send_queue);
+        ccn_indexbuf_destroy(&q->control_queue);
+        if (q->sender != NULL) {
+            ccn_schedule_cancel(h->sched, q->sender);
+            q->sender = NULL;
+        }
+        free(q);
+        *pq = NULL;
+    }
+}
+
+/**
+ * Close an open file descriptor quietly.
+ */
+static void
+close_fd(int *pfd)
+{
+    if (*pfd != -1) {
+        close(*pfd);
+        *pfd = -1;
+    }
+}
+
+/**
+ * Close an open file descriptor, and grumble about it.
+ */
+static void
+ccnd_close_fd(struct ccnd_handle *h, unsigned faceid, int *pfd)
+{
+    int res;
+    
+    if (*pfd != -1) {
+        int linger = 0;
+        setsockopt(*pfd, SOL_SOCKET, SO_LINGER,
+                   &linger, sizeof(linger));
+        res = close(*pfd);
+        if (res == -1)
+            ccnd_msg(h, "close failed for face %u fd=%d: %s (errno=%d)",
+                     faceid, *pfd, strerror(errno), errno);
+        else
+            ccnd_msg(h, "closing fd %d while finalizing face %u", *pfd, faceid);
+        *pfd = -1;
+    }
+}
+
+uint32_t
+ccnd_random(struct ccnd_handle *h)
+{
+    return(nrand48(h->seed));
+}
+
+/**
+ * Associate a guid with a face.
+ *
+ * The same guid is shared among all the peers that communicate over the
+ * face, and no two faces at a node should have the same guid.
+ *
+ * @returns 0 for success, -1 for error.
+ */
+int
+ccnd_set_face_guid(struct ccnd_handle *h, struct face *face,
+                   const unsigned char *guid, size_t size)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct ccn_charbuf *c = NULL;
+    int res;
+    
+    if (size > 255)
+        return(-1);
+    if (face->guid != NULL)
+        return(-1);
+    if (h->faceid_by_guid == NULL)
+        return(-1);
+    c = ccn_charbuf_create();
+    ccn_charbuf_append_value(c, size, 1);
+    ccn_charbuf_append(c, guid, size);
+    hashtb_start(h->faceid_by_guid, e);
+    res = hashtb_seek(e, c->buf, c->length, 0);
+    ccn_charbuf_destroy(&c);
+    if (res < 0)
+        return(-1);
+    if (res == HT_NEW_ENTRY) {
+        face->guid = e->key;
+        *(unsigned *)(e->data) = face->faceid;
+        res = 0;
+    }
+    else
+        res = -1;
+    hashtb_end(e);
+    return(res);
+}
+
+/**
+ * Return the faceid associated with the guid.
+ */
+unsigned
+ccnd_faceid_from_guid(struct ccnd_handle *h,
+                      const unsigned char *guid, size_t size)
+{
+    struct ccn_charbuf *c = NULL;
+    unsigned *pfaceid = NULL;
+    
+    if (size > 255)
+        return(CCN_NOFACEID);
+    if (h->faceid_by_guid == NULL)
+        return(CCN_NOFACEID);
+    c = ccn_charbuf_create();
+    ccn_charbuf_append_value(c, size, 1);
+    ccn_charbuf_append(c, guid, size);
+    pfaceid = hashtb_lookup(h->faceid_by_guid, c->buf, c->length);
+    ccn_charbuf_destroy(&c);
+    if (pfaceid == NULL)
+        return(CCN_NOFACEID);
+    return(*pfaceid);
+}
+
+/**
+ * Append the guid associated with a face to a charbuf
+ *
+ * @returns the length of the appended guid, or -1 for error.
+ */
+int
+ccnd_append_face_guid(struct ccnd_handle *h, struct ccn_charbuf *cb,
+                      struct face *face)
+{
+    if (face == NULL || face->guid == NULL)
+        return(-1);
+    ccn_charbuf_append(cb, face->guid + 1, face->guid[0]);
+    return(face->guid[0]);
+}
+
+/**
+ * Forget the guid associated with a face.
+ *
+ * The first byte of face->guid is the length of the actual guid bytes.
+ */
+void
+ccnd_forget_face_guid(struct ccnd_handle *h, struct face *face)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    const unsigned char *guid;
+    int res;
+    
+    guid = face->guid;
+    face->guid = NULL;
+    ccn_charbuf_destroy(&face->guid_cob);
+    if (guid == NULL)
+        return;
+    if (h->faceid_by_guid == NULL)
+        return;
+    hashtb_start(h->faceid_by_guid, e);
+    res = hashtb_seek(e, guid, guid[0] + 1, 0);
+    if (res < 0)
+        return;
+    hashtb_delete(e);
+    hashtb_end(e);
+}
+
+/**
+ * Generate a new guid for a face
+ *
+ * This guid is useful for routing agents, as it gives an unambiguous way
+ * to talk about a connection between two nodes.
+ *
+ * lo and hi, if not NULL, are exclusive bounds for the generated guid.
+ * The size is in bytes, and refers to both the bounds and the result.
+ */
+void
+ccnd_generate_face_guid(struct ccnd_handle *h, struct face *face, int size,
+                        const unsigned char *lo, const unsigned char *hi)
+{
+    int i;
+    unsigned check = CCN_FACE_GG | CCN_FACE_UNDECIDED | CCN_FACE_PASSIVE;
+    unsigned want = 0;
+    uint_least64_t range;
+    uint_least64_t r;
+    struct ccn_charbuf *c = NULL;
+    
+    if ((face->flags & check) != want)
+        return;
+     /* XXX - This should be using higher-quality randomness */
+    if (lo != NULL && hi != NULL) {
+        /* Generate up to 64 additional random bits to augment guid */
+        for (i = 0; i < size && lo[i] == hi[i];)
+            i++;
+        if (i == size || lo[i] > hi[i])
+            return;
+        if (size - i > sizeof(range))
+            range = ~0;
+        else {
+            range = 0;
+            for (; i < size; i++)
+                range = (range << 8) + hi[i] - lo[i];
+        }
+        if (range < 2)
+            return;
+        c = ccn_charbuf_create();
+        ccn_charbuf_append(c, lo, size);
+        r = nrand48(h->seed);
+        r = (r << 20) ^ nrand48(h->seed);
+        r = (r << 20) ^ nrand48(h->seed);
+        r = r % (range - 1) + 1;
+        for (i = size - 1; r != 0 && i >= 0; i--) {
+            r = r + c->buf[i];
+            c->buf[i] = r & 0xff;
+            r = r >> 8;
+        }
+    }
+    else {
+        for (i = 0; i < size; i++)
+            ccn_charbuf_append_value(c, nrand48(h->seed) & 0xff, 1);
+    }
+    ccnd_set_face_guid(h, face, c->buf, c->length);
+    ccn_charbuf_destroy(&c);
+}
+
+/**
+ * Clean up when a face is being destroyed.
+ *
+ * This is called when an entry is deleted from one of the hash tables that
+ * keep track of faces.
+ */
+static void
+finalize_face(struct hashtb_enumerator *e)
+{
+    struct ccnd_handle *h = hashtb_get_param(e->ht, NULL);
+    struct face *face = e->data;
+    unsigned i = face->faceid & MAXFACES;
+    enum cq_delay_class c;
+    int recycle = 0;
+    int m;
+    
+    if (i < h->face_limit && h->faces_by_faceid[i] == face) {
+        if ((face->flags & CCN_FACE_UNDECIDED) == 0)
+            ccnd_face_status_change(h, face->faceid);
+        if (e->ht == h->faces_by_fd)
+            ccnd_close_fd(h, face->faceid, &face->recv_fd);
+        if ((face->guid) != NULL)
+            ccnd_forget_face_guid(h, face);
+        ccn_charbuf_destroy(&face->guid_cob);
+        h->faces_by_faceid[i] = NULL;
+        if ((face->flags & CCN_FACE_UNDECIDED) != 0 &&
+              face->faceid == ((h->face_rover - 1) | h->face_gen)) {
+            /* stream connection with no ccn traffic - safe to reuse */
+            recycle = 1;
+            h->face_rover--;
+        }
+        for (c = 0; c < CCN_CQ_N; c++)
+            content_queue_destroy(h, &(face->q[c]));
+        ccn_charbuf_destroy(&face->inbuf);
+        ccn_charbuf_destroy(&face->outbuf);
+        ccnd_msg(h, "%s face id %u (slot %u)",
+            recycle ? "recycling" : "releasing",
+            face->faceid, face->faceid & MAXFACES);
+        /* Don't free face->addr; storage is managed by hash table */
+    }
+    else if (face->faceid != CCN_NOFACEID)
+        ccnd_msg(h, "orphaned face %u", face->faceid);
+    if (face->lfaceattrs != NULL) {
+        free(face->lfaceattrs);
+        face->lfaceattrs = NULL;
+        face->nlfaceattr = 0;
+    }
+    for (m = 0; m < CCND_FACE_METER_N; m++)
+        ccnd_meter_destroy(&face->meter[m]);
+}
+
+static int
+faceattr_index_lookup(struct ccnd_handle *h, const char *name, int singlebit)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct faceattr_index_entry *entry = NULL;
+    int i;
+    int res;
+    
+    hashtb_start(h->faceattr_index_tab, e);
+    res = hashtb_seek(e, (const void *)name, strlen(name), 1);
+    entry = e->data;
+    if (res == HT_OLD_ENTRY)
+        i = entry->fa_index;
+    else if (res == HT_NEW_ENTRY) {
+        i = 32;
+        if (singlebit) {
+            for (i = 0; i < 32; i++) {
+                if ((h->faceattr_packed & (1U << i)) == 0) {
+                    h->faceattr_packed |= (1U << i);
+                    break;
+                }
+            }
+        }
+        if (i == 32)
+            i += (h->nlfaceattr++);
+        entry->fa_index = i;
+    }
+    else
+        i = -1;
+    hashtb_end(e);
+    return(i);
+}
+
+int
+faceattr_index_from_name(struct ccnd_handle *h, const char *name)
+{
+    return(faceattr_index_lookup(h, name, 0));
+}
+
+int
+faceattr_bool_index_from_name(struct ccnd_handle *h, const char *name)
+{
+    return(faceattr_index_lookup(h, name, 1));
+}
+
+int
+faceattr_index_allocate(struct ccnd_handle *h)
+{
+    int ans;
+    int i;
+    char id[20];
+    
+    id[0] = 0;
+    i = 32 + h->nlfaceattr;
+    snprintf(id, sizeof(id), "_%d", i);
+    ans = faceattr_index_from_name(h, id);
+    if (ans >= 0 && ans != i) abort();
+    return(ans);
+}
+
+int
+faceattr_index_free(struct ccnd_handle *h, int faceattr_index)
+{
+    /*
+     * Doing a careful job of this could be done:
+     *
+     * 1. enumerate faceattr_index_tab, looking for the assigned index.
+     * 2. remove it, and keep track of the free index
+     * 3. enumerate faces, clearing the associated values
+     *
+     * since all of that is probably more involved than the rest of
+     * the faceattr handling code, for now we simple don't attempt to
+     * re-use the index.
+     */
+    return(0);
+}
+
+int
+faceattr_set(struct ccnd_handle *h, struct face *face, int faceattr_index, unsigned value)
+{
+    unsigned *x = NULL;
+
+    if (face == NULL)
+        return(-1);
+    if (faceattr_index < 0)
+        return(-1);
+    if (faceattr_index < 32) {
+        if (value & 1)
+            face->faceattr_packed |= ((unsigned)1 << faceattr_index);
+        else
+            face->faceattr_packed &= ~((unsigned)1 << faceattr_index);
+        return(0);
+    }
+    x = face->lfaceattrs;
+    if (faceattr_index - 32 >= face->nlfaceattr) {
+        if (faceattr_index - 32 >= h->nlfaceattr)
+            return(-1);
+        if (value == 0)
+            return(0);
+        x = realloc(x, sizeof(unsigned) * (faceattr_index - 32 + 1));
+        if (x == NULL)
+            return(-1);
+        while (faceattr_index - 32 >= face->nlfaceattr)
+            x[face->nlfaceattr++] = 0;
+        face->lfaceattrs = x;
+    }
+    x[faceattr_index - 32] = value;
+    return(0);
+}
+
+unsigned
+faceattr_get(struct ccnd_handle *h, struct face *face, int faceattr_index)
+{
+    if (face == NULL)
+        return(0);
+    if (faceattr_index < 0 || faceattr_index > 32 + face->nlfaceattr)
+        return(0);
+    if (faceattr_index < 32)
+        return((face->faceattr_packed >> faceattr_index) & 1);
+    return(face->lfaceattrs[faceattr_index - 32]);
+}
+
+unsigned
+faceattr_get_packed(struct ccnd_handle *h, struct face *face)
+{
+    if (face == NULL)
+        return(0);
+    return(face->faceattr_packed);
+}
+
+static void
+faceattr_declare(struct ccnd_handle *h, const char *name, int ndx)
+{
+    int res;
+    
+    if (ndx < 32)
+        res = faceattr_bool_index_from_name(h, name);
+    else
+        res = faceattr_index_from_name(h, name);
+    if (res != ndx)
+        abort();
+}
+
+const char *
+faceattr_next_name(struct ccnd_handle *h, const char *name)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    const char *next = NULL;
+    int res;
+
+    hashtb_start(h->faceattr_index_tab, e);
+    if (name == NULL)
+        next = (const char *)e->key;
+    else {
+        res = hashtb_seek(e, (const void *)name, strlen(name), 1);
+        if (res == HT_OLD_ENTRY) {
+            hashtb_next(e);
+            next = (const char *)e->key;
+        }
+        else if (res == HT_NEW_ENTRY) {
+            hashtb_delete(e);
+        }
+    }
+    hashtb_end(e);
+    return(next);
+}
+
+/**
+ * Convert an accession to its associated content handle.
+ *
+ * @returns content handle, or NULL if it is no longer available.
+ */
+static struct content_entry *
+content_from_accession(struct ccnd_handle *h, ccn_cookie accession)
+{
+    struct content_entry *ans = NULL;
+    struct ccny *y;
+   
+    // modified by xu  
+    // modified by xu for g content store 
+    y = ccny_from_cookie(h->content_tree, accession);
+
+    //  -->
+    if (y != NULL)
+        ans = ccny_payload(y);
+    return(ans);
+}
+/**
+ * Convert an accession to its associated content handle.
+ *
+ * @returns content handle, or NULL if it is no longer available.
+ */
+static struct content_entry *
+content_from_accession_qos(struct ccnd_handle *h, ccn_cookie accession, enum controlpacketid control)
+{
+    struct content_entry *ans = NULL;
+    struct ccny *y;
+   
+    // modified by xu  
+    // modified by xu for g content store 
+    if(control == GUARANTEE)
+    y = ccny_from_cookie(h->content_tree_g, accession);
+    else
+    y = ccny_from_cookie(h->content_tree, accession);
+
+
+    //  -->
+    if (y != NULL)
+        ans = ccny_payload(y);
+    return(ans);
+}
+
+
+/**
+ * Find the first candidate that might match the given interest.
+ */
+static struct content_entry *
+find_first_match_candidate(struct ccnd_handle *h,
+                           const unsigned char *interest_msg,
+                           const struct ccn_parsed_interest *pi)
+{
+    size_t start = pi->offset[CCN_PI_B_Name];
+    size_t end = pi->offset[CCN_PI_E_Name];
+    struct ccn_charbuf *namebuf = charbuf_obtain(h); // XXX Need to release
+    struct ccny *y = NULL;
+    
+    ccn_flatname_from_ccnb(namebuf, interest_msg + start, end - start);
+    // XXX check return
+    if (pi->offset[CCN_PI_B_Exclude] < pi->offset[CCN_PI_E_Exclude]) {
+        /* Check for <Exclude><Any/><Component>... fast case */
+        struct ccn_buf_decoder decoder;
+        struct ccn_buf_decoder *d;
+        size_t ex1start;
+        size_t ex1end;
+        d = ccn_buf_decoder_start(&decoder,
+                                  interest_msg + pi->offset[CCN_PI_B_Exclude],
+                                  pi->offset[CCN_PI_E_Exclude] -
+                                  pi->offset[CCN_PI_B_Exclude]);
+        ccn_buf_advance(d);
+        if (ccn_buf_match_dtag(d, CCN_DTAG_Any)) {
+            ccn_buf_advance(d);
+            ccn_buf_check_close(d);
+            if (ccn_buf_match_dtag(d, CCN_DTAG_Component)) {
+                ex1start = pi->offset[CCN_PI_B_Exclude] + d->decoder.token_index;
+                ccn_buf_advance_past_element(d);
+                ex1end = pi->offset[CCN_PI_B_Exclude] + d->decoder.token_index;
+                if (d->decoder.state >= 0) {
+                    ccn_flatname_append_from_ccnb(namebuf,
+                                                  interest_msg + ex1start,
+                                                  ex1end - ex1start, 0, 1);
+//                    if (h->debug & 8)
+//                        ccnd_debug_ccnb(h, __LINE__, "fastex", NULL,
+//                                        namebuf->buf, namebuf->length);
+                }
+            }
+        }
+    }
+    // modified by xu 
+    // modified by xu for g content store 
+    if (pi->control == GUARANTEE)
+        y = ccn_nametree_look_ge(h->content_tree_g, namebuf->buf, namebuf->length);
+    else
+        y = ccn_nametree_look_ge(h->content_tree, namebuf->buf, namebuf->length);
+    // -->
+    charbuf_release(h, namebuf);
+    if (y == NULL)
+        return(NULL);
+    return(ccny_payload(y));
+}
+
+/**
+ *  Check for a prefix match
+ */
+static int
+content_matches_prefix(struct ccnd_handle *h,
+                       struct content_entry *content,
+                       struct ccn_charbuf *flat)
+{
+    struct ccny *y = NULL;
+    int res;
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE)
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+    else
+        y = ccny_from_cookie(h->content_tree, content->accession);
+
+
+    res = ccn_flatname_compare(flat->buf, flat->length,
+                               ccny_key(y), ccny_keylen(y));
+    return (res == CCN_STRICT_PREFIX || res == 0);
+}
+
+/**
+ * Advance to the next entry in the nametree
+ */
+static struct content_entry *
+content_next(struct ccnd_handle *h, struct content_entry *content)
+{
+    struct ccny *y = NULL;
+    if (content == NULL)
+        return(NULL);
+
+
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE)
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+    else
+        y = ccny_from_cookie(h->content_tree, content->accession);
+
+
+    if (y == NULL)
+        return(NULL);
+    y = ccny_next(y);
+    if (y == NULL)
+        return(NULL);
+    return(ccny_payload(y));
+}
+
+static int
+ex_index_cmp(const unsigned char *a, size_t alen,
+             const unsigned char *b, size_t blen)
+{
+    /* Just use the lengths for this compare, ignore the pointers */
+    /* These are times in seconds since ccnd start, so no overflow worries. */ 
+    return((int)alen - (int)blen);
+}
+
+/**
+ *  Update the index to the expiry queue
+ *
+ * This index is used for quickly finding the last entry in the expiry queue
+ * that has a staletime less than or equal to the given value.
+ *
+ */
+static void
+update_ex_index(struct ccnd_handle *h, int staletime, ccn_cookie c)
+{
+    struct ccn_nametree *e = NULL;
+    struct ccny *y = NULL;
+    
+    e = h->ex_index;
+    y = ccn_nametree_lookup(e, NULL, staletime);
+    if (c == 0) {
+        if (y != NULL) {
+            ccny_remove(e, y);
+            ccny_destroy(e, &y);
+        }
+    }
+    else {
+        if (y == NULL) {
+            y = ccny_create(nrand48(h->seed), 0);
+            /* Our compare action only uses keylen */
+            ccny_set_key_fields(y, NULL, staletime);
+            if (e->n >= e->limit)
+                ccn_nametree_grow(e);
+            ccny_enroll(e, y);
+            if (ccny_cookie(y) == 0) abort();
+        }
+        ccny_set_info(y, c);
+    }
+}
+
+/**
+ *  Enter content into the content expiry queue according to its staletime
+ */
+static void
+content_enqueuex(struct ccnd_handle *h, struct content_entry *content)
+{
+    struct content_entry *next = NULL;
+    struct content_entry *prev = NULL;
+    struct ccny *y = NULL;
+    int tts;
+    
+    tts = content->staletime;
+    ccnd_msg(h, "GUARANTEE: %d", 1118);
+    ccnd_msg(h, "GUARANTEE: %d, %d", 1118, content->control);
+    if (content->control == GUARANTEE){
+        ccnd_msg(h, "GUARANTEE: %d", 1119);
+        ccnd_msg(h, "GUARANTEE: %d, accession: %d, tts: %d", 1119, content->accession_g, tts);
+        if(content->nextx != NULL) 
+            ccnd_msg(h, "GUARANTEE: %d", 1120);
+        
+        if (content->nextx != NULL || content->accession_g == 0 || tts < 0) abort();    
+    }
+    else
+        if (content->nextx != NULL || content->accession == 0 || tts < 0) abort();    
+    ccnd_msg(h, "GUARANTEE: %d", 1125);
+    prev = h->headx->prevx;
+    if (prev->staletime > tts) {
+        y = ccn_nametree_look_le(h->ex_index, NULL, tts);
+        if (y == NULL)
+            prev = h->headx;
+        else
+            prev = content_from_accession_qos(h, ccny_info(y), content->control);
+        // if prev is NULL, we forgot to remove an entry
+    }
+    ccnd_msg(h, "GUARANTEE: %d", 1130);
+    if (prev->nextx->staletime <= tts && prev->nextx != h->headx) abort();
+    ccnd_msg(h, "GUARANTEE: %d", 1132);
+    if (prev->staletime > tts) {
+        // Oops, this should not happen.  Revert to slow-but-sure.
+        ccnd_msg(h, "Err, break at ccnd.c:%d to debug this", __LINE__);
+        for (prev = h->headx->prevx; prev->staletime > tts;)
+            prev = prev->prevx;
+    }
+    next = prev->nextx;
+    content->nextx = next;
+    content->prevx = prev;
+    next->prevx = prev->nextx = content;
+    if (next != h->headx)
+        update_ex_index(h, content->staletime, content->accession);
+    else if (prev != h->headx && prev->staletime < tts)
+        update_ex_index(h, prev->staletime, prev->accession);
+}
+
+/**
+ *  Remove content from the content expiry queue
+ */
+static void
+content_dequeuex(struct ccnd_handle *h, struct content_entry *content)
+{
+    struct content_entry *next = NULL;
+    struct content_entry *prev = NULL;
+    
+    if (content->nextx == NULL && content->prevx == NULL)
+        return;
+    next = content->nextx;
+    prev = content->prevx;
+    if (prev->nextx != content || next->prevx != content) abort();
+    prev->nextx = next;
+    next->prevx = prev;
+    content->nextx = content->prevx = NULL;
+    if (content->staletime != next->staletime) {
+        /* On average, we get here no more than once per second */
+        if (content->staletime == prev->staletime)
+            update_ex_index(h, prev->staletime, prev->accession);
+        else
+            update_ex_index(h, content->staletime, 0);
+    }
+}
+
+/**
+ *  Check to see whether content is stale
+ *
+ * This depends on h->sec being more or less up to date, but that should
+ * be true pretty anytime we care about staleness.
+ */
+static int
+is_stale(struct ccnd_handle *h, struct content_entry *content)
+{
+    // ccnd_msg(h, "is_stale.%d acc %u staletime %d : now %d", __LINE__, content->accession, content->staletime, (int)(h->sec - h->starttime));
+    return(content->staletime <= h->sec - h->starttime);
+}
+
+/**
+ *  Return the number of stale content objects still cached
+ *
+ * This is only used for status reporting
+ */
+int
+ccnd_n_stale(struct ccnd_handle *h)
+{
+    unsigned n = 0;
+    struct content_entry *p = NULL;
+    int now;
+    
+    p = h->headx->prevx;
+    if (p == h->headx)
+        return(0);
+    now = h->sec - h->starttime;
+    if (p->staletime <= now)
+        // modified by xu for g content store 
+        // todo: here should return summizaiton of content tree (g, n..)
+        //return(h->content_tree->n); /* Everything is stale */
+        return(h->content_tree->n); /* Everything is stale */
+    /* We know there is an entry with staletime > now, so this terminates. */
+    for (p = h->headx->nextx; p->staletime <= now; p = p->nextx)
+        n++;
+    return(n);
+}
+
+/**
+ *  Dequeue content from expiry queue when removing it from nametree
+ */
+static void
+content_preremove(struct ccn_nametree *ntree, struct ccny *y)
+{
+    struct ccnd_handle *h = NULL;
+    struct content_entry *content = NULL;
+    
+    h = ntree->data;
+    content = ccny_payload(y);
+    if (content == NULL)
+        return;
+    if (content->nextx != NULL)
+        content_dequeuex(h, content);
+}
+
+/**
+ *  Finalize content, freeing the raw ccnb before the content_entry is freed.
+ */
+static void
+content_finalize(struct ccn_nametree *ntree, struct ccny *y)
+{
+    struct content_entry *content = NULL;
+
+    content = ccny_payload(y);
+    if (content == NULL)
+        return;
+    free(content->ccnb);
+    content->ccnb = NULL;
+}
+
+/**
+ * Consume an interest.
+ */
+static void
+consume_interest(struct ccnd_handle *h, struct interest_entry *ie)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    int res;
+    
+    hashtb_start(h->interest_tab, e);
+    res = hashtb_seek(e, ie->interest_msg, ie->size - 1, 1);
+    if (res != HT_OLD_ENTRY)
+        abort();
+    hashtb_delete(e);
+    hashtb_end(e);
+}    
+
+/**
+ * Clean up a name prefix entry when it is removed from the hash table.
+ */
+static void
+finalize_nameprefix(struct hashtb_enumerator *e)
+{
+    struct ccnd_handle *h = hashtb_get_param(e->ht, NULL);
+    struct nameprefix_entry *npe = e->data;
+    struct ielinks *head = &npe->ie_head;
+    if (head->next != NULL) {
+        while (head->next != head)
+            consume_interest(h, (struct interest_entry *)(head->next));
+    }
+    ccn_indexbuf_destroy(&npe->forward_to);
+    ccn_indexbuf_destroy(&npe->tap);
+    while (npe->forwarding != NULL) {
+        struct ccn_forwarding *f = npe->forwarding;
+        npe->forwarding = f->next;
+        free(f);
+    }
+    if (npe->si != NULL)
+        remove_strategy_instance(h, npe);
+}
+
+/**
+ * Link an interest to its name prefix entry.
+ */
+static void
+link_interest_entry_to_nameprefix(struct ccnd_handle *h,
+    struct interest_entry *ie, struct nameprefix_entry *npe)
+{
+    struct ielinks *head = &npe->ie_head;
+    struct ielinks *ll = &ie->ll;
+    ll->next = head;
+    ll->prev = head->prev;
+    ll->prev->next = ll->next->prev = ll;
+    ll->npe = npe;
+}
+
+/**
+ * Clean up an interest_entry when it is removed from its hash table.
+ */
+static void
+finalize_interest(struct hashtb_enumerator *e)
+{
+    struct pit_face_item *p = NULL;
+    struct pit_face_item *next = NULL;
+    struct ccnd_handle *h = hashtb_get_param(e->ht, NULL);
+    struct interest_entry *ie = e->data;
+    struct face *face = NULL;
+
+    if (ie->ev != NULL)
+        ccn_schedule_cancel(h->sched, ie->ev);
+    if (ie->stev != NULL)
+        ccn_schedule_cancel(h->sched, ie->stev);
+    if (ie->ll.next != NULL) {
+        ie->ll.next->prev = ie->ll.prev;
+        ie->ll.prev->next = ie->ll.next;
+        ie->ll.next = ie->ll.prev = NULL;
+        ie->ll.npe = NULL;
+    }
+    for (p = ie->strategy.pfl; p != NULL; p = next) {
+        next = p->next;
+        if ((p->pfi_flags & CCND_PFI_PENDING) != 0) {
+            face = face_from_faceid(h, p->faceid);
+            if (face != NULL)
+                face->pending_interests -= 1;
+        }
+        if ((p->pfi_flags & CCND_PFI_UPENDING) != 0) {
+            face = face_from_faceid(h, p->faceid);
+            if (face != NULL)
+                face->outstanding_interests -= 1;
+        }
+        free(p);
+    }
+    ie->strategy.pfl = NULL;
+    ie->strategy.ie = NULL;
+    ie->interest_msg = NULL; /* part of hashtb, don't free this */
+}
+
+/**
+ *  Look for duplication of interest nonces
+ *
+ * If nonce is NULL and the interest message has a nonce, the latter will
+ * be used.
+ *
+ * The nonce will be added to the nonce table if it is not already there.
+ * Some expired entries may be trimmed.
+ *
+ * @returns 0 if a duplicate, unexpired nonce exists, 1 if nonce is new,
+ *          2 if duplicate is from originating face, or 3 if the interest
+ *          does not have a nonce.  Negative means error.
+ */
+static int
+nonce_ok(struct ccnd_handle *h, struct face *face,
+         const unsigned char *interest_msg, struct ccn_parsed_interest *pi,
+         const unsigned char *nonce, size_t noncesize)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct nonce_entry *nce = NULL;
+    int res;
+    int i;
+    
+    if (nonce == NULL) {
+        nonce = interest_msg + pi->offset[CCN_PI_B_Nonce];
+        noncesize = pi->offset[CCN_PI_E_Nonce] - pi->offset[CCN_PI_B_Nonce];
+        if (noncesize == 0)
+            return(3);
+        ccn_ref_tagged_BLOB(CCN_DTAG_Nonce, interest_msg,
+                            pi->offset[CCN_PI_B_Nonce],
+                            pi->offset[CCN_PI_E_Nonce],
+                            &nonce, &noncesize);
+    }
+    hashtb_start(h->nonce_tab, e);
+    /* Remove a few expired nonces */
+    for (i = 0; i < 10; i++) {
+        if (h->ncehead.next == &h->ncehead)
+            break;
+        nce = (void *)h->ncehead.next;
+        if (wt_compare(nce->expiry, h->wtnow) >= 0)
+            break;
+        res = hashtb_seek(e, nce->key, nce->size, 0);
+        if (res != HT_OLD_ENTRY) abort();
+        hashtb_delete(e);
+    }
+    /* Look up or add the given nonce */
+    res = hashtb_seek(e, nonce, noncesize, 0);
+    if (res < 0)
+        return(res);
+    nce = e->data;
+    if (res == HT_NEW_ENTRY) {
+        nce->ll.next = NULL;
+        nce->faceid = (face != NULL) ? face->faceid : CCN_NO_FACEID;
+        nce->key = e->key;
+        nce->size = e->keysize;
+        res = 1;
+    }
+    else if (face != NULL && face->faceid == nce->faceid) {
+        /* From same face as before, count as a refresh */
+        res = 2;
+    }
+    else {
+        if (wt_compare(nce->expiry, h->wtnow) < 0)
+            res = 1; /* nonce's expiry has passed, count as new */
+        else
+            res = 0; /* nonce is duplicate */
+    }
+    /* Re-insert it at the end of the expiry queue */
+    if (nce->ll.next != NULL) {
+        nce->ll.next->prev = nce->ll.prev;
+        nce->ll.prev->next = nce->ll.next;
+        nce->ll.next = nce->ll.prev = NULL;
+    }
+    nce->ll.next = &h->ncehead;
+    nce->ll.prev = h->ncehead.prev;
+    nce->ll.next->prev = nce->ll.prev->next = &nce->ll;
+    nce->expiry = h->wtnow + 6 * WTHZ; // XXX hardcoded 6 seconds
+    hashtb_end(e);
+    return(res);
+}
+
+/**
+ * Clean up a nonce_entry when it is removed from its hash table.
+ */
+static void
+finalize_nonce(struct hashtb_enumerator *e)
+{
+    struct nonce_entry *nce = e->data;
+    
+    /* If this entry is in the expiry queue, remove it. */
+    if (nce->ll.next != NULL) {
+        nce->ll.next->prev = nce->ll.prev;
+        nce->ll.prev->next = nce->ll.next;
+        nce->ll.next = nce->ll.prev = NULL;
+    }
+}
+
+/**
+ * Clean up a guest_entry when it is removed from its hash table.
+ */
+static void
+finalize_guest(struct hashtb_enumerator *e)
+{
+    struct guest_entry *g = e->data;
+    ccn_charbuf_destroy(&g->cob);
+}
+
+/**
+ * Create a listener on a unix-domain socket.
+ */
+static int
+create_local_listener(struct ccnd_handle *h, const char *sockname, int backlog)
+{
+    int res;
+    int savedmask;
+    int sock;
+    struct sockaddr_un a = { 0 };
+    res = unlink(sockname);
+    if (res == 0) {
+        ccnd_msg(NULL, "unlinked old %s, please wait", sockname);
+        sleep(9); /* give old ccnd a chance to exit */
+    }
+    if (!(res == 0 || errno == ENOENT))
+        ccnd_msg(NULL, "failed to unlink %s", sockname);
+    a.sun_family = AF_UNIX;
+    strncpy(a.sun_path, sockname, sizeof(a.sun_path));
+    sock = socket(AF_UNIX, SOCK_STREAM, 0);
+    if (sock == -1)
+        return(sock);
+    savedmask = umask(0111); /* socket should be R/W by anybody */
+    res = bind(sock, (struct sockaddr *)&a, sizeof(a));
+    umask(savedmask);
+    if (res == -1) {
+        close(sock);
+        return(-1);
+    }
+    unlink_at_exit(sockname);
+    res = listen(sock, backlog);
+    if (res == -1) {
+        close(sock);
+        return(-1);
+    }
+    record_connection(h, sock, (struct sockaddr *)&a, sizeof(a),
+                      (CCN_FACE_LOCAL | CCN_FACE_PASSIVE));
+    return(sock);
+}
+
+/**
+ * Adjust socket buffer limit
+ */
+static int
+establish_min_recv_bufsize(struct ccnd_handle *h, int fd, int minsize)
+{
+    int res;
+    int rcvbuf;
+    socklen_t rcvbuf_sz;
+
+    rcvbuf_sz = sizeof(rcvbuf);
+    res = getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, &rcvbuf_sz);
+    if (res == -1)
+        return (res);
+    if (rcvbuf < minsize) {
+        rcvbuf = minsize;
+        res = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf));
+        if (res == -1)
+            return(res);
+    }
+    ccnd_msg(h, "SO_RCVBUF for fd %d is %d", fd, rcvbuf);
+    return(rcvbuf);
+}
+
+/**
+ * Initialize the face flags based upon the addr information
+ * and the provided explicit setflags.
+ */
+static void
+init_face_flags(struct ccnd_handle *h, struct face *face, int setflags)
+{
+    const struct sockaddr *addr = face->addr;
+    const unsigned char *rawaddr = NULL;
+    
+    if (addr->sa_family == AF_INET6) {
+        const struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr;
+        face->flags |= CCN_FACE_INET6;
+#ifdef IN6_IS_ADDR_LOOPBACK
+        if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr))
+            face->flags |= CCN_FACE_LOOPBACK;
+#endif
+    }
+    else if (addr->sa_family == AF_INET) {
+        const struct sockaddr_in *addr4 = (struct sockaddr_in *)addr;
+        rawaddr = (const unsigned char *)&addr4->sin_addr.s_addr;
+        face->flags |= CCN_FACE_INET;
+        if (rawaddr[0] == 127)
+            face->flags |= CCN_FACE_LOOPBACK;
+        else {
+            /* If our side and the peer have the same address, consider it loopback */
+            /* This is the situation inside of FreeBSD jail. */
+            struct sockaddr_in myaddr;
+            socklen_t myaddrlen = sizeof(myaddr);
+            if (0 == getsockname(face->recv_fd, (struct sockaddr *)&myaddr, &myaddrlen)) {
+                if (addr4->sin_addr.s_addr == myaddr.sin_addr.s_addr)
+                    face->flags |= CCN_FACE_LOOPBACK;
+            }
+        }
+    }
+    else if (addr->sa_family == AF_UNIX)
+        face->flags |= CCN_FACE_LOCAL;
+    face->flags |= setflags;
+}
+
+/**
+ * Make a new face entered in the faces_by_fd table.
+ */
+static struct face *
+record_connection(struct ccnd_handle *h, int fd,
+                  struct sockaddr *who, socklen_t wholen,
+                  int setflags)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    int res;
+    struct face *face = NULL;
+    unsigned char *addrspace;
+    
+    res = fcntl(fd, F_SETFL, O_NONBLOCK);
+    if (res == -1)
+        ccnd_msg(h, "fcntl: %s", strerror(errno));
+    hashtb_start(h->faces_by_fd, e);
+    if (hashtb_seek(e, &fd, sizeof(fd), wholen) == HT_NEW_ENTRY) {
+        face = e->data;
+        face->recv_fd = fd;
+        face->sendface = CCN_NOFACEID;
+        face->addrlen = e->extsize;
+        addrspace = ((unsigned char *)e->key) + e->keysize;
+        face->addr = (struct sockaddr *)addrspace;
+        memcpy(addrspace, who, e->extsize);
+        init_face_flags(h, face, setflags);
+        res = enroll_face(h, face);
+        if (res == -1) {
+            hashtb_delete(e);
+            face = NULL;
+        }
+    }
+    hashtb_end(e);
+    return(face);
+}
+
+/**
+ * Accept an incoming SOCK_STREAM connection, creating a new face.
+ *
+ * This could be, for example, a unix-domain socket, or TCP.
+ *
+ * @returns fd of new socket, or -1 for an error.
+ */
+static int
+accept_connection(struct ccnd_handle *h, int listener_fd, int listener_flags)
+{
+    struct sockaddr_storage who;
+    socklen_t wholen = sizeof(who);
+    int fd;
+    struct face *face;
+
+    listener_flags &= (CCN_FACE_LOCAL | CCN_FACE_INET | CCN_FACE_INET6);
+    fd = accept(listener_fd, (struct sockaddr *)&who, &wholen);
+    if (fd == -1) {
+        ccnd_msg(h, "accept: %s", strerror(errno));
+        return(-1);
+    }
+    face = record_connection(h, fd,
+                            (struct sockaddr *)&who, wholen,
+                            CCN_FACE_UNDECIDED | listener_flags);
+    if (face == NULL)
+        close_fd(&fd);
+    else
+        ccnd_msg(h, "accepted client fd=%d id=%u", fd, face->faceid);
+    return(fd);
+}
+
+/**
+ * Make an outbound stream connection.
+ */
+static struct face *
+make_connection(struct ccnd_handle *h,
+                struct sockaddr *who, socklen_t wholen,
+                int setflags)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    int fd;
+    int res;
+    struct face *face;
+    const int checkflags = CCN_FACE_LINK | CCN_FACE_DGRAM | CCN_FACE_LOCAL |
+                           CCN_FACE_NOSEND | CCN_FACE_UNDECIDED;
+    const int wantflags = 0;
+    
+    /* Check for an existing usable connection */
+    for (hashtb_start(h->faces_by_fd, e); e->data != NULL; hashtb_next(e)) {
+        face = e->data;
+        if (face->addr != NULL && face->addrlen == wholen &&
+            ((face->flags & checkflags) == wantflags) &&
+            0 == memcmp(face->addr, who, wholen)) {
+            hashtb_end(e);
+            return(face);
+        }
+    }
+    face = NULL;
+    hashtb_end(e);
+    /* No existing connection, try to make a new one. */
+    fd = socket(who->sa_family, SOCK_STREAM, 0);
+    if (fd == -1) {
+        ccnd_msg(h, "socket: %s", strerror(errno));
+        return(NULL);
+    }
+    res = fcntl(fd, F_SETFL, O_NONBLOCK);
+    if (res == -1)
+        ccnd_msg(h, "connect fcntl: %s", strerror(errno));
+    setflags &= ~CCN_FACE_CONNECTING;
+    res = connect(fd, who, wholen);
+    if (res == -1 && errno == EINPROGRESS) {
+        res = 0;
+        setflags |= CCN_FACE_CONNECTING;
+    }
+    if (res == -1) {
+        ccnd_msg(h, "connect failed: %s (errno = %d)", strerror(errno), errno);
+        close(fd);
+        return(NULL);
+    }
+    face = record_connection(h, fd, who, wholen, setflags);
+    if (face == NULL) {
+        close(fd);
+        return(NULL);
+    }
+    if ((face->flags & CCN_FACE_CONNECTING) != 0) {
+        ccnd_msg(h, "connecting to client fd=%d id=%u", fd, face->faceid);
+        face->outbufindex = 0;
+        face->outbuf = ccn_charbuf_create();
+    }
+    else
+        ccnd_msg(h, "connected client fd=%d id=%u", fd, face->faceid);
+    return(face);
+}
+
+/**
+ * Get a bound datagram socket.
+ *
+ * This is handed to ccn_setup_socket() when setting up a multicast face.
+ */
+static int
+ccnd_getboundsocket(void *dat, struct sockaddr *who, socklen_t wholen)
+{
+    struct ccnd_handle *h = dat;
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    int yes = 1;
+    int res;
+    int ans = -1;
+    int wantflags = (CCN_FACE_DGRAM | CCN_FACE_PASSIVE);
+    for (hashtb_start(h->faces_by_fd, e); e->data != NULL; hashtb_next(e)) {
+        struct face *face = e->data;
+        if ((face->flags & wantflags) == wantflags &&
+              wholen == face->addrlen &&
+              0 == memcmp(who, face->addr, wholen)) {
+            ans = face->recv_fd;
+            break;
+        }
+    }
+    hashtb_end(e);
+    if (ans != -1)
+        return(ans);
+    ans = socket(who->sa_family, SOCK_DGRAM, 0);
+    if (ans == -1)
+        return(ans);
+    setsockopt(ans, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+    res = bind(ans, who, wholen);
+    if (res == -1) {
+        ccnd_msg(h, "bind failed: %s (errno = %d)", strerror(errno), errno);
+        close(ans);
+        return(-1);
+    }
+    record_connection(h, ans, who, wholen,
+                      CCN_FACE_DGRAM | CCN_FACE_PASSIVE | CCN_FACE_NORECV);
+    return(ans);
+}
+
+/**
+ * Get the faceid associated with a file descriptor.
+ *
+ * @returns the faceid, or CCN_NOFACEID.
+ */
+static unsigned
+faceid_from_fd(struct ccnd_handle *h, int fd)
+{
+    struct face *face = hashtb_lookup(h->faces_by_fd, &fd, sizeof(fd));
+    if (face != NULL)
+        return(face->faceid);
+    return(CCN_NOFACEID);
+}
+
+typedef void (*loggerproc)(void *, const char *, ...);
+
+/**
+ * Set up a multicast face.
+ */
+static struct face *
+setup_multicast(struct ccnd_handle *h, struct ccn_face_instance *face_instance,
+                struct sockaddr *who, socklen_t wholen)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct ccn_sockets socks = { -1, -1 };
+    int res;
+    struct face *face = NULL;
+    const int checkflags = CCN_FACE_LINK | CCN_FACE_DGRAM | CCN_FACE_MCAST |
+                           CCN_FACE_LOCAL | CCN_FACE_NOSEND;
+    const int wantflags = CCN_FACE_DGRAM | CCN_FACE_MCAST;
+
+    /* See if one is already active */
+    // XXX - should also compare and record additional mcast props.
+    for (hashtb_start(h->faces_by_fd, e); e->data != NULL; hashtb_next(e)) {
+        face = e->data;
+        if (face->addr != NULL && face->addrlen == wholen &&
+            ((face->flags & checkflags) == wantflags) &&
+            0 == memcmp(face->addr, who, wholen)) {
+            hashtb_end(e);
+            return(face);
+        }
+    }
+    face = NULL;
+    hashtb_end(e);
+    
+    res = ccn_setup_socket(&face_instance->descr,
+                           (loggerproc)&ccnd_msg, (void *)h,
+                           &ccnd_getboundsocket, (void *)h,
+                           &socks);
+    if (res < 0)
+        return(NULL);
+    establish_min_recv_bufsize(h, socks.recving, 128*1024);
+    face = record_connection(h, socks.recving, who, wholen,
+                             (CCN_FACE_MCAST | CCN_FACE_DGRAM));
+    if (face == NULL) {
+        close(socks.recving);
+        if (socks.sending != socks.recving)
+            close(socks.sending); // XXX - could be problematic, but record_connection is unlikely to fail for other than ENOMEM
+        return(NULL);
+    }
+    face->sendface = faceid_from_fd(h, socks.sending);
+    ccnd_msg(h, "multicast on fd=%d id=%u, sending on face %u",
+             face->recv_fd, face->faceid, face->sendface);
+    return(face);
+}
+
+/**
+ * Close a socket, destroying the associated face.
+ */
+static void
+shutdown_client_fd(struct ccnd_handle *h, int fd)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct face *face = NULL;
+    unsigned faceid = CCN_NOFACEID;
+    hashtb_start(h->faces_by_fd, e);
+    if (hashtb_seek(e, &fd, sizeof(fd), 0) == HT_OLD_ENTRY) {
+        face = e->data;
+        if (face->recv_fd != fd) abort();
+        faceid = face->faceid;
+        if (faceid == CCN_NOFACEID) {
+            ccnd_msg(h, "error indication on fd %d ignored", fd);
+            hashtb_end(e);
+            return;
+        }
+        close(fd);
+        face->recv_fd = -1;
+        ccnd_msg(h, "shutdown client fd=%d id=%u", fd, faceid);
+        ccn_charbuf_destroy(&face->inbuf);
+        ccn_charbuf_destroy(&face->outbuf);
+        face = NULL;
+    }
+    hashtb_delete(e);
+    hashtb_end(e);
+    check_comm_file(h);
+}
+
+/**<!-- add by xu
+ * Insert Control Packet ID into the Content Object
+ *
+ * if no Control Packet ID in the content object
+ * 
+ * Return the pointer of the new content entry 
+ * if insert sucessfully
+ * or 
+ * return the orginal pointer of content entry
+ * if failed   
+*/
+struct content_entry *
+insert_controlpacketid_contentobject(struct ccnd_handle *h, 
+                                     struct content_entry *content, 
+                                       enum controlpacketid control)
+{
+    if (-1 == content->control || 
+         0 > content->control ||
+         4 <= content->control)
+    {
+        //ccnd_msg(h, "Content Object has no control ID");
+	struct ccn_charbuf *c = ccn_charbuf_create();
+	unsigned char *dst;
+        size_t size;
+        size = content->size;
+	/*Remove the end closer of this ContentObject*/
+        //ccnd_msg(h, "Remove the end closer");
+        dst = ccn_charbuf_reserve(c, size - 1);
+	    memcpy(dst, content->ccnb, size - 1); 
+	    c->length += (size-1);
+
+	    /**Append ControlPacketID
+	     * Here the NOTICE should be dynamic according to real situation
+	    */
+        //ccnd_msg(h, "Append control packet id");
+	    ccnb_tagged_putf(c, CCN_DTAG_ControlPacketID, "%d", control);
+	    /**Append closer */
+        //ccnd_msg(h, "Append closer");
+	    ccnb_element_end(c);
+
+        if (NULL != c->buf){
+            /**Release the original ContentObject memory*/
+	        free(content->ccnb);
+	        /**Assign a new memory with size of c->length*/
+	        content->ccnb = malloc(c->length);
+	        content->size = c->length;
+                content->control = control;
+	        /**Copy the content of c->buf to content->ccnb
+	         * The header addresses of c->buf and content->ccnb are same 
+	        */
+	        content->ccnb = c->buf;
+	        memcpy(content->ccnb, c->buf, c->length);   
+            return (content);
+        }
+        else{
+            free(c);
+            ccnd_msg(h, "ERROR: Insert ControlPacketID Failed");
+            return (content);
+        }
+ 
+    }
+    else{
+        /*The content has already a control packet id*/
+        return (content);
+    }
+}
+/* add by xu end -->*/
+
+/**
+ * Send a ContentObject
+ *
+ * This is after it has worked its way through the queue; update the meters
+ * and stuff the packet as appropriate.
+ */
+static void
+send_content(struct ccnd_handle *h, struct face *face, struct content_entry *content)
+{
+    size_t size;
+
+    if ((face->flags & CCN_FACE_NOSEND) != 0) {
+        // XXX - should count this.
+        return;
+    }
+
+    /*<!-- add by xu */
+    /* Insert a Control Packet ID into Content Object
+     * if the content has already a Control Packet ID,
+     * the content remained no change.
+     */
+    content = insert_controlpacketid_contentobject(h, content, NOTICE);
+    /* add by xu end -->*/
+    size = content->size;
+    if (h->debug & 4)
+        ccnd_debug_content(h, __LINE__, "content_to", face, content);
+    //ccnd_msg(h, "content control %d", content->control);
+    //stuff_and_send(h, face, content->ccnb, size, NULL, 0, 0, 0);
+    stuff_and_send_qos(h, face, content->ccnb, size, NULL, 0, 0, 0, content->control);
+
+    ccnd_meter_bump(h, face->meter[FM_DATO], 1);
+    h->content_items_sent += 1;
+}
+
+/**
+ * Select the output queue class for a piece of content
+ */
+static enum cq_delay_class
+choose_content_delay_class(struct ccnd_handle *h, unsigned faceid, int content_flags)
+{
+    struct face *face = face_from_faceid(h, faceid);
+    
+    if (face == NULL)
+        return(CCN_CQ_ASAP); /* Going nowhere, get it over with */
+    /* <!--kuwayama */
+    if (content_flags == CCN_CQ_GUARANTEE)
+      return(CCN_CQ_GUARANTEE);
+    /*  kuwayama--> */
+    if ((face->flags & (CCN_FACE_LINK | CCN_FACE_MCAST)) != 0) /* udplink or such, delay more */
+        return((content_flags & CCN_CONTENT_ENTRY_SLOWSEND) ? CCN_CQ_SLOW : CCN_CQ_NORMAL);
+    if ((face->flags & CCN_FACE_DGRAM) != 0)
+        return(CCN_CQ_NORMAL); /* udp, delay just a little */
+    if ((face->flags & (CCN_FACE_GG | CCN_FACE_LOCAL)) != 0)
+        return(CCN_CQ_ASAP); /* localhost, answer quickly */
+    return(CCN_CQ_NORMAL); /* default */
+}
+
+/**
+ * Pick a randomized delay for sending
+ *
+ * This is primarily for multicast and similar broadcast situations, where we
+ * may see the content being sent by somebody else.  If that is the case,
+ * we will avoid sending our copy as well.
+ *
+ */
+static unsigned
+randomize_content_delay(struct ccnd_handle *h, struct content_queue *q)
+{
+    unsigned usec;
+    
+    usec = q->min_usec + q->rand_usec;
+    if (usec < 2)
+        return(1);
+    if (usec <= 20 || q->rand_usec < 2) // XXX - what is a good value for this?
+        return(usec); /* small value, don't bother to randomize */
+    usec = q->min_usec + (nrand48(h->seed) % q->rand_usec);
+    if (usec < 2)
+        return(1);
+    return(usec);
+}
+
+/**
+ * Scheduled event for sending from a queue.
+ */
+static int
+content_sender(struct ccn_schedule *sched,
+    void *clienth,
+    struct ccn_scheduled_event *ev,
+    int flags)
+{
+    int i, j;
+    int delay;
+    int nsec;
+    int burst_nsec;
+    int burst_max;
+    struct ccnd_handle *h = clienth;
+    struct content_entry *content = NULL;
+    unsigned faceid = ev->evint;
+    struct face *face = NULL;
+    struct content_queue *q = ev->evdata;
+    (void)sched;
+    
+    if ((flags & CCN_SCHEDULE_CANCEL) != 0)
+        goto Bail;
+    face = face_from_faceid(h, faceid);
+    if (face == NULL)
+        goto Bail;
+    if (q->send_queue == NULL)
+        goto Bail;
+    if ((face->flags & CCN_FACE_NOSEND) != 0)
+        goto Bail;
+    /* Send the content at the head of the queue */
+    if (q->ready > q->send_queue->n ||
+        (q->ready == 0 && q->nrun >= 12 && q->nrun < 120))
+        q->ready = q->send_queue->n;
+    nsec = 0;
+    burst_nsec = q->burst_nsec;
+    //burst_max = 2;
+    burst_max = 4;//modified by xu
+    if (q->ready < burst_max)
+        burst_max = q->ready;
+    if (burst_max == 0)
+        q->nrun = 0;
+    for (i = 0; i < burst_max && nsec < 1000000; i++) {
+        content = content_from_accession_qos(h, q->send_queue->buf[i], q->control_queue->buf[i]);
+        if (content == NULL)
+            q->nrun = 0;
+        else {
+            send_content(h, face, content);
+            content->refs--;
+            /* face may have vanished, bail out if it did */
+            if (face_from_faceid(h, faceid) == NULL)
+                goto Bail;
+            nsec += burst_nsec * (unsigned)((content->size + 1023) / 1024);
+            q->nrun++;
+        }
+    }
+    if (q->ready < i) abort();
+    q->ready -= i;
+    /* Update queue */
+    for (j = 0; i < q->send_queue->n; i++, j++)
+        q->send_queue->buf[j] = q->send_queue->buf[i];
+        q->control_queue->buf[j] = q->control_queue->buf[i];
+    q->send_queue->n = j;
+    q->control_queue->n = j;
+    /* Do a poll before going on to allow others to preempt send. */
+    delay = (nsec + 499) / 1000 + 1;
+    if (q->ready > 0) {
+        if (h->debug & 8)
+            ccnd_msg(h, "face %u ready %u delay %i nrun %u",
+                     faceid, q->ready, delay, q->nrun, face->surplus);
+        return(delay);
+    }
+    q->ready = j;
+    if (q->nrun >= 12 && q->nrun < 120) {
+        /* We seem to be a preferred provider, forgo the randomized delay */
+        if (j == 0)
+            delay += burst_nsec / 50;
+        if (h->debug & 8)
+            ccnd_msg(h, "face %u ready %u delay %i nrun %u surplus %u",
+                    (unsigned)ev->evint, q->ready, delay, q->nrun, face->surplus);
+        return(delay);
+    }
+    /* Determine when to run again */
+    for (i = 0; i < q->send_queue->n; i++) {
+        content = content_from_accession_qos(h, q->send_queue->buf[i], q->control_queue->buf[i]);
+        if (content != NULL) {
+            q->nrun = 0;
+            delay = randomize_content_delay(h, q);
+            if (h->debug & 8)
+                ccnd_msg(h, "face %u queued %u delay %i",
+                         (unsigned)ev->evint, q->ready, delay);
+            return(delay);
+        }
+    }
+    q->send_queue->n = q->ready = 0;
+    q->control_queue->n = q->ready = 0;
+Bail:
+    q->sender = NULL;
+    return(0);
+}
+
+/**
+ * Queue a ContentObject to be sent on a face.
+ */
+static int
+face_send_queue_insert(struct ccnd_handle *h,
+                       struct face *face, struct content_entry *content)
+{
+    int ans;
+    int delay;
+    int n;
+    enum cq_delay_class c;
+    enum cq_delay_class k;
+    struct content_queue *q;
+    
+    if (face == NULL || content == NULL || (face->flags & CCN_FACE_NOSEND) != 0)
+        return(-1);
+    c = choose_content_delay_class(h, face->faceid, content->flags);
+    if (face->q[c] == NULL)
+        face->q[c] = content_queue_create(h, face, c);
+    q = face->q[c];
+    if (q == NULL)
+        return(-1);
+    /* Check the other queues first, it might be in one of them */
+    for (k = 0; k < CCN_CQ_N; k++) {
+        if (k != c && face->q[k] != NULL) {
+            ans = ccn_indexbuf_member(face->q[k]->send_queue, content->accession);
+            if (ans >= 0) {
+                if (h->debug & 8)
+                    ccnd_debug_content(h, __LINE__, "content_otherq", face,
+                                       content);
+                return(ans);
+            }
+        }
+    }
+    n = q->send_queue->n;
+    if(content->control == GUARANTEE)
+        ans = ccn_indexbuf_set_insert(q->send_queue, content->accession_g);
+    else
+        ans = ccn_indexbuf_set_insert(q->send_queue, content->accession);
+    //ans = ccn_indexbuf_set_insert(q->control_queue, content->accession);
+    if(q->control_queue->n <= ans) 
+        ccn_indexbuf_append_element(q->control_queue, content->control);
+    ccnd_msg(h, "content control in send queue insert: %d", content->control);
+    ccnd_msg(h, "ans: %d", ans);
+    if (n != q->send_queue->n)
+        content->refs++;
+    if (q->sender == NULL) {
+        delay = randomize_content_delay(h, q);
+        q->ready = q->send_queue->n;
+        /* <!--kuwayama */
+        /* <!-- commented by xu
+        if (content->flags == CCN_CQ_GUARANTEE)
+          q->sender = ccn_schedule_event(h->drr, delay,
+                                         content_sender, q, face->faceid);
+        else
+          q->sender = ccn_schedule_event(h->sched, delay,
+                                         content_sender, q, face->faceid);
+         commented by xu end -->*/
+        /*  kuwayama--> */
+        /* <!--  */
+        delay = 1; //add by xu. fix the delay to 1 that all contents are sent as ASAP
+        q->sender = ccn_schedule_event(h->sched, delay,
+                                         content_sender, q, face->faceid);
+
+        if (h->debug & 8)
+            ccnd_msg(h, "face %u q %d delay %d usec", face->faceid, c, delay);
+    }
+    return (ans);
+}
+
+/**
+ * Return true iff the interest is pending on the given face
+ */
+static int
+is_pending_on(struct ccnd_handle *h, struct interest_entry *ie, unsigned faceid)
+{
+    struct pit_face_item *x;
+    
+    for (x = ie->strategy.pfl; x != NULL; x = x->next) {
+        if (x->faceid == faceid && (x->pfi_flags & CCND_PFI_PENDING) != 0)
+            return(1);
+        // XXX - depending on how list is ordered, an early out might be possible
+        // For now, we assume no particular ordering
+    }
+    return(0);
+}
+
+/**
+ * Consume matching interests
+ * given a nameprefix_entry and a piece of content.
+ *
+ * If face is not NULL, pay attention only to interests from that face.
+ * It is allowed to pass NULL for pc, but if you have a (valid) one it
+ * will avoid a re-parse.
+ * @returns number of matches found.
+ */
+static int
+consume_matching_interests(struct ccnd_handle *h,
+                           struct nameprefix_entry *npe,
+                           struct content_entry *content,
+                           struct ccn_parsed_ContentObject *pc,
+                           struct face *face,
+                           struct face *content_face)
+{
+    int matches = 0;
+    struct ielinks *head;
+    struct ielinks *next;
+    struct ielinks *pl;
+    struct interest_entry *p;
+    struct pit_face_item *x;
+    const unsigned char *content_msg;
+    size_t content_size;
+    
+    head = &npe->ie_head;
+    content_msg = content->ccnb;
+    content_size = content->size;
+    for (pl = head->next; pl != head; pl = next) {
+        next = pl->next;
+        p = (struct interest_entry *)pl;
+        if (p->interest_msg == NULL)
+            continue;
+        if (face != NULL && is_pending_on(h, p, face->faceid) == 0)
+            continue;
+        if (ccn_content_matches_interest(content_msg, content_size, 1, pc,
+                                         p->interest_msg, p->size, NULL)) {
+            if (content_face != NULL)
+                strategy_callout(h, p, CCNST_SATISFIED, content_face->faceid);
+            for (x = p->strategy.pfl; x != NULL; x = x->next) {
+                if ((x->pfi_flags & CCND_PFI_PENDING) != 0)
+                    face_send_queue_insert(h, face_from_faceid(h, x->faceid),
+                                           content);
+            }
+            matches += 1;
+            consume_interest(h, p);
+        }
+    }
+    return(matches);
+}
+
+/**
+ * Find and consume interests that match given content.
+ *
+ * Schedules the sending of the content.
+ * If face is not NULL, pay attention only to interests from that face.
+ * It is allowed to pass NULL for pc, but if you have a (valid) one it
+ * will avoid a re-parse.
+ * For new content, from_face is the source; for old content, from_face is NULL.
+ * @returns number of matches, or -1 if the new content should be dropped.
+ */
+static int
+match_interests(struct ccnd_handle *h, struct content_entry *content,
+                struct ccn_parsed_ContentObject *pc,
+                struct face *face, struct face *from_face)
+{
+    int n_matched = 0;
+    int new_matches;
+    int ci;
+    struct ccn_charbuf *name = NULL;
+    struct ccn_indexbuf *namecomps = NULL;
+    unsigned c0 = 0;
+    const unsigned char *key = NULL;
+    struct nameprefix_entry *npe = NULL;
+    struct ccny *y = NULL;
+    
+
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE){
+        ccnd_msg(h, "GUARANTEE: %d", -2257);
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+        ccnd_msg(h, "GUARANTEE: %d", -2259);
+    }
+    else
+        y = ccny_from_cookie(h->content_tree, content->accession);
+
+
+    if (y == NULL) abort();
+    name = charbuf_obtain(h);
+    ccn_name_init(name);
+    ccn_name_append_flatname(name, ccny_key(y), ccny_keylen(y), 0, -1);
+    namecomps = indexbuf_obtain(h);
+    ccn_name_split(name, namecomps);
+    c0 = namecomps->buf[0];
+    key = name->buf + c0;
+    for (ci = namecomps->n - 1; ci >= 0; ci--) {
+        int size = namecomps->buf[ci] - c0;
+        npe = hashtb_lookup(h->nameprefix_tab, key, size);
+        if (npe != NULL)
+            break;
+    }
+    charbuf_release(h, name);
+    name = NULL;
+    indexbuf_release(h, namecomps);
+    namecomps = NULL;
+    ccnd_msg(h, "GUARANTEE: %d", -2283);
+    for (; npe != NULL; npe = npe->parent) {
+        if (npe->fgen != h->forward_to_gen)
+            update_forward_to(h, npe);
+        if (from_face != NULL && (npe->flags & CCN_FORW_LOCAL) != 0 &&
+            (from_face->flags & CCN_FACE_GG) == 0)
+            return(-1);
+        new_matches = consume_matching_interests(h, npe, content, pc,
+                                                 face, from_face);
+        n_matched += new_matches;
+    }
+    return(n_matched);
+}
+
+
+/**
+ * Send a message in a PDU, possibly stuffing other interest messages into it.
+ * The message may be in two pieces.
+ */
+static void
+stuff_and_send(struct ccnd_handle *h, struct face *face,
+               const unsigned char *data1, size_t size1,
+               const unsigned char *data2, size_t size2,
+               const char *tag, int lineno) {
+    struct ccn_charbuf *c = NULL;
+    
+    if ((face->flags & CCN_FACE_LINK) != 0) {
+        c = charbuf_obtain(h);
+        ccn_charbuf_reserve(c, size1 + size2 + 5 + 8);
+        ccnb_element_begin(c, CCN_DTAG_CCNProtocolDataUnit);
+        ccn_charbuf_append(c, data1, size1);
+        if (size2 != 0)
+            ccn_charbuf_append(c, data2, size2);
+        if (tag != NULL)
+            ccnd_debug_ccnb(h, lineno, tag, face, c->buf + 4, c->length - 4);
+        ccn_stuff_interest(h, face, c);
+        ccn_append_link_stuff(h, face, c);
+        ccnb_element_end(c);
+    }
+    else if (size2 != 0 || h->mtu > size1 + size2 ||
+             (face->flags & (CCN_FACE_SEQOK | CCN_FACE_SEQPROBE)) != 0 ||
+             face->recvcount <= 1) {
+        c = charbuf_obtain(h);
+        ccn_charbuf_append(c, data1, size1);
+        if (size2 != 0)
+            ccn_charbuf_append(c, data2, size2);
+        if (tag != NULL)
+            ccnd_debug_ccnb(h, lineno, tag, face, c->buf, c->length);
+        ccn_stuff_interest(h, face, c);
+        ccn_append_link_stuff(h, face, c);
+    }
+    else {
+        /* avoid a copy in this case */
+        if (tag != NULL)
+            ccnd_debug_ccnb(h, lineno, tag, face, data1, size1);
+        ccnd_send(h, face, data1, size1);
+        return;
+    }
+    ccnd_send(h, face, c->buf, c->length);
+    charbuf_release(h, c);
+    return;
+}
+
+
+/**
+ * Send a message in a PDU, possibly stuffing other interest messages into it.
+ * The message may be in two pieces.
+ */
+static void
+stuff_and_send_qos(struct ccnd_handle *h, struct face *face,
+               const unsigned char *data1, size_t size1,
+               const unsigned char *data2, size_t size2,
+               const char *tag, int lineno,  enum controlpacketid control) {
+    struct ccn_charbuf *c = NULL;
+    
+    if ((face->flags & CCN_FACE_LINK) != 0) {
+        c = charbuf_obtain(h);
+        ccn_charbuf_reserve(c, size1 + size2 + 5 + 8);
+        ccnb_element_begin(c, CCN_DTAG_CCNProtocolDataUnit);
+        ccn_charbuf_append(c, data1, size1);
+        if (size2 != 0)
+            ccn_charbuf_append(c, data2, size2);
+        if (tag != NULL)
+            ccnd_debug_ccnb(h, lineno, tag, face, c->buf + 4, c->length - 4);
+        ccn_stuff_interest(h, face, c);
+        ccn_append_link_stuff(h, face, c);
+        ccnb_element_end(c);
+    }
+    else if (size2 != 0 || h->mtu > size1 + size2 ||
+             (face->flags & (CCN_FACE_SEQOK | CCN_FACE_SEQPROBE)) != 0 ||
+             face->recvcount <= 1) {
+        c = charbuf_obtain(h);
+        ccn_charbuf_append(c, data1, size1);
+        if (size2 != 0)
+            ccn_charbuf_append(c, data2, size2);
+        if (tag != NULL)
+            ccnd_debug_ccnb(h, lineno, tag, face, c->buf, c->length);
+        ccn_stuff_interest(h, face, c);
+        ccn_append_link_stuff(h, face, c);
+    }
+    else {
+        /* avoid a copy in this case */
+        if (tag != NULL)
+            ccnd_debug_ccnb(h, lineno, tag, face, data1, size1);
+        ccnd_send(h, face, data1, size1);
+        return;
+    }
+    /*<-- add by xu*/
+    if (tag == 0){
+        struct object_in_queue oiq;
+        oiq.face = face;
+        oiq.c = c;
+        oiq.data = c->buf;
+        oiq.size = c->length;
+        //ccnd_msg(h, "FACE ID: %d", face->faceid);
+        //ccnd_msg(h, "FACE ID INIT 2: %d", h->face_id_int_2);
+        //ccnd_msg(h, "Control ID in send qos: %d", control);
+		if(face->faceid == h->face_id_int_2){
+                        //ccnd_msg(h, "FACE ID: %d", face->faceid);
+			switch(control){
+				case NOTICE:
+					queue_push(h->qos_queue_0,oiq);
+					break;
+				case GUARANTEE:
+					queue_push(h->qos_queue_1,oiq);
+					break;
+				case RESERVE:
+					queue_push(h->qos_queue_2,oiq);
+					break;
+				case DEFAULT:
+					queue_push(h->norm_queue,oiq);
+					break;
+			   default:  
+					queue_push(h->norm_queue,oiq);
+					break;
+			}	
+		}
+		
+		if(face->faceid == h->face_id_int_5){
+                        //ccnd_msg(h, "FACE ID - F: %d", face->faceid);
+			switch(control){
+				case NOTICE:
+					//queue_push(h->qos_queue_f_0,oiq);
+					queue_push(h->norm_queue_f,oiq);
+					break;
+				case GUARANTEE:
+					queue_push(h->qos_queue_f_1,oiq);
+					//queue_push(h->norm_queue_f,oiq);
+					break;
+				case RESERVE:
+					//queue_push(h->qos_queue_f_2,oiq);
+					queue_push(h->norm_queue_f,oiq);
+					break;
+				case DEFAULT:
+					queue_push(h->norm_queue_f,oiq);
+					break;
+			   default:  
+					queue_push(h->norm_queue_f,oiq);
+					break;
+			}	
+		}
+        
+     
+       return;
+     }
+    /* add by xu end -->*/
+    //ccnd_send(h, face, c->buf, c->length);
+    charbuf_release(h, c);
+    return;
+}
+
+/**
+ * Append a link-check interest if appropriate.
+ *
+ * @returns the number of messages that were stuffed.
+ */
+static int
+stuff_link_check(struct ccnd_handle *h,
+                   struct face *face, struct ccn_charbuf *c)
+{
+    int checkflags = CCN_FACE_DGRAM | CCN_FACE_MCAST | CCN_FACE_GG | CCN_FACE_LC;
+    int wantflags = CCN_FACE_DGRAM;
+    struct ccn_charbuf *name = NULL;
+    struct ccn_charbuf *ibuf = NULL;
+    int res;
+    int ans = 0;
+    if (face->recvcount > 1)
+        return(0);
+    if ((face->flags & checkflags) != wantflags)
+        return(0);
+    name = ccn_charbuf_create();
+    if (name == NULL) goto Bail;
+    ccn_name_init(name);
+    res = ccn_name_from_uri(name, CCNDID_NEIGHBOR_URI);
+    if (res < 0) goto Bail;
+    ibuf = ccn_charbuf_create();
+    if (ibuf == NULL) goto Bail;
+    ccnb_element_begin(ibuf, CCN_DTAG_Interest);
+    ccn_charbuf_append(ibuf, name->buf, name->length);
+    ccnb_tagged_putf(ibuf, CCN_DTAG_Scope, "2");
+    // XXX - ought to generate a nonce
+    ccnb_element_end(ibuf);
+    ccn_charbuf_append(c, ibuf->buf, ibuf->length);
+    ccnd_meter_bump(h, face->meter[FM_INTO], 1);
+    h->interests_stuffed++;
+    face->flags |= CCN_FACE_LC;
+    if (h->debug & 2)
+        ccnd_debug_ccnb(h, __LINE__, "stuff_interest_to", face,
+                        ibuf->buf, ibuf->length);
+    ans = 1;
+Bail:
+    ccn_charbuf_destroy(&ibuf);
+    ccn_charbuf_destroy(&name);
+    return(ans);
+}
+
+/**
+ * Stuff a PDU with interest messages that will fit.
+ *
+ * @returns the number of messages that were stuffed.
+ */
+static int
+ccn_stuff_interest(struct ccnd_handle *h,
+                   struct face *face, struct ccn_charbuf *c)
+{
+    int n_stuffed = 0;
+    
+    n_stuffed += stuff_link_check(h, face, c);
+    return(n_stuffed);
+}
+
+/**
+ * Set up to send one sequence number to see it the other side wants to play.
+ *
+ * If we don't hear a number from the other side, we won't keep sending them.
+ */
+static void
+ccn_link_state_init(struct ccnd_handle *h, struct face *face)
+{
+    int checkflags;
+    int matchflags;
+    
+    matchflags = CCN_FACE_DGRAM;
+    checkflags = matchflags | CCN_FACE_MCAST | CCN_FACE_GG | CCN_FACE_SEQOK | \
+                 CCN_FACE_PASSIVE;
+    if ((face->flags & checkflags) != matchflags)
+        return;
+    /* Send one sequence number to see if the other side wants to play. */
+    face->pktseq = nrand48(h->seed);
+    face->flags |= CCN_FACE_SEQPROBE;
+}
+
+/**
+ * Append a sequence number if appropriate.
+ */
+static void
+ccn_append_link_stuff(struct ccnd_handle *h,
+                      struct face *face,
+                      struct ccn_charbuf *c)
+{
+    if ((face->flags & (CCN_FACE_SEQOK | CCN_FACE_SEQPROBE)) == 0)
+        return;
+    ccnb_element_begin(c, CCN_DTAG_SequenceNumber);
+    ccn_charbuf_append_tt(c, 2, CCN_BLOB);
+    ccn_charbuf_append_value(c, face->pktseq, 2);
+    ccnb_element_end(c);
+    if (0)
+        ccnd_msg(h, "debug.%d pkt_to %u seq %u",
+                 __LINE__, face->faceid, (unsigned)face->pktseq);
+    face->pktseq++;
+    face->flags &= ~CCN_FACE_SEQPROBE;
+}
+
+/**
+ * Process an incoming link message.
+ */
+static int
+process_incoming_link_message(struct ccnd_handle *h,
+                              struct face *face, enum ccn_dtag dtag,
+                              unsigned char *msg, size_t size)
+{
+    uintmax_t s;
+    int checkflags;
+    int matchflags;
+    struct ccn_buf_decoder decoder;
+    struct ccn_buf_decoder *d = ccn_buf_decoder_start(&decoder, msg, size);
+
+    switch (dtag) {
+        case CCN_DTAG_SequenceNumber:
+            s = ccn_parse_required_tagged_binary_number(d, dtag, 1, 6);
+            if (d->decoder.state < 0)
+                return(d->decoder.state);
+            /*
+             * If the other side is unicast and sends sequence numbers,
+             * then it is OK for us to send numbers as well.
+             */
+            matchflags = CCN_FACE_DGRAM;
+            checkflags = matchflags | CCN_FACE_MCAST | CCN_FACE_SEQOK;
+            if ((face->flags & checkflags) == matchflags)
+                face->flags |= CCN_FACE_SEQOK;
+            if (face->rrun == 0) {
+                face->rseq = s;
+                face->rrun = 1;
+                return(0);
+            }
+            if (s == face->rseq + 1) {
+                face->rseq = s;
+                if (face->rrun < 255)
+                    face->rrun++;
+                return(0);
+            }
+            if (s > face->rseq && s - face->rseq < 255) {
+                //ccnd_msg(h, "seq_gap %u %ju to %ju",
+                //         face->faceid, face->rseq, s);
+                face->rseq = s;
+                face->rrun = 1;
+                return(0);
+            }
+            if (s <= face->rseq) {
+                if (face->rseq - s < face->rrun) {
+                    ccnd_msg(h, "seq_dup %u %ju", face->faceid, s);
+                    return(0);
+                }
+                if (face->rseq - s < 255) {
+                    /* Received out of order */
+                    //ccnd_msg(h, "seq_ooo %u %ju", face->faceid, s);
+                    if (s == face->rseq - face->rrun) {
+                        face->rrun++;
+                        return(0);
+                    }
+                }
+            }
+            face->rseq = s;
+            face->rrun = 1;
+            break;
+        default:
+            return(-1);
+    }
+    return(0);
+}
+
+/**
+ * Checks for inactivity on datagram faces.
+ * @returns number of faces that have gone away.
+ */
+static int
+check_dgram_faces(struct ccnd_handle *h)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    int count = 0;
+    int checkflags = CCN_FACE_DGRAM;
+    int wantflags = CCN_FACE_DGRAM;
+    int adj_req = 0;
+    
+    hashtb_start(h->dgram_faces, e);
+    while (e->data != NULL) {
+        struct face *face = e->data;
+        if (face->addr != NULL && (face->flags & checkflags) == wantflags) {
+            face->flags &= ~CCN_FACE_LC; /* Rate limit link check interests */
+            if (face->recvcount == 0) {
+                if ((face->flags & (CCN_FACE_PERMANENT | CCN_FACE_ADJ)) == 0) {
+                    count += 1;
+                    hashtb_delete(e);
+                    continue;
+                }
+            }
+            else if (face->recvcount == 1) {
+                face->recvcount = 0;
+            }
+            else {
+                face->recvcount = 1; /* go around twice */
+            }
+        }
+        hashtb_next(e);
+    }
+    hashtb_end(e);
+    if (adj_req) {
+        process_internal_client_buffer(h);
+    }
+    return(count);
+}
+
+/**
+ * Destroys the face identified by faceid.
+ * @returns 0 for success, -1 for failure.
+ */
+int
+ccnd_destroy_face(struct ccnd_handle *h, unsigned faceid)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct face *face;
+    int dgram_chk = CCN_FACE_DGRAM | CCN_FACE_MCAST;
+    int dgram_want = CCN_FACE_DGRAM;
+    
+    face = face_from_faceid(h, faceid);
+    if (face == NULL)
+        return(-1);
+    if ((face->flags & dgram_chk) == dgram_want) {
+        hashtb_start(h->dgram_faces, e);
+        hashtb_seek(e, face->addr, face->addrlen, 0);
+        if (e->data == face)
+            face = NULL;
+        hashtb_delete(e);
+        hashtb_end(e);
+        if (face == NULL)
+            return(0);
+    }
+    shutdown_client_fd(h, face->recv_fd);
+    face = NULL;
+    return(0);
+}
+
+/**
+ * Remove expired faces from *ip
+ */
+static void
+check_forward_to(struct ccnd_handle *h, struct ccn_indexbuf **ip)
+{
+    struct ccn_indexbuf *ft = *ip;
+    int i;
+    int j;
+    if (ft == NULL)
+        return;
+    for (i = 0; i < ft->n; i++)
+        if (face_from_faceid(h, ft->buf[i]) == NULL)
+            break;
+    for (j = i + 1; j < ft->n; j++)
+        if (face_from_faceid(h, ft->buf[j]) != NULL)
+            ft->buf[i++] = ft->buf[j];
+    if (i == 0)
+        ccn_indexbuf_destroy(ip);
+    else if (i < ft->n)
+        ft->n = i;
+}
+
+/**
+ * Ages src info and retires unused nameprefix entries.
+ * @returns number that have gone away.
+ */
+static int
+check_nameprefix_entries(struct ccnd_handle *h)
+{
+    int count = 0;
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct ielinks *head;
+    struct nameprefix_entry *npe;
+    
+    hashtb_start(h->nameprefix_tab, e);
+    for (npe = e->data; npe != NULL; npe = e->data) {
+        if ( (npe->sst.s[0] & CCN_AGED) != 0 &&
+              npe->children == 0 &&
+              npe->forwarding == NULL &&
+              npe->si == NULL) {
+            head = &npe->ie_head;
+            if (head == head->next) {
+                count += 1;
+                if (npe->parent != NULL) {
+                    npe->parent->children--;
+                    npe->parent = NULL;
+                }
+                hashtb_delete(e);
+                continue;
+            }
+        }
+        check_forward_to(h, &npe->forward_to);
+        check_forward_to(h, &npe->tap);
+        npe->sst.s[0] |= CCN_AGED;
+        hashtb_next(e);
+    }
+    hashtb_end(e);
+    return(count);
+}
+
+static void
+check_comm_file(struct ccnd_handle *h)
+{
+    if (!comm_file_ok()) {
+        ccnd_msg(h, "stopping (%s gone)", unlink_this_at_exit);
+        unlink_this_at_exit = NULL;
+        h->running = 0;
+    }
+}
+
+/**
+ * Scheduled reap event for retiring expired structures.
+ */
+static int
+reap(
+    struct ccn_schedule *sched,
+    void *clienth,
+    struct ccn_scheduled_event *ev,
+    int flags)
+{
+    struct ccnd_handle *h = clienth;
+    (void)(sched);
+    (void)(ev);
+    if ((flags & CCN_SCHEDULE_CANCEL) != 0) {
+        h->reaper = NULL;
+        return(0);
+    }
+    check_dgram_faces(h);
+    check_nameprefix_entries(h);
+    check_comm_file(h);
+    return(2 * CCN_INTEREST_LIFETIME_MICROSEC);
+}
+
+static void
+reap_needed(struct ccnd_handle *h, int init_delay_usec)
+{
+    if (h->reaper == NULL) {
+        h->reaper = ccn_schedule_event(h->sched, init_delay_usec, reap, NULL, 0);
+        /* <!--kuwayama */
+        //commented by xu//ccn_schedule_event(h->drr, init_delay_usec, reap, NULL, 0);
+        /*  kuwayama--> */
+    }
+}
+
+/**
+ * Remove a content object from the store
+ */
+static int
+remove_content(struct ccnd_handle *h, struct content_entry *content)
+{
+    struct ccny *y = NULL;
+    int flag = 0;
+    if (content == NULL)
+        return(-1);
+
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE){
+        flag = 0;
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+    }
+    else{
+        flag = 1;
+        y = ccny_from_cookie(h->content_tree, content->accession);
+    }
+
+
+    if (y == NULL)
+        return(-1);
+    if (content->refs != 0)
+        ccnd_debug_content(h, __LINE__, "remove_queued_content", NULL, content);
+    else if (h->debug & 4)
+        ccnd_debug_content(h, __LINE__, "remove", NULL, content);
+    // modified by xu for g content store 
+    if(flag == 0){
+        ccny_remove(h->content_tree_g, y);
+        content = NULL;
+        ccny_destroy(h->content_tree_g, &y); /* releases content as well */
+    } else {
+        ccny_remove(h->content_tree, y);
+        content = NULL;
+        ccny_destroy(h->content_tree, &y); /* releases content as well */
+    }
+    return(0);
+}
+
+/**
+ * Age out the old forwarding table entries
+ */
+static int
+age_forwarding(struct ccn_schedule *sched,
+             void *clienth,
+             struct ccn_scheduled_event *ev,
+             int flags)
+{
+    struct ccnd_handle *h = clienth;
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct ccn_forwarding *f;
+    struct ccn_forwarding *next;
+    struct ccn_forwarding **p;
+    struct nameprefix_entry *npe;
+    
+    if ((flags & CCN_SCHEDULE_CANCEL) != 0) {
+        h->age_forwarding = NULL;
+        return(0);
+    }
+    hashtb_start(h->nameprefix_tab, e);
+    for (npe = e->data; npe != NULL; npe = e->data) {
+        p = &npe->forwarding;
+        for (f = npe->forwarding; f != NULL; f = next) {
+            next = f->next;
+            if ((f->flags & CCN_FORW_REFRESHED) == 0 ||
+                  face_from_faceid(h, f->faceid) == NULL) {
+                if (h->debug & 2) {
+                    struct face *face = face_from_faceid(h, f->faceid);
+                    if (face != NULL) {
+                        struct ccn_charbuf *prefix = ccn_charbuf_create();
+                        ccn_name_init(prefix);
+                        ccn_name_append_components(prefix, e->key, 0, e->keysize);
+                        ccnd_debug_ccnb(h, __LINE__, "prefix_expiry", face,
+                                prefix->buf,
+                                prefix->length);
+                        ccn_charbuf_destroy(&prefix);
+                    }
+                }
+                *p = next;
+                free(f);
+                f = NULL;
+                continue;
+            }
+            f->expires -= CCN_FWU_SECS;
+            if (f->expires <= 0)
+                f->flags &= ~CCN_FORW_REFRESHED;
+            p = &(f->next);
+        }
+        hashtb_next(e);
+    }
+    hashtb_end(e);
+    h->forward_to_gen += 1;
+    return(CCN_FWU_SECS*1000000);
+}
+
+/**
+ * Make sure a call to age_forwarding is scheduled.
+ */
+static void
+age_forwarding_needed(struct ccnd_handle *h)
+{
+    if (h->age_forwarding == NULL)
+        h->age_forwarding = ccn_schedule_event(h->sched,
+                                               CCN_FWU_SECS*1000000,
+                                               age_forwarding,
+                                               NULL, 0);
+}
+
+/**
+ * Look up a forwarding entry, creating it if it is not there.
+ */
+static struct ccn_forwarding *
+seek_forwarding(struct ccnd_handle *h,
+                struct nameprefix_entry *npe, unsigned faceid)
+{
+    struct ccn_forwarding *f;
+    
+    for (f = npe->forwarding; f != NULL; f = f->next)
+        if (f->faceid == faceid)
+            return(f);
+    f = calloc(1, sizeof(*f));
+    if (f != NULL) {
+        f->faceid = faceid;
+        f->flags = (CCN_FORW_CHILD_INHERIT | CCN_FORW_ACTIVE);
+        f->expires = 0x7FFFFFFF;
+        f->next = npe->forwarding;
+        npe->forwarding = f;
+    }
+    return(f);
+}
+
+/**
+ * Register or update a prefix in the forwarding table (FIB).
+ *
+ * @param h is the ccnd handle.
+ * @param msg is a ccnb-encoded message containing the name prefix somewhere.
+ * @param comps contains the delimiting offsets for the name components in msg.
+ * @param ncomps is the number of relevant components.
+ * @param faceid indicates which face to forward to.
+ * @param flags are the forwarding entry flags (CCN_FORW_...), -1 for defaults.
+ * @param expires tells the remaining lifetime, in seconds.
+ * @returns -1 for error, or new flags upon success; the private flag
+ *        CCN_FORW_REFRESHED indicates a previously existing entry.
+ */
+static int
+ccnd_reg_prefix(struct ccnd_handle *h,
+                const unsigned char *msg,
+                struct ccn_indexbuf *comps,
+                int ncomps,
+                unsigned faceid,
+                int flags,
+                int expires)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct ccn_forwarding *f = NULL;
+    struct nameprefix_entry *npe = NULL;
+    int res;
+    struct face *face = NULL;
+    
+    if (flags >= 0 &&
+        (flags & CCN_FORW_PUBMASK) != flags)
+        return(-1);
+    face = face_from_faceid(h, faceid);
+    if (face == NULL)
+        return(-1);
+    /* This is a bit hacky, but it gives us a way to set CCN_FACE_DC */
+    if (flags >= 0 && (flags & CCN_FORW_LAST) != 0)
+        face->flags |= CCN_FACE_DC;
+    hashtb_start(h->nameprefix_tab, e);
+    res = nameprefix_seek(h, e, msg, comps, ncomps);
+    if (res >= 0) {
+        res = (res == HT_OLD_ENTRY) ? CCN_FORW_REFRESHED : 0;
+        npe = e->data;
+        f = seek_forwarding(h, npe, faceid);
+        if (f != NULL) {
+            h->forward_to_gen += 1; // XXX - too conservative, should check changes
+            f->expires = expires;
+            if (flags < 0)
+                flags = f->flags & CCN_FORW_PUBMASK;
+            f->flags = (CCN_FORW_REFRESHED | flags);
+            res |= flags;
+            if (h->debug & (2 | 4)) {
+                struct ccn_charbuf *prefix = ccn_charbuf_create();
+                struct ccn_charbuf *debugtag = ccn_charbuf_create();
+                ccn_charbuf_putf(debugtag, "prefix,ff=%s%x",
+                                 flags > 9 ? "0x" : "", flags);
+                if (f->expires < (1 << 30))
+                    ccn_charbuf_putf(debugtag, ",sec=%d", expires);
+                ccn_name_init(prefix);
+                ccn_name_append_components(prefix, msg,
+                                           comps->buf[0], comps->buf[ncomps]);
+                ccnd_debug_ccnb(h, __LINE__,
+                                ccn_charbuf_as_string(debugtag),
+                                face,
+                                prefix->buf,
+                                prefix->length);
+                ccn_charbuf_destroy(&prefix);
+                ccn_charbuf_destroy(&debugtag);
+            }
+        }
+        else
+            res = -1;
+    }
+    hashtb_end(e);
+    if (res >= 0)
+        update_npe_children(h, npe, faceid);
+    return(res);
+}
+
+/**
+ * Register a prefix, expressed in the form of a URI.
+ * @returns negative value for error, or new face flags for success.
+ */
+int
+ccnd_reg_uri(struct ccnd_handle *h,
+             const char *uri,
+             unsigned faceid,
+             int flags,
+             int expires)
+{
+    struct ccn_charbuf *name;
+    struct ccn_buf_decoder decoder;
+    struct ccn_buf_decoder *d;
+    struct ccn_indexbuf *comps;
+    int res;
+    
+    name = ccn_charbuf_create();
+    ccn_name_init(name);
+    res = ccn_name_from_uri(name, uri);
+    if (res < 0)
+        goto Bail;
+    comps = ccn_indexbuf_create();
+    d = ccn_buf_decoder_start(&decoder, name->buf, name->length);
+    res = ccn_parse_Name(d, comps);
+    if (res < 0)
+        goto Bail;
+    res = ccnd_reg_prefix(h, name->buf, comps, comps->n - 1,
+                          faceid, flags, expires);
+Bail:
+    ccn_charbuf_destroy(&name);
+    ccn_indexbuf_destroy(&comps);
+    return(res);
+}
+
+/**
+ * Register prefixes, expressed in the form of a list of URIs.
+ * The URIs in the charbuf are each terminated by nul.
+ */
+void
+ccnd_reg_uri_list(struct ccnd_handle *h,
+             struct ccn_charbuf *uris,
+             unsigned faceid,
+             int flags,
+             int expires)
+{
+    size_t i;
+    const char *s;
+    s = ccn_charbuf_as_string(uris);
+    for (i = 0; i + 1 < uris->length; i += strlen(s + i) + 1)
+        ccnd_reg_uri(h, s + i, faceid, flags, expires);
+}
+
+/**
+ * Called when a face is first created, and (perhaps) a second time in the case
+ * that a face transitions from the undecided state.
+ */
+static void
+register_new_face(struct ccnd_handle *h, struct face *face)
+{
+    if (face->faceid != 0 && (face->flags & (CCN_FACE_UNDECIDED | CCN_FACE_PASSIVE)) == 0) {
+        ccnd_face_status_change(h, face->faceid);
+        if (h->flood && h->autoreg != NULL && (face->flags & CCN_FACE_GG) == 0)
+            ccnd_reg_uri_list(h, h->autoreg, face->faceid,
+                              CCN_FORW_CAPTURE_OK | CCN_FORW_CHILD_INHERIT | CCN_FORW_ACTIVE,
+                              0x7FFFFFFF);
+        ccn_link_state_init(h, face);
+    }
+}
+
+/**
+ * Replaces contents of reply_body with a ccnb-encoded StatusResponse.
+ *
+ * @returns CCN_CONTENT_NACK, or -1 in case of error.
+ */
+static int
+ccnd_nack(struct ccnd_handle *h, struct ccn_charbuf *reply_body,
+          int errcode, const char *errtext)
+{
+    int res;
+    reply_body->length = 0;
+    res = ccn_encode_StatusResponse(reply_body, errcode, errtext);
+    if (res == 0) {
+        res = CCN_CONTENT_NACK;
+        ccnd_msg(h, "nack status_code %d - %s", errcode, errtext);
+    }
+    return(res);
+}
+
+/**
+ * Check that indicated ccndid matches ours.
+ *
+ * Fills reply_body with a StatusResponse in case of no match.
+ *
+ * @returns 0 if OK, or CCN_CONTENT_NACK if not.
+ */
+static int
+check_ccndid(struct ccnd_handle *h,
+             const void *p, size_t sz, struct ccn_charbuf *reply_body)
+{
+    if (sz != sizeof(h->ccnd_id) || memcmp(p, h->ccnd_id, sz) != 0)
+        return(ccnd_nack(h, reply_body, 531, "missing or incorrect ccndid"));
+    return(0);
+}
+
+/**
+ * Check ccndid, given a face instance.
+ */
+static int
+check_face_instance_ccndid(struct ccnd_handle *h,
+    struct ccn_face_instance *f, struct ccn_charbuf *reply_body)
+{
+    return(check_ccndid(h, f->ccnd_id, f->ccnd_id_size, reply_body));
+}
+
+/**
+ * Check ccndid, given a parsed ForwardingEntry.
+ */
+static int
+check_forwarding_entry_ccndid(struct ccnd_handle *h,
+    struct ccn_forwarding_entry *f, struct ccn_charbuf *reply_body)
+{
+    return(check_ccndid(h, f->ccnd_id, f->ccnd_id_size, reply_body));
+}
+
+/**
+ * Process a newface request for the ccnd internal client.
+ *
+ * @param h is the ccnd handle
+ * @param msg points to a ccnd-encoded ContentObject containing a
+ *         FaceInstance in its Content.
+ * @param size is its size in bytes
+ * @param reply_body is a buffer to hold the Content of the reply, as a
+ *         FaceInstance including faceid
+ * @returns 0 for success, negative for no response, or CCN_CONTENT_NACK to
+ *         set the response type to NACK.
+ *
+ * Is is permitted for the face to already exist.
+ * A newly created face will have no registered prefixes, and so will not
+ * receive any traffic.
+ */
+int
+ccnd_req_newface(struct ccnd_handle *h,
+                 const unsigned char *msg, size_t size,
+                 struct ccn_charbuf *reply_body)
+{
+    struct ccn_parsed_ContentObject pco = {0};
+    int res;
+    const unsigned char *req;
+    size_t req_size;
+    struct ccn_face_instance *face_instance = NULL;
+    struct addrinfo hints = {0};
+    struct addrinfo *addrinfo = NULL;
+    int mcast;
+    struct face *face = NULL;
+    struct face *reqface = NULL;
+    struct face *newface = NULL;
+    int save;
+    int nackallowed = 0;
+
+    save = h->flood;
+    h->flood = 0; /* never auto-register for these */
+    res = ccn_parse_ContentObject(msg, size, &pco, NULL);
+    if (res < 0)
+        goto Finish;
+    res = ccn_content_get_value(msg, size, &pco, &req, &req_size);
+    if (res < 0)
+        goto Finish;
+    res = -1;
+    face_instance = ccn_face_instance_parse(req, req_size);
+    if (face_instance == NULL || face_instance->action == NULL)
+        goto Finish;
+    if (strcmp(face_instance->action, "newface") != 0)
+        goto Finish;
+    /* consider the source ... */
+    reqface = face_from_faceid(h, h->interest_faceid);
+    if (reqface == NULL ||
+        (reqface->flags & CCN_FACE_GG) == 0)
+        goto Finish;
+    nackallowed = 1;
+    res = check_face_instance_ccndid(h, face_instance, reply_body);
+    if (res != 0)
+        goto Finish;
+    if (face_instance->descr.ipproto != IPPROTO_UDP &&
+        face_instance->descr.ipproto != IPPROTO_TCP) {
+        res = ccnd_nack(h, reply_body, 504, "parameter error");
+        goto Finish;
+    }
+    if (face_instance->descr.address == NULL) {
+        res = ccnd_nack(h, reply_body, 504, "parameter error");
+        goto Finish;
+    }
+    if (face_instance->descr.port == NULL) {
+        res = ccnd_nack(h, reply_body, 504, "parameter error");
+        goto Finish;
+    }
+    if ((reqface->flags & CCN_FACE_GG) == 0) {
+        res = ccnd_nack(h, reply_body, 430, "not authorized");
+        goto Finish;
+    }
+    hints.ai_flags |= AI_NUMERICHOST;
+    hints.ai_protocol = face_instance->descr.ipproto;
+    hints.ai_socktype = (hints.ai_protocol == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
+    res = getaddrinfo(face_instance->descr.address,
+                      face_instance->descr.port,
+                      &hints,
+                      &addrinfo);
+    if (res != 0 || (h->debug & 128) != 0)
+        ccnd_msg(h, "ccnd_req_newface from %u: getaddrinfo(%s, %s, ...) returned %d",
+                 h->interest_faceid,
+                 face_instance->descr.address,
+                 face_instance->descr.port,
+                 res);
+    if (res != 0 || addrinfo == NULL) {
+        res = ccnd_nack(h, reply_body, 501, "syntax error in address");
+        goto Finish;
+    }
+    if (addrinfo->ai_next != NULL)
+        ccnd_msg(h, "ccnd_req_newface: (addrinfo->ai_next != NULL) ? ?");
+    if (face_instance->descr.ipproto == IPPROTO_UDP) {
+        mcast = 0;
+        if (addrinfo->ai_family == AF_INET) {
+            face = face_from_faceid(h, h->ipv4_faceid);
+            mcast = IN_MULTICAST(ntohl(((struct sockaddr_in *)(addrinfo->ai_addr))->sin_addr.s_addr));
+        }
+        else if (addrinfo->ai_family == AF_INET6) {
+            face = face_from_faceid(h, h->ipv6_faceid);
+            mcast = IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6 *)addrinfo->ai_addr)->sin6_addr);
+        }
+        if (mcast)
+            face = setup_multicast(h, face_instance,
+                                   addrinfo->ai_addr,
+                                   addrinfo->ai_addrlen);
+        if (face == NULL) {
+            res = ccnd_nack(h, reply_body, 453, "could not setup multicast");
+            goto Finish;
+        }
+        newface = get_dgram_source(h, face,
+                                   addrinfo->ai_addr,
+                                   addrinfo->ai_addrlen,
+                                   0);
+    }
+    else if (addrinfo->ai_socktype == SOCK_STREAM) {
+        newface = make_connection(h,
+                                  addrinfo->ai_addr,
+                                  addrinfo->ai_addrlen,
+                                  0);
+    }
+    if (newface != NULL) {
+        newface->flags |= CCN_FACE_PERMANENT;
+        face_instance->action = NULL;
+        face_instance->ccnd_id = h->ccnd_id;
+        face_instance->ccnd_id_size = sizeof(h->ccnd_id);
+        face_instance->faceid = newface->faceid;
+        face_instance->lifetime = 0x7FFFFFFF;
+        /*
+         * A short lifetime is a clue to the client that
+         * the connection has not been completed.
+         */
+        if ((newface->flags & CCN_FACE_CONNECTING) != 0)
+            face_instance->lifetime = 1;
+        res = ccnb_append_face_instance(reply_body, face_instance);
+        if (res > 0)
+            res = 0;
+    }
+    else
+        res = ccnd_nack(h, reply_body, 450, "could not create face");
+Finish:
+    h->flood = save; /* restore saved flood flag */
+    ccn_face_instance_destroy(&face_instance);
+    if (addrinfo != NULL)
+        freeaddrinfo(addrinfo);
+    return((nackallowed || res <= 0) ? res : -1);
+}
+
+/**
+ * @brief Process a destroyface request for the ccnd internal client.
+ * @param h is the ccnd handle
+ * @param msg points to a ccnd-encoded ContentObject containing a FaceInstance
+            in its Content.
+ * @param size is its size in bytes
+ * @param reply_body is a buffer to hold the Content of the reply, as a
+ *         FaceInstance including faceid
+ * @returns 0 for success, negative for no response, or CCN_CONTENT_NACK to
+ *         set the response type to NACK.
+ *
+ * Is is an error if the face does not exist.
+ */
+int
+ccnd_req_destroyface(struct ccnd_handle *h,
+                     const unsigned char *msg, size_t size,
+                     struct ccn_charbuf *reply_body)
+{
+    struct ccn_parsed_ContentObject pco = {0};
+    int res;
+    int at = 0;
+    const unsigned char *req;
+    size_t req_size;
+    struct ccn_face_instance *face_instance = NULL;
+    struct face *reqface = NULL;
+    int nackallowed = 0;
+
+    res = ccn_parse_ContentObject(msg, size, &pco, NULL);
+    if (res < 0) { at = __LINE__; goto Finish; }
+    res = ccn_content_get_value(msg, size, &pco, &req, &req_size);
+    if (res < 0) { at = __LINE__; goto Finish; }
+    res = -1;
+    face_instance = ccn_face_instance_parse(req, req_size);
+    if (face_instance == NULL) { at = __LINE__; goto Finish; }
+    if (face_instance->action == NULL) { at = __LINE__; goto Finish; }
+    /* consider the source ... */
+    reqface = face_from_faceid(h, h->interest_faceid);
+    if (reqface == NULL) { at = __LINE__; goto Finish; }
+    if ((reqface->flags & CCN_FACE_GG) == 0) { at = __LINE__; goto Finish; }
+    nackallowed = 1;
+    if (strcmp(face_instance->action, "destroyface") != 0)
+        { at = __LINE__; goto Finish; }
+    res = check_face_instance_ccndid(h, face_instance, reply_body);
+    if (res != 0)
+        { at = __LINE__; goto Finish; }
+    if (face_instance->faceid == 0) { at = __LINE__; goto Finish; }
+    res = ccnd_destroy_face(h, face_instance->faceid);
+    if (res < 0) { at = __LINE__; goto Finish; }
+    face_instance->action = NULL;
+    face_instance->ccnd_id = h->ccnd_id;
+    face_instance->ccnd_id_size = sizeof(h->ccnd_id);
+    face_instance->lifetime = 0;
+    res = ccnb_append_face_instance(reply_body, face_instance);
+    if (res < 0) {
+        at = __LINE__;
+    }
+Finish:
+    if (at != 0) {
+        ccnd_msg(h, "ccnd_req_destroyface failed (line %d, res %d)", at, res);
+        if (reqface == NULL || (reqface->flags & CCN_FACE_GG) == 0)
+            res = -1;
+        else
+            res = ccnd_nack(h, reply_body, 450, "could not destroy face");
+    }
+    ccn_face_instance_destroy(&face_instance);
+    return((nackallowed || res <= 0) ? res : -1);
+}
+
+/**
+ * Worker bee for two very similar public functions.
+ */
+static int
+ccnd_req_prefix_or_self_reg(struct ccnd_handle *h,
+                            const unsigned char *msg, size_t size, int selfreg,
+                            struct ccn_charbuf *reply_body)
+{
+    struct ccn_parsed_ContentObject pco = {0};
+    int res;
+    const unsigned char *req;
+    size_t req_size;
+    struct ccn_forwarding_entry *forwarding_entry = NULL;
+    struct face *face = NULL;
+    struct face *reqface = NULL;
+    struct ccn_indexbuf *comps = NULL;
+    int nackallowed = 0;
+
+    res = ccn_parse_ContentObject(msg, size, &pco, NULL);
+    if (res < 0)
+        goto Finish;
+    res = ccn_content_get_value(msg, size, &pco, &req, &req_size);
+    if (res < 0)
+        goto Finish;
+    res = -1;
+    forwarding_entry = ccn_forwarding_entry_parse(req, req_size);
+    if (forwarding_entry == NULL || forwarding_entry->action == NULL)
+        goto Finish;
+    /* consider the source ... */
+    reqface = face_from_faceid(h, h->interest_faceid);
+    if (reqface == NULL)
+        goto Finish;
+    if ((reqface->flags & (CCN_FACE_GG | CCN_FACE_REGOK)) == 0)
+        goto Finish;
+    nackallowed = 1;
+    if (selfreg) {
+        if (strcmp(forwarding_entry->action, "selfreg") != 0)
+            goto Finish;
+        if (forwarding_entry->faceid == CCN_NOFACEID)
+            forwarding_entry->faceid = h->interest_faceid;
+        else if (forwarding_entry->faceid != h->interest_faceid)
+            goto Finish;
+    }
+    else {
+        if (strcmp(forwarding_entry->action, "prefixreg") != 0)
+        goto Finish;
+    }
+    if (forwarding_entry->name_prefix == NULL)
+        goto Finish;
+    if (forwarding_entry->ccnd_id_size == sizeof(h->ccnd_id)) {
+        if (memcmp(forwarding_entry->ccnd_id,
+                   h->ccnd_id, sizeof(h->ccnd_id)) != 0)
+            goto Finish;
+    }
+    else if (forwarding_entry->ccnd_id_size != 0)
+        goto Finish;
+    face = face_from_faceid(h, forwarding_entry->faceid);
+    if (face == NULL)
+        goto Finish;
+    if (forwarding_entry->lifetime < 0)
+        forwarding_entry->lifetime = 2000000000;
+    else if (forwarding_entry->lifetime > 3600 &&
+             forwarding_entry->lifetime < (1 << 30))
+        forwarding_entry->lifetime = 300;
+    comps = ccn_indexbuf_create();
+    res = ccn_name_split(forwarding_entry->name_prefix, comps);
+    if (res < 0)
+        goto Finish;
+    res = ccnd_reg_prefix(h,
+                          forwarding_entry->name_prefix->buf, comps, res,
+                          face->faceid,
+                          forwarding_entry->flags,
+                          forwarding_entry->lifetime);
+    if (res < 0)
+        goto Finish;
+    forwarding_entry->flags = res;
+    forwarding_entry->action = NULL;
+    forwarding_entry->ccnd_id = h->ccnd_id;
+    forwarding_entry->ccnd_id_size = sizeof(h->ccnd_id);
+    res = ccnb_append_forwarding_entry(reply_body, forwarding_entry);
+    if (res > 0)
+        res = 0;
+Finish:
+    ccn_forwarding_entry_destroy(&forwarding_entry);
+    ccn_indexbuf_destroy(&comps);
+    if (nackallowed && res < 0)
+        res = ccnd_nack(h, reply_body, 450, "could not register prefix");
+    return((nackallowed || res <= 0) ? res : -1);
+}
+
+/**
+ * @brief Process a prefixreg request for the ccnd internal client.
+ * @param h is the ccnd handle
+ * @param msg points to a ccnd-encoded ContentObject containing a
+ *          ForwardingEntry in its Content.
+ * @param size is its size in bytes
+ * @param reply_body is a buffer to hold the Content of the reply, as a
+ *         FaceInstance including faceid
+ * @returns 0 for success, negative for no response, or CCN_CONTENT_NACK to
+ *         set the response type to NACK.
+ *
+ */
+int
+ccnd_req_prefixreg(struct ccnd_handle *h,
+                   const unsigned char *msg, size_t size,
+                   struct ccn_charbuf *reply_body)
+{
+    return(ccnd_req_prefix_or_self_reg(h, msg, size, 0, reply_body));
+}
+
+/**
+ * @brief Process a selfreg request for the ccnd internal client.
+ * @param h is the ccnd handle
+ * @param msg points to a ccnd-encoded ContentObject containing a
+ *          ForwardingEntry in its Content.
+ * @param size is its size in bytes
+ * @param reply_body is a buffer to hold the Content of the reply, as a
+ *         ccnb-encoded ForwardingEntry
+ * @returns 0 for success, negative for no response, or CCN_CONTENT_NACK to
+ *         set the response type to NACK.
+ *
+ */
+int
+ccnd_req_selfreg(struct ccnd_handle *h,
+                 const unsigned char *msg, size_t size,
+                 struct ccn_charbuf *reply_body)
+{
+    return(ccnd_req_prefix_or_self_reg(h, msg, size, 1, reply_body));
+}
+
+/**
+ * @brief Process an unreg request for the ccnd internal client.
+ * @param h is the ccnd handle
+ * @param msg points to a ccnd-encoded ContentObject containing a
+ *          ForwardingEntry in its Content.
+ * @param size is its size in bytes
+ * @param reply_body is a buffer to hold the Content of the reply, as a
+ *         ccnb-encoded ForwardingEntry
+ * @returns 0 for success, negative for no response, or CCN_CONTENT_NACK to
+ *         set the response type to NACK.
+ *
+ */
+int
+ccnd_req_unreg(struct ccnd_handle *h,
+               const unsigned char *msg, size_t size,
+               struct ccn_charbuf *reply_body)
+{
+    struct ccn_parsed_ContentObject pco = {0};
+    int n_name_comp = 0;
+    int res;
+    const unsigned char *req;
+    size_t req_size;
+    size_t start;
+    size_t stop;
+    int found;
+    struct ccn_forwarding_entry *forwarding_entry = NULL;
+    struct face *face = NULL;
+    struct face *reqface = NULL;
+    struct ccn_indexbuf *comps = NULL;
+    struct ccn_forwarding **p = NULL;
+    struct ccn_forwarding *f = NULL;
+    struct nameprefix_entry *npe = NULL;
+    int nackallowed = 0;
+    
+    res = ccn_parse_ContentObject(msg, size, &pco, NULL);
+    if (res < 0)
+        goto Finish;        
+    res = ccn_content_get_value(msg, size, &pco, &req, &req_size);
+    if (res < 0)
+        goto Finish;
+    res = -1;
+    forwarding_entry = ccn_forwarding_entry_parse(req, req_size);
+    /* consider the source ... */
+    reqface = face_from_faceid(h, h->interest_faceid);
+    if (reqface == NULL || (reqface->flags & CCN_FACE_GG) == 0)
+        goto Finish;
+    nackallowed = 1;
+    if (forwarding_entry == NULL || forwarding_entry->action == NULL)
+        goto Finish;
+    if (strcmp(forwarding_entry->action, "unreg") != 0)
+        goto Finish;
+    if (forwarding_entry->faceid == CCN_NOFACEID)
+        goto Finish;
+    if (forwarding_entry->name_prefix == NULL)
+        goto Finish;
+    res = check_forwarding_entry_ccndid(h, forwarding_entry, reply_body);
+    if (res != 0)
+        goto Finish;
+    res = -1;
+    face = face_from_faceid(h, forwarding_entry->faceid);
+    if (face == NULL)
+        goto Finish;
+    comps = ccn_indexbuf_create();
+    n_name_comp = ccn_name_split(forwarding_entry->name_prefix, comps);
+    if (n_name_comp < 0)
+        goto Finish;
+    if (n_name_comp + 1 > comps->n)
+        goto Finish;
+    start = comps->buf[0];
+    stop = comps->buf[n_name_comp];
+    npe = hashtb_lookup(h->nameprefix_tab,
+                        forwarding_entry->name_prefix->buf + start,
+                        stop - start);
+    if (npe == NULL)
+        goto Finish;
+    found = 0;
+    p = &npe->forwarding;
+    for (f = npe->forwarding; f != NULL; f = f->next) {
+        if (f->faceid == forwarding_entry->faceid) {
+            found = 1;
+            if (h->debug & (2 | 4))
+                ccnd_debug_ccnb(h, __LINE__, "prefix_unreg", face,
+                                forwarding_entry->name_prefix->buf,
+                                forwarding_entry->name_prefix->length);
+            *p = f->next;
+            free(f);
+            f = NULL;
+            h->forward_to_gen += 1;
+            break;
+        }
+        p = &(f->next);
+    }
+    if (!found)
+        goto Finish;    
+    forwarding_entry->action = NULL;
+    forwarding_entry->ccnd_id = h->ccnd_id;
+    forwarding_entry->ccnd_id_size = sizeof(h->ccnd_id);
+    res = ccnb_append_forwarding_entry(reply_body, forwarding_entry);
+    if (res > 0)
+        res = 0;
+Finish:
+    ccn_forwarding_entry_destroy(&forwarding_entry);
+    ccn_indexbuf_destroy(&comps);
+    if (nackallowed && res < 0)
+        res = ccnd_nack(h, reply_body, 450, "could not unregister prefix");
+    return((nackallowed || res <= 0) ? res : -1);
+}
+
+/**
+ * Process a strategy selection request
+ *
+ * This is a request to set, remove, or get the strategy associated
+ * with a prefix.
+ */
+int
+ccnd_req_strategy(struct ccnd_handle *h,
+                  const unsigned char *msg, size_t size,
+                  const char *action,
+                  struct ccn_charbuf *reply_body)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct ccn_parsed_ContentObject pco = {0};
+    int reason = 0;
+    int res;
+    const unsigned char *req;
+    size_t req_size;
+    struct ccn_strategy_selection *strategy_selection = NULL;
+    struct strategy_instance *si = NULL;
+    const struct strategy_class *sclass = NULL;
+    struct nameprefix_entry *npe = NULL;
+    struct nameprefix_entry *p = NULL;
+    struct face *reqface = NULL;
+    struct ccn_indexbuf *comps = NULL;
+    int n = 0;
+    int nackallowed = 0;
+    
+    reason = __LINE__;
+    res = ccn_parse_ContentObject(msg, size, &pco, NULL);
+    if (res < 0)
+        goto Finish;
+    res = ccn_content_get_value(msg, size, &pco, &req, &req_size);
+    if (res < 0)
+        goto Finish;
+    res = -1;
+    reason = __LINE__;
+    strategy_selection = ccn_strategy_selection_parse(req, req_size);
+    if (strategy_selection == NULL || strategy_selection->action == NULL)
+        goto Finish;
+    /* consider the source ... */
+    reqface = face_from_faceid(h, h->interest_faceid);
+    if (reqface == NULL)
+        goto Finish;
+    if ((reqface->flags & (CCN_FACE_GG | CCN_FACE_REGOK)) == 0)
+        goto Finish;
+    nackallowed = 1;
+    
+    if (strategy_selection->name_prefix == NULL) {
+        reason = __LINE__;
+        goto Finish;
+    }
+    if (strategy_selection->ccnd_id_size == sizeof(h->ccnd_id)) {
+        if (memcmp(strategy_selection->ccnd_id,
+                   h->ccnd_id, sizeof(h->ccnd_id)) != 0) {
+            reason = __LINE__;
+            goto Finish;
+        }
+    }
+    else if (strategy_selection->ccnd_id_size != 0) {
+        reason = __LINE__;
+        goto Finish;
+    }
+    if (strcmp(strategy_selection->action, action) != 0) {
+        reason = __LINE__;
+        goto Finish;
+    }
+    /* All requests need a prefix to operate on; set it up here */
+    comps = ccn_indexbuf_create();
+    n = ccn_name_split(strategy_selection->name_prefix, comps);
+    if (n < 0) {
+        reason = __LINE__;
+        goto Finish;
+    }
+    reason = __LINE__;
+    hashtb_start(h->nameprefix_tab, e);
+    res = nameprefix_seek(h, e, strategy_selection->name_prefix->buf, comps, n);
+    npe = e->data;
+    hashtb_end(e);
+    if (npe == NULL || res < 0) {
+        reason = __LINE__;
+        goto Finish;
+    }
+    /* Handle the specific command */
+    if (strcmp(action, "setstrategy") == 0) {
+        if (strategy_selection->strategyid == NULL) {
+            reason = __LINE__;
+            goto Finish;
+        }
+        sclass = strategy_class_from_id(strategy_selection->strategyid);
+        if (sclass == NULL) {
+            reason = __LINE__;
+            goto Finish;
+        }
+        reason = __LINE__;
+        if (h->errbuf != NULL) abort();
+        si = create_strategy_instance(h, npe, sclass,
+                                      strategy_selection->parameters);
+        if (h->errbuf != NULL) {
+            remove_strategy_instance(h, npe);
+            si = NULL;
+        }
+    }
+    else if (strcmp(action, "getstrategy") == 0) {
+        reason = __LINE__;
+        si = get_strategy_instance(h, npe);
+    }
+    else if (strcmp(action, "removestrategy") == 0) {
+        reason = __LINE__;
+        remove_strategy_instance(h, npe);
+        si = get_strategy_instance(h, npe);
+    }
+    else abort(); /* bug in caller, not request */
+    if (si == NULL)
+        goto Finish;
+    /* We need to trim the prefix in the reply */
+    for (p = npe; p != NULL && n > 0; p = p->parent) {
+        if (p->si == si)
+            break;
+        n--;
+    }
+    res = ccn_name_chop(strategy_selection->name_prefix, comps, n);
+    if (res < 0) {
+        reason = __LINE__;
+        goto Finish;
+    }
+    strategy_selection->action = NULL;
+    strategy_selection->ccnd_id = h->ccnd_id;
+    strategy_selection->ccnd_id_size = sizeof(h->ccnd_id);
+    strategy_selection->strategyid = si->sclass->id;
+    strategy_selection->parameters = si->parameters;
+    strategy_selection->lifetime = -1; /* NYI */
+    res = ccnb_append_strategy_selection(reply_body, strategy_selection);
+    if (res > 0)
+        res = 0;
+Finish:
+    ccn_strategy_selection_destroy(&strategy_selection);
+    ccn_indexbuf_destroy(&comps);
+    if (nackallowed && si == NULL) {
+        struct ccn_charbuf *msg = ccn_charbuf_create();
+        ccn_charbuf_putf(msg, "could not process strategy req (l.%d)", reason);
+        if (h->errbuf != NULL)
+            ccn_charbuf_putf(msg, ": %s", ccn_charbuf_as_string(h->errbuf));
+        res = ccnd_nack(h, reply_body, 504, ccn_charbuf_as_string(msg));
+        ccn_charbuf_destroy(&msg);
+    }
+    ccn_charbuf_destroy(&h->errbuf);
+    return((nackallowed || res <= 0) ? res : -1);
+}
+
+/**
+ * Report a strategy initialization failure
+ */
+void
+strategy_init_error(struct ccnd_handle *h,
+                    struct strategy_instance *instance,
+                    const char *message)
+{
+    if (h->errbuf == NULL)
+        h->errbuf = ccn_charbuf_create();
+    else
+        ccn_charbuf_putf(h->errbuf, " / ");
+    ccn_charbuf_putf(h->errbuf, "%s", message);
+}
+
+/**
+ * Set up forward_to list for a name prefix entry.
+ *
+ * Recomputes the contents of npe->forward_to and npe->flags
+ * from forwarding lists of npe and all of its ancestors.
+ * 
+ * Also updates the tap, strategy_ix, and strategy_up fields of npe.
+ */
+static void
+update_forward_to(struct ccnd_handle *h, struct nameprefix_entry *npe)
+{
+    struct ccn_indexbuf *x = NULL;
+    struct ccn_indexbuf *tap = NULL;
+    struct ccn_forwarding *f = NULL;
+    struct nameprefix_entry *p = NULL;
+    unsigned tflags;
+    unsigned wantflags;
+    unsigned moreflags;
+    unsigned lastfaceid;
+    unsigned namespace_flags;
+
+    x = npe->forward_to;
+    if (x == NULL)
+        npe->forward_to = x = ccn_indexbuf_create();
+    else
+        x->n = 0;
+    wantflags = CCN_FORW_ACTIVE;
+    lastfaceid = CCN_NOFACEID;
+    namespace_flags = 0;
+    for (p = npe; p != NULL; p = p->parent) {
+        moreflags = CCN_FORW_CHILD_INHERIT;
+        for (f = p->forwarding; f != NULL; f = f->next) {
+            if (face_from_faceid(h, f->faceid) == NULL)
+                continue;
+            /* The sense of this flag needs to be inverted for this test */
+            tflags = f->flags ^ CCN_FORW_CAPTURE_OK;
+            if ((tflags & wantflags) == wantflags) {
+                if (h->debug & 32)
+                    ccnd_msg(h, "fwd.%d adding %u", __LINE__, f->faceid);
+                ccn_indexbuf_set_insert(x, f->faceid);
+                if ((f->flags & CCN_FORW_TAP) != 0) {
+                    if (tap == NULL)
+                        tap = ccn_indexbuf_create();
+                    ccn_indexbuf_set_insert(tap, f->faceid);
+                }
+                if ((f->flags & CCN_FORW_LAST) != 0)
+                    lastfaceid = f->faceid;
+            }
+            namespace_flags |= f->flags;
+            if ((f->flags & CCN_FORW_CAPTURE) != 0)
+                moreflags |= CCN_FORW_CAPTURE_OK;
+        }
+        wantflags |= moreflags;
+    }
+    if (lastfaceid != CCN_NOFACEID)
+        ccn_indexbuf_move_to_end(x, lastfaceid);
+    npe->flags = namespace_flags;
+    if (x->n == 0)
+        ccn_indexbuf_destroy(&npe->forward_to);
+    ccn_indexbuf_destroy(&npe->tap);
+    npe->tap = tap;
+    npe->fgen = h->forward_to_gen;
+}
+
+/**
+ * This is where we consult the interest forwarding table.
+ * @param h is the ccnd handle
+ * @param from is the handle for the originating face (may be NULL).
+ * @param msg points to the ccnb-encoded interest message
+ * @param pi must be the parse information for msg
+ * @param npe should be the result of the prefix lookup
+ * @result Newly allocated set of outgoing faceids (never NULL)
+ */
+static struct ccn_indexbuf *
+get_outbound_faces(struct ccnd_handle *h,
+    struct face *from,
+    const unsigned char *msg,
+    struct ccn_parsed_interest *pi,
+    struct nameprefix_entry *npe)
+{
+    int checkmask = 0;
+    int wantmask = 0;
+    struct ccn_indexbuf *x;
+    struct face *face;
+    int i;
+    int n;
+    unsigned faceid;
+    
+    while (npe->parent != NULL && npe->forwarding == NULL)
+        npe = npe->parent;
+    if (npe->fgen != h->forward_to_gen)
+        update_forward_to(h, npe);
+    x = ccn_indexbuf_create();
+    if (pi->scope == 0)
+        return(x);
+    if (from != NULL && (from->flags & CCN_FACE_GG) != 0) {
+        i = ccn_fetch_tagged_nonNegativeInteger(CCN_DTAG_FaceID, msg,
+              pi->offset[CCN_PI_B_OTHER], pi->offset[CCN_PI_E_OTHER]);
+        if (i != -1) {
+            faceid = i;
+            ccn_indexbuf_append_element(x, faceid);
+            if (h->debug & 32)
+                ccnd_msg(h, "outbound.%d adding %u", __LINE__, faceid);
+            return(x);
+        }
+    }
+    if (npe->forward_to == NULL || npe->forward_to->n == 0)
+        return(x);
+    if ((npe->flags & CCN_FORW_LOCAL) != 0)
+        checkmask = (from != NULL && (from->flags & CCN_FACE_GG) != 0) ? CCN_FACE_GG : (~0);
+    else if (pi->scope == 1)
+        checkmask = CCN_FACE_GG;
+    else if (pi->scope == 2)
+        checkmask = from ? (CCN_FACE_GG & ~(from->flags)) : ~0;
+    wantmask = checkmask;
+    if (wantmask == CCN_FACE_GG)
+        checkmask |= CCN_FACE_DC;
+    for (n = npe->forward_to->n, i = 0; i < n; i++) {
+        faceid = npe->forward_to->buf[i];
+        face = face_from_faceid(h, faceid);
+        if (face != NULL && face != from &&
+            ((face->flags & checkmask) == wantmask)) {
+            if (h->debug & 32)
+                ccnd_msg(h, "outbound.%d adding %u", __LINE__, face->faceid);
+            ccn_indexbuf_append_element(x, face->faceid);
+        }
+    }
+    return(x);
+}
+
+/**
+ * Compute the delay until the next timed action on an interest.
+ */
+static int
+ie_next_usec(struct ccnd_handle *h, struct interest_entry *ie,
+             ccn_wrappedtime *expiry)
+{
+    struct pit_face_item *p;
+    ccn_wrappedtime base;
+    ccn_wrappedtime delta;
+    ccn_wrappedtime mn;
+    int ans;
+    int debug = (h->debug & 32) != 0;
+    const int horizon = 6 * WTHZ; /* complain if we get behind by too much */
+    
+    base = h->wtnow - horizon;
+    mn = 600 * WTHZ + horizon;
+    for (p = ie->strategy.pfl; p != NULL; p = p->next) {
+        delta = p->expiry - base;
+        if (delta >= 0x80000000 && (h->debug & 2) != 0)
+            debug = 1;
+        if (debug) {
+            static const char fmt_ie_next_usec[] = 
+              "ie_next_usec.%d now%+d i=%u f=%04x %u "
+              " %02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X";
+            ccnd_msg(h, fmt_ie_next_usec, __LINE__,
+                     (int)delta - horizon, ie->serial, p->pfi_flags, p->faceid,
+                     p->nonce[0], p->nonce[1], p->nonce[2], p->nonce[3],
+                     p->nonce[4], p->nonce[5], p->nonce[6], p->nonce[7],
+                     p->nonce[8], p->nonce[9], p->nonce[10], p->nonce[11]);
+        }
+        if (delta < mn)
+            mn = delta;
+    }
+    if (mn < horizon)
+        mn = 0;
+    else
+        mn -= horizon;
+    ans = mn * (1000000 / WTHZ);
+    if (expiry != NULL) {
+        *expiry = h->wtnow + mn;
+        if (debug)
+            ccnd_msg(h, "ie_next_usec.%d expiry=%x", __LINE__,
+                     (unsigned)*expiry);
+    }
+    if (debug)
+        ccnd_msg(h, "ie_next_usec.%d %d usec", __LINE__, ans);
+    return(ans);
+}
+
+/**
+ *  Forward an interest message
+ *
+ *  x is downstream (the interest came from x).
+ *  p is upstream (the interest is to be forwarded to p).
+ *  @returns p (or its reallocated replacement).
+ */
+struct pit_face_item *
+send_interest(struct ccnd_handle *h, struct interest_entry *ie,
+              struct pit_face_item *x, struct pit_face_item *p)
+{
+    struct face *face = NULL;
+    struct ccn_charbuf *c = h->send_interest_scratch;
+    const intmax_t default_life = CCN_INTEREST_LIFETIME_SEC << 12;
+    intmax_t lifetime = default_life;
+    ccn_wrappedtime delta;
+    size_t noncesize;
+    
+    face = face_from_faceid(h, p->faceid);
+    if (face == NULL)
+        return(p);
+    h->interest_faceid = x->faceid; /* relevant if p is face 0 */
+    p = pfi_copy_nonce(h, ie, p, x);
+    delta = x->expiry - x->renewed;
+    lifetime = (intmax_t)delta * 4096 / WTHZ;
+    /* clip lifetime against various limits here */
+    lifetime = (((lifetime + 511) >> 9) << 9); /* round up - 1/8 sec */
+    p->renewed = h->wtnow;
+    p->expiry = h->wtnow + (lifetime * WTHZ / 4096);
+    ccn_charbuf_reset(c);
+    if (lifetime != default_life)
+        ccnb_append_tagged_binary_number(c, CCN_DTAG_InterestLifetime, lifetime);
+    /* <!-- add by xu */
+    /* There may be a bug that if the orginal interest has a ControlPacketID field,
+     * more than one ControlPacketID may be appended.
+     * This situation may occur when a node is forwarding an Interest packet.
+     */
+    if (h->interest_control_flag != -1)
+        ccnb_tagged_putf(c, CCN_DTAG_ControlPacketID, "%d", h->interest_control_flag);//add by xu
+    /* add by xu end -->*/
+    noncesize = p->pfi_flags & CCND_PFI_NONCESZ;
+    if (noncesize != 0)
+        ccnb_append_tagged_blob(c, CCN_DTAG_Nonce, p->nonce, noncesize);
+    ccnb_element_end(c);
+    h->interests_sent += 1;
+    if ((p->pfi_flags & CCND_PFI_UPENDING) == 0) {
+        p->pfi_flags |= CCND_PFI_UPENDING;
+        face->outstanding_interests += 1;
+    }
+    p->pfi_flags &= ~(CCND_PFI_SENDUPST | CCND_PFI_UPHUNGRY);
+    ccnd_meter_bump(h, face->meter[FM_INTO], 1);
+    stuff_and_send(h, face, ie->interest_msg, ie->size - 1, c->buf, c->length, (h->debug & 2) ? "interest_to" : NULL, __LINE__);
+    return(p);
+}
+
+/**
+ * Find the entry for the longest name prefix that contains forwarding info
+ */
+struct nameprefix_entry *
+get_fib_npe(struct ccnd_handle *h, struct interest_entry *ie)
+{
+    struct nameprefix_entry *npe;
+    
+    for (npe = ie->ll.npe; npe != NULL; npe = npe->parent)
+        if (npe->forwarding != NULL)
+            return(npe);
+    return(NULL);
+}
+
+/** Implementation detail for strategy_settimer */
+static int
+strategy_timer(struct ccn_schedule *sched,
+             void *clienth,
+             struct ccn_scheduled_event *ev,
+             int flags)
+{
+    struct ccnd_handle *h = clienth;
+    struct interest_entry *ie = ev->evdata;
+    //struct ccn_strategy *s = &ie->strategy;
+
+    if (ie->stev == ev)
+        ie->stev = NULL;
+    if (flags & CCN_SCHEDULE_CANCEL)
+        return(0);
+    strategy_callout(h, ie, (enum ccn_strategy_op)ev->evint, CCN_NOFACEID);
+    return(0);
+}
+
+/**
+ * Schedule a strategy wakeup
+ *
+ * Any previously wakeup will be cancelled.
+ */
+void
+strategy_settimer(struct ccnd_handle *h, struct interest_entry *ie,
+                  int usec, enum ccn_strategy_op op)
+{
+    //struct ccn_strategy *s = &ie->strategy;
+    
+    if (ie->stev != NULL)
+        ccn_schedule_cancel(h->sched, ie->stev);
+    if (op == CCNST_NOP)
+        return;
+    ie->stev = ccn_schedule_event(h->sched, usec, strategy_timer, ie, op);
+}
+
+/**
+ * Return a pointer to the strategy state records for
+ * the name prefix of the given interest entry and up to k-1 parents.
+ */
+void
+strategy_getstate(struct ccnd_handle *h, struct ccn_strategy *s,
+                  struct nameprefix_state **sst, int k)
+{
+    struct nameprefix_entry *npe = NULL;
+    int i;
+    
+    if (s != NULL)
+        npe = s->ie->ll.npe;
+    for (i = 0; i < k && npe != NULL; i++, npe = npe->parent)
+        sst[i] = &npe->sst;
+    while (i < k)
+        sst[i++] = NULL;
+}
+
+/**
+ * Execute the next timed action on a propagating interest.
+ */
+static int
+do_propagate(struct ccn_schedule *sched,
+             void *clienth,
+             struct ccn_scheduled_event *ev,
+             int flags)
+{
+    struct ccnd_handle *h = clienth;
+    struct interest_entry *ie = ev->evdata;
+    struct face *face = NULL;
+    struct pit_face_item *p = NULL;
+    struct pit_face_item *next = NULL;
+    struct pit_face_item *d[3] = { NULL, NULL, NULL };
+    ccn_wrappedtime now;
+    int next_delay;
+    int i;
+    int n;
+    int pending;
+    int changes;
+    unsigned life;
+    unsigned mn;
+    unsigned rem;
+    
+    if (ie->ev == ev)
+        ie->ev = NULL;
+    else if (ie->ev != NULL) abort();
+    if (flags & CCN_SCHEDULE_CANCEL)
+        return(0);
+    now = h->wtnow;  /* capture our reference */
+    mn = 600 * WTHZ; /* keep track of when we should wake up again */
+    pending = 0;
+    n = 0;
+    for (p = ie->strategy.pfl; p != NULL; p = next) {
+        next = p->next;
+        if ((p->pfi_flags & CCND_PFI_DNSTREAM) != 0) {
+            if (wt_compare(p->expiry, now) <= 0) {
+                strategy_callout(h, ie, CCNST_EXPDN, p->faceid);
+                if (h->debug & 2)
+                    ccnd_debug_ccnb(h, __LINE__, "interest_expiry",
+                                    face_from_faceid(h, p->faceid),
+                                    ie->interest_msg, ie->size);
+                pfi_destroy(h, ie, p);
+                continue;
+            }
+            if ((p->pfi_flags & CCND_PFI_PENDING) == 0)
+                continue;
+            rem = p->expiry - now;
+            if (rem < mn)
+                mn = rem;
+            pending++;
+            /* If this downstream will expire soon, don't use it */
+            life = p->expiry - p->renewed;
+            if (rem * 8 <= life)
+                continue;
+            /* keep track of the 2 longest-lasting downstreams */
+            for (i = n; i > 0 && wt_compare(d[i-1]->expiry, p->expiry) < 0; i--)
+                d[i] = d[i-1];
+            d[i] = p;
+            if (n < 2)
+                n++;
+        }
+    }
+    /* Check the upstreams */
+    changes = 0;
+    for (p = ie->strategy.pfl; p != NULL; p = next) {
+        next = p->next;
+        if ((p->pfi_flags & CCND_PFI_UPSTREAM) == 0)
+            continue;
+        face = face_from_faceid(h, p->faceid);
+        if (face == NULL || (face->flags & CCN_FACE_NOSEND) != 0) {
+            pfi_destroy(h, ie, p);
+            continue;
+        }
+        if ((face->flags & CCN_FACE_DC) != 0 &&
+            (p->pfi_flags & CCND_PFI_DCFACE) == 0) {
+            /* Add 60 ms extra delay before sending to a DC face */
+            p->expiry += (60 * WTHZ + 999) / 1000;
+            p->pfi_flags |= CCND_PFI_DCFACE;
+        }
+        if (wt_compare(now + 1, p->expiry) < 0) {
+            /* Not expired yet */
+            rem = p->expiry - now;
+            if (rem < mn)
+                mn = rem;
+            continue;
+        }
+        if ((p->pfi_flags & CCND_PFI_UPENDING) != 0) {
+            p->pfi_flags &= ~CCND_PFI_UPENDING;
+            face->outstanding_interests -= 1;
+            strategy_callout(h, ie, CCNST_EXPUP, p->faceid);
+        }
+        if ((p->pfi_flags & CCND_PFI_SENDUPST) != 0)
+            continue; /* strategy has already asked to send */
+        for (i = 0; i < n; i++)
+            if (d[i]->faceid != p->faceid)
+                break;
+        if (i < n) {
+            /* Strategy needs to make the decision, so mark it. */
+            changes++;
+            p->pfi_flags |= CCND_PFI_ATTENTION;
+            p->pfi_flags &= ~(CCND_PFI_UPHUNGRY | CCND_PFI_INACTIVE);
+            if (face->recvcount == 0 && (face->flags & CCN_FACE_DGRAM) != 0)
+                p->pfi_flags |= CCND_PFI_INACTIVE;
+        }
+        else {
+            /* Upstream expired, but we have nothing to feed it. */
+            p->pfi_flags |= CCND_PFI_UPHUNGRY;
+        }
+    }
+    if (changes != 0)
+        strategy_callout(h, ie, CCNST_UPDATE, CCN_NOFACEID);
+    for (p = ie->strategy.pfl; p != NULL; p = p->next) {
+        if ((p->pfi_flags & CCND_PFI_ATTENTION) != 0) {
+            ccnd_msg(h, "BUG: ccnd_%s_strategy_impl failed to clear "
+                        "CCND_PFI_ATTENTION",
+                        get_strategy_instance(h, ie->ll.npe)->sclass->id);
+            p->pfi_flags &= ~CCND_PFI_ATTENTION;
+        }
+        if ((p->pfi_flags & CCND_PFI_SENDUPST) == 0)
+            continue;
+        /* select a legitimate downstream */
+        for (i = 0; i < n; i++)
+            if (d[i]->faceid != p->faceid)
+                break;
+        if (i < n) {
+            p = send_interest(h, ie, d[i], p);
+            if (ie->ev != NULL)
+                ccn_schedule_cancel(h->sched, ie->ev);
+            rem = p->expiry - now;
+            if (rem < mn)
+                mn = rem;
+        }
+    }
+    /* if we have some pending upstreams, stick around even if no downstreams */
+    for (p = ie->strategy.pfl; pending == 0 && p != NULL; p = p->next) {
+        if ((p->pfi_flags & CCND_PFI_UPENDING) != 0)
+            pending++;
+    }
+    if (pending == 0) {
+        strategy_callout(h, ie, CCNST_TIMEOUT, CCN_NOFACEID);
+        consume_interest(h, ie);
+        return(0);
+    }
+    /* Determine when we need to run again */
+    if (mn == 0) abort();
+    next_delay = mn * (1000000 / WTHZ);
+    ev->evint = h->wtnow + mn;
+    if (ie->ev != NULL) abort();
+    ie->ev = ev;
+    return(next_delay);
+}
+
+/**
+ * Append an interest Nonce value that is useful for debugging.
+ *
+ * This does leak some information about the origin of interests, but it
+ * also makes it easier to figure out what is happening.
+ *
+ * The debug nonce is 12 bytes long.  When converted to hexadecimal and
+ * broken into fields (big-endian style), it looks like
+ *
+ *   IIIIII-PPPP-FFFF-SSss-XXXXXX
+ *
+ * where
+ *   IIIIII - first 24 bits of the CCNDID.
+ *   PPPP   - pid of the ccnd.
+ *   FFFF   - 16 low-order bits of the faceid.
+ *   SSss   - local time modulo 256 seconds, with 8 bits of fraction
+ *   XXXXXX - 24 random bits.
+ */
+static int
+ccnd_debug_nonce(struct ccnd_handle *h, struct face *face, unsigned char *s) {
+    int i;
+    
+    for (i = 0; i < 3; i++)
+        s[i] = h->ccnd_id[i];
+    s[i++] = h->logpid >> 8;
+    s[i++] = h->logpid;
+    s[i++] = face->faceid >> 8;
+    s[i++] = face->faceid;
+    s[i++] = h->sec;
+    s[i++] = h->usec * 256 / 1000000;
+    for (; i < TYPICAL_NONCE_SIZE; i++)
+        s[i] = nrand48(h->seed);
+    return(i);
+}
+
+/**
+ * Append a random interest Nonce value.
+ *
+ * For production use, although this uses a simple PRNG.
+ */
+static int
+ccnd_plain_nonce(struct ccnd_handle *h, struct face *face, unsigned char *s) {
+    int noncebytes = 6;
+    int i;
+    
+    for (i = 0; i < noncebytes; i++)
+        s[i] = nrand48(h->seed);
+    return(i);
+}
+
+/**
+ * Compare two wrapped time values
+ *
+ * @returns negative if a < b, 0 if a == b, positive if a > b
+ */
+static int
+wt_compare(ccn_wrappedtime a, ccn_wrappedtime b)
+{
+    ccn_wrappedtime delta = a - b;
+    if (delta >= 0x80000000)
+        return(-1);
+    return(delta > 0);
+}
+
+/** Used in just one place; could go away */
+static struct pit_face_item *
+pfi_create(struct ccnd_handle *h,
+           unsigned faceid, unsigned flags,
+           const unsigned char *nonce, size_t noncesize,
+           struct pit_face_item **pp)
+{
+    struct pit_face_item *p;    
+    size_t nsize = TYPICAL_NONCE_SIZE;
+    
+    if (noncesize > CCND_PFI_NONCESZ) return(NULL);
+    if (noncesize > nsize)
+        nsize = noncesize;
+    p = calloc(1, sizeof(*p) + nsize - TYPICAL_NONCE_SIZE);
+    if (p == NULL) return(NULL);
+    p->faceid = faceid;
+    p->renewed = h->wtnow;
+    p->expiry = h->wtnow;
+    p->pfi_flags = (flags & ~CCND_PFI_NONCESZ) + noncesize;
+    memcpy(p->nonce, nonce, noncesize);
+    if (pp != NULL) {
+        p->next = *pp;
+        *pp = p;
+    }
+    return(p);    
+}
+
+/** Remove the pit face item from the interest entry */
+static void
+pfi_destroy(struct ccnd_handle *h, struct interest_entry *ie,
+            struct pit_face_item *p)
+{
+    struct face *face = NULL;
+    struct pit_face_item **pp;
+    
+    for (pp = &ie->strategy.pfl; *pp != p; pp = &(*pp)->next) {
+        if (*pp == NULL) abort();
+    }
+    if ((p->pfi_flags & CCND_PFI_PENDING) != 0) {
+        face = face_from_faceid(h, p->faceid);
+        if (face != NULL)
+            face->pending_interests -= 1;
+    }
+    if ((p->pfi_flags & CCND_PFI_UPENDING) != 0) {
+        face = face_from_faceid(h, p->faceid);
+        if (face != NULL)
+            face->outstanding_interests -= 1;
+    }
+    *pp = p->next;
+    free(p);
+}
+
+/**
+ * Find the pit face item with the given flag set,
+ * or create it if not present.
+ *
+ * New items are appended to the end of the list
+ */
+static struct pit_face_item *
+pfi_seek(struct ccnd_handle *h, struct interest_entry *ie,
+         unsigned faceid, unsigned pfi_flag)
+{
+    struct pit_face_item *p;
+    struct pit_face_item **pp;
+    
+    for (pp = &ie->strategy.pfl, p = ie->strategy.pfl; p != NULL; pp = &p->next, p = p->next) {
+        if (p->faceid == faceid && (p->pfi_flags & pfi_flag) != 0)
+            return(p);
+    }
+    p = calloc(1, sizeof(*p));
+    if (p != NULL) {
+        p->faceid = faceid;
+        p->pfi_flags = pfi_flag;
+        p->expiry = h->wtnow;
+        *pp = p;
+    }
+    return(p);
+}
+
+/**
+ * Set the expiry of the pit face item based upon an interest lifetime
+ *
+ * lifetime is in the units specified by the CCNx protocal - 1/4096 sec
+ *
+ * Also sets the renewed timestamp to now.
+ */
+static void
+pfi_set_expiry_from_lifetime(struct ccnd_handle *h, struct interest_entry *ie,
+                             struct pit_face_item *p, intmax_t lifetime)
+{
+    ccn_wrappedtime delta;
+    ccn_wrappedtime odelta;
+    int minlifetime = 4096 / 8;
+    unsigned maxlifetime = 7 * 24 * 3600 * 4096U; /* one week */
+    
+    if (lifetime < minlifetime)
+        lifetime = minlifetime;
+    if (lifetime > maxlifetime)
+        lifetime = maxlifetime;
+    lifetime = (((lifetime + 511) >> 9) << 9); /* round up - 1/8 sec */
+    delta = ((uintmax_t)lifetime * WTHZ + 4095U) / 4096U;
+    odelta = p->expiry - h->wtnow;
+    if (delta < odelta && odelta < 0x80000000)
+        ccnd_msg(h, "pfi_set_expiry_from_lifetime.%d Oops", __LINE__);
+    p->renewed = h->wtnow;
+    p->expiry = h->wtnow + delta;
+}
+
+/**
+ * Set the expiry of the pit face item using a time in microseconds from present
+ *
+ * Does not set the renewed timestamp.
+ */
+void
+pfi_set_expiry_from_micros(struct ccnd_handle *h, struct interest_entry *ie,
+                           struct pit_face_item *p, unsigned micros)
+{
+    ccn_wrappedtime delta;
+    
+    delta = (micros + (1000000 / WTHZ - 1)) / (1000000 / WTHZ);
+    p->expiry = h->wtnow + delta;
+}
+
+/**
+ * Set the nonce in a pit face item
+ *
+ * @returns the replacement value, which is p unless the nonce will not fit.
+ */
+static struct pit_face_item *
+pfi_set_nonce(struct ccnd_handle *h, struct interest_entry *ie,
+             struct pit_face_item *p,
+             const unsigned char *nonce, size_t noncesize)
+{
+    struct pit_face_item *q = NULL;    
+    size_t nsize;
+    
+    nsize = (p->pfi_flags & CCND_PFI_NONCESZ);
+    if (noncesize != nsize) {
+        if (noncesize > TYPICAL_NONCE_SIZE) {
+            /* Hard case, need to reallocate */
+            q = pfi_create(h, p->faceid, p->pfi_flags,
+                           nonce, noncesize, &p->next);
+            if (q != NULL) {
+                q->renewed = p->renewed;
+                q->expiry = p->expiry;
+                p->pfi_flags = 0; /* preserve pending interest accounting */
+                pfi_destroy(h, ie, p);
+            }
+            return(q);
+        }
+        p->pfi_flags = (p->pfi_flags & ~CCND_PFI_NONCESZ) + noncesize;
+    }
+    memcpy(p->nonce, nonce, noncesize);
+    return(p);
+}
+
+/**
+ * Return true iff the nonce in p matches the given one.
+ */
+static int
+pfi_nonce_matches(struct pit_face_item *p,
+                  const unsigned char *nonce, size_t size)
+{
+    if (p == NULL)
+        return(0);
+    if (size != (p->pfi_flags & CCND_PFI_NONCESZ))
+        return(0);
+    if (memcmp(nonce, p->nonce, size) != 0)
+        return(0);
+    return(1);
+}
+
+/**
+ * Copy a nonce from src into p
+ *
+ * @returns p (or its replacement)
+ */
+static struct pit_face_item *
+pfi_copy_nonce(struct ccnd_handle *h, struct interest_entry *ie,
+             struct pit_face_item *p, const struct pit_face_item *src)
+{
+    p = pfi_set_nonce(h, ie, p, src->nonce, src->pfi_flags & CCND_PFI_NONCESZ);
+    return(p);
+}
+
+/**
+ * True iff the nonce in p does not occur in any of the other items of the entry
+ */
+static int
+pfi_unique_nonce(struct ccnd_handle *h, struct interest_entry *ie,
+                 struct pit_face_item *p)
+{
+    struct pit_face_item *q = NULL;
+    size_t nsize;
+    
+    if (p == NULL)
+        return(1);
+    nsize = (p->pfi_flags & CCND_PFI_NONCESZ);
+    for (q = ie->strategy.pfl; q != NULL; q = q->next) {
+        if (q != p && pfi_nonce_matches(q, p->nonce, nsize))
+            return(0);
+    }
+    return(1);
+}
+
+/**
+ * Send out a new interest to all the TAP registrations
+ */
+static void
+send_tap_interests(struct ccnd_handle *h, struct interest_entry *ie)
+{
+    struct nameprefix_entry *npe;
+    struct ccn_indexbuf *tap = NULL;
+    struct pit_face_item *x = NULL;
+    struct pit_face_item *p = NULL;
+
+    npe = get_fib_npe(h, ie);
+    if (npe == NULL) return;
+    tap = npe->tap;
+    if (tap == NULL) return;
+    /* Find our downstream; right now there should be just one. */
+    for (x = ie->strategy.pfl; x != NULL; x = x->next)
+        if ((x->pfi_flags & CCND_PFI_DNSTREAM) != 0)
+            break;
+    if (x == NULL || (x->pfi_flags & CCND_PFI_PENDING) == 0)
+        return;
+    for (p = ie->strategy.pfl; p!= NULL; p = p->next) {
+        if ((p->pfi_flags & CCND_PFI_UPSTREAM) != 0) {
+            if (ccn_indexbuf_member(tap, p->faceid) >= 0)
+                p = send_interest(h, ie, x, p);
+        }
+    }
+}
+
+/**
+ * Schedules the propagation of an Interest message.
+ */
+static int
+propagate_interest(struct ccnd_handle *h,
+                   struct face *face,
+                   unsigned char *msg,
+                   struct ccn_parsed_interest *pi,
+                   struct nameprefix_entry *npe)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct pit_face_item *p = NULL;
+    struct interest_entry *ie = NULL;
+    struct ccn_indexbuf *outbound = NULL;
+    const unsigned char *nonce;
+    intmax_t lifetime;
+    ccn_wrappedtime expiry;
+    unsigned char cb[TYPICAL_NONCE_SIZE];
+    size_t noncesize;
+    unsigned faceid;
+    int i;
+    int res;
+    int usec;
+    
+    faceid = face->faceid;
+    hashtb_start(h->interest_tab, e);
+    res = hashtb_seek(e, msg, pi->offset[CCN_PI_B_InterestLifetime], 1);
+    if (res < 0) goto Bail;
+    ie = e->data;
+    if (res == HT_NEW_ENTRY) {
+        ie->serial = ++h->iserial;
+        ie->strategy.birth = h->wtnow;
+        ie->strategy.renewed = h->wtnow;
+        ie->strategy.renewals = 0;
+        ie->strategy.ie = ie;
+    }
+    if (ie->interest_msg == NULL) {
+        struct ccn_parsed_interest xpi = {0};
+        int xres;
+        link_interest_entry_to_nameprefix(h, ie, npe);
+        ie->interest_msg = e->key;
+        ie->size = pi->offset[CCN_PI_B_InterestLifetime] + 1;
+        /* Ugly bit, this.  Clear the extension byte. */
+        ((unsigned char *)(intptr_t)ie->interest_msg)[ie->size - 1] = 0;
+        xres = ccn_parse_interest(ie->interest_msg, ie->size, &xpi, NULL);
+        if (xres < 0) abort();
+    
+    /*<-- add by xu*/
+    /*nothing for current*/
+    /*add by xu -->*/
+    }
+    lifetime = ccn_interest_lifetime(msg, pi);
+    outbound = get_outbound_faces(h, face, msg, pi, npe);
+    if (outbound == NULL) goto Bail;
+    nonce = msg + pi->offset[CCN_PI_B_Nonce];
+    noncesize = pi->offset[CCN_PI_E_Nonce] - pi->offset[CCN_PI_B_Nonce];
+    if (noncesize != 0)
+        ccn_ref_tagged_BLOB(CCN_DTAG_Nonce, msg,
+                            pi->offset[CCN_PI_B_Nonce],
+                            pi->offset[CCN_PI_E_Nonce],
+                            &nonce, &noncesize);
+    else {
+        /* This interest has no nonce; generate one before going on */
+        noncesize = (h->noncegen)(h, face, cb);
+        nonce = cb;
+        nonce_ok(h, face, msg, pi, nonce, noncesize);
+    }
+    p = pfi_seek(h, ie, faceid, CCND_PFI_DNSTREAM);
+    p = pfi_set_nonce(h, ie, p, nonce, noncesize);
+    pfi_set_expiry_from_lifetime(h, ie, p, lifetime);
+    if (nonce == cb || pfi_unique_nonce(h, ie, p)) {
+        ie->strategy.renewed = h->wtnow;
+        ie->strategy.renewals += 1;
+        if ((p->pfi_flags & CCND_PFI_PENDING) == 0) {
+            p->pfi_flags |= CCND_PFI_PENDING;
+            face->pending_interests += 1;
+        }
+        if (res == HT_OLD_ENTRY)
+            strategy_callout(h, ie, CCNST_REFRESH, faceid);
+    }
+    else {
+        /* Nonce has been seen before; do not forward. */
+        p->pfi_flags |= CCND_PFI_SUPDATA;
+    }
+    for (i = 0; i < outbound->n; i++) {
+        p = pfi_seek(h, ie, outbound->buf[i], CCND_PFI_UPSTREAM);
+        if ((p->pfi_flags & CCND_PFI_UPENDING) == 0) {
+            p->expiry = h->wtnow;
+            p->pfi_flags &= ~CCND_PFI_UPHUNGRY;
+        }
+    }
+    if (res == HT_NEW_ENTRY) {
+        send_tap_interests(h, ie);
+        strategy_callout(h, ie, CCNST_FIRST, faceid);
+    }
+    usec = ie_next_usec(h, ie, &expiry);
+    if (ie->ev != NULL && wt_compare(expiry + 2, ie->ev->evint) < 0)
+        ccn_schedule_cancel(h->sched, ie->ev);
+    if (ie->ev == NULL)
+        ie->ev = ccn_schedule_event(h->sched, usec, do_propagate, ie, expiry);
+Bail:
+    hashtb_end(e);
+    ccn_indexbuf_destroy(&outbound);
+    return(res);
+}
+
+/**
+ * We have a FIB change - accelerate forwarding of existing interests
+ */
+static void
+update_npe_children(struct ccnd_handle *h, struct nameprefix_entry *npe, unsigned faceid)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct face *fface = NULL;
+    struct ccn_parsed_interest pi;
+    struct pit_face_item *p = NULL;
+    struct interest_entry *ie = NULL;
+    struct nameprefix_entry *x = NULL;
+    struct ccn_indexbuf *ob = NULL;
+    int i;
+    unsigned usec = 6000; /*  a bit of time for prefix reg  */
+
+    hashtb_start(h->interest_tab, e);
+    for (ie = e->data; ie != NULL; ie = e->data) {
+        for (x = ie->ll.npe; x != NULL; x = x->parent) {
+            if (x == npe) {
+                for (fface = NULL, p = ie->strategy.pfl; p != NULL; p = p->next) {
+                    if (p->faceid == faceid) {
+                        if ((p->pfi_flags & CCND_PFI_UPSTREAM) != 0) {
+                            fface = NULL;
+                            break;
+                        }
+                    }
+                    else if ((p->pfi_flags & CCND_PFI_DNSTREAM) != 0) {
+                        if (fface == NULL || (fface->flags & CCN_FACE_GG) == 0)
+                            fface = face_from_faceid(h, p->faceid);
+                    }
+                }
+                if (fface != NULL) {
+                    ccn_parse_interest(ie->interest_msg, ie->size, &pi, NULL);
+                    ob = get_outbound_faces(h, fface, ie->interest_msg,
+                                            &pi, ie->ll.npe);
+                    for (i = 0; i < ob->n; i++) {
+                        if (ob->buf[i] == faceid) {
+                            p = pfi_seek(h, ie, faceid, CCND_PFI_UPSTREAM);
+                            // XXX - strategy callout should be able to control what happens next.
+                            if ((p->pfi_flags & CCND_PFI_UPENDING) == 0) {
+                                p->expiry = h->wtnow + usec / (1000000 / WTHZ);
+                                usec += 200;
+                                if (ie->ev != NULL && wt_compare(p->expiry + 4, ie->ev->evint) < 0)
+                                    ccn_schedule_cancel(h->sched, ie->ev);
+                                if (ie->ev == NULL)
+                                    ie->ev = ccn_schedule_event(h->sched, usec, do_propagate, ie, p->expiry);
+                            }
+                            break;
+                        }
+                    }
+                    ccn_indexbuf_destroy(&ob);
+                }
+                break;
+            }
+        }
+        hashtb_next(e);
+    }
+    hashtb_end(e);
+}
+
+/**
+ * Creates a nameprefix entry if it does not already exist, together
+ * with all of its parents.
+ */
+static int
+nameprefix_seek(struct ccnd_handle *h, struct hashtb_enumerator *e,
+                const unsigned char *msg, struct ccn_indexbuf *comps, int ncomps)
+{
+    int i;
+    int j;
+    int base;
+    int res = -1;
+    struct nameprefix_entry *parent = NULL;
+    struct nameprefix_entry *npe = NULL;
+    struct ielinks *head = NULL;
+
+    if (ncomps + 1 > comps->n)
+        return(-1);
+    base = comps->buf[0];
+    for (i = 0; i <= ncomps; i++) {
+        res = hashtb_seek(e, msg + base, comps->buf[i] - base, 0);
+        if (res < 0)
+            break;
+        npe = e->data;
+        if (res == HT_NEW_ENTRY) {
+            head = &npe->ie_head;
+            head->next = head;
+            head->prev = head;
+            head->npe = NULL;
+            npe->parent = parent;
+            npe->forwarding = NULL;
+            npe->fgen = h->forward_to_gen - 1;
+            npe->forward_to = NULL;
+            npe->si = NULL;
+            if (parent != NULL) {
+                parent->children++;
+                npe->flags = parent->flags;
+                npe->sst = parent->sst;
+                // XXX - it might be a good idea to flag the copy
+            }
+            else {
+                for (j = 0; j < CCND_STRATEGY_STATE_N; j++)
+                    npe->sst.s[j] = CCN_UNINIT;
+            }
+        }
+        parent = npe;
+    }
+    return(res);
+}
+
+// ZZZZ - not in the most obvious place - move closer to other content table stuff
+// XXX - missing doxy
+static struct content_entry *
+next_child_at_level(struct ccnd_handle *h,
+                    struct content_entry *content, int level)
+{
+    struct content_entry *next = NULL;
+    struct ccn_charbuf *flatname = NULL;
+    struct ccn_charbuf *name = NULL;
+    struct ccny *y = NULL;
+    int res;
+    
+    if (content == NULL)
+        return(NULL);
+    if (content->ncomps <= level + 1)
+        return(NULL);
+    name = charbuf_obtain(h);
+    ccn_name_init(name);
+
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE)
+        y = ccny_from_cookie(h->content_tree_g, content->accession_g);
+    else
+        y = ccny_from_cookie(h->content_tree, content->accession);
+
+    res = ccn_name_append_flatname(name, ccny_key(y), ccny_keylen(y), 0, level + 1);
+    if (res < level)
+        goto Bail;
+//    ccnd_debug_ccnb(h, __LINE__, "ccn_name_next_sibling_is_next", NULL,
+//                    name->buf, name->length);
+    if (res == level)
+        res = ccn_name_append(name, NULL, 0);
+    else if (res == level + 1)
+        res = ccn_name_next_sibling(name); // XXX - would be nice to have a flatname version of this
+    if (res < 0)
+        goto Bail;
+    if (h->debug & 8)
+        ccnd_debug_ccnb(h, __LINE__, "child_successor", NULL,
+                        name->buf, name->length);
+    flatname = ccn_charbuf_create();
+    ccn_flatname_from_ccnb(flatname, name->buf, name->length);
+
+    // modified by xu for g content store 
+    if(content->control == GUARANTEE)
+        y = ccn_nametree_look_ge(h->content_tree_g, flatname->buf, flatname->length);
+    else
+        y = ccn_nametree_look_ge(h->content_tree, flatname->buf, flatname->length);
+
+
+    if (y != NULL)
+        next = ccny_payload(y);
+Bail:
+    charbuf_release(h, name);
+    ccn_charbuf_destroy(&flatname);
+    return(next);
+}
+
+/**
+ * Check whether the interest should be dropped for local namespace reasons
+ */
+static int
+drop_nonlocal_interest(struct ccnd_handle *h, struct nameprefix_entry *npe,
+                       struct face *face,
+                       unsigned char *msg, size_t size)
+{
+    if (npe->fgen != h->forward_to_gen)
+        update_forward_to(h, npe);
+    if ((npe->flags & CCN_FORW_LOCAL) != 0 &&
+        (face->flags & CCN_FACE_GG) == 0) {
+        ccnd_debug_ccnb(h, __LINE__, "interest_nonlocal", face, msg, size);
+        h->interests_dropped += 1;
+        return (1);
+    }
+    return(0);
+}
+
+/**
+ * Process an incoming interest message.
+ *
+ * Parse the Interest and discard if it does not parse.
+ * Check for correct scope (a scope 0 or scope 1 interest should never
+ *  arrive on an external face).
+ * Check for a duplicated Nonce, discard if it has been seen before.
+ * Look up the name prefix.  Check for a local namespace and discard
+ *  if an interest in a local namespace arrives from outside.
+ * Consult the content store.  If a suitable matching ContentObject is found,
+ *  prepare to send it, consuming this interest and any pending interests
+ *  on that face that also match this object.
+ * Otherwise, initiate propagation of the interest.
+ */
+static void
+process_incoming_interest(struct ccnd_handle *h, struct face *face,
+                          unsigned char *msg, size_t size)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct ccn_parsed_interest parsed_interest = {0};
+    struct ccn_parsed_interest *pi = &parsed_interest;
+    int k;
+    int res;
+    int try;
+    int matched;
+    int s_ok;
+    struct interest_entry *ie = NULL;
+    struct nameprefix_entry *npe = NULL;
+    struct content_entry *content = NULL;
+    struct content_entry *last_match = NULL;
+    struct content_entry *next = NULL;
+    struct ccn_charbuf *flatname = NULL;
+    struct ccn_indexbuf *comps = indexbuf_obtain(h);
+
+    if (size > 65535) {
+        res = -__LINE__;
+    } else { 
+        res = ccn_parse_interest(msg, size, pi, comps);
+        /* <!--kuwayama 
+        flatname = ccn_charbuf_create();
+        ccn_flatname_append_from_ccnb(flatname, msg, size, 0, -1);
+        if (pi->control == RESERVE || strstr(flatname->buf, "RESERVE") != NULL) {
+        //   perror("ccnx2: RESERVE\n");
+          // 資源調査
+        }
+	  ccn_charbuf_destroy(&flatname);
+	  flatname = NULL;	   
+    *  kuwayama--> */
+    }
+    if (res < 0) {
+        ccnd_msg(h, "error parsing Interest - code %d", res);
+        ccn_indexbuf_destroy(&comps);
+        return;
+    }
+    flatname = ccn_charbuf_create();
+    ccn_flatname_append_from_ccnb(flatname, msg, size, 0, -1);
+    if (pi->control == GUARANTEE || strstr(flatname->buf, "GUARANTEE") != NULL) {
+        pi->control = GUARANTEE;
+    }else{
+        pi->control = DEFAULT;
+    }
+    ccn_charbuf_destroy(&flatname);
+    
+    /* <!-- add by xu */
+    if (pi->control != -1) {
+        h->interest_control_flag = pi->control;
+        switch(pi->control) {
+          case DEFAULT:
+              //ccnd_msg(h, "DEFAULT INTEREST is Coming");
+              break; 
+          case RESERVE:
+              h->is_reserved = 1;
+              break;
+          case GUARANTEE:  
+              //todo: queue this interest packet 
+              //      into a high prior queue
+              //ccnd_msg(h, "GUARANTEE INTEREST is Coming");
+              break;
+          case RELEASE:
+               h->is_reserved = 0;
+              break;
+          case NOTICE:
+              //todo: for future use
+              break;
+          default:
+              break;
+        }
+    }
+    //else
+    //    ccnd_msg(h, "Interest control ID has no value");
+   /*    add by xu end -->*/
+    ccnd_meter_bump(h, face->meter[FM_INTI], 1);
+    if (pi->scope >= 0 && pi->scope < 2 &&
+             (face->flags & CCN_FACE_GG) == 0) {
+        ccnd_debug_ccnb(h, __LINE__, "interest_outofscope", face, msg, size);
+        h->interests_dropped += 1;
+    }
+    else {
+        if (h->debug & (16 | 8 | 2))
+            ccnd_debug_ccnb(h, __LINE__, "interest_from", face, msg, size);
+        if (pi->magic < 20090701) {
+            if (++(h->oldformatinterests) == h->oldformatinterestgrumble) {
+                h->oldformatinterestgrumble *= 2;
+                ccnd_msg(h, "downrev interests received: %d (%d)",
+                         h->oldformatinterests,
+                         pi->magic);
+            }
+        }
+        h->interests_accepted += 1;
+        res = nonce_ok(h, face, msg, pi, NULL, 0);
+        if (res == 0) {
+            if (h->debug & 2)
+                ccnd_debug_ccnb(h, __LINE__, "interest_dupnonce", face, msg, size);
+            h->interests_dropped += 1;
+            indexbuf_release(h, comps);
+            return;
+        }
+        ie = hashtb_lookup(h->interest_tab, msg,
+                           pi->offset[CCN_PI_B_InterestLifetime]);
+        if (ie != NULL) {
+            /* Since this is in the PIT, we do not need to check the CS. */
+            indexbuf_release(h, comps);
+            comps = NULL;
+            npe = ie->ll.npe;
+            if (drop_nonlocal_interest(h, npe, face, msg, size))
+                return;
+            propagate_interest(h, face, msg, pi, npe);
+            //Noted by xu: This means that the content name is in PIT. 
+            //            Thus propagate the interest
+            return;
+        }
+        if (h->debug & 16) {
+            /* Only print details that are not already presented */
+            ccnd_msg(h,
+                     "version: %d, "
+                     "etc: %d bytes",
+                     pi->magic,
+                     pi->offset[CCN_PI_E_OTHER] - pi->offset[CCN_PI_B_OTHER]);
+        }
+        s_ok = (pi->answerfrom & CCN_AOK_STALE) != 0;
+        matched = 0;
+        hashtb_start(h->nameprefix_tab, e);
+        res = nameprefix_seek(h, e, msg, comps, pi->prefix_comps);
+        npe = e->data;
+        if (npe == NULL || drop_nonlocal_interest(h, npe, face, msg, size))
+            goto Bail;
+        if ((pi->answerfrom & CCN_AOK_CS) != 0) {
+            flatname = ccn_charbuf_create();
+            ccn_flatname_append_from_ccnb(flatname, msg, size, 0, -1);
+            last_match = NULL;
+            content = find_first_match_candidate(h, msg, pi);
+            if (content != NULL && (h->debug & 8))
+                ccnd_debug_content(h, __LINE__, "first_candidate", NULL,
+                                   content);
+            if (content != NULL &&
+                !content_matches_prefix(h, content, flatname)) {
+                if (h->debug & 8)
+                    ccnd_debug_ccnb(h, __LINE__, "prefix_mismatch", NULL,
+                                    msg, size);
+                content = NULL;
+            }
+            for (try = 0; content != NULL; try++) {
+                if (!s_ok && is_stale(h, content)) {
+                    next = content_next(h, content);
+                    if (content->refs == 0)
+                        remove_content(h, content);
+                    else
+                        try--;
+                    content = next;
+                    goto check_next_prefix;
+                }
+                if (ccn_content_matches_interest(content->ccnb,
+                                       content->size,
+                                       1, NULL, msg, size, pi)) {
+                    if (h->debug & 8)
+                        ccnd_debug_content(h, __LINE__, "matches", NULL,
+                                           content);
+                    if ((pi->orderpref & 1) == 0) // XXX - should be symbolic
+                        break;
+                    last_match = content;
+                    content = next_child_at_level(h, content, comps->n - 1);
+                    goto check_next_prefix;
+                }
+                content = content_next(h, content);
+            check_next_prefix:
+                if (try >= CCND_MAX_MATCH_PROBES)
+                    content = NULL;
+                else if (content != NULL &&
+                    !content_matches_prefix(h, content, flatname)) {
+                    if (h->debug & 8)
+                        ccnd_debug_content(h, __LINE__, "prefix_mismatch", NULL,
+                                           content);
+                    content = NULL;
+                }
+            }
+            if (last_match != NULL)
+                content = last_match;
+            if (content != NULL) {
+                /* Check to see if we are planning to send already */
+                /*Noted by xu:
+                     Here means this node found the content in its cs */
+                enum cq_delay_class c;
+                for (c = 0, k = -1; c < CCN_CQ_N && k == -1; c++)
+                    if (face->q[c] != NULL)
+                        k = ccn_indexbuf_member(face->q[c]->send_queue, content->accession);
+                if (k == -1) {
+                    /* <!--kuwayama */
+                    if (pi->control == GUARANTEE || strstr(flatname->buf, "GUARANTEE") != NULL) {
+                      // perror("GUARANTEE INTEREST\n");
+                      content->flags = CCN_CQ_GUARANTEE;
+                      content->control = GUARANTEE;//add by xu
+                      //ccnd_msg(h, "GUARANTEE INTEREST is Coming propagate");
+                      //propagate_interest(h, face, msg, pi, npe);
+                      //goto Bail;
+                    }
+                    /*<!--add by xu*/
+                    else if (pi->control == NOTICE || strstr(flatname->buf, "NOTICE") != NULL) {
+                      //perror("GUARANTEE NOTICE\n");
+                      content->flags = CCN_CQ_GUARANTEE;
+                      content->control = NOTICE;//add by xu
+                    }
+                    else if (pi->control == RESERVE || strstr(flatname->buf, "RESERVE") != NULL) {
+                      // perror("GUARANTEE INTEREST\n");
+                      content->flags = CCN_CQ_GUARANTEE;
+                      content->control = RESERVE;//add by xu
+                    }
+                    else {
+                      content->control = DEFAULT;//add by xu
+                    }
+
+                    /*  add by xu end -->*/
+                    /*  kuwayama--> */
+                    k = face_send_queue_insert(h, face, content);
+                    if (k >= 0) {
+                        if (h->debug & (32 | 8))
+                            ccnd_debug_ccnb(h, __LINE__, "consume", face, msg, size);
+                    }
+                    /* Any other matched interests need to be consumed, too. */
+                    match_interests(h, content, NULL, face, NULL);
+                }
+                if ((pi->answerfrom & CCN_AOK_EXPIRE) != 0)
+                    mark_stale(h, content);
+                matched = 1;
+            }
+        }
+        if (!matched && npe != NULL && (pi->answerfrom & CCN_AOK_EXPIRE) == 0)
+            propagate_interest(h, face, msg, pi, npe);
+    Bail:
+        hashtb_end(e);
+    }
+    indexbuf_release(h, comps);
+    ccn_charbuf_destroy(&flatname);
+}
+
+const struct strategy_class *
+strategy_class_from_id(const char *id)
+{
+    const struct strategy_class *sclass;
+
+    for (sclass = ccnd_strategy_classes; sclass->id[0] != 0; sclass++) {
+        if (strncmp(id, sclass->id, sizeof(sclass->id)) == 0)
+            return(sclass);
+    }
+    return(NULL);
+}
+
+struct strategy_instance *
+create_strategy_instance(struct ccnd_handle *h, struct nameprefix_entry *npe,
+                         const struct strategy_class *sclass,
+                         const char *parameters)
+{
+    struct strategy_instance *si = NULL;
+    char *space = NULL;
+    size_t size;
+    
+    if (parameters == NULL)
+        parameters = "";
+    size = strlen(parameters) + 1;
+    if (npe->si != NULL &&
+        npe->si->sclass == sclass &&
+        strcmp(npe->si->parameters, parameters) == 0)
+        return(npe->si); /* no change */
+    /* Use one allocation for si and parameters */
+    space = calloc(1, sizeof(*si) + size);
+    if (space == NULL)
+        return(NULL);
+    si = (void *)space;
+    memcpy(space + sizeof(*si), parameters, size);
+    if (npe->si != NULL)
+        remove_strategy_instance(h, npe);
+    si->sclass = sclass;
+    si->parameters = space + sizeof(*si);
+    si->npe = npe;
+    npe->si = si;
+    (si->sclass->callout)(h, si, NULL, CCNST_INIT, CCN_NOFACEID);
+    return(si);
+}
+
+void
+remove_strategy_instance(struct ccnd_handle *h,
+                         struct nameprefix_entry *npe)
+{
+    struct strategy_instance *si;
+    
+    si = npe->si;
+    if (si == NULL)
+        return;
+    if (si->npe != npe) abort();
+    (si->sclass->callout)(h, si, NULL, CCNST_FINALIZE, CCN_NOFACEID);
+    npe->si = NULL;
+    if (si->data != NULL) abort();  /* callout should have cleaned this */
+    free(si);
+}
+
+/**
+ * Search the nameprefix tree to find the strategy that is in effect.
+ */
+struct strategy_instance *
+get_strategy_instance(struct ccnd_handle *h,
+                      struct nameprefix_entry *npe)
+{
+    struct nameprefix_entry *p;
+    
+    for (p = npe; p != NULL; p = p->parent)
+        if (p->si != NULL)
+            return(p->si);
+    /* rarely, we need to provide the default on the root */
+    while (npe->parent != NULL)
+        npe = npe->parent;
+    return(create_strategy_instance(h, npe,
+               strategy_class_from_id("default"), NULL));
+}
+
+/**
+ * Call the strategy routine
+ */
+static void
+strategy_callout(struct ccnd_handle *h,
+                 struct interest_entry *ie,
+                 enum ccn_strategy_op op,
+                 unsigned faceid)
+{
+    struct strategy_instance *si;
+    
+    si = get_strategy_instance(h, ie->ll.npe);
+    (si->sclass->callout)(h, si, &ie->strategy, op, faceid);
+}
+
+/**
+ * Mark content as stale
+ */
+static void
+mark_stale(struct ccnd_handle *h, struct content_entry *content)
+{
+    if (is_stale(h, content))
+        return;
+    content_dequeuex(h, content);
+    content->staletime = h->sec - h->starttime;
+    content_enqueuex(h, content);
+}
+
+/**
+ * Arrange to toss unsolicited content before anything else
+ */
+static void
+mark_unsolicited(struct ccnd_handle *h, struct content_entry *content)
+{
+    content_dequeuex(h, content);
+    content->staletime = 0;
+    content_enqueuex(h, content);
+}
+
+/**
+ * Schedules content expiration based on its FreshnessSeconds, and the
+ * configured default and limit.
+ */
+static void
+set_content_timer(struct ccnd_handle *h, struct content_entry *content,
+                  struct ccn_parsed_ContentObject *pco)
+{
+    int seconds = 0;
+    size_t start = pco->offset[CCN_PCO_B_FreshnessSeconds];
+    size_t stop  = pco->offset[CCN_PCO_E_FreshnessSeconds];
+    ccnd_msg(h, "GUARANTEE: %d", 5181);
+    if (h->capacity == 0)
+        goto Finish;        /* force zero freshness */
+    if (start == stop)
+        seconds = h->tts_default;
+    else
+        seconds = ccn_fetch_tagged_nonNegativeInteger(
+                CCN_DTAG_FreshnessSeconds,
+                content->ccnb,
+                start, stop);
+    ccnd_msg(h, "GUARANTEE: %d", 5192);
+    if (seconds < 0 || seconds > h->tts_limit)
+        seconds = h->tts_limit;
+    ccnd_msg(h, "GUARANTEE: %d", 5194);
+Finish:
+    ccnd_msg(h, "GUARANTEE: %d", 5197);
+    content_dequeuex(h, content);
+    ccnd_msg(h, "GUARANTEE: %d", 5200);
+    content->staletime = h->sec - h->starttime + seconds;
+    ccnd_msg(h, "GUARANTEE: %d", 5201);
+    content_enqueuex(h, content);
+    ccnd_msg(h, "GUARANTEE: %d", 5202);
+}
+
+/**
+ * Discard content as needed to enforce capacity limit
+ */
+void
+content_tree_trim(struct ccnd_handle *h) {
+    int tries;
+    struct content_entry *c;
+    struct content_entry *nextx;
+
+    if (h->content_tree->n <= h->capacity)
+        return;
+    tries = 30;
+    for (c = h->headx->nextx; c != h->headx; c = nextx) {
+        nextx = c->nextx;
+        if (c->refs == 0) {
+            remove_content(h, c);
+            if (h->content_tree->n <= h->capacity)
+                return;
+        }
+        else if (!is_stale(h, c)) {
+            /* add to no new queues so it will drain eventually */
+            mark_stale(h, c);
+            if (h->debug & 4)
+                ccnd_debug_content(h, __LINE__, "force_stale", NULL, c);
+            break;
+        }
+        else if (--tries <= 0)
+            break;
+    }
+    if (h->content_tree->n > h->content_tree->limit) {
+        /* we've tried and failed to preserve queued content */
+        c = h->headx->nextx;
+        if (c != h->headx)
+            remove_content(h, c); /* logs remove_queued_content */
+    }
+}
+/**
+ * Discard content as needed to enforce capacity limit
+ */
+void
+content_tree_g_trim(struct ccnd_handle *h) {
+    int tries;
+    struct content_entry *c;
+    struct content_entry *nextx;
+
+    if (h->content_tree_g->n <= h->capacity_g)
+        return;
+    tries = 30;
+    for (c = h->headx->nextx; c != h->headx; c = nextx) {
+        nextx = c->nextx;
+        if (c->refs == 0) {
+            remove_content(h, c);
+            if (h->content_tree_g->n <= h->capacity_g)
+                return;
+        }
+        else if (!is_stale(h, c)) {
+            /* add to no new queues so it will drain eventually */
+            mark_stale(h, c);
+            if (h->debug & 4)
+                ccnd_debug_content(h, __LINE__, "force_stale", NULL, c);
+            break;
+        }
+        else if (--tries <= 0)
+            break;
+    }
+    if (h->content_tree_g->n > h->content_tree_g->limit) {
+        /* we've tried and failed to preserve queued content */
+        c = h->headx->nextx;
+        if (c != h->headx)
+            remove_content(h, c); /* logs remove_queued_content */
+    }
+}
+
+
+/**
+ * Process an arriving ContentObject.
+ *
+ * Parse the ContentObject and discard if it is not well-formed.
+ *
+ * Compute the digest.
+ *
+ * Look it up in the content store.  It it is already there, but is stale,
+ * make it fresh again.  If it is not there, add it.
+ *
+ * Find the matching pending interests in the PIT and consume them,
+ * queueing the ContentObject to be sent on the associated faces.
+ * If no matches were found and the content object was new, remove it
+ * from the store.
+ *
+ * XXX - the change to staleness should also not happen if there was no
+ * matching PIT entry.
+ */
+static void
+process_incoming_content(struct ccnd_handle *h, struct face *face,
+                         unsigned char *wire_msg, size_t wire_size)
+{
+    unsigned char *msg;
+    size_t size;
+    struct ccn_parsed_ContentObject obj = {0};
+    int res;
+    struct content_entry *content = NULL;
+    int i;
+    struct ccn_indexbuf *comps = indexbuf_obtain(h);
+    struct ccn_charbuf *f = charbuf_obtain(h);
+    struct ccny *y = NULL;
+    ccn_cookie ocookie;
+    msg = wire_msg;
+    size = wire_size;    
+    res = ccn_parse_ContentObject(msg, size, &obj, comps);
+    if (res < 0) {
+        ccnd_msg(h, "error parsing ContentObject - code %d", res);
+        goto Bail;
+    }
+    ccnd_meter_bump(h, face->meter[FM_DATI], 1);
+    /* Make the ContentObject-digest name component explicit in flatname */
+    ccn_digest_ContentObject(msg, &obj);
+    if (obj.digest_bytes != 32) {
+        ccnd_debug_ccnb(h, __LINE__, "indigestible", face, msg, size);
+        goto Bail;
+    }
+    if (obj.magic != 20090415) {
+        if (++(h->oldformatcontent) == h->oldformatcontentgrumble) {
+            h->oldformatcontentgrumble *= 10;
+            ccnd_msg(h, "downrev content items received: %d (%d)",
+                     h->oldformatcontent,
+                     obj.magic);
+        }
+    }
+    if (h->content_tree->n >= h->content_tree->limit) {
+        if (h->content_tree->limit < h->capacity + CCND_CACHE_MARGIN)
+            ccn_nametree_grow(h->content_tree);
+    }
+    // modified by xu for g content store 
+    if (h->content_tree_g->n >= h->content_tree_g->limit) {
+        if (h->content_tree_g->limit < h->capacity_g + CCND_CACHE_MARGIN)
+            ccn_nametree_grow(h->content_tree_g);
+    }
+    ccn_flatname_append_from_ccnb(f, msg, size, 0, -1);
+    ccn_flatname_append_component(f, obj.digest, obj.digest_bytes);
+    y = ccny_create(nrand48(h->seed), sizeof(*content));
+    res = ccny_set_key(y, f->buf, f->length);
+    if (res < 0) {
+        res = -__LINE__;
+        goto Bail;
+    }
+    content = ccny_payload(y); /* Allocated by ccny_create */
+    content->control = obj.control;//add by xu
+    // modified by xu for g content store 
+    int c;
+    //ocookie = ccny_enroll(h->content_tree, y);  // Here update the ccntent_tree index, insert name entry into content tree. 
+                                                  // Thus, the content tree could be more than 1,
+                                                  // and control which contents is inserted which content tree. by xu
+    //ocookie = ccny_enroll(h->content_tree, y);  // Here update the ccntent_tree index by xu
+    c = ccny_cookie(y);
+    ccnd_msg(h, "y's cookie B: %d", c);
+    if (obj.control == GUARANTEE || strstr(f->buf, "GUARANTEE") != NULL) {
+        content->control = GUARANTEE;//add by xu
+        ccnd_msg(h, "guarantee content");
+        ocookie = ccny_enroll(h->content_tree_g, y);  
+        c = ccny_cookie(y);
+        ccnd_msg(h, "y's cookie G: %d", c);
+    }else{
+        content->control = DEFAULT;//add by xu
+        ocookie = ccny_enroll(h->content_tree, y); 
+    }
+
+    ccnd_msg(h, "content type: %d", content->control);
+    ccnd_msg(h, "content tree: %d, %d", h->content_tree->n, h->content_tree_g->n);
+    
+    if (ocookie != 0) {
+        /* An entry was already present */
+        // modified by xu for g content store 
+        if (content->control == GUARANTEE || obj.control == GUARANTEE || strstr(f->buf, "GUARANTEE") != NULL) {
+            ccnd_msg(h, "GUARANTEE: %d", -5396);
+            ccny_destroy(h->content_tree_g, &y);
+        // modified by xu for g content store 
+        // todo: handle multiple content trees
+            content = ccny_payload(ccny_from_cookie(h->content_tree_g, ocookie));
+        }else{
+            ccnd_msg(h, "GUARANTEE: %d", -5402);
+            ccny_destroy(h->content_tree, &y);
+            content = ccny_payload(ccny_from_cookie(h->content_tree, ocookie));
+        }
+        if (is_stale(h, content)) {
+            /* When old content arrives after it has gone stale, freshen it */
+            // XXX - ought to do mischief checks before this
+            ccnd_msg(h, "GUARANTEE: %d", -5409);
+            set_content_timer(h, content, &obj);
+            /* Record the new arrival face only if the old face is gone */
+            // XXX - it is not clear that this is the most useful choice
+            if (face_from_faceid(h, content->arrival_faceid) == NULL)
+                content->arrival_faceid = face->faceid;
+            // XXX - no counter for this case
+        }
+        else {
+            h->content_dups_recvd++;
+            if (h->debug & 4)
+                ccnd_debug_content(h, __LINE__, "content_dup", face, content);
+        }
+        res = 0;
+    }
+    else if (ccny_cookie(y) == 0) {
+        /* Reporting and cleanup happens below */
+        res = -__LINE__;
+        content = NULL;
+        ccnd_msg(h, "GUARANTEE: %d", -5428);
+    }
+    else {
+        res = -__LINE__;
+        if (obj.control == GUARANTEE || strstr(f->buf, "GUARANTEE") != NULL) {
+            ccnd_msg(h, "GUARANTEE: %d", res);
+            content->accession_g = ccny_cookie(y);
+            ccnd_msg(h, "GUARANTEE: %d", -5366);
+        }else{
+            content->accession = ccny_cookie(y);
+        }
+        ccnd_msg(h, "GUARANTEE: %d", -5373);
+        content->arrival_faceid = face->faceid;
+        content->ncomps = comps->n + 1;
+        content->ccnb = malloc(size);
+        ccnd_msg(h, "GUARANTEE: %d", -5377);
+        if (content->ccnb == NULL){
+            ccnd_msg(h, "GUARANTEE: %d", -5379);
+            goto Bail;
+        }
+        content->size = size;
+        memcpy(content->ccnb, msg, size);
+        ccnd_msg(h, "GUARANTEE: %d", -5384);
+        set_content_timer(h, content, &obj);
+        ccnd_msg(h, "GUARANTEE: %d", -5385);
+        h->accessioned++;
+        ccnd_msg(h, "GUARANTEE: %d", -5386);
+        if (h->debug & 4)
+            ccnd_debug_content(h, __LINE__, "content_from", face, content);
+        res = 1;
+    }
+Bail:
+    // indexbuf_release(h, comps);
+    // charbuf_release(h, f);
+    // f = NULL;
+    if (res < 0) {
+        ccnd_msg(h, "GUARANTEE: %d", -5396);
+        indexbuf_release(h, comps);
+        charbuf_release(h, f);
+        f = NULL;
+        indexbuf_release(h, comps);
+        ccnd_debug_ccnb(h, -res, "content_dropped", face, msg, size);
+        // modified by xu for g content store 
+        // todo: handle multiple content trees
+        
+        //if (obj.control == GUARANTEE || strstr(f->buf, "GUARANTEE") != NULL) {
+        ccnd_msg(h, "GUARANTEE: %d", -5406);
+        ccny_destroy(h->content_tree, &y);
+        if(content != NULL)
+            ccnd_msg(h, "GUARANTEE: %d", -5409);
+        if (content != NULL) abort();
+    }
+    else {
+        int n_matches;
+        enum cq_delay_class c;
+        struct content_queue *q;
+        if(content == NULL)
+        ccnd_msg(h, "GUARANTEE: %d", -5409);
+
+        if (content == NULL) abort();
+        /* <!--kuwayama 
+        if (obj.control == NOTICE || strstr(f->buf, "NOTICE") != NULL) {
+          struct hashtb_enumerator ee, *e;
+          int ncomp = obj.name_ncomps;
+          e = &ee;
+          hashtb_start(h->nameprefix_tab, e);
+          // perror("NOTICE\n");
+          n_matches = match_interests(h, content, &obj, NULL, face);
+          nameprefix_seek(h, e, msg, comps, ncomp);
+          hashtb_end(e);
+          // PITエントリを再生したつもりがHT_OLD_ENTRYが返ってくる
+          // pinserverのプロシージャでccnbをxml化して出力せよ
+        } else if (obj.control == RELEASE || strstr(f->buf, "RELEASE") != NULL) {
+          // perror("RELEASE\n");
+          n_matches = match_interests(h, content, &obj, NULL, face);
+          } else 
+            kuwayama--> */
+        if (obj.control == GUARANTEE || strstr(f->buf, "GUARANTEE") != NULL) {
+          // perror("GUARANTEE CONTENT\n");
+          ccnd_msg(h, "GUARANTEE contents");
+          content->flags = CCN_CQ_GUARANTEE;  
+          content->control = GUARANTEE;//add by xu
+          n_matches = match_interests(h, content, &obj, NULL, face); //send out 
+        }
+        /*<!-- add by xu */
+        else if (obj.control == NOTICE || strstr(f->buf, "NOTICE") != NULL) {
+          //perror("NOTICE CONTENT\n");
+          content->flags = CCN_CQ_GUARANTEE;  
+          content->control = NOTICE;//add by xu
+          n_matches = match_interests(h, content, &obj, NULL, face);
+        }
+        else if (obj.control == RESERVE || strstr(f->buf, "RESERVE") != NULL) {
+          //perror("RESERVE CONTENT\n");
+          content->flags = CCN_CQ_GUARANTEE;  
+          content->control = RESERVE;//add by xu
+          n_matches = match_interests(h, content, &obj, NULL, face);
+        }  
+        /*  add by xu end -->*/
+        else {
+          content->control = DEFAULT;//add by xu
+          n_matches = match_interests(h, content, &obj, NULL, face);
+        }
+        indexbuf_release(h, comps);
+        charbuf_release(h, f);
+        f = NULL;
+        /*  kuwayama--> */
+        if (res == 1) {
+            if (n_matches < 0) {
+                remove_content(h, content);
+                return;
+            }
+            if (n_matches == 0 && (face->flags & CCN_FACE_GG) == 0) {
+                if (h->debug & 4)
+                    ccnd_debug_content(h, __LINE__, "content_unsolicted", face, content);
+                mark_unsolicited(h, content);
+            }
+        }
+        // ZZZZ - review whether the following is actually needed
+        for (c = 0; c < CCN_CQ_N; c++) {
+            q = face->q[c];
+            if (q != NULL) {
+                i = ccn_indexbuf_member(q->send_queue, content->accession);
+                if (i >= 0) {
+                    /*
+                     * In the case this consumed any interests from this source,
+                     * don't send the content back
+                     */
+                    if (h->debug & 8)
+                        ccnd_debug_ccnb(h, __LINE__, "content_nosend", face, msg, size);
+                    q->send_queue->buf[i] = 0;
+                    content->refs--;
+                }
+            }
+        }
+        // todo: handle multiple content tree
+        //       consider whether the handle should be inside or outside of content_tree_trim
+        content_tree_trim(h);
+        content_tree_g_trim(h);
+    }
+}
+
+/**
+ * Process an incoming message.
+ *
+ * This is where we decide whether we have an Interest message,
+ * a ContentObject, or something else.
+ */
+static void
+process_input_message(struct ccnd_handle *h, struct face *face,
+                      unsigned char *msg, size_t size, int pdu_ok)
+{
+    struct ccn_skeleton_decoder decoder = {0};
+    struct ccn_skeleton_decoder *d = &decoder;
+    ssize_t dres;
+    enum ccn_dtag dtag;
+    
+    if ((face->flags & CCN_FACE_UNDECIDED) != 0) {
+        face->flags &= ~CCN_FACE_UNDECIDED;
+        if ((face->flags & (CCN_FACE_LOOPBACK | CCN_FACE_LOCAL)) != 0)
+            face->flags |= CCN_FACE_GG;
+        /* YYY This is the first place that we know that an inbound stream face is speaking CCNx protocol. */
+        register_new_face(h, face);
+    }
+    d->state |= CCN_DSTATE_PAUSE;
+    dres = ccn_skeleton_decode(d, msg, size);
+    if (d->state < 0)
+        abort(); /* cannot happen because of checks in caller */
+    if (CCN_GET_TT_FROM_DSTATE(d->state) != CCN_DTAG) {
+        ccnd_msg(h, "discarding unknown message; size = %lu", (unsigned long)size);
+        // XXX - keep a count?
+        return;
+    }
+    dtag = d->numval;
+    switch (dtag) {
+        case CCN_DTAG_CCNProtocolDataUnit:
+            if (!pdu_ok)
+                break;
+            size -= d->index;
+            if (size > 0)
+                size--;
+            msg += d->index;
+            if ((face->flags & (CCN_FACE_LINK | CCN_FACE_GG)) != CCN_FACE_LINK) {
+                face->flags |= CCN_FACE_LINK;
+                face->flags &= ~CCN_FACE_GG;
+                register_new_face(h, face);
+            }
+            memset(d, 0, sizeof(*d));
+            while (d->index < size) {
+                dres = ccn_skeleton_decode(d, msg + d->index, size - d->index);
+                if (d->state != 0)
+                    abort(); /* cannot happen because of checks in caller */
+                /* The pdu_ok parameter limits the recursion depth */
+                process_input_message(h, face, msg + d->index - dres, dres, 0);
+            }
+            return;
+        case CCN_DTAG_Interest:
+            process_incoming_interest(h, face, msg, size);
+            return;
+        case CCN_DTAG_ContentObject:
+            process_incoming_content(h, face, msg, size);
+            return;
+        case CCN_DTAG_SequenceNumber:
+            process_incoming_link_message(h, face, dtag, msg, size);
+            return;
+        default:
+            break;
+    }
+    ccnd_msg(h, "discarding unknown message; dtag=%u, size = %lu",
+             (unsigned)dtag,
+             (unsigned long)size);
+}
+
+/**
+ * Log a notification that a new datagram face has been created.
+ */
+static void
+ccnd_new_face_msg(struct ccnd_handle *h, struct face *face)
+{
+    const struct sockaddr *addr = face->addr;
+    int port = 0;
+    const unsigned char *rawaddr = NULL;
+    char printable[80];
+    const char *peer = NULL;
+    if (addr->sa_family == AF_INET6) {
+        const struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr;
+        rawaddr = (const unsigned char *)&addr6->sin6_addr;
+        port = htons(addr6->sin6_port);
+    }
+    else if (addr->sa_family == AF_INET) {
+        const struct sockaddr_in *addr4 = (struct sockaddr_in *)addr;
+        rawaddr = (const unsigned char *)&addr4->sin_addr.s_addr;
+        port = htons(addr4->sin_port);
+    }
+    if (rawaddr != NULL)
+        peer = inet_ntop(addr->sa_family, rawaddr, printable, sizeof(printable));
+    if (peer == NULL)
+        peer = "(unknown)";
+    //add by xu
+         
+	if(strcmp(peer, "192.168.2.2") == 0)
+		h->face_id_int_2 = face->faceid;
+	if(strcmp(peer, "192.168.5.2") == 0)
+		h->face_id_int_5 = face->faceid;
+	ccnd_msg(h,
+             "accepted datagram client id=%d (flags=0x%x) %s port %d",
+             face->faceid, face->flags, peer, port);
+}
+
+/**
+ * Since struct sockaddr_in6 may contain fields that should not participate
+ * in comparison / hash, ensure the undesired fields are zero.
+ *
+ * Per RFC 3493, sin6_flowinfo is zeroed.
+ *
+ * @param addr is the sockaddr (any family)
+ * @param addrlen is its length
+ * @param space points to a buffer that may be used for the result.
+ * @returns either the original addr or a pointer to a scrubbed copy.
+ *
+ */
+static struct sockaddr *
+scrub_sockaddr(struct sockaddr *addr, socklen_t addrlen,
+               struct sockaddr_in6 *space)
+{
+    struct sockaddr_in6 *src;
+    struct sockaddr_in6 *dst;
+    if (addr->sa_family != AF_INET6 || addrlen != sizeof(*space))
+        return(addr);
+    dst = space;
+    src = (void *)addr;
+    memset(dst, 0, addrlen);
+    /* Copy first byte case sin6_len is used. */
+    ((uint8_t *)dst)[0] = ((uint8_t *)src)[0];
+    dst->sin6_family   = src->sin6_family;
+    dst->sin6_port     = src->sin6_port;
+    dst->sin6_addr     = src->sin6_addr;
+    dst->sin6_scope_id = src->sin6_scope_id;
+    return((struct sockaddr *)dst);
+}
+
+/**
+ * Get (or create) the face associated with a given sockaddr.
+ */
+static struct face *
+get_dgram_source(struct ccnd_handle *h, struct face *face,
+                 struct sockaddr *addr, socklen_t addrlen, int why)
+{
+    struct face *source = NULL;
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    struct sockaddr_in6 space;
+    int res;
+    if ((face->flags & CCN_FACE_DGRAM) == 0)
+        return(face);
+    if ((face->flags & CCN_FACE_MCAST) != 0)
+        return(face);
+    hashtb_start(h->dgram_faces, e);
+    res = hashtb_seek(e, scrub_sockaddr(addr, addrlen, &space), addrlen, 0);
+    if (res >= 0) {
+        source = e->data;
+        source->recvcount++;
+        if (source->addr == NULL) {
+            source->addr = e->key;
+            source->addrlen = e->keysize;
+            source->recv_fd = face->recv_fd;
+            source->sendface = face->faceid;
+            init_face_flags(h, source, CCN_FACE_DGRAM);
+            if (why == 1 && (source->flags & CCN_FACE_LOOPBACK) != 0)
+                source->flags |= CCN_FACE_GG;
+            res = enroll_face(h, source);
+            if (res == -1) {
+                hashtb_delete(e);
+                source = NULL;
+            }
+            else
+                ccnd_new_face_msg(h, source);
+        }
+    }
+    hashtb_end(e);
+    return(source);
+}
+
+/**
+ * Break up data in a face's input buffer buffer into individual messages,
+ * and call process_input_message on each one.
+ *
+ * This is used to handle things originating from the internal client -
+ * its output is input for face 0.
+ */
+static void
+process_input_buffer(struct ccnd_handle *h, struct face *face)
+{
+    unsigned char *msg;
+    size_t size;
+    ssize_t dres;
+    struct ccn_skeleton_decoder *d;
+
+    if (face == NULL || face->inbuf == NULL)
+        return;
+    d = &face->decoder;
+    msg = face->inbuf->buf;
+    size = face->inbuf->length;
+    while (d->index < size) {
+        dres = ccn_skeleton_decode(d, msg + d->index, size - d->index);
+        if (d->state != 0)
+            break;
+        process_input_message(h, face, msg + d->index - dres, dres, 0);
+    }
+    if (d->index != size) {
+        ccnd_msg(h, "protocol error on face %u (state %d), discarding %d bytes",
+                     face->faceid, d->state, (int)(size - d->index));
+        // XXX - perhaps this should be a fatal error.
+    }
+    face->inbuf->length = 0;
+    memset(d, 0, sizeof(*d));
+}
+
+/**
+ * Process the input from a socket.
+ *
+ * The socket has been found ready for input by the poll call.
+ * Decide what face it corresponds to, and after checking for exceptional
+ * cases, receive data, parse it into ccnb-encoded messages, and call
+ * process_input_message for each one.
+ */
+static void
+process_input(struct ccnd_handle *h, int fd)
+{
+    struct face *face = NULL;
+    struct face *source = NULL;
+    ssize_t res;
+    ssize_t msgstart;
+    unsigned char *buf;
+    struct ccn_skeleton_decoder *d;
+    struct sockaddr_storage sstor;
+    socklen_t addrlen = sizeof(sstor);
+    struct sockaddr *addr = (struct sockaddr *)&sstor;
+    int err = 0;
+    socklen_t err_sz;
+    
+    face = hashtb_lookup(h->faces_by_fd, &fd, sizeof(fd));
+    if (face == NULL)
+        return;
+    if ((face->flags & (CCN_FACE_DGRAM | CCN_FACE_PASSIVE)) == CCN_FACE_PASSIVE) {
+        accept_connection(h, fd, face->flags);
+        check_comm_file(h);
+        return;
+    }
+    err_sz = sizeof(err);
+    res = getsockopt(face->recv_fd, SOL_SOCKET, SO_ERROR, &err, &err_sz);
+    if (res >= 0 && err != 0) {
+        ccnd_msg(h, "error on face %u: %s (%d)", face->faceid, strerror(err), err);
+        if (err == ETIMEDOUT && (face->flags & CCN_FACE_CONNECTING) != 0) {
+            shutdown_client_fd(h, fd);
+            return;
+        }
+    }
+    d = &face->decoder;
+    if (face->inbuf == NULL)
+        face->inbuf = ccn_charbuf_create();
+    if (face->inbuf->length == 0)
+        memset(d, 0, sizeof(*d));
+    buf = ccn_charbuf_reserve(face->inbuf, CCN_MAX_MESSAGE_BYTES);
+    memset(&sstor, 0, sizeof(sstor));
+    res = recvfrom(face->recv_fd, buf, face->inbuf->limit - face->inbuf->length,
+            /* flags */ 0, addr, &addrlen);
+    if (res == -1)
+        ccnd_msg(h, "recvfrom face %u :%s (errno = %d)",
+                    face->faceid, strerror(errno), errno);
+    else if (res == 0 && (face->flags & CCN_FACE_DGRAM) == 0)
+        shutdown_client_fd(h, fd);
+    else {
+        source = get_dgram_source(h, face, addr, addrlen, (res == 1) ? 1 : 2);
+        ccnd_meter_bump(h, source->meter[FM_BYTI], res);
+        source->recvcount++;
+        source->surplus = 0; // XXX - we don't actually use this, except for some obscure messages.
+        if (res <= 1 && (source->flags & CCN_FACE_DGRAM) != 0) {
+            // XXX - If the initial heartbeat gets missed, we don't realize the locality of the face.
+            if (h->debug & 128)
+                ccnd_msg(h, "%d-byte heartbeat on %d", (int)res, source->faceid);
+            return;
+        }
+        face->inbuf->length += res;
+        msgstart = 0;
+        if (((face->flags & CCN_FACE_UNDECIDED) != 0 &&
+             face->inbuf->length >= 6 &&
+             0 == memcmp(face->inbuf->buf, "GET ", 4))) {
+            ccnd_stats_handle_http_connection(h, face);
+            return;
+        }
+        ccn_skeleton_decode(d, buf, res);
+        while (d->state == 0) {
+            process_input_message(h, source,
+                                  face->inbuf->buf + msgstart,
+                                  d->index - msgstart,
+                                  (face->flags & CCN_FACE_LOCAL) != 0);
+            msgstart = d->index;
+            if (msgstart == face->inbuf->length) {
+                face->inbuf->length = 0;
+                return;
+            }
+            ccn_skeleton_decode(d,
+                                face->inbuf->buf + msgstart,
+                                face->inbuf->length - msgstart);
+        }
+        if ((face->flags & CCN_FACE_DGRAM) != 0) {
+            ccnd_msg(h, "protocol error on face %u, discarding %u bytes",
+                source->faceid,
+                (unsigned)(face->inbuf->length - msgstart));
+            face->inbuf->length = 0;
+            /* XXX - should probably ignore this source for a while */
+            return;
+        }
+        else if (d->state < 0) {
+            ccnd_msg(h, "protocol error on face %u", source->faceid);
+            shutdown_client_fd(h, fd);
+            return;
+        }
+        if (msgstart < face->inbuf->length && msgstart > 0) {
+            /* move partial message to start of buffer */
+            memmove(face->inbuf->buf, face->inbuf->buf + msgstart,
+                face->inbuf->length - msgstart);
+            face->inbuf->length -= msgstart;
+            d->index -= msgstart;
+        }
+        /*
+         * If after processing any complete messages the remaining message is
+         * larger than our limit we should boot this client
+         */
+        if (face->inbuf->length >= CCN_MAX_MESSAGE_BYTES) {
+            ccnd_msg(h, "protocol error on face %u", source->faceid);
+            shutdown_client_fd(h, fd);
+        }
+    }
+}
+
+/**
+ * Process messages from our internal client.
+ *
+ * The internal client's output is input to us.
+ */
+static void
+process_internal_client_buffer(struct ccnd_handle *h)
+{
+    struct face *face = h->face0;
+    if (face == NULL)
+        return;
+    face->inbuf = ccn_grab_buffered_output(h->internal_client);
+    if (face->inbuf == NULL)
+        return;
+    ccnd_meter_bump(h, face->meter[FM_BYTI], face->inbuf->length);
+    process_input_buffer(h, face);
+    ccn_charbuf_destroy(&(face->inbuf));
+}
+
+/**
+ * Scheduled event for deferred processing of internal client
+ */
+static int
+process_icb_action(
+    struct ccn_schedule *sched,
+    void *clienth,
+    struct ccn_scheduled_event *ev,
+    int flags)
+{
+    struct ccnd_handle *h = clienth;
+    
+    if ((flags & CCN_SCHEDULE_CANCEL) != 0)
+        return(0);
+    process_internal_client_buffer(h);
+    return(0);
+}
+
+/**
+ * Schedule the processing of internal client results
+ *
+ * This little dance keeps us from destroying an interest
+ * entry while we are in the middle of processing it.
+ */
+void
+ccnd_internal_client_has_somthing_to_say(struct ccnd_handle *h)
+{
+    ccn_schedule_event(h->sched, 0, process_icb_action, NULL, 0);
+}
+
+/**
+ * Handle errors after send() or sendto().
+ * @returns -1 if error has been dealt with, or 0 to defer sending.
+ */
+static int
+handle_send_error(struct ccnd_handle *h, int errnum, struct face *face,
+                  const void *data, size_t size)
+{
+    int res = -1;
+    if (errnum == EAGAIN) {
+        res = 0;
+    }
+    else if (errnum == EPIPE) {
+        face->flags |= CCN_FACE_NOSEND;
+        face->outbufindex = 0;
+        ccn_charbuf_destroy(&face->outbuf);
+    }
+    else {
+        ccnd_msg(h, "send to face %u failed: %s (errno = %d)",
+                 face->faceid, strerror(errnum), errnum);
+        if (errnum == EISCONN)
+            res = 0;
+    }
+    return(res);
+}
+
+/**
+ * Determine what socket to use to send on a face.
+ *
+ * For streams, this just returns the associated fd.
+ *
+ * For datagrams, one fd may be in use for many faces, so we need to find the
+ * right one to use.
+ *
+ * This is not as smart as it should be for situations where
+ * CCND_LISTEN_ON has been specified.
+ */
+static int
+sending_fd(struct ccnd_handle *h, struct face *face)
+{
+    struct face *out = NULL;
+    if (face->sendface == face->faceid)
+        return(face->recv_fd);
+    out = face_from_faceid(h, face->sendface);
+    if (out != NULL)
+        return(out->recv_fd);
+    face->sendface = CCN_NOFACEID;
+    if (face->addr != NULL) {
+        switch (face->addr->sa_family) {
+            case AF_INET:
+                face->sendface = h->ipv4_faceid;
+                break;
+            case AF_INET6:
+                face->sendface = h->ipv6_faceid;
+                break;
+            default:
+                break;
+        }
+    }
+    out = face_from_faceid(h, face->sendface);
+    if (out != NULL)
+        return(out->recv_fd);
+    return(-1);
+}
+
+/**
+ * Send data to the face.
+ *
+ * No direct error result is provided; the face state is updated as needed.
+ */
+void
+ccnd_send(struct ccnd_handle *h,
+          struct face *face,
+          const void *data, size_t size)
+{
+    ssize_t res;
+    int fd;
+    int bcast = 0;
+    
+    if ((face->flags & CCN_FACE_NOSEND) != 0)
+        return;
+    face->surplus++;
+    if (face->outbuf != NULL) {
+        ccn_charbuf_append(face->outbuf, data, size);
+        return;
+    }
+    if (face == h->face0) {
+        ccnd_meter_bump(h, face->meter[FM_BYTO], size);
+        ccn_dispatch_message(h->internal_client, (void *)data, size);
+        ccnd_internal_client_has_somthing_to_say(h);
+        return;
+    }
+    if ((face->flags & CCN_FACE_DGRAM) == 0)
+        res = send(face->recv_fd, data, size, 0);
+    else {
+        fd = sending_fd(h, face);
+        if ((face->flags & CCN_FACE_BC) != 0) {
+            bcast = 1;
+            setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &bcast, sizeof(bcast));
+        }
+        res = sendto(fd, data, size, 0, face->addr, face->addrlen);
+        if (res == -1 && errno == EACCES &&
+            (face->flags & (CCN_FACE_BC | CCN_FACE_NBC)) == 0) {
+            bcast = 1;
+            setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &bcast, sizeof(bcast));
+            res = sendto(fd, data, size, 0, face->addr, face->addrlen);
+            if (res == -1)
+                face->flags |= CCN_FACE_NBC; /* did not work, do not try */
+            else
+                face->flags |= CCN_FACE_BC; /* remember for next time */
+        }
+        if (bcast != 0) {
+            bcast = 0;
+            setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &bcast, sizeof(bcast));
+        }
+    }
+    if (res > 0)
+        ccnd_meter_bump(h, face->meter[FM_BYTO], res);
+    if (res == size)
+        return;
+    if (res == -1) {
+        res = handle_send_error(h, errno, face, data, size);
+        if (res == -1)
+            return;
+    }
+    if ((face->flags & CCN_FACE_DGRAM) != 0) {
+        ccnd_msg(h, "sendto short");
+        return;
+    }
+    if (h->debug & 8)
+        ccnd_msg(h, "output_blocked %u residual=%jd",
+                 face->faceid, (intmax_t)(size - res));
+    face->outbufindex = 0;
+    face->outbuf = ccn_charbuf_create();
+    if (face->outbuf == NULL) {
+        ccnd_msg(h, "do_write: %s", strerror(errno));
+        return;
+    }
+    ccn_charbuf_append(face->outbuf,
+                       ((const unsigned char *)data) + res, size - res);
+}
+
+/**
+ * Do deferred sends.
+ *
+ * These can only happen on streams, after there has been a partial write.
+ */
+static void
+do_deferred_write(struct ccnd_handle *h, int fd)
+{
+    /* This only happens on connected sockets */
+    ssize_t res;
+    struct face *face = hashtb_lookup(h->faces_by_fd, &fd, sizeof(fd));
+    if (face == NULL)
+        return;
+    if (face->outbuf != NULL) {
+        ssize_t sendlen = face->outbuf->length - face->outbufindex;
+        if (sendlen > 0) {
+            res = send(fd, face->outbuf->buf + face->outbufindex, sendlen, 0);
+            if (res == -1) {
+                if (errno == EPIPE) {
+                    face->flags |= CCN_FACE_NOSEND;
+                    face->outbufindex = 0;
+                    ccn_charbuf_destroy(&face->outbuf);
+                    return;
+                }
+                ccnd_msg(h, "send: %s (errno = %d)", strerror(errno), errno);
+                shutdown_client_fd(h, fd);
+                return;
+            }
+            if (h->debug & 8)
+               ccnd_msg(h, "deferred_send %u bytes=%jd", face->faceid, (intmax_t)res);
+            if (res == sendlen) {
+                face->outbufindex = 0;
+                ccn_charbuf_destroy(&face->outbuf);
+                if ((face->flags & CCN_FACE_CLOSING) != 0)
+                    shutdown_client_fd(h, fd);
+                return;
+            }
+            face->outbufindex += res;
+            return;
+        }
+        face->outbufindex = 0;
+        ccn_charbuf_destroy(&face->outbuf);
+    }
+    if ((face->flags & CCN_FACE_CLOSING) != 0)
+        shutdown_client_fd(h, fd);
+    else if ((face->flags & CCN_FACE_CONNECTING) != 0) {
+        face->flags &= ~CCN_FACE_CONNECTING;
+        ccnd_face_status_change(h, face->faceid);
+    }
+    else
+        ccnd_msg(h, "ccnd:do_deferred_write: something fishy on %d", fd);
+}
+
+/**
+ * Set up the array of fd descriptors for the poll(2) call.
+ *
+ * Arrange the array so that multicast receivers are early, so that
+ * if the same packet arrives on both a multicast socket and a
+ * normal socket, we will count is as multicast.
+ */
+static void
+prepare_poll_fds(struct ccnd_handle *h)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    int i, j, k;
+    if (hashtb_n(h->faces_by_fd) != h->nfds) {
+        h->nfds = hashtb_n(h->faces_by_fd);
+        h->fds = realloc(h->fds, h->nfds * sizeof(h->fds[0]));
+        memset(h->fds, 0, h->nfds * sizeof(h->fds[0]));
+    }
+    for (i = 0, k = h->nfds, hashtb_start(h->faces_by_fd, e);
+         i < k && e->data != NULL; hashtb_next(e)) {
+        struct face *face = e->data;
+        if (face->flags & CCN_FACE_MCAST)
+            j = i++;
+        else
+            j = --k;
+        h->fds[j].fd = face->recv_fd;
+        h->fds[j].events = ((face->flags & CCN_FACE_NORECV) == 0) ? POLLIN : 0;
+        if ((face->outbuf != NULL || (face->flags & CCN_FACE_CLOSING) != 0))
+            h->fds[j].events |= POLLOUT;
+    }
+    hashtb_end(e);
+    if (i < k)
+        abort();
+}
+
+/**
+ * Run the main loop of the ccnd
+ */
+void
+ccnd_run(struct ccnd_handle *h)
+{
+    int i;
+    int res;
+    int timeout_ms = -1;
+    int prev_timeout_ms = -1;
+    int usec;
+    for (h->running = 1; h->running;) {
+        process_internal_client_buffer(h);
+        /* <!--kuwayama */
+        //commented by xu//usec = ccn_schedule_run_qos(h->sched, h->drr);
+        /*  kuwayama--> */
+        usec = ccn_schedule_run(h->sched);//add by xu
+        timeout_ms = (usec < 0) ? -1 : ((usec + 960) / 1000);
+        if (timeout_ms == 0 && prev_timeout_ms == 0)
+            timeout_ms = 1;
+        process_internal_client_buffer(h);
+        prepare_poll_fds(h);
+        if (0) ccnd_msg(h, "at ccnd.c:%d poll(h->fds, %d, %d)", __LINE__, h->nfds, timeout_ms);
+        res = poll(h->fds, h->nfds, timeout_ms);
+        prev_timeout_ms = ((res == 0) ? timeout_ms : 1);
+        if (-1 == res) {
+            ccnd_msg(h, "poll: %s (errno = %d)", strerror(errno), errno);
+            sleep(1);
+            continue;
+        }
+        if (res > 0) {
+            /* we need a fresh current time for setting interest expiries */
+            struct ccn_timeval dummy;
+            h->ticktock.gettime(&h->ticktock, &dummy);
+        }
+        for (i = 0; res > 0 && i < h->nfds; i++) {
+            if (h->fds[i].revents != 0) {
+                res--;
+                if (h->fds[i].revents & (POLLERR | POLLNVAL | POLLHUP)) {
+                    if (h->fds[i].revents & (POLLIN))
+                        process_input(h, h->fds[i].fd);
+                    else
+                        shutdown_client_fd(h, h->fds[i].fd);
+                    continue;
+                }
+                if (h->fds[i].revents & (POLLOUT))
+                    do_deferred_write(h, h->fds[i].fd);
+                else if (h->fds[i].revents & (POLLIN))
+                    process_input(h, h->fds[i].fd);
+            }
+        }
+    }
+}
+
+/**
+ * Reseed our pseudo-random number generator.
+ */
+static void
+ccnd_reseed(struct ccnd_handle *h)
+{
+    int fd;
+    ssize_t res;
+    
+    res = -1;
+    fd = open("/dev/urandom", O_RDONLY);
+    if (fd != -1) {
+        res = read(fd, h->seed, sizeof(h->seed));
+        close(fd);
+    }
+    if (res != sizeof(h->seed)) {
+        h->seed[1] = (unsigned short)getpid(); /* better than no entropy */
+        h->seed[2] = (unsigned short)time(NULL);
+    }
+    /*
+     * The call to seed48 is needed by cygwin, and should be harmless
+     * on other platforms.
+     */
+    seed48(h->seed);
+}
+
+/**
+ * Get the name of our unix-domain socket listener.
+ *
+ * Uses the library to generate the name, using the environment.
+ * @returns a newly-allocated nul-terminated string.
+ */
+static char *
+ccnd_get_local_sockname(void)
+{
+    struct sockaddr_un sa;
+    ccn_setup_sockaddr_un(NULL, &sa);
+    return(strdup(sa.sun_path));
+}
+
+/**
+ * Get the time.
+ *
+ * This is used to supply the clock for our scheduled events.
+ */
+static void
+ccnd_gettime(const struct ccn_gettime *self, struct ccn_timeval *result)
+{
+    struct ccnd_handle *h = self->data;
+    struct timeval now = {0};
+    long int sdelta;
+    int udelta;
+    ccn_wrappedtime delta;
+    
+    gettimeofday(&now, 0);
+    result->s = now.tv_sec;
+    result->micros = now.tv_usec;
+    sdelta = now.tv_sec - h->sec;
+    udelta = now.tv_usec + h->sliver - h->usec;
+    h->sec = now.tv_sec;
+    h->usec = now.tv_usec;
+    while (udelta < 0) {
+        udelta += 1000000;
+        sdelta -= 1;
+    }
+    /* avoid letting time run backwards or taking huge steps */
+    if (sdelta < 0)
+        delta = 1;
+    else if (sdelta >= (1U << 30) / WTHZ)
+        delta = (1U << 30) / WTHZ;
+    else {
+        delta = (unsigned)udelta / (1000000U / WTHZ);
+        h->sliver = udelta - delta * (1000000U / WTHZ);
+        delta += (unsigned)sdelta * WTHZ;
+    }
+    h->wtnow += delta;
+}
+
+/**
+ * Set IPV6_V6ONLY on a socket.
+ *
+ * The handle is used for error reporting.
+ */
+void
+ccnd_setsockopt_v6only(struct ccnd_handle *h, int fd)
+{
+    int yes = 1;
+    int res = 0;
+#ifdef IPV6_V6ONLY
+    res = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes));
+#endif
+    if (res == -1)
+        ccnd_msg(h, "warning - could not set IPV6_V6ONLY on fd %d: %s",
+                 fd, strerror(errno));
+}
+
+/**
+ * Translate an address family constant to a string.
+ */
+static const char *
+af_name(int family)
+{
+    switch (family) {
+        case AF_INET:
+            return("ipv4");
+        case AF_INET6:
+            return("ipv6");
+        default:
+            return("");
+    }
+}
+
+/**
+ * Create the standard ipv4 and ipv6 bound ports.
+ */
+static int
+ccnd_listen_on_wildcards(struct ccnd_handle *h)
+{
+    int fd;
+    int res;
+    int whichpf;
+    struct addrinfo hints = {0};
+    struct addrinfo *addrinfo = NULL;
+    struct addrinfo *a;
+    
+    hints.ai_socktype = SOCK_DGRAM;
+    hints.ai_flags = AI_PASSIVE;
+    for (whichpf = 0; whichpf < 2; whichpf++) {
+        hints.ai_family = whichpf ? PF_INET6 : PF_INET;
+        res = getaddrinfo(NULL, h->portstr, &hints, &addrinfo);
+        if (res == 0) {
+            for (a = addrinfo; a != NULL; a = a->ai_next) {
+                fd = socket(a->ai_family, SOCK_DGRAM, 0);
+                if (fd != -1) {
+                    struct face *face = NULL;
+                    int yes = 1;
+                    int rcvbuf = 0;
+                    socklen_t rcvbuf_sz;
+                    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+                    rcvbuf_sz = sizeof(rcvbuf);
+                    getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, &rcvbuf_sz);
+                    if (a->ai_family == AF_INET6)
+                        ccnd_setsockopt_v6only(h, fd);
+                    res = bind(fd, a->ai_addr, a->ai_addrlen);
+                    if (res != 0) {
+                        close(fd);
+                        continue;
+                    }
+                    face = record_connection(h, fd,
+                                             a->ai_addr, a->ai_addrlen,
+                                             CCN_FACE_DGRAM | CCN_FACE_PASSIVE);
+                    if (face == NULL) {
+                        close(fd);
+                        continue;
+                    }
+                    if (a->ai_family == AF_INET)
+                        h->ipv4_faceid = face->faceid;
+                    else
+                        h->ipv6_faceid = face->faceid;
+                    ccnd_msg(h, "accepting %s datagrams on fd %d rcvbuf %d",
+                             af_name(a->ai_family), fd, rcvbuf);
+                }
+            }
+            for (a = addrinfo; a != NULL; a = a->ai_next) {
+                fd = socket(a->ai_family, SOCK_STREAM, 0);
+                if (fd != -1) {
+                    int yes = 1;
+                    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+                    if (a->ai_family == AF_INET6)
+                        ccnd_setsockopt_v6only(h, fd);
+                    res = bind(fd, a->ai_addr, a->ai_addrlen);
+                    if (res != 0) {
+                        close(fd);
+                        continue;
+                    }
+                    res = listen(fd, 30);
+                    if (res == -1) {
+                        close(fd);
+                        continue;
+                    }
+                    record_connection(h, fd,
+                                      a->ai_addr, a->ai_addrlen,
+                                      CCN_FACE_PASSIVE);
+                    ccnd_msg(h, "accepting %s connections on fd %d",
+                             af_name(a->ai_family), fd);
+                }
+            }
+            freeaddrinfo(addrinfo);
+        }
+    }
+    return(0);
+}
+
+/**
+ * Create a tcp listener and a bound udp socket on the given address
+ */
+static int
+ccnd_listen_on_address(struct ccnd_handle *h, const char *addr)
+{
+    int fd;
+    int res;
+    struct addrinfo hints = {0};
+    struct addrinfo *addrinfo = NULL;
+    struct addrinfo *a;
+    int ok = 0;
+    
+    ccnd_msg(h, "listen_on %s", addr);
+    hints.ai_socktype = SOCK_DGRAM;
+    hints.ai_flags = AI_PASSIVE;
+    res = getaddrinfo(addr, h->portstr, &hints, &addrinfo);
+    if (res == 0) {
+        for (a = addrinfo; a != NULL; a = a->ai_next) {
+            fd = socket(a->ai_family, SOCK_DGRAM, 0);
+            if (fd != -1) {
+                struct face *face = NULL;
+                int yes = 1;
+                int rcvbuf = 0;
+                socklen_t rcvbuf_sz;
+                setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+                rcvbuf_sz = sizeof(rcvbuf);
+                getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, &rcvbuf_sz);
+                if (a->ai_family == AF_INET6)
+                    ccnd_setsockopt_v6only(h, fd);
+                res = bind(fd, a->ai_addr, a->ai_addrlen);
+                if (res != 0) {
+                    close(fd);
+                    continue;
+                }
+                face = record_connection(h, fd,
+                                         a->ai_addr, a->ai_addrlen,
+                                         CCN_FACE_DGRAM | CCN_FACE_PASSIVE);
+                if (face == NULL) {
+                    close(fd);
+                    continue;
+                }
+                if (a->ai_family == AF_INET)
+                    h->ipv4_faceid = face->faceid;
+                else
+                    h->ipv6_faceid = face->faceid;
+                ccnd_msg(h, "accepting %s datagrams on fd %d rcvbuf %d",
+                             af_name(a->ai_family), fd, rcvbuf);
+                ok++;
+            }
+        }
+        for (a = addrinfo; a != NULL; a = a->ai_next) {
+            fd = socket(a->ai_family, SOCK_STREAM, 0);
+            if (fd != -1) {
+                int yes = 1;
+                setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+                if (a->ai_family == AF_INET6)
+                    ccnd_setsockopt_v6only(h, fd);
+                res = bind(fd, a->ai_addr, a->ai_addrlen);
+                if (res != 0) {
+                    close(fd);
+                    continue;
+                }
+                res = listen(fd, 30);
+                if (res == -1) {
+                    close(fd);
+                    continue;
+                }
+                record_connection(h, fd,
+                                  a->ai_addr, a->ai_addrlen,
+                                  CCN_FACE_PASSIVE);
+                ccnd_msg(h, "accepting %s connections on fd %d",
+                         af_name(a->ai_family), fd);
+                ok++;
+            }
+        }
+        freeaddrinfo(addrinfo);
+    }
+    return(ok > 0 ? 0 : -1);
+}
+
+/**
+ * Create listeners or bound udp ports using the given addresses
+ *
+ * The addresses may be separated by whitespace, commas, or semicolons.
+ */
+static int
+ccnd_listen_on(struct ccnd_handle *h, const char *addrs)
+{
+    unsigned char ch;
+    unsigned char dlm;
+    int res = 0;
+    int i;
+    struct ccn_charbuf *addr = NULL;
+    
+    if (addrs == NULL || !*addrs || 0 == strcmp(addrs, "*"))
+        return(ccnd_listen_on_wildcards(h));
+    addr = ccn_charbuf_create();
+    for (i = 0, ch = addrs[i]; addrs[i] != 0;) {
+        addr->length = 0;
+        dlm = 0;
+        if (ch == '[') {
+            dlm = ']';
+            ch = addrs[++i];
+        }
+        for (; ch > ' ' && ch != ',' && ch != ';' && ch != dlm; ch = addrs[++i])
+            ccn_charbuf_append_value(addr, ch, 1);
+        if (ch && ch == dlm)
+            ch = addrs[++i];
+        if (addr->length > 0) {
+            res |= ccnd_listen_on_address(h, ccn_charbuf_as_string(addr));
+        }
+        while ((0 < ch && ch <= ' ') || ch == ',' || ch == ';')
+            ch = addrs[++i];
+    }
+    ccn_charbuf_destroy(&addr);
+    return(res);
+}
+
+/**
+ * Parse a list of ccnx URIs
+ *
+ * The URIs may be separated by whitespace, commas, or semicolons.
+ *
+ * Errors are logged.
+ *
+ * @returns a newly-allocated charbuf containing nul-terminated URIs; or
+ *          NULL if no valid URIs are found.
+ */
+static struct ccn_charbuf *
+ccnd_parse_uri_list(struct ccnd_handle *h, const char *what, const char *uris)
+{
+    struct ccn_charbuf *ans;
+    struct ccn_charbuf *name;
+    int i;
+    size_t j;
+    int res;
+    unsigned char ch;
+    const char *uri;
+
+    if (uris == NULL)
+        return(NULL);
+    ans = ccn_charbuf_create();
+    name = ccn_charbuf_create();
+    for (i = 0, ch = uris[0]; ch != 0;) {
+        while ((0 < ch && ch <= ' ') || ch == ',' || ch == ';')
+            ch = uris[++i];
+        j = ans->length;
+        while (ch > ' ' && ch != ',' && ch != ';') {
+            ccn_charbuf_append_value(ans, ch, 1);
+            ch = uris[++i];
+        }
+        if (j < ans->length) {
+            ccn_charbuf_append_value(ans, 0, 1);
+            uri = (const char *)ans->buf + j;
+            name->length = 0;
+            res = ccn_name_from_uri(name, uri);
+            if (res < 0) {
+                ccnd_msg(h, "%s: invalid ccnx URI: %s", what, uri);
+                ans->length = j;
+            }
+        }
+    }
+    ccn_charbuf_destroy(&name);
+    if (ans->length == 0)
+        ccn_charbuf_destroy(&ans);
+    return(ans);
+}
+
+
+/* <!--kuwayama */
+/* <!-- commented by xu
+struct reserve_list *rlist_create(void) {
+    struct reserve_list *p;
+    
+    p = (struct reserve_list *)malloc(sizeof(struct reserve_list));
+    p->flatname = ccn_charbuf_create();
+    p->faceid = 0;
+    p->next = NULL;
+    p->prev = NULL;
+    return p;
+}
+
+void rlist_destroy(struct ccnd_handle *h, struct reserve_list *p) {
+    struct reserve_list *next, *prev;
+
+    if (p == NULL || h->rlist_head == NULL)
+        return;
+    next = p->next;
+    prev = p->prev;
+    if (p == h->rlist_head)
+        h->rlist_head = next;
+    ccn_charbuf_destroy(p->flatname);
+    free(p);
+    if (next != NULL)
+        next->prev = prev;
+    if (prev != NULL)
+        prev->next = next;
+}
+
+void rlist_append(struct ccnd_handle *h, struct reserve_list *p) {
+    struct reserve_list *tail;
+
+    if (p == NULL || h->rlist_head == NULL)
+        return;
+    tail = h->rlist_head;
+    while (tail->next != NULL)
+        tail = tail->next;
+    tail->next = p;
+    p->prev = tail;
+}
+
+void rlist_clear(struct ccnd_handle *h) {
+    while (h->rlist_head != NULL)
+        rlist_destroy(h, h->rlist_head);
+}
+  commented by xu end -->*/
+/*  kuwayama--> */
+
+
+/**
+ * Start a new ccnd instance
+ * @param progname - name of program binary, used for locating helpers
+ * @param logger - logger function
+ * @param loggerdata - data to pass to logger function
+ */
+struct ccnd_handle *
+ccnd_create(const char *progname, ccnd_logger logger, void *loggerdata)
+{
+    char *sockname;
+    const char *portstr;
+    const char *debugstr;
+    const char *entrylimit;
+    const char *entrylimit_g;
+    const char *mtu;
+    const char *data_pause;
+    const char *tts_default;
+    const char *tts_limit;
+    const char *predicted_response_limit;
+    const char *autoreg;
+    const char *listen_on;
+    int fd;
+    struct ccnd_handle *h;
+    struct hashtb_param param = {0};
+    unsigned cap;
+    unsigned cap_g;
+    
+    sockname = ccnd_get_local_sockname();
+    h = calloc(1, sizeof(*h));
+    if (h == NULL)
+        return(h);
+    h->logger = logger;
+    h->loggerdata = loggerdata;
+    h->noncegen = &ccnd_plain_nonce;
+    h->logpid = (int)getpid();
+    h->progname = progname;
+    h->debug = -1;
+    param.finalize_data = h;
+    h->face_limit = 1024; /* soft limit */
+    h->faces_by_faceid = calloc(h->face_limit, sizeof(h->faces_by_faceid[0]));
+    param.finalize = &finalize_face;
+    h->faces_by_fd = hashtb_create(sizeof(struct face), &param);
+    h->dgram_faces = hashtb_create(sizeof(struct face), &param);
+    param.finalize = &finalize_nonce;
+    h->nonce_tab = hashtb_create(sizeof(struct nonce_entry), &param);
+    h->ncehead.next = h->ncehead.prev = &h->ncehead;
+    param.finalize = 0;
+    h->faceid_by_guid = hashtb_create(sizeof(unsigned), &param);
+    param.finalize = &finalize_nameprefix;
+    h->nameprefix_tab = hashtb_create(sizeof(struct nameprefix_entry), &param);
+    param.finalize = &finalize_interest;
+    h->interest_tab = hashtb_create(sizeof(struct interest_entry), &param);
+    param.finalize = &finalize_guest;
+    h->guest_tab = hashtb_create(sizeof(struct guest_entry), &param);
+    param.finalize = 0;
+    h->faceattr_index_tab = hashtb_create(sizeof(struct faceattr_index_entry),
+                                          &param);
+    h->headx = calloc(1, sizeof(*h->headx));
+    h->headx->staletime = -1;
+    h->headx->nextx = h->headx->prevx = h->headx;
+    h->ex_index = ccn_nametree_create(1);
+    h->ex_index->compare = &ex_index_cmp;
+    h->send_interest_scratch = ccn_charbuf_create();
+    h->ticktock.descr[0] = 'C';
+    h->ticktock.micros_per_base = 1000000;
+    h->ticktock.gettime = &ccnd_gettime;
+    h->ticktock.data = h;
+    h->sched = ccn_schedule_create(h, &h->ticktock);
+    /* <!--kuwayama */
+    //commented by xu //h->drr = ccn_schedule_create(h, &h->ticktock);
+    //commented by xu //h->rlist_head = rlist_create();
+	/*<!-- add by xu */
+    h->qos_queue_0 = (queue_t *)malloc(sizeof(queue_t));
+    h->qos_queue_1 = (queue_t *)malloc(sizeof(queue_t));
+    h->qos_queue_2 = (queue_t *)malloc(sizeof(queue_t));
+    h->norm_queue = (queue_t *)malloc(sizeof(queue_t));
+	h->qos_queue_f_0 = (queue_t *)malloc(sizeof(queue_t));
+    h->qos_queue_f_1 = (queue_t *)malloc(sizeof(queue_t));
+    h->qos_queue_f_2 = (queue_t *)malloc(sizeof(queue_t));
+    h->norm_queue_f = (queue_t *)malloc(sizeof(queue_t));
+    queue_init(h->qos_queue_0, 65530);
+    queue_init(h->qos_queue_1, 65530);
+    queue_init(h->qos_queue_2, 65530);
+    queue_init(h->norm_queue, 65530);
+	queue_init(h->qos_queue_f_0, 65530);
+    queue_init(h->qos_queue_f_1, 65530);
+    queue_init(h->qos_queue_f_2, 65530);
+    queue_init(h->norm_queue_f, 65530);
+	h->queue_flag = 0;
+	h->queue_flag_f = 0;
+	h->face_id_int_2 = -1;
+	h->face_id_int_5 = -1;
+	/* add by xu end-->*/
+    // h->bwpool = 設定ファイルから読めるようにしたい
+    /*  kuwayama--> */
+    h->starttime = h->sec;
+    h->starttime_usec = h->usec;
+    h->wtnow = 0xFFFF0000; /* provoke a rollover early on */
+    h->oldformatcontentgrumble = 1;
+    h->oldformatinterestgrumble = 1;
+    debugstr = getenv("CCND_DEBUG");
+    if (debugstr != NULL && debugstr[0] != 0) {
+        h->debug = atoi(debugstr);
+        if (h->debug == 0 && debugstr[0] != '0')
+            h->debug = 1;
+    }
+    else
+        h->debug = 1;
+    portstr = getenv(CCN_LOCAL_PORT_ENVNAME);
+    if (portstr == NULL || portstr[0] == 0 || strlen(portstr) > 10)
+        portstr = CCN_DEFAULT_UNICAST_PORT;
+    h->portstr = portstr;
+    entrylimit = getenv("CCND_CAP");
+    entrylimit_g = getenv("CCND_CAP_G");
+    h->capacity = (~0U)/2; 
+    h->capacity_g = (~0U)/2; 
+    if (entrylimit != NULL && entrylimit[0] != 0)
+        h->capacity = strtoul(entrylimit, NULL, 10);
+    if (entrylimit_g != NULL && entrylimit_g[0] != 0)
+        h->capacity_g = strtoul(entrylimit_g, NULL, 10);
+
+    ccnd_msg(h, "CCND_DEBUG=%d CCND_CAP=%lu", h->debug, h->capacity);
+    ccnd_msg(h, "CCND_DEBUG=%d CCND_CAP_G=%lu", h->debug, h->capacity_g);
+    //cap = 100000; /* Don't try to allocate an insanely high number */
+    cap = 1000000;//modified by xu /* Don't try to allocate an insanely high number */
+    cap_g = 1000000;//modified by xu /* Don't try to allocate an insanely high number */
+    cap = h->capacity < cap ? h->capacity : cap;
+    cap_g = h->capacity_g < cap_g ? h->capacity_g : cap_g;
+
+    h->content_tree = ccn_nametree_create(cap);
+    h->content_tree->data = h;
+    h->content_tree->pre_remove = &content_preremove;
+    h->content_tree->finalize = &content_finalize;
+
+    // modified by xu for g content store 
+    h->content_tree_g = ccn_nametree_create(cap_g);
+    h->content_tree_g->data = h;
+    h->content_tree_g->pre_remove = &content_preremove;
+    h->content_tree_g->finalize = &content_finalize;
+
+    // todo: may need a contetn tree for DEFAULT contents
+    h->mtu = 0;
+    mtu = getenv("CCND_MTU");
+    if (mtu != NULL && mtu[0] != 0) {
+        h->mtu = atol(mtu);
+        if (h->mtu < 0)
+            h->mtu = 0;
+        if (h->mtu > CCN_MAX_MESSAGE_BYTES)
+            h->mtu = CCN_MAX_MESSAGE_BYTES;
+    }
+    h->data_pause_microsec = 10000;
+    data_pause = getenv("CCND_DATA_PAUSE_MICROSEC");
+    if (data_pause != NULL && data_pause[0] != 0) {
+        h->data_pause_microsec = atol(data_pause);
+        if (h->data_pause_microsec == 0)
+            h->data_pause_microsec = 1;
+        if (h->data_pause_microsec > 1000000)
+            h->data_pause_microsec = 1000000;
+    }
+    h->tts_limit = 126230400; /* 4 years, assuming 1 leap year */
+    tts_limit = getenv("CCND_MAX_TIME_TO_STALE");
+    if (tts_limit != NULL && tts_limit[0] != 0) {
+        int v = atoi(tts_limit);
+        if (v <= 0)
+            v = 1;
+        if (v < h->tts_limit)
+            h->tts_limit = v;
+        ccnd_msg(h, "CCND_MAX_TIME_TO_STALE=%d", h->tts_limit);
+    }
+    h->predicted_response_limit = 160000;
+    predicted_response_limit = getenv("CCND_MAX_RTE_MICROSEC");
+    if (predicted_response_limit != NULL && predicted_response_limit[0] != 0) {
+        h->predicted_response_limit = atoi(predicted_response_limit);
+        if (h->predicted_response_limit <= 2000)
+            h->predicted_response_limit = 2000;
+        else if (h->predicted_response_limit > 60000000)
+            h->predicted_response_limit = 60000000;
+        ccnd_msg(h, "CCND_MAX_RTE_MICROSEC=%d", h->predicted_response_limit);
+    }
+    h->tts_default = -1;
+    tts_default = getenv("CCND_DEFAULT_TIME_TO_STALE");
+    if (tts_default != NULL && tts_default[0] != 0)
+        h->tts_default = atoi(tts_default);
+    if (h->tts_default <= 0 || h->tts_default > h->tts_limit)
+        h->tts_default = h->tts_limit;
+    if (h->tts_default != h->tts_limit || tts_default != NULL)
+        ccnd_msg(h, "CCND_DEFAULT_TIME_TO_STALE=%d", h->tts_default);
+    listen_on = getenv("CCND_LISTEN_ON");
+    autoreg = getenv("CCND_AUTOREG");
+    if (autoreg != NULL && autoreg[0] != 0) {
+        h->autoreg = ccnd_parse_uri_list(h, "CCND_AUTOREG", autoreg);
+        if (h->autoreg != NULL)
+            ccnd_msg(h, "CCND_AUTOREG=%s", autoreg);
+    }
+    if (listen_on != NULL && listen_on[0] != 0)
+        ccnd_msg(h, "CCND_LISTEN_ON=%s", listen_on);
+    // if (h->debug & 256)
+        h->noncegen = &ccnd_debug_nonce;
+    /* Do keystore setup early, it takes a while the first time */
+    ccnd_init_internal_keystore(h);
+    ccnd_reseed(h);
+    faceattr_declare(h, "valid", FAI_VALID);
+    faceattr_declare(h, "application", FAI_APPLICATION);
+    faceattr_declare(h, "broadcastcapable", FAI_BROADCAST_CAPABLE);
+    faceattr_declare(h, "directcontrol", FAI_DIRECT_CONTROL);
+    if (h->face0 == NULL) {
+        struct face *face;
+        face = calloc(1, sizeof(*face));
+        face->recv_fd = -1;
+        face->sendface = 0;
+        face->flags = CCN_FACE_GG;
+        h->face0 = face;
+    }
+    enroll_face(h, h->face0);
+    ccnd_face_status_change(h, 0);
+    fd = create_local_listener(h, sockname, 42);
+    if (fd == -1)
+        ccnd_msg(h, "%s: %s", sockname, strerror(errno));
+    else
+        ccnd_msg(h, "listening on %s", sockname);
+    h->flood = (h->autoreg != NULL);
+    h->ipv4_faceid = h->ipv6_faceid = CCN_NOFACEID;
+    ccnd_listen_on(h, listen_on);
+    reap_needed(h, 55000);
+    age_forwarding_needed(h);
+    ccnd_internal_client_start(h);
+    free(sockname);
+    sockname = NULL;
+    return(h);
+}
+
+/**
+ * Shutdown listeners and bound datagram sockets, leaving connected streams.
+ */
+static void
+ccnd_shutdown_listeners(struct ccnd_handle *h)
+{
+    struct hashtb_enumerator ee;
+    struct hashtb_enumerator *e = &ee;
+    for (hashtb_start(h->faces_by_fd, e); e->data != NULL;) {
+        struct face *face = e->data;
+        if ((face->flags & (CCN_FACE_MCAST | CCN_FACE_PASSIVE)) != 0)
+            hashtb_delete(e);
+        else
+            hashtb_next(e);
+    }
+    hashtb_end(e);
+}
+
+/**
+ * Destroy the ccnd instance, releasing all associated resources.
+ */
+void
+ccnd_destroy(struct ccnd_handle **pccnd)
+{
+    struct ccnd_handle *h = *pccnd;
+    if (h == NULL)
+        return;
+    ccnd_shutdown_listeners(h);
+    ccnd_internal_client_stop(h);
+    ccn_schedule_destroy(&h->sched);
+    /* <!--kuwayama */
+    //commented by xu//ccn_schedule_destroy(&h->drr);
+    // rlist_clear(h->rlist_head);
+    /*<!-- add by xu */
+    queue_uninit(h->qos_queue_0);
+    queue_uninit(h->qos_queue_1);
+    queue_uninit(h->qos_queue_2);
+    queue_uninit(h->norm_queue);
+    queue_uninit(h->qos_queue_f_0);
+    queue_uninit(h->qos_queue_f_1);
+    queue_uninit(h->qos_queue_f_2);
+    queue_uninit(h->norm_queue_f);
+    /* add by xu end -->*/
+    /*  kuwayama--> */
+    hashtb_destroy(&h->nonce_tab);
+    hashtb_destroy(&h->dgram_faces);
+    hashtb_destroy(&h->faces_by_fd);
+    hashtb_destroy(&h->faceid_by_guid);
+    hashtb_destroy(&h->interest_tab);
+    hashtb_destroy(&h->nameprefix_tab);
+    hashtb_destroy(&h->guest_tab);
+    hashtb_destroy(&h->faceattr_index_tab);
+    if (h->fds != NULL) {
+        free(h->fds);
+        h->fds = NULL;
+        h->nfds = 0;
+    }
+    if (h->faces_by_faceid != NULL) {
+        free(h->faces_by_faceid);
+        h->faces_by_faceid = NULL;
+        h->face_limit = h->face_gen = 0;
+    }
+    ccn_nametree_destroy(&h->content_tree);
+    // modified by xu for g content store 
+    ccn_nametree_destroy(&h->content_tree_g);
+
+    ccn_nametree_destroy(&h->ex_index);
+    ccn_charbuf_destroy(&h->send_interest_scratch);
+    ccn_charbuf_destroy(&h->scratch_charbuf);
+    ccn_charbuf_destroy(&h->autoreg);
+    ccn_indexbuf_destroy(&h->scratch_indexbuf);
+    if (h->face0 != NULL) {
+        int i;
+        ccn_charbuf_destroy(&h->face0->inbuf);
+        ccn_charbuf_destroy(&h->face0->outbuf);
+        for (i = 0; i < CCN_CQ_N; i++)
+            content_queue_destroy(h, &(h->face0->q[i]));
+        for (i = 0; i < CCND_FACE_METER_N; i++)
+            ccnd_meter_destroy(&h->face0->meter[i]);
+        free(h->face0);
+        h->face0 = NULL;
+    }
+    if (h->headx != NULL)
+        free(h->headx);
+    free(h);
+    *pccnd = NULL;
+}
+
+// add by xu
+
+/**
+* @brief Init queue.
+* @param[out] q Queue structure
+* @param[in] capacity Initial queue capacity
+* @return None
+*/
+void queue_init(queue_t *q, const int capacity) {
+    q->front = 0;
+    q->rear = 0;
+    q->capacity = capacity;
+    q->elems = (queue_elem_t*)malloc(capacity * sizeof(queue_elem_t));
+}
+
+/**
+* @brief Release queue.
+* @param[inout] q Queue structure
+* @return None
+*/
+void queue_uninit(queue_t *q) {
+    q->front = 0;
+    q->rear = 0;
+    q->capacity = 0;
+    free(q->elems);
+    q->elems = NULL;
+}
+
+/**
+* @brief if the queue is empty.
+* @param[in] q Queue structure
+* @return Empty return TRUE,NOT empty return FALSE
+*/
+bool queue_empty(const queue_t *q) {
+    return q->front == q->rear;
+}
+
+/**
+* @brief Get the number of elements.
+* @param[in] q Queue structure
+* @return number of elements
+*/
+long int queue_size(const queue_t *q) {
+    return (q->rear - q->front + q->capacity) % q->capacity;
+}
+
+/**
+* @brief Append an element to the tail of the queue
+* @param[in] q Queue structure
+* @param[in] x the element to be appended
+* @return None
+*/
+void queue_push(queue_t *q, const queue_elem_t x) {
+    if ((q->rear + 1) % q->capacity == q->front)
+    {
+        // Queue is full, rellocate memory
+        queue_elem_t* tmp = (queue_elem_t*)malloc(q->capacity * 2 * sizeof(queue_elem_t));
+        if (q->front < q->rear)
+        {
+            memcpy(tmp, q->elems + q->front, (q->rear - q->front) * sizeof(queue_elem_t));
+            q->rear -= q->front;
+            q->front = 0;
+        }
+        else if (q->front > q->rear)
+        {
+            /* Copy data between q->front and q->capacity */
+            memcpy(tmp, q->elems + q->front, (q->capacity - q->front) * sizeof(queue_elem_t));
+            /* Copy data between q->data[0] and q->data[rear] */
+            memcpy(tmp + (q->capacity - q->front), q->elems, q->rear * sizeof(queue_elem_t));
+            q->rear += q->capacity - q->front;
+            q->front = 0;
+        }
+        free(q->elems);
+        q->elems = tmp;
+        q->capacity *= 2;
+    }
+    q->elems[q->rear] = x;
+    q->rear = (q->rear + 1) % q->capacity;
+}
+
+
+/**
+* @brief Delete an element from the head of the queue.
+* @param[in] q Queue structure
+* @return None
+*/
+void queue_pop(queue_t *q) {
+    q->front = (q->front + 1) % q->capacity;
+}
+
+/**
+* @brief Get first element of the queue, not pop.
+* @param[in] q Queue structure
+* @return Firest element of the queue
+*/
+queue_elem_t queue_front(const queue_t *q) {
+    return q->elems[q->front];
+}
+
+/**
+* @brief Get last element of the queue.
+* @param[in] q Queue structure
+* @return Last element of the queue
+*/
+queue_elem_t queue_back(const queue_t *q) {
+    return q->elems[q->rear - 1];
+}
+
diff --git a/csrc/ccnd/ccnd_main.c b/csrc/ccnd/ccnd_main.c
index 00e3ae14af..11975e1377 100644
--- a/csrc/ccnd/ccnd_main.c
+++ b/csrc/ccnd/ccnd_main.c
@@ -25,8 +25,109 @@
 #include <openssl/evp.h>
 #include <openssl/err.h>
 #include <openssl/crypto.h>
-
+#include <sys/time.h> // add by xu
+#include <string.h> //add by xu
 #include "ccnd_private.h"
+#include <ccn/charbuf.h> //add by xu
+#define UNIT_CONVERT 8
+
+/*add by Fumiya for adaptive bandwidth control*/
+
+static double time_diff(struct timeval s, struct timeval e){
+    double sec = (double)(e.tv_sec - s.tv_sec);
+    double micro = (double)(e.tv_usec - s.tv_usec);
+    double passed = sec + micro / 1000.0 / 1000.0;
+
+    return passed;
+}
+
+
+static void
+bandwidth_calculation(struct ccnd_handle *h){
+	struct timeval tv;
+	struct timeval time_last_1sec={0}; //一秒集計用のtimeval
+	int k = 0;
+
+    unsigned i;
+    int j;
+    int n;
+    struct face *f;
+    struct content_queue *q;
+    
+    double bw_of_g;
+    int bw_of_face;
+
+    while(k<100000000000000){
+	gettimeofday(&tv,NULL);
+	//queueの更新作業
+        for (i = 0; i < h->face_limit ; i++){
+            if (h->faces_by_faceid[i] == NULL)
+                continue;
+            f = h->faces_by_faceid[i];
+
+            for (j = 0;  j<QOS_QUEUE ; j++) {
+                if (f->qos_q[j] == NULL)
+                    break;
+                else{
+                    q = f->qos_q[j];
+                    if (q->use_flag == 2 && time_diff(q->last_use,tv) >= 0.3 && q->sender == NULL) {
+                        if (q->queue_type == CQ_DEFAULT)
+                            f->number_of_default_queue--;
+                        else
+                            f->number_of_guarantee_queue--;
+			q->use_flag = 0;
+			ccnd_msg(h,"queue delete remianing queue D:%d  G:%d",f->number_of_default_queue, f->number_of_guarantee_queue);
+                    }
+		    if (q->use_flag == 1 && q->sender == NULL && time_diff(q->last_use,tv) >= 0.3) {
+                        q->use_flag = 2;
+                        struct timeval last;
+                        gettimeofday(&last,NULL);
+                        q->last_use = last;
+                    }
+                }
+            }
+        }
+	//最終更新時間から1秒が経過していた時
+	if((tv.tv_sec - time_last_1sec.tv_sec) >= 1){
+	    time_last_1sec = tv;
+
+            for (i = 0; i < h->face_limit ; i++){
+                if (h->faces_by_faceid[i] == NULL)
+                    continue;
+                f = h->faces_by_faceid[i];
+		bw_of_g = 3000000.0 * (double)(f->amount_size_of_guarantee - f->send_size_of_guarantee) / (4000.0 * 94.0);
+		if(bw_of_g > 3000000.0){
+            		bw_of_g = 3000000.0;
+		}
+                for (j = 0;  j<QOS_QUEUE ; j++) {
+                    if (f->qos_q[j] == NULL)
+                        break;
+                    else{
+                        q = f->qos_q[j];
+			if (q->use_flag == 0)
+                            continue;
+
+                        if ((f->number_of_default_queue + f->number_of_guarantee_queue) > 0){
+                            if (q->queue_type == CQ_DEFAULT) {
+                                q->bandwidth = (q->bandwidth_of_face - (int)bw_of_g) / (f->number_of_default_queue + f->number_of_guarantee_queue);
+                            }else{
+                                q->bandwidth = (q->bandwidth_of_face - (int)bw_of_g) / (f->number_of_default_queue + f->number_of_guarantee_queue)
+                                      + (int)bw_of_g / f->number_of_guarantee_queue;
+				//q->bandwidth = (int)bw_of_g / f->number_of_guarantee_queue; //これがdefaultのキューがめっちゃ存在した場合
+                            }
+			}
+                        else
+                            q->bandwidth = q->bandwidth_of_face;
+
+			q->remaining_bandwidth = q->bandwidth;
+                        q->bw_flag = 0;
+                    }
+                }
+            }
+	}
+    }
+}
+/*add by Fumiya for adaptive bandwidth control*/
 
 static int
 stdiologger(void *loggerdata, const char *format, va_list ap)
@@ -40,12 +141,22 @@ main(int argc, char **argv)
 {
     struct ccnd_handle *h;
     
+    /*add by Fumiya for adaptive bandwidth control*/
+    int bw_thread;
+    pthread_t thread8;
+    /*add by Fumiya for adaptive bandwidth control*/
+
     if (argc > 1) {
         fprintf(stderr, "%s", ccnd_usage_message);
         exit(1);
     }
     signal(SIGPIPE, SIG_IGN);
     h = ccnd_create(argv[0], stdiologger, stderr);
+    
+    /*add by Fumiya for adaptive bandwidth control*/
+    bw_thread = pthread_create(&thread8, NULL, (void *)&bandwidth_calculation, h);
+    /*add by Fumiya for adaptive bandwidth control*/
+
     if (h == NULL)
         exit(1);
     ccnd_run(h);
diff --git a/csrc/ccnd/ccnd_main.c2 b/csrc/ccnd/ccnd_main.c2
new file mode 100644
index 0000000000..8185cf3162
--- /dev/null
+++ b/csrc/ccnd/ccnd_main.c2
@@ -0,0 +1,639 @@
+/**
+ * @file ccnd_main.c
+ *
+ * A CCNx program.
+ *
+ * Copyright (C) 2009-2011, 2013 Palo Alto Research Center, Inc.
+ *
+ * This work is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ * This work is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details. You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <signal.h>
+#include <stddef.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <openssl/evp.h>
+#include <openssl/err.h>
+#include <openssl/crypto.h>
+#include <sys/time.h> // add by xu
+#include <string.h> //add by xu
+#include "ccnd_private.h"
+#include <ccn/charbuf.h> //add by xu
+
+#define UNIT_CONVERT 8
+/*add by xu*/
+int bitcount(unsigned int n)
+{
+    unsigned int c =0 ;
+    for (c =0; n; ++c)
+    {
+        n &= (n -1) ; // clear right most 1
+    }
+    return c ;
+}
+/**
+ * Release a charbuf for reuse
+ */
+static void
+charbuf_release_qos(struct ccnd_handle *h, struct ccn_charbuf *c)
+{
+    c->length = 0;
+	/*
+    if (h->scratch_charbuf == NULL)
+        h->scratch_charbuf = c;
+    else*/
+    ccn_charbuf_destroy(&c);
+}
+/*<!-- add by xu for multi-thread */
+void qos_send_message_0(struct ccnd_handle *h)
+{
+  int i = 0;
+  int count;
+  int size;
+  int intvl_b;
+  int c_t = 0;
+  const char *intvl_c;
+  struct timeval tv;
+  int bw = 5;
+  intvl_c = getenv("CCND_INTVL_G");
+  if(intvl_c !=NULL){
+     intvl_b = strtoul(intvl_c, NULL, 10);
+  }
+  else{
+     intvl_b = 0;
+  }
+  long tv_start;
+  long tv_end;
+  long time_flag;
+  long time_flag_c;
+  time_flag = 0;
+  
+  while(i<1000000000000)
+ {	
+      gettimeofday(&tv, NULL);
+	  time_flag_c = tv.tv_sec; //get current time
+	  if(time_flag_c - time_flag > 1){
+	      h->queue_flag = h->queue_flag & (~QUEUE_0_RUNNING);
+	  }
+      if(!queue_empty(h->qos_queue_0)){
+          h->queue_flag = h->queue_flag | QUEUE_0_RUNNING;
+          size = queue_size(h->qos_queue_0);
+          for(count = 0; count < size; count ++){
+            gettimeofday(&tv, NULL);
+            tv_start = tv.tv_usec;
+            ccnd_send(h, queue_front(h->qos_queue_0).face, queue_front(h->qos_queue_0).data, queue_front(h->qos_queue_0).size);
+	    intvl_b = (int)((float)queue_front(h->qos_queue_0).size*UNIT_CONVERT/(float)bw);
+	    //ccnd_msg(h, "Need sleep time: %d", intvl_b);
+            //c_t++;
+            queue_pop(h->qos_queue_0);
+            //ccnd_msg(h, "SIZE_0: %d", queue_front(h->qos_queue_0).size);
+            //ccnd_msg(h, "Counter: %d", c_t); 
+            gettimeofday(&tv, NULL);
+            tv_end = tv.tv_usec;
+            if( (intvl_b - tv_end+tv_start) >  0){
+                usleep(intvl_b-tv_end+tv_start);
+            }
+         }
+		 gettimeofday(&tv, NULL); // get last time sent packet
+		 time_flag = tv.tv_sec;
+      }
+      i++;
+  }
+
+}
+/*<!-- add by xu for multi-thread */
+void qos_send_message_1(struct ccnd_handle *h)
+{
+  int i = 0;
+  int count;
+  int size;
+  int intvl_b;
+  int c_t = 0;
+  const char *intvl_c;
+  struct timeval tv;
+  int bw = 5;
+  intvl_c = getenv("CCND_INTVL_N");
+  if(intvl_c !=NULL){
+     intvl_b = strtoul(intvl_c, NULL, 10);
+  }
+  else{
+     intvl_b = 0;
+  }
+  long tv_start;
+  long tv_end;
+  long time_flag;
+  long time_flag_c;
+  time_flag = 0;
+  
+  while(i<1000000000000)
+ {
+	  gettimeofday(&tv, NULL);
+	  time_flag_c = tv.tv_sec;
+	  if(time_flag_c - time_flag > 1){
+	      h->queue_flag = h->queue_flag & (~QUEUE_1_RUNNING);
+	  }
+      if(!queue_empty(h->qos_queue_1)){
+		  h->queue_flag = h->queue_flag | QUEUE_1_RUNNING;
+          size = queue_size(h->qos_queue_1);
+          for(count = 0; count < size; count ++){
+            gettimeofday(&tv, NULL);
+            tv_start = tv.tv_usec;
+            ccnd_send(h, queue_front(h->qos_queue_1).face, queue_front(h->qos_queue_1).data, queue_front(h->qos_queue_1).size);
+			intvl_b = (int)((float)queue_front(h->qos_queue_1).size*UNIT_CONVERT/(float)bw);
+			//ccnd_msg(h, "Need sleep time: %d", intvl_b);
+            //c_t++;
+            
+            //ccnd_msg(h, "SIZE_1: %d", queue_front(h->qos_queue_1).size);
+            //ccnd_msg(h, "Counter: %d", c_t); 
+            gettimeofday(&tv, NULL);
+            tv_end = tv.tv_usec;
+            if( (intvl_b - tv_end+tv_start) >  0){
+                usleep(intvl_b-tv_end+tv_start);
+            }
+			charbuf_release_qos(h,  queue_front(h->qos_queue_1).c);
+			queue_pop(h->qos_queue_1);
+         }		 
+		 gettimeofday(&tv, NULL);
+		 time_flag = tv.tv_sec;
+      }
+      i++;
+  }
+}
+
+/*<!-- add by xu for multi-thread */
+void qos_send_message_2(struct ccnd_handle *h)
+{
+  int i = 0;
+  int count;
+  int size;
+  int intvl_b;
+  int c_t = 0;
+  int bw = 5;
+  const char *intvl_c;
+  struct timeval tv;
+  intvl_c = getenv("CCND_INTVL_R");
+  if(intvl_c !=NULL){
+     intvl_b = strtoul(intvl_c, NULL, 10);
+  }
+  else{
+     intvl_b = 0;
+  }
+  long tv_start;
+  long tv_end;
+  long time_flag;
+  long time_flag_c;
+  time_flag = 0;
+  while(i<1000000000000)
+ {	  
+      gettimeofday(&tv, NULL);
+	  time_flag_c = tv.tv_sec;
+	  if(time_flag_c - time_flag > 1){
+	      h->queue_flag = h->queue_flag & (~QUEUE_2_RUNNING);
+	  }
+      if(!queue_empty(h->qos_queue_2)){
+		  h->queue_flag = h->queue_flag | QUEUE_2_RUNNING;
+          size = queue_size(h->qos_queue_2);
+          for(count = 0; count < size; count ++){
+            gettimeofday(&tv, NULL);
+            tv_start = tv.tv_usec;
+            ccnd_send(h, queue_front(h->qos_queue_2).face, queue_front(h->qos_queue_2).data, queue_front(h->qos_queue_2).size);
+			intvl_b = (int)((float)queue_front(h->qos_queue_2).size*UNIT_CONVERT/(float)bw);
+			//ccnd_msg(h, "Need sleep time: %d", intvl_b);
+            //c_t++;
+            
+            //ccnd_msg(h, "SIZE_2: %d", queue_front(h->qos_queue_2).size);
+            //ccnd_msg(h, "Counter: %d", c_t); 
+            gettimeofday(&tv, NULL);
+            tv_end = tv.tv_usec;
+            if( (intvl_b - tv_end+tv_start) >  0){
+                 usleep(intvl_b-tv_end+tv_start);
+            }
+			charbuf_release_qos(h,  queue_front(h->qos_queue_2).c);
+			queue_pop(h->qos_queue_2);
+         }
+		 gettimeofday(&tv, NULL);
+		 time_flag = tv.tv_sec;
+      }
+      i++;
+  }
+
+}
+
+void norm_send_message(struct ccnd_handle *h)
+{
+  int i = 0;
+  int intvl_b;
+  int count;
+  int size;
+  const char *intvl_c;
+  struct timeval tv;
+  
+  intvl_c = getenv("CCND_INTVL_D");
+  if(intvl_c !=NULL){
+     intvl_b = strtoul(intvl_c, NULL, 10);
+  }
+  else{
+     intvl_b = 0;
+  }
+  ccnd_msg(h,"intvl_b: %d", intvl_b);
+  
+  long tv_start;
+  long tv_end;
+  int bw = 20;
+  while(i<1000000000000)
+ {
+      if(!queue_empty(h->norm_queue)){
+		  switch(bitcount(h->queue_flag)){
+			  case 0:
+			      //ccnd_msg(h, "Zero guarantee queue running: 0");
+                              bw = 20; 
+			      break;
+			  case 1:
+			      //ccnd_msg(h, "ONE guarantee queue running: 1");
+                              bw = 15;
+			      break;
+			  case 2:
+			      //ccnd_msg(h, "Two guarantee queue running: 2");
+                              bw = 10;
+		              break;
+			  case 3:
+			      //ccnd_msg(h, "Three guarantee queue running: 3");
+                              bw = 5;
+			      break;
+			  default:
+			      ccnd_msg(h, "Default: No guarantee queue running: Error");// could not happen
+			      break;
+		  }
+          size = queue_size(h->norm_queue);
+          for(count = 0; count < size; count ++){
+             gettimeofday(&tv, NULL);
+             tv_start = tv.tv_usec;
+             ccnd_send(h, queue_front(h->norm_queue).face, queue_front(h->norm_queue).data, queue_front(h->norm_queue).size);
+             intvl_b = (int)((float)queue_front(h->norm_queue).size*UNIT_CONVERT/(float)bw);
+			 //ccnd_msg(h, "Need sleep time: %d", intvl_b);
+             
+             gettimeofday(&tv, NULL);
+             tv_end = tv.tv_usec;
+             if( (intvl_b - tv_end+tv_start) >  0){
+                 usleep(intvl_b-tv_end+tv_start);
+             }
+			 charbuf_release_qos(h,  queue_front(h->norm_queue).c);
+			 queue_pop(h->norm_queue);
+         }
+      }
+      i++;
+  }
+}
+
+
+//___________
+
+void qos_send_message_face_1_0(struct ccnd_handle *h)
+{
+  int i = 0;
+  int count;
+  int size;
+  int intvl_b;
+  int c_t = 0;
+  const char *intvl_c;
+  struct timeval tv;
+  int bw = 5;
+  intvl_c = getenv("CCND_INTVL_G");
+  if(intvl_c !=NULL){
+     intvl_b = strtoul(intvl_c, NULL, 10);
+  }
+  else{
+     intvl_b = 0;
+  }
+  long tv_start;
+  long tv_end;
+  long time_flag;
+  long time_flag_c;
+  time_flag = 0;
+  
+  while(i<1000000000000)
+ {	
+      gettimeofday(&tv, NULL);
+	  time_flag_c = tv.tv_sec; //get current time
+	  if(time_flag_c - time_flag > 1){
+	      h->queue_flag_f = h->queue_flag_f & (~QUEUE_f0_RUNNING);
+	  }
+      if(!queue_empty(h->qos_queue_f_0)){
+          h->queue_flag_f = h->queue_flag_f | QUEUE_f0_RUNNING;
+          size = queue_size(h->qos_queue_f_0);
+          for(count = 0; count < size; count ++){
+            gettimeofday(&tv, NULL);
+            tv_start = tv.tv_usec;
+            ccnd_send(h, queue_front(h->qos_queue_f_0).face, queue_front(h->qos_queue_f_0).data, queue_front(h->qos_queue_f_0).size);
+	    intvl_b = (int)((float)queue_front(h->qos_queue_f_0).size*UNIT_CONVERT/(float)bw);
+	    //ccnd_msg(h, "Need sleep time: %d", intvl_b);
+            //c_t++;
+            
+            //ccnd_msg(h, "SIZE_0: %d", queue_front(h->qos_queue_f_0).size);
+            //ccnd_msg(h, "Counter: %d", c_t); 
+            gettimeofday(&tv, NULL);
+            tv_end = tv.tv_usec;
+            if( (intvl_b - tv_end+tv_start) >  0){
+                usleep(intvl_b-tv_end+tv_start);
+            }
+			charbuf_release_qos(h,  queue_front(h->qos_queue_f_0).c);
+			queue_pop(h->qos_queue_f_0);
+         }
+		 gettimeofday(&tv, NULL); // get last time sent packet
+		 time_flag = tv.tv_sec;
+      }
+      i++;
+  }
+
+}
+/*<!-- add by xu for multi-thread */
+void qos_send_message_face_1_1(struct ccnd_handle *h)
+{
+  int i = 0;
+  int count;
+  int size;
+  int intvl_b;
+  int c_t = 0;
+  const char *intvl_c;
+  struct timeval tv;
+  int bw = 5;
+  intvl_c = getenv("CCND_INTVL_N");
+  if(intvl_c !=NULL){
+     intvl_b = strtoul(intvl_c, NULL, 10);
+  }
+  else{
+     intvl_b = 0;
+  }
+  long tv_start;
+  long tv_end;
+  long time_flag;
+  long time_flag_c;
+  time_flag = 0;
+  
+  while(i<1000000000000)
+ {
+	  gettimeofday(&tv, NULL);
+	  time_flag_c = tv.tv_sec;
+	  if(time_flag_c - time_flag > 1){
+	      h->queue_flag_f = h->queue_flag_f & (~QUEUE_f1_RUNNING);
+	  }
+      if(!queue_empty(h->qos_queue_f_1)){
+		  h->queue_flag_f = h->queue_flag_f | QUEUE_f1_RUNNING;
+          size = queue_size(h->qos_queue_f_1);
+          for(count = 0; count < size; count ++){
+            gettimeofday(&tv, NULL);
+            tv_start = tv.tv_usec;
+            ccnd_send(h, queue_front(h->qos_queue_f_1).face, queue_front(h->qos_queue_f_1).data, queue_front(h->qos_queue_f_1).size);
+			intvl_b = (int)((float)queue_front(h->qos_queue_f_1).size*UNIT_CONVERT/(float)bw);
+			//ccnd_msg(h, "Need sleep time: %d", intvl_b);
+            //c_t++;
+            
+            //ccnd_msg(h, "SIZE_1: %d", queue_front(h->qos_queue_f_1).size);
+            //ccnd_msg(h, "Counter: %d", c_t); 
+            gettimeofday(&tv, NULL);
+            tv_end = tv.tv_usec;
+            if( (intvl_b - tv_end+tv_start) >  0){
+                usleep(intvl_b-tv_end+tv_start);
+            }
+			charbuf_release_qos(h,  queue_front(h->qos_queue_f_1).c);
+			queue_pop(h->qos_queue_f_1);
+         }		 
+		 gettimeofday(&tv, NULL);
+		 time_flag = tv.tv_sec;
+      }
+      i++;
+  }
+}
+
+/*<!-- add by xu for multi-thread */
+void qos_send_message_face_1_2(struct ccnd_handle *h)
+{
+  int i = 0;
+  int count;
+  int size;
+  int intvl_b;
+  int c_t = 0;
+  int bw = 5;
+  const char *intvl_c;
+  struct timeval tv;
+  intvl_c = getenv("CCND_INTVL_R");
+  if(intvl_c !=NULL){
+     intvl_b = strtoul(intvl_c, NULL, 10);
+  }
+  else{
+     intvl_b = 0;
+  }
+  long tv_start;
+  long tv_end;
+  long time_flag;
+  long time_flag_c;
+  time_flag = 0;
+  while(i<1000000000000)
+ {	  
+      gettimeofday(&tv, NULL);
+	  time_flag_c = tv.tv_sec;
+	  if(time_flag_c - time_flag > 1){
+	      h->queue_flag_f = h->queue_flag_f & (~QUEUE_f2_RUNNING);
+	  }
+      if(!queue_empty(h->qos_queue_f_2)){
+		  h->queue_flag_f = h->queue_flag_f | QUEUE_f2_RUNNING;
+          size = queue_size(h->qos_queue_f_2);
+          for(count = 0; count < size; count ++){
+            gettimeofday(&tv, NULL);
+            tv_start = tv.tv_usec;
+            ccnd_send(h, queue_front(h->qos_queue_f_2).face, queue_front(h->qos_queue_f_2).data, queue_front(h->qos_queue_f_2).size);
+			intvl_b = (int)((float)queue_front(h->qos_queue_f_2).size*UNIT_CONVERT/(float)bw);
+			//ccnd_msg(h, "Need sleep time: %d", intvl_b);
+            //c_t++;
+            
+            //ccnd_msg(h, "SIZE_2: %d", queue_front(h->qos_queue_f_2).size);
+            //ccnd_msg(h, "Counter: %d", c_t); 
+            gettimeofday(&tv, NULL);
+            tv_end = tv.tv_usec;
+            if( (intvl_b - tv_end+tv_start) >  0){
+                 usleep(intvl_b-tv_end+tv_start);
+            }
+			charbuf_release_qos(h,  queue_front(h->qos_queue_f_2).c);
+			queue_pop(h->qos_queue_f_2);
+         }
+		 gettimeofday(&tv, NULL);
+		 time_flag = tv.tv_sec;
+      }
+      i++;
+  }
+
+}
+
+void norm_send_message_face_1(struct ccnd_handle *h)
+{
+  int i = 0;
+  int intvl_b;
+  int count;
+  int size;
+  const char *intvl_c;
+  struct timeval tv;
+  
+  intvl_c = getenv("CCND_INTVL_D");
+  if(intvl_c !=NULL){
+     intvl_b = strtoul(intvl_c, NULL, 10);
+  }
+  else{
+     intvl_b = 0;
+  }
+  ccnd_msg(h,"intvl_b: %d", intvl_b);
+  
+  long tv_start;
+  long tv_end;
+  int bw = 20;
+  while(i<1000000000000)
+ {
+      if(!queue_empty(h->norm_queue_f)){
+		  switch(bitcount(h->queue_flag_f)){
+			  case 0:
+			      //ccnd_msg(h, "Zero guarantee queue running: 0");
+                              bw = 20; 
+			      break;
+			  case 1:
+			      //ccnd_msg(h, "ONE guarantee queue running: 1");
+                              bw = 15;
+			      break;
+			  case 2:
+			      //ccnd_msg(h, "Two guarantee queue running: 2");
+                              bw = 10;
+		              break;
+			  case 3:
+			      //ccnd_msg(h, "Three guarantee queue running: 3");
+                              bw = 5;
+			      break;
+			  default:
+			      ccnd_msg(h, "Default: No guarantee queue running: Error");// could not happen
+			      break;
+		  }
+          size = queue_size(h->norm_queue_f);
+          for(count = 0; count < size; count ++){
+             gettimeofday(&tv, NULL);
+             tv_start = tv.tv_usec;
+             ccnd_send(h, queue_front(h->norm_queue_f).face, queue_front(h->norm_queue_f).data, queue_front(h->norm_queue_f).size);
+             intvl_b = (int)((float)queue_front(h->norm_queue_f).size*UNIT_CONVERT/(float)bw);
+			 //ccnd_msg(h, "Need sleep time: %d", intvl_b);
+             
+             gettimeofday(&tv, NULL);
+             tv_end = tv.tv_usec;
+             if( (intvl_b - tv_end+tv_start) >  0){
+                 usleep(intvl_b-tv_end+tv_start);
+             }
+			 charbuf_release_qos(h,  queue_front(h->norm_queue_f).c);
+			 queue_pop(h->norm_queue_f);
+         }
+      }
+      i++;
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* add by xu end -->*/
+
+static int
+stdiologger(void *loggerdata, const char *format, va_list ap)
+{
+    FILE *fp = (FILE *)loggerdata;
+    return(vfprintf(fp, format, ap));
+}
+
+int
+main(int argc, char **argv)
+{
+    struct ccnd_handle *h;
+    
+    /*<!-- add by xu for multi-thread */
+    int ret_thrd0;
+    int ret_thrd1;
+    int ret_thrd2;
+    int ret_thrd3;
+	int ret_thrd4;
+    int ret_thrd5;
+    int ret_thrd6;
+    int ret_thrd7;
+    pthread_t thread0;
+    pthread_t thread1;
+    pthread_t thread2;
+    pthread_t thread3;
+	pthread_t thread4;
+    pthread_t thread5;
+    pthread_t thread6;
+    pthread_t thread7;
+    /* add by xu end -->*/
+
+    if (argc > 1) {
+        fprintf(stderr, "%s", ccnd_usage_message);
+        exit(1);
+    }
+    signal(SIGPIPE, SIG_IGN);
+    h = ccnd_create(argv[0], stdiologger, stderr);
+    
+    /*<!-- add by xu multi-thread */
+    ret_thrd0 = pthread_create(&thread0, NULL, (void *)&qos_send_message_0, h);
+    if(ret_thrd0!=0){ccnd_msg(h, "Thread-0 create failed!");exit(0);}
+    ret_thrd1 = pthread_create(&thread1, NULL, (void *)&qos_send_message_1, h);
+    if(ret_thrd1!=0){ccnd_msg(h, "Thread-1 create failed!");exit(0);}
+    ret_thrd2 = pthread_create(&thread2, NULL, (void *)&qos_send_message_2, h);
+    if(ret_thrd2!=0){ccnd_msg(h, "Thread-2 create failed!");exit(0);}
+    ret_thrd3 = pthread_create(&thread3, NULL, (void *)&norm_send_message,  h);
+    if(ret_thrd3!=0){ccnd_msg(h, "Thread-3 create failed!");exit(0);}
+	ret_thrd4 = pthread_create(&thread4, NULL, (void *)&qos_send_message_face_1_0, h);
+    if(ret_thrd0!=0){ccnd_msg(h, "Thread-0 create failed!");exit(0);}
+    ret_thrd5 = pthread_create(&thread5, NULL, (void *)&qos_send_message_face_1_1, h);
+    if(ret_thrd1!=0){ccnd_msg(h, "Thread-1 create failed!");exit(0);}
+    ret_thrd6 = pthread_create(&thread6, NULL, (void *)&qos_send_message_face_1_2, h);
+    if(ret_thrd2!=0){ccnd_msg(h, "Thread-2 create failed!");exit(0);}
+    ret_thrd7 = pthread_create(&thread7, NULL, (void *)&norm_send_message_face_1,  h);
+    if(ret_thrd3!=0){ccnd_msg(h, "Thread-3 create failed!");exit(0);}
+    /* add by xu end -->*/
+    if (h == NULL)
+        exit(1);
+    ccnd_run(h);
+    ccnd_msg(h, "exiting.");
+    ccnd_destroy(&h);
+    ERR_remove_state(0);
+    EVP_cleanup();
+    CRYPTO_cleanup_all_ex_data();
+    exit(0);
+}
diff --git a/csrc/ccnd/ccnd_msg.c b/csrc/ccnd/ccnd_msg.c
index 0905059ffc..f7ef4dc2e5 100644
--- a/csrc/ccnd/ccnd_msg.c
+++ b/csrc/ccnd/ccnd_msg.c
@@ -271,8 +271,11 @@ ccnd_debug_content(struct ccnd_handle *h,
 {
     struct ccny *y = NULL;
     struct ccn_charbuf *c;
-    
-    y = ccny_from_cookie(h->content_tree, content->accession);
+      
+    y = ccny_from_cookie(h->content_tree_g, content->accession);
+    if (y == NULL){
+        y = ccny_from_cookie(h->content_tree, content->accession);
+    }
     if (y == NULL) return;
     c = ccn_charbuf_create();
     if (c == NULL) return;
diff --git a/csrc/ccnd/ccnd_private.h b/csrc/ccnd/ccnd_private.h
index 4af39aad14..9fc143a4a9 100644
--- a/csrc/ccnd/ccnd_private.h
+++ b/csrc/ccnd/ccnd_private.h
@@ -69,6 +69,61 @@ struct ncelinks {
     struct ncelinks *prev;           /**< previous in list */
 };
 
+/*<!-- add by xu */
+#ifndef __cplusplus
+typedef char bool;
+#define false 0
+#define true 1
+#endif
+
+typedef struct object_in_queue {
+    struct face *face;
+    struct ccn_charbuf *c;
+    const void *data;
+    size_t size;
+}object_in_queue;
+typedef object_in_queue queue_elem_t; // type of element in queue
+typedef struct queue_t {
+    long int front;                /* Header of queue */
+    long int rear;                 /* Tail of queue */
+    long int capacity;             /* Capacity of queue, unit of element */
+    queue_elem_t *elems;           /* memory block for data */
+}queue_t;
+void queue_init(queue_t *q, const int capacity);
+void queue_uninit(queue_t *q);
+bool queue_empty(const queue_t *q);
+long int queue_size(const queue_t *q);
+void queue_push(queue_t *q, const queue_elem_t x);
+void queue_pop(queue_t *q);
+queue_elem_t queue_front(const queue_t *q);
+queue_elem_t queue_back(const queue_t *q);
+/* add by xu end --> */
+
+/* <!--kuwayama */
+struct reserve_list {
+    struct ccn_charbuf *flatname;
+    unsigned faceid;
+    // unsigned bandwidth;
+    struct reserve_list *next;
+    struct reserve_list *prev;
+};
+
+struct reserve_list *rlist_create(void);
+void rlist_destroy(struct ccnd_handle *, struct reserve_list *);
+void rlist_append(struct ccnd_handle *, struct reserve_list *);
+void rlist_clear(struct ccnd_handle *);
+/*  kuwayama--> */
+
+/*<!-- add by xu */
+#define QUEUE_0_RUNNING   (1 << 0) /**< Queue 0 is running */
+#define QUEUE_1_RUNNING   (1 << 1) 
+#define QUEUE_2_RUNNING   (1 << 2) 
+#define QUEUE_3_RUNNING   (1 << 3) 
+#define QUEUE_f0_RUNNING   (1 << 0) /**< Queue 0 is running */
+#define QUEUE_f1_RUNNING   (1 << 1) 
+#define QUEUE_f2_RUNNING   (1 << 2) 
+#define QUEUE_f3_RUNNING   (1 << 3) 
+/*  add by xu end -->*/
 /**
  * We pass this handle almost everywhere within ccnd
  */
@@ -108,14 +163,27 @@ struct ccnd_handle {
     unsigned starttime_usec;        /**< ccnd start time fractional part */
     unsigned iserial;               /**< interest serial number (for logs) */
     struct ccn_schedule *sched;     /**< our schedule */
+    /* <!-- add by xu */
+    enum controlpacketid interest_control_flag;  /** for propogate interest*/ 
+    unsigned is_reserved;            /** for forwarding content object*/
+                                     /** 0: channel is not reserved, 
+                                       *    contents are forwared in a normal queue 
+                                       * 1: channel is reserved, 
+                                       *    contents are frowarded in a high prior queue*/
+    /* -- xu -->*/
     struct ccn_charbuf *errbuf;     /**< for strategy error reporting */
     struct ccn_charbuf *send_interest_scratch; /**< for use by send_interest */
     struct ccn_charbuf *scratch_charbuf; /**< one-slot scratch cache */
     struct ccn_indexbuf *scratch_indexbuf; /**< one-slot scratch cache */
     struct ccn_nametree *content_tree; /**< content store */
+    struct ccn_nametree *content_tree_g; /**< content store for g by xu*/
+    struct ccn_nametree *content_tree_d; /**< content store for d by xu*/
     struct content_entry *headx;    /**< list head for expiry queue */
     unsigned capacity;              /**< may toss content if there more than
                                      this many content objects in the store */
+    unsigned capacity_g;              /**< may toss content if there more than
+                                     this many content objects in the store for guarantee capacity by xu*/
+    
     struct ccn_nametree *ex_index;  /**< for speedy adds to expiry queue */
     unsigned long accessioned;
     unsigned long oldformatcontent;
@@ -156,6 +224,10 @@ struct ccnd_handle {
     int tts_default;                /**< CCND_DEFAULT_TIME_TO_STALE (seconds) */
     int tts_limit;                  /**< CCND_MAX_TIME_TO_STALE (seconds) */
     int predicted_response_limit;   /**< CCND_MAX_RTE_MICROSEC */
+    
+    //add by Fumiya
+    struct ccn_timeval last_update_qos;
+    //add by Fumiya End
 };
 
 /**
@@ -168,6 +240,11 @@ struct ccnd_handle {
 #define FACESLOTBITS 18
 #define MAXFACES ((1U << FACESLOTBITS) - 1)
 
+enum queue_class {
+    CQ_DEFAULT,
+    CQ_GUARANTEE,
+};
+
 struct content_queue {
     unsigned burst_nsec;             /**< nsec per KByte, limits burst rate */
     unsigned min_usec;               /**< minimum delay for this queue */
@@ -175,13 +252,28 @@ struct content_queue {
     unsigned ready;                  /**< # that have waited enough */
     unsigned nrun;                   /**< # sent since last randomized delay */
     struct ccn_indexbuf *send_queue; /**< accession numbers of pending content */
+    struct ccn_indexbuf *control_queue; /**< for mark which type this content is. add by xu */
     struct ccn_scheduled_event *sender;
+
+    //add by Fumiya
+    struct ccn_charbuf *content_name;
+    enum queue_class queue_type;
+    int bandwidth_of_face;
+    int bandwidth;
+    int remaining_bandwidth;
+    struct timeval last_use;
+    int bw_flag;
+    int use_flag;
+    //add by Fumiya End
 };
 
 enum cq_delay_class {
     CCN_CQ_ASAP,
     CCN_CQ_NORMAL,
     CCN_CQ_SLOW,
+    /* <!--kuwayama */
+    CCN_CQ_GUARANTEE,
+    /*  kuwayama--> */
     CCN_CQ_N
 };
 
@@ -198,6 +290,9 @@ enum ccnd_face_meter_index {
     CCND_FACE_METER_N
 };
 
+#define QOS_QUEUE 100
+#define BANDWIDTH_OF_FACE 800000000
+
 /**
  * One of our active faces
  */
@@ -227,6 +322,15 @@ struct face {
     struct ccnd_meter *meter[CCND_FACE_METER_N];
     unsigned short pktseq;      /**< sequence number for sent packets */
     unsigned short adjstate;    /**< state of adjacency negotiotiation */
+
+    /*add by Fumiya for adaptive bandwidth control*/
+    int amount_size_of_guarantee;
+    int send_size_of_guarantee;
+    int bandwidth_of_face;
+    int number_of_default_queue;
+    int number_of_guarantee_queue;
+    struct content_queue *qos_q[QOS_QUEUE];
+    /*add by Fumiya for adaptive bandwidth control*/
 };
 
 /** face flags */
@@ -289,6 +393,8 @@ struct content_entry {
     int staletime;              /**< Time in seconds, relative to starttime */
     struct content_entry *nextx; /**< Next to expire after us */
     struct content_entry *prevx; /**< Expiry doubly linked for fast removal */
+    enum controlpacketid control; /**< Content control packet id add by xu*/
+    ccn_cookie accession_g;       /**< for associated nametree entry if it is a guarantee content */
 };
 
 /**
diff --git a/csrc/ccnd/dir.mk b/csrc/ccnd/dir.mk
index 65e3aea25d..6f2822520d 100644
--- a/csrc/ccnd/dir.mk
+++ b/csrc/ccnd/dir.mk
@@ -12,7 +12,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 
-LDLIBS = -L$(CCNLIBDIR) $(MORE_LDLIBS) -lccn
+# Add "-lpthread" for multi-thread compile to the following line // add by xu
+LDLIBS = -L$(CCNLIBDIR) $(MORE_LDLIBS) -lccn -lpthread
 CCNLIBDIR = ../lib
 
 INSTALLED_PROGRAMS = ccnd ccndsmoketest 
diff --git a/csrc/ccnd/tmp.c b/csrc/ccnd/tmp.c
new file mode 100644
index 0000000000..53c5fdf179
--- /dev/null
+++ b/csrc/ccnd/tmp.c
@@ -0,0 +1 @@
+#include <stdio.h>
diff --git a/csrc/ccnr/android_main.c b/csrc/ccnr/android_main.c
index e4074f5b62..92444d4bfe 100644
--- a/csrc/ccnr/android_main.c
+++ b/csrc/ccnr/android_main.c
@@ -20,7 +20,7 @@
 
 #include <stdarg.h>
 #include <android/log.h>
-#include <ccnr_private.h>
+#include "ccnr_private.h"
 
 static int
 logger(void *loggerdata, const char *format, va_list ap)
diff --git a/csrc/ccnr/ccnr_dispatch.c b/csrc/ccnr/ccnr_dispatch.c
index e52dc20f19..3e60944d35 100644
--- a/csrc/ccnr/ccnr_dispatch.c
+++ b/csrc/ccnr/ccnr_dispatch.c
@@ -169,7 +169,7 @@ r_dispatch_process_input(struct ccnr_handle *h, int fd)
     struct sockaddr_storage sstor;
     socklen_t addrlen = sizeof(sstor);
     struct sockaddr *addr = (struct sockaddr *)&sstor;
-    
+   
     fdholder = r_io_fdholder_from_fd(h, fd);
     if (fdholder == NULL)
         return;
diff --git a/csrc/ccnr/ccnr_sendq.c b/csrc/ccnr/ccnr_sendq.c
index c6254cdc39..b83c3dae39 100644
--- a/csrc/ccnr/ccnr_sendq.c
+++ b/csrc/ccnr/ccnr_sendq.c
@@ -61,9 +61,14 @@
 #include "ccnr_msg.h"
 #include "ccnr_store.h"
 
+
 static int
 choose_face_delay(struct ccnr_handle *h, struct fdholder *fdholder, enum cq_delay_class c)
 {
+    /* <!--kuwayama 
+    if (c == CCN_CQ_GUARANTEE)
+      return(CCN_CQ_GUARANTEE);
+    /*  kuwayama--> */
     if (fdholder->flags & CCNR_FACE_CCND)
         return(1);
     if (fdholder->flags & CCNR_FACE_REPODATA)
@@ -112,6 +117,11 @@ r_sendq_content_queue_destroy(struct ccnr_handle *h, struct content_queue **pq)
 static enum cq_delay_class
 choose_content_delay_class(struct ccnr_handle *h, unsigned filedesc, int content_flags)
 {
+  /* <!--kuwayama 
+  if (content_flags == CCN_CQ_GUARANTEE)
+    return(CCN_CQ_GUARANTEE);
+  else
+  /*  kuwayama--> */
     return(CCN_CQ_NORMAL); /* default */
 }
 
diff --git a/csrc/cmd/ccnpeek.c b/csrc/cmd/ccnpeek.c
index 7c0c24813a..112a4e1210 100644
--- a/csrc/cmd/ccnpeek.c
+++ b/csrc/cmd/ccnpeek.c
@@ -32,7 +32,7 @@ static void
 usage(const char *progname)
 {
     fprintf(stderr,
-            "%s [-a] [-c] [-l lifetime] [-s scope] [-u] [-v] [-w timeout] ccnx:/a/b\n"
+            "%s [-a] [-c] [-l lifetime] [-s scope] [-u] [-v] [-w timeout] [-g] ccnx:/a/b\n"
             "   Get one content item matching the name prefix and write it to stdout"
             "\n"
             "   -a - allow stale data\n"
@@ -41,8 +41,11 @@ usage(const char *progname)
             "   -s {0,1,2} - scope of interest.  Default none.\n"
             "   -u - allow unverified content\n"
             "   -v - resolve version number\n"
-            "   -w x - wait time (seconds) for response.  0.001 <= timeout <= 60.000, Default 3.0\n",
-           progname);
+            "   -w x - wait time (seconds) for response.  0.001 <= timeout <= 3600.000, Default 3600.000\n"
+            /* <!--kuwayama */
+            "   -g - guarantee\n",
+            /*  kuwayama--> */
+            progname);
     exit(1);
 }
 
@@ -63,13 +66,16 @@ main(int argc, char **argv)
     const unsigned char *ptr;
     size_t length;
     int resolve_version = 0;
-    int timeout_ms = 3000;
+    int timeout_ms = 3600000;
     const unsigned lifetime_default = CCN_INTEREST_LIFETIME_SEC << 12;
     unsigned lifetime_l12 = lifetime_default;
     double lifetime;
     int get_flags = 0;
+    /* <!--kuwayama */
+    int guarantee = 0;
+    /*  kuwayama--> */
     
-    while ((opt = getopt(argc, argv, "acl:s:uvw:h")) != -1) {
+    while ((opt = getopt(argc, argv, "acgl:s:uvw:h")) != -1) {
         switch (opt) {
             case 'a':
                 allow_stale = 1;
@@ -107,11 +113,16 @@ main(int argc, char **argv)
                 break;
             case 'w':
                 timeout_ms = strtod(optarg, NULL) * 1000;
-                if (timeout_ms <= 0 || timeout_ms > 60000) {
-                    fprintf(stderr, "%s: invalid timeout.  0.001 <= timeout <= 60.000\n", optarg);
+                if (timeout_ms <= 0 || timeout_ms > 3600000) {
+                    fprintf(stderr, "%s: invalid timeout.  0.001 <= timeout <= 3600.000\n", optarg);
                     exit(1);
                 }
                 break;
+            /* <!--kuwayama */
+            case 'g':
+              guarantee = 1;
+              break;
+            /*  kuwayama--> */
             case 'h':
             default:
                 usage(argv[0]);
@@ -138,7 +149,7 @@ main(int argc, char **argv)
         fprintf(stderr, "%s: bad ccn URI: %s\n", argv[0], arg);
         exit(1);
     }
-	if (allow_stale || lifetime_l12 != lifetime_default || scope != -1) {
+	if (allow_stale || lifetime_l12 != lifetime_default || scope != -1 || guarantee == 1) {
         templ = ccn_charbuf_create();
         ccnb_element_begin(templ, CCN_DTAG_Interest);
         ccnb_element_begin(templ, CCN_DTAG_Name);
@@ -163,6 +174,11 @@ main(int argc, char **argv)
 				buf[i] = lifetime_l12 & 0xff;
 			ccnb_append_tagged_blob(templ, CCN_DTAG_InterestLifetime, buf, sizeof(buf));
 		}
+    /* <!--kuwayama */
+    if (guarantee) {
+      ccnb_tagged_putf(templ, CCN_DTAG_ControlPacketID, "%d", RESERVE); /* RESERVE */
+    }
+    /*  kuwayama--> */
         ccnb_element_end(templ); /* </Interest> */
     }
     resultbuf = ccn_charbuf_create();
diff --git a/csrc/include/ccn/ccn.h b/csrc/include/ccn/ccn.h
index bcfddf42b7..4b19a0d788 100644
--- a/csrc/include/ccn/ccn.h
+++ b/csrc/include/ccn/ccn.h
@@ -72,6 +72,9 @@ struct ccn_pkey;
 /* forward declarations */
 struct ccn_closure;
 struct ccn_upcall_info;
+/* <!--kuwayama */
+enum controlpacketid;
+/*  kuwayama--> */
 struct ccn_parsed_interest;
 struct ccn_parsed_ContentObject;
 struct ccn_parsed_Link;
@@ -518,6 +521,10 @@ enum ccn_parsed_interest_offsetid {
     CCN_PI_E_Scope,
     CCN_PI_B_InterestLifetime,
     CCN_PI_E_InterestLifetime,
+    /* <!--kuwayama */
+    CCN_PI_B_ControlPacketID,
+    CCN_PI_E_ControlPacketID,
+    /*  kuwayama--> */
     CCN_PI_B_Nonce,
     CCN_PI_E_Nonce,
     CCN_PI_B_OTHER,
@@ -525,6 +532,11 @@ enum ccn_parsed_interest_offsetid {
     CCN_PI_E
 };
 
+
+/* <!--kuwayama */
+//Migrate to code.h, for ccnd.c//commented by xu //enum controlpacketid {DEFAULT = 0, RESERVE = 1, GUARANTEE = 2, NOTICE = 3, RELEASE = 4};
+/*  kuwayama--> */
+
 struct ccn_parsed_interest {
     int magic;
     int prefix_comps;
@@ -533,7 +545,11 @@ struct ccn_parsed_interest {
     int orderpref;
     int answerfrom;
     int scope;
+    int control;//add by xu
     unsigned short offset[CCN_PI_E+1];
+  /* <!--kuwayama */
+  //enum controlpacketid control;
+  /*  kuwayama--> */
 };
 
 enum ccn_parsed_Link_offsetid {
@@ -688,6 +704,10 @@ enum ccn_parsed_content_object_offsetid {
     CCN_PCO_B_ExtOpt,
     CCN_PCO_E_ExtOpt,
     CCN_PCO_E_SignedInfo,
+    /* <!--kuwayama */
+    CCN_PCO_B_ControlPacketID,
+    CCN_PCO_E_ControlPacketID,
+    /*  kuwayama--> */
     CCN_PCO_B_Content,
     CCN_PCO_E_Content,
     CCN_PCO_E
@@ -700,6 +720,9 @@ struct ccn_parsed_ContentObject {
     unsigned short offset[CCN_PCO_E+1];
     unsigned char digest[32];	/* Computed only when needed */
     int digest_bytes;
+  /* <!--kuwayama */    
+  enum controlpacketid control;
+  /*  kuwayama--> */
 };
 
 /*
@@ -843,6 +866,18 @@ int ccn_sign_content(struct ccn *h,
                      const struct ccn_signing_params *params,
                      const void *data, size_t size);
 
+int ccn_sign_notice(struct ccn *h,
+                    struct ccn_charbuf *resultbuf,
+                    const struct ccn_charbuf *name_prefix,
+                    const struct ccn_signing_params *params,
+                    const void *data, size_t size);
+
+int ccn_sign_release(struct ccn *h,
+                     struct ccn_charbuf *resultbuf,
+                     const struct ccn_charbuf *name_prefix,
+                     const struct ccn_signing_params *params,
+                     const void *data, size_t size);
+
 int ccn_load_signing_key(struct ccn *h,
                          const char *keystore_path,
                          const char *keystore_passphrase,
@@ -895,7 +930,10 @@ int ccn_encode_ContentObject(struct ccn_charbuf *buf,
                              const void *data,
                              size_t size,
                              const char *digest_algorithm,
-                             const struct ccn_pkey *private_key);
+                             const struct ccn_pkey *private_key,
+                             /* <!--kuwayama */
+                             enum controlpacketid control
+                             /*  kuwayama--> */);
 
 /***********************************
  * Matching
@@ -969,6 +1007,7 @@ int ccn_charbuf_append_tt(struct ccn_charbuf *c, size_t val, enum ccn_tt tt);
  */
 int ccn_charbuf_append_closer(struct ccn_charbuf *c);
 
+int ccn_charbuf_remove_closer(struct ccn_charbuf *c);//add by xu
 /***********************************
  * Slightly higher level binary formatting
  */
diff --git a/csrc/include/ccn/coding.h b/csrc/include/ccn/coding.h
index fdda1e1cd8..f5e58a91da 100644
--- a/csrc/include/ccn/coding.h
+++ b/csrc/include/ccn/coding.h
@@ -47,6 +47,11 @@ enum ccn_tt {
 /** CCN_CLOSE terminates composites */
 #define CCN_CLOSE ((unsigned char)(0))
 
+/* <-- add by xu */
+/*Migrate from ccn.h, for ccnd*/
+enum controlpacketid {DEFAULT = 0, RESERVE = 1, GUARANTEE = 2, NOTICE = 3, RELEASE = 4};
+/*  add by xu end -->*/
+
 enum ccn_ext_subtype {
     /* skip smallest values for now */
     CCN_PROCESSING_INSTRUCTIONS = 16 /* <?name:U value:U?> */
@@ -167,6 +172,9 @@ enum ccn_dtag {
     CCN_DTAG_StrategySelection = 144,
     CCN_DTAG_StrategyID = 145,
     CCN_DTAG_StrategyParameters = 146,
+    /* <!--kuwayama */
+    CCN_DTAG_ControlPacketID = 147,
+    /*  kuwayama--> */
     CCN_DTAG_SequenceNumber = 256,
     CCN_DTAG_CCNProtocolDataUnit = 17702112
 };
diff --git a/csrc/include/ccn/schedule.h b/csrc/include/ccn/schedule.h
index 6e1ad3cddf..d40f8c22ec 100644
--- a/csrc/include/ccn/schedule.h
+++ b/csrc/include/ccn/schedule.h
@@ -106,4 +106,7 @@ int ccn_schedule_cancel(struct ccn_schedule *, struct ccn_scheduled_event *);
  */
 int ccn_schedule_run(struct ccn_schedule *);
 
+/* <!--kuwayama */
+int ccn_schedule_run_qos(struct ccn_schedule *, struct ccn_schedule *);
+/*  kuwayama--> */
 #endif
diff --git a/csrc/include/ccn/tmp b/csrc/include/ccn/tmp
new file mode 100755
index 0000000000..575161d59d
Binary files /dev/null and b/csrc/include/ccn/tmp differ
diff --git a/csrc/include/ccn/tmp.c b/csrc/include/ccn/tmp.c
new file mode 100644
index 0000000000..3e3904018e
--- /dev/null
+++ b/csrc/include/ccn/tmp.c
@@ -0,0 +1,11 @@
+#include <stdio.h>
+#include <ccn/ccn.h>
+
+int main(){
+
+	printf("this program is test by fumiya");
+	printf("\nCCN_PCO_B_Signature : %d\n",CCN_PCO_B_Signature);
+	printf("CCN_PCO_B_Witness : %d\n",CCN_PCO_B_Witness);
+
+return 0;
+}
diff --git a/csrc/lib/ccn_buf_decoder.c b/csrc/lib/ccn_buf_decoder.c
index 4dd02f6554..be20620aa6 100644
--- a/csrc/lib/ccn_buf_decoder.c
+++ b/csrc/lib/ccn_buf_decoder.c
@@ -23,7 +23,7 @@
 #include <ccn/charbuf.h>
 #include <ccn/coding.h>
 #include <ccn/indexbuf.h>
-
+#include <stdio.h> //add by xu
 struct ccn_buf_decoder *
 ccn_buf_decoder_start(struct ccn_buf_decoder *d,
                       const unsigned char *buf, size_t size)
@@ -312,6 +312,35 @@ ccn_parse_Name(struct ccn_buf_decoder *d, struct ccn_indexbuf *components)
         return(ncomp);
 }
 
+/* <!--kuwayama
+ * CCN_DTAG_ControlPacketIDが付加されていない場合 DEFAULT   = 0
+ * 資源予約パケットの場合                         RESERVE   = 1
+ * 帯域幅付きInterest/ContentObject               GUARANTEE = 2
+ * 確保通知パケットの場合                         NOTICE    = 3
+ * 資源解放パケットの場合                         RELEASE   = 4
+
+int 
+ccn_parse_ControlPacketID(struct ccn_buf_decoder *d, struct ccn_parsed_interest *pi)
+{
+  int res = 0;
+  unsigned pubstart = d->decoder.token_index;
+  unsigned pubend = pubstart;
+  if (ccn_buf_match_dtag(d, CCN_DTAG_ControlPacketID)) {
+    ccn_buf_advance(d);
+    res = ccn_parse_nonNegativeInteger(d);
+    ccn_buf_check_close(d);
+    pubend = d->decoder.token_index;
+    if (d->decoder.state < 0)
+      return (d->decoder.state);
+    if (pi != NULL) {
+      pi->offset[CCN_PI_B_ControlPacketID] = pubstart;
+      pi->offset[CCN_PI_E_ControlPacketID] = pubend;
+    }
+  }
+  return(res);
+}
+/*  kuwayama--> */
+
 int
 ccn_parse_PublisherID(struct ccn_buf_decoder *d, struct ccn_parsed_interest *pi)
 {
@@ -608,7 +637,7 @@ ccn_parse_interest(const unsigned char *msg, size_t size,
         if (res >= 0)
             interest->max_suffix_comps = res < 32767 ? res : 32767;
         if (interest->max_suffix_comps < interest->min_suffix_comps)
-            return (d->decoder.state = -__LINE__);
+            return (d->decoder.state = -__LINE__);        
         /* optional PublisherID */
         res = ccn_parse_PublisherID(d, interest);
         /* optional Exclude element */
@@ -619,6 +648,7 @@ ccn_parse_interest(const unsigned char *msg, size_t size,
         interest->offset[CCN_PI_B_ChildSelector] = d->decoder.token_index;
         res = ccn_parse_optional_tagged_nonNegativeInteger(d,
                          CCN_DTAG_ChildSelector);
+        
         if (res < 0)
             res = 0;
         interest->orderpref = res;
@@ -648,6 +678,12 @@ ccn_parse_interest(const unsigned char *msg, size_t size,
         if (res >= 0)
             magic |= 20100401;
         interest->offset[CCN_PI_E_InterestLifetime] = d->decoder.token_index;
+        /* <!--kuwayama */
+        interest->offset[CCN_PI_B_ControlPacketID] = d->decoder.token_index;
+        interest->control = ccn_parse_optional_tagged_nonNegativeInteger(d,
+                                                                         CCN_DTAG_ControlPacketID);
+        interest->offset[CCN_PI_E_ControlPacketID] = d->decoder.token_index;
+        /*  kuwayama--> */
         /* optional Nonce */
         interest->offset[CCN_PI_B_Nonce] = d->decoder.token_index;
         res = ccn_parse_optional_tagged_BLOB(d, CCN_DTAG_Nonce, 4, 64);
@@ -829,9 +865,20 @@ ccn_parse_ContentObject(const unsigned char *msg, size_t size,
         x->offset[CCN_PCO_E_ComponentLast] = d->decoder.token_index - 1;
         x->offset[CCN_PCO_E_Name] = d->decoder.token_index;
         ccn_parse_SignedInfo(d, x);
+        /* <!--kuwayama 
+        x->control = ccn_parse_optional_tagged_nonNegativeInteger(d,
+                         CCN_DTAG_ControlPacketID);
+          kuwayama--> */
         x->offset[CCN_PCO_B_Content] = d->decoder.token_index;
         ccn_parse_required_tagged_BLOB(d, CCN_DTAG_Content, 0, -1);
         x->offset[CCN_PCO_E_Content] = d->decoder.token_index;
+        /* <!--kuwayama move from above here by xu*/
+        x->offset[CCN_PCO_B_ControlPacketID] = d->decoder.token_index;//add by xu
+        x->control = ccn_parse_optional_tagged_nonNegativeInteger(d,
+                         CCN_DTAG_ControlPacketID);
+        x->offset[CCN_PCO_E_ControlPacketID] = d->decoder.token_index;//add by xu
+        /*  kuwayama--> */
+
         ccn_buf_check_close(d);
         x->offset[CCN_PCO_E] = d->decoder.index;
     }
diff --git a/csrc/lib/ccn_buf_encoder.c b/csrc/lib/ccn_buf_encoder.c
index d44143880a..e4c7c341d5 100644
--- a/csrc/lib/ccn_buf_encoder.c
+++ b/csrc/lib/ccn_buf_encoder.c
@@ -153,8 +153,10 @@ ccn_encode_ContentObject(struct ccn_charbuf *buf,
                          const void *data,
                          size_t size,
                          const char *digest_algorithm,
-                         const struct ccn_pkey *key
-                         )
+                         const struct ccn_pkey *key,
+                         /* <!--kuwayama */
+                         enum controlpacketid control
+                         /*  kuwayama--> */)
 {
     int res = 0;
     struct ccn_sigc *sig_ctx = NULL;
@@ -218,6 +220,17 @@ ccn_encode_ContentObject(struct ccn_charbuf *buf,
                                 NULL, 0, signature, signature_size);
     res |= ccn_charbuf_append_charbuf(buf, Name);
     res |= ccn_charbuf_append_charbuf(buf, SignedInfo);
+    /* <!--kuwayama */
+    if (control == NOTICE) {
+      res |= ccnb_tagged_putf(buf, CCN_DTAG_ControlPacketID, "%d", NOTICE);
+    } else if (control == RELEASE) {
+      res |= ccnb_tagged_putf(buf, CCN_DTAG_ControlPacketID, "%d", RELEASE);
+    } else if (control == GUARANTEE) {
+      res |= ccnb_tagged_putf(buf, CCN_DTAG_ControlPacketID, "%d", GUARANTEE);
+    } /* else {
+      res |= ccnb_tagged_putf(buf, CCN_DTAG_ControlPacketID, "%d", DEFAULT);
+    }
+    kuwayama--> */
     res |= ccnb_append_tagged_blob(buf, CCN_DTAG_Content, data, size);
     res |= ccnb_element_end(buf);
 Bail:
diff --git a/csrc/lib/ccn_client.c b/csrc/lib/ccn_client.c
index 40f34307ca..a3435fd532 100644
--- a/csrc/lib/ccn_client.c
+++ b/csrc/lib/ccn_client.c
@@ -402,8 +402,10 @@ ccn_connect(struct ccn *h, const char *name)
     }
 #endif
     h->sock = socket(sockaddr.ss_family, SOCK_STREAM, 0);
-    if (h->sock == -1)
+    if (h->sock == -1){
+	printf("create socket failed...\n");
         return(NOTE_ERRNO(h));
+    }
     switch (sockaddr.ss_family) {
         case AF_UNIX: addr_size = sizeof(*un_addr); break;
         case AF_INET: addr_size = sizeof(*in_addr); break;
@@ -411,11 +413,15 @@ ccn_connect(struct ccn *h, const char *name)
         default: addr_size = 0;
     }
     res = connect(h->sock, addr, addr_size);
-    if (res == -1)
+    if (res == -1){
+	printf("connect socket failed...\n");
         return(NOTE_ERRNO(h));
+    }
     res = fcntl(h->sock, F_SETFL, O_NONBLOCK);
-    if (res == -1)
+    if (res == -1){
+	printf("set nonblock failed...\n");
         return(NOTE_ERRNO(h));
+    }
     return(h->sock);
 }
 
@@ -1139,8 +1145,8 @@ ccn_put(struct ccn *h, const void *p, size_t length)
     }
     if (h->sock == -1)
         res = 0;
-    else
-        res = write(h->sock, p, length);
+    else{
+        res = write(h->sock, p, length);}
     if (res == length)
         return(0);
     if (res == -1) {
@@ -1792,8 +1798,8 @@ ccn_dispatch_message(struct ccn *h, unsigned char *msg, size_t size)
                                                                  &info);
                                     if (interest->magic != 0x7059e5f4)
                                         ccn_gripe(interest);
-                                    if (ures == CCN_UPCALL_RESULT_REEXPRESS)
-                                        ccn_refresh_interest(h, interest);
+                                    if (ures == CCN_UPCALL_RESULT_REEXPRESS){
+                                        ccn_refresh_interest(h, interest);}
                                     else if ((ures == CCN_UPCALL_RESULT_VERIFY ||
                                               ures == CCN_UPCALL_RESULT_FETCHKEY) &&
                                              (upcall_kind == CCN_UPCALL_CONTENT_UNVERIFIED ||
@@ -1950,8 +1956,8 @@ ccn_age_interest(struct ccn *h,
             }
             ccn_indexbuf_release(h, info.interest_comps);
         }
-        if (ures == CCN_UPCALL_RESULT_REEXPRESS)
-            ccn_refresh_interest(h, interest);
+        if (ures == CCN_UPCALL_RESULT_REEXPRESS){
+            ccn_refresh_interest(h, interest);}
         else
             interest->target = 0;
     }
@@ -2121,7 +2127,7 @@ ccn_run(struct ccn *h, int timeout)
             break;
         }
         if (h->schedule != NULL) {
-            s_microsec = ccn_schedule_run(h->schedule);
+          s_microsec = ccn_schedule_run(h->schedule);
         }
         microsec = ccn_process_scheduled_operations(h);
         if (s_microsec >= 0 && s_microsec < microsec)
@@ -2905,24 +2911,20 @@ ccn_chk_signing_params(struct ccn *h,
     return(res);
 }
 
-/**
- * Create a signed ContentObject.
- *
- * @param h is the ccn handle
- * @param resultbuf - result buffer to which the ContentObject will be appended
- * @param name_prefix contains the ccnb-encoded name
- * @param params describe the ancillary information needed
- * @param data points to the raw content
- * @param size is the size of the raw content, in bytes
- * @returns 0 for success, -1 for error
+/* <!--kuwayama
+ * ccn_sign_{content, notice, release}()
+ * から共通部分を括り出したサブルーチン
+ * ccn_sign_content()からのコピペ
  */
 int
-ccn_sign_content(struct ccn *h,
-                 struct ccn_charbuf *resultbuf,
-                 const struct ccn_charbuf *name_prefix,
-                 const struct ccn_signing_params *params,
-                 const void *data, size_t size)
+ccn_sign_template(struct ccn *h,
+                  struct ccn_charbuf *resultbuf,
+                  const struct ccn_charbuf *name_prefix,
+                  const struct ccn_signing_params *params,
+                  const void *data, size_t size,
+                  enum controlpacketid control)
 {
+
     struct hashtb_enumerator ee;
     struct hashtb_enumerator *e = &ee;
     struct ccn_signing_params p = CCN_SIGNING_PARAMS_INIT;
@@ -3008,7 +3010,8 @@ ccn_sign_content(struct ccn *h,
                                            data,
                                            size,
                                            ccn_keystore_digest_algorithm(keystore),
-                                           ccn_keystore_key(keystore));
+                                           ccn_keystore_key(keystore),
+                                           control);
     }
     else {
         res = NOTE_ERR(h, -1);
@@ -3021,6 +3024,68 @@ ccn_sign_content(struct ccn *h,
     ccn_charbuf_destroy(&signed_info);
     return(res);
 }
+/*  kuwayama--> */
+
+/**
+ * Create a signed ContentObject.
+ *
+ * @param h is the ccn handle
+ * @param resultbuf - result buffer to which the ContentObject will be appended
+ * @param name_prefix contains the ccnb-encoded name
+ * @param params describe the ancillary information needed
+ * @param data points to the raw content
+ * @param size is the size of the raw content, in bytes
+ * @returns 0 for success, -1 for error
+ */
+int
+ccn_sign_content(struct ccn *h,
+                 struct ccn_charbuf *resultbuf,
+                 const struct ccn_charbuf *name_prefix,
+                 const struct ccn_signing_params *params,
+                 const void *data, size_t size)
+{
+  /* <!--kuwayama */
+  return ccn_sign_template(h,
+                           resultbuf,
+                           name_prefix,
+                           params,
+                           data,
+                           size,
+                           DEFAULT);
+}
+
+int
+ccn_sign_notice(struct ccn *h,
+                struct ccn_charbuf *resultbuf,
+                const struct ccn_charbuf *name_prefix,
+                const struct ccn_signing_params *params,
+                const void *data, size_t size)
+{
+  return ccn_sign_template(h,
+                           resultbuf,
+                           name_prefix,
+                           params,
+                           data,
+                           size,
+                           NOTICE);
+}
+
+int
+ccn_sign_release(struct ccn *h,
+                 struct ccn_charbuf *resultbuf,
+                 const struct ccn_charbuf *name_prefix,
+                 const struct ccn_signing_params *params,
+                 const void *data, size_t size)
+{
+  return ccn_sign_template(h,
+                           resultbuf,
+                           name_prefix,
+                           params,
+                           data,
+                           size,
+                           RELEASE);
+}
+/*  kuwayama--> */
 /**
  * Check whether content described by info is final block.
  *
diff --git a/csrc/lib/ccn_dtag_table.c b/csrc/lib/ccn_dtag_table.c
index 37987fe752..2899efb055 100644
--- a/csrc/lib/ccn_dtag_table.c
+++ b/csrc/lib/ccn_dtag_table.c
@@ -133,6 +133,7 @@ static const struct ccn_dict_entry ccn_tagdict[] = {
     {CCN_DTAG_StrategySelection, "StrategySelection"},
     {CCN_DTAG_StrategyID, "StrategyID"},
     {CCN_DTAG_StrategyParameters, "StrategyParameters"},
+    {CCN_DTAG_ControlPacketID, "ControlPacketID"},  //add by xu
     {CCN_DTAG_SequenceNumber, "SequenceNumber"},
     {CCN_DTAG_CCNProtocolDataUnit, "CCNProtocolDataUnit"},
     {0, 0}
diff --git a/csrc/lib/ccn_schedule.c b/csrc/lib/ccn_schedule.c
index fdeabde0e7..50aa9cf7e5 100644
--- a/csrc/lib/ccn_schedule.c
+++ b/csrc/lib/ccn_schedule.c
@@ -279,13 +279,16 @@ ccn_schedule_cancel(struct ccn_schedule *sched, struct ccn_scheduled_event *ev)
     return(0);
 }
 
+/* <!--kuwayama 
+    いずれsys/socket::send()の返値を呼び出し元に返してsleepしないdrrにしたい
+/*  kuwayama--> */
 static void
 ccn_schedule_run_next(struct ccn_schedule *sched)
 {
     struct ccn_scheduled_event *ev;
     heapmicros late;
     int res;
-    if (sched->heap_n == 0) return;
+    if (sched->heap_n == 0) return 0;
     ev = sched->heap[0].ev;
     sched->heap[0].ev = NULL;
     late = sched->now - sched->heap[0].event_time;
@@ -293,7 +296,7 @@ ccn_schedule_run_next(struct ccn_schedule *sched)
     res = (ev->action)(sched, sched->clienth, ev, 0);
     if (res <= 0) {
         free(ev);
-        return;
+        return res;
     }
     /*
      * Try to reschedule based on the time the
@@ -330,6 +333,51 @@ ccn_schedule_run(struct ccn_schedule *sched)
     return(INT_MAX);
 }
 
+/* <!--kuwayama */
+int
+ccn_schedule_run_qos(struct ccn_schedule *sched, struct ccn_schedule *drr)
+{
+    heapmicros ans;
+    int dtoken = 0;
+    int stoken = 0;
+
+    if (drr == NULL)
+      return ccn_schedule_run(sched);
+    do {
+      dtoken += 800;
+      stoken += 200;
+      dtoken = (dtoken > 8000 ? 8000 : dtoken); 
+      stoken = (stoken > 2000 ? 2000 : stoken);
+      /* 帯域保証で送信トークンを消費 */
+      while (drr->heap_n > 0 && drr->heap[0].event_time <= drr->now
+             && dtoken > 0) {
+        // perror("while(drr)...");
+        ccn_schedule_run_next(drr);
+        dtoken--;
+      }
+      update_time(drr);
+ 
+      while (sched->heap_n > 0 && sched->heap[0].event_time <= sched->now
+             && stoken > 0) {
+        // perror("while(sched)...");
+        ccn_schedule_run_next(sched);
+        stoken--;
+      }
+      update_time(sched);
+
+      usleep(100); // usleep = 1マイクロ秒寝る
+    } while((drr->heap_n > 0 && drr->heap[0].event_time <= drr->now) 
+            || (sched->heap_n > 0 && sched->heap[0].event_time <= sched->now));
+    if (drr->heap_n == 0 && sched->heap_n == 0)
+      return(-1);
+    
+    ans = sched->heap[0].event_time - sched->now;
+    if (ans < INT_MAX)
+      return(ans);
+    return(INT_MAX);
+}
+/*  kuwayama--> */
+
 #ifdef TESTSCHEDULE
 // cc -g -o testschedule -DTESTSCHEDULE=main -I../include ccn_schedule.c
 #include <stdio.h>
diff --git a/csrc/lib/ccn_setup_sockaddr_un.c b/csrc/lib/ccn_setup_sockaddr_un.c
index 593b56fe52..73907fe78b 100644
--- a/csrc/lib/ccn_setup_sockaddr_un.c
+++ b/csrc/lib/ccn_setup_sockaddr_un.c
@@ -61,7 +61,7 @@ ccn_setup_sockaddr_un(const char *portstr, struct sockaddr_un *result)
     memset(sa, 0, sizeof(*sa));
     sa->sun_family = AF_UNIX;
     if (portstr == NULL || portstr[0] == 0)
-        portstr = getenv(CCN_LOCAL_PORT_ENVNAME);
+        portstr = getenv("CCN_LOCAL_PORT_ENVNAME");
     if (portstr != NULL && atoi(portstr) > 0 &&
           atoi(portstr) != atoi(CCN_DEFAULT_UNICAST_PORT))
         snprintf(sa->sun_path, sizeof(sa->sun_path), "%s.%s",
@@ -95,7 +95,7 @@ ccn_setup_sockaddr_in(const char *name, struct sockaddr *result, int length)
     if (port)
         *port++ = 0;
     if (port == NULL || port[0] == 0)
-        port = getenv(CCN_LOCAL_PORT_ENVNAME);
+        port = getenv("CCN_LOCAL_PORT_ENVNAME");
     if (port == NULL || port[0] == 0)
         port = CCN_DEFAULT_UNICAST_PORT;
     memset(result, 0, length);
diff --git a/csrc/lib/encodedecodetest.c b/csrc/lib/encodedecodetest.c
index de77e491b7..b6f3f9be8f 100644
--- a/csrc/lib/encodedecodetest.c
+++ b/csrc/lib/encodedecodetest.c
@@ -85,7 +85,9 @@ encode_message(struct ccn_charbuf *message, struct path * name_path,
         ccn_name_append_str(path, name_path->comps[i]);
     }
 
-    res = ccn_encode_ContentObject(message, path, signed_info, data, len, digest_algorithm, pkey);
+    /* <!--kuwayama */
+    res = ccn_encode_ContentObject(message, path, signed_info, data, len, digest_algorithm, pkey, DEFAULT);
+    /*  kuwayama--> */
 
     if (res != 0) {
         fprintf(stderr, "Failed to encode ContentObject\n");
diff --git a/csrc/lib/hashtb.c b/csrc/lib/hashtb.c
index 5832423a90..2cb546afe8 100644
--- a/csrc/lib/hashtb.c
+++ b/csrc/lib/hashtb.c
@@ -225,6 +225,12 @@ hashtb_seek(struct hashtb_enumerator *hte, const void *key, size_t keysize, size
         setpos(hte, NULL);
         return(-1);
     }
+    /*add by Fumiya
+    if (keysize == NULL){
+	setpos(hte, NULL);
+	return(-1);
+    }
+    add by Fumiya*/
     if (ht->refcount == 1 && ht->n > ht->n_buckets * 3) {
         ht->refcount--;
         hashtb_rehash(ht, 2 * ht->n + 1);
diff --git a/csrc/lib/signbenchtest.c b/csrc/lib/signbenchtest.c
index 9449818cef..6cc0cdaaaa 100644
--- a/csrc/lib/signbenchtest.c
+++ b/csrc/lib/signbenchtest.c
@@ -138,7 +138,11 @@ main(int argc, char **argv)
 				   path, signed_info, 
 				   msgbuf, PAYLOAD_SIZE,
 				   ccn_keystore_digest_algorithm(keystore), 
-				   ccn_keystore_key(keystore));
+           ccn_keystore_key(keystore),
+                                   /* <!--kuwayama */
+                                   DEFAULT
+                                   /*  kuwayama--> */
+                                   );
 
     if (res != 0) {
       printf("ContentObject encode failed on iteration %d\n", i);