Skip to content

Commit 8be46d0

Browse files
author
Nick Briggs
committed
Refs #101038 Replace calls to ccn_charbuf_append_tt()/ccn_charbuf_append_closer() with ccnb_element_begin()/_end() to clarify the coding.
1 parent 6a51bb3 commit 8be46d0

25 files changed

+220
-220
lines changed

‎apps/vlc/ccn.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -524,29 +524,29 @@ static struct ccn_charbuf *
524524
make_prefetch_template()
525525
{
526526
struct ccn_charbuf *templ = ccn_charbuf_create_n(16);
527-
ccn_charbuf_append_tt(templ, CCN_DTAG_Interest, CCN_DTAG);
528-
ccn_charbuf_append_tt(templ, CCN_DTAG_Name, CCN_DTAG);
529-
ccn_charbuf_append_closer(templ); /* </Name> */
530-
ccn_charbuf_append_tt(templ, CCN_DTAG_MaxSuffixComponents, CCN_DTAG);
527+
ccnb_element_begin(templ, CCN_DTAG_Interest);
528+
ccnb_element_begin(templ, CCN_DTAG_Name);
529+
ccnb_element_end(templ); /* </Name> */
530+
ccnb_element_begin(templ, CCN_DTAG_MaxSuffixComponents);
531531
ccnb_append_number(templ, 1);
532-
ccn_charbuf_append_closer(templ); /* </MaxSuffixComponents> */
532+
ccnb_element_end(templ); /* </MaxSuffixComponents> */
533533
ccnb_append_tagged_binary_number(templ, CCN_DTAG_InterestLifetime, CCN_PREFETCH_LIFETIME);
534-
ccn_charbuf_append_closer(templ); /* </Interest> */
534+
ccnb_element_end(templ); /* </Interest> */
535535
return(templ);
536536
}
537537

538538
static struct ccn_charbuf *
539539
make_data_template()
540540
{
541541
struct ccn_charbuf *templ = ccn_charbuf_create_n(16);
542-
ccn_charbuf_append_tt(templ, CCN_DTAG_Interest, CCN_DTAG);
543-
ccn_charbuf_append_tt(templ, CCN_DTAG_Name, CCN_DTAG);
544-
ccn_charbuf_append_closer(templ); /* </Name> */
545-
ccn_charbuf_append_tt(templ, CCN_DTAG_MaxSuffixComponents, CCN_DTAG);
542+
ccnb_element_begin(templ, CCN_DTAG_Interest);
543+
ccnb_element_begin(templ, CCN_DTAG_Name);
544+
ccnb_element_end(templ); /* </Name> */
545+
ccnb_element_begin(templ, CCN_DTAG_MaxSuffixComponents);
546546
ccnb_append_number(templ, 1);
547-
ccn_charbuf_append_closer(templ); /* </MaxSuffixComponents> */
547+
ccnb_element_end(templ); /* </MaxSuffixComponents> */
548548
ccnb_append_tagged_binary_number(templ, CCN_DTAG_InterestLifetime, CCN_DATA_LIFETIME);
549-
ccn_charbuf_append_closer(templ); /* </Interest> */
549+
ccnb_element_end(templ); /* </Interest> */
550550
return(templ);
551551
}
552552

‎csrc/ccnd/ccnd.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -1910,15 +1910,15 @@ stuff_and_send(struct ccnd_handle *h, struct face *face,
19101910
if ((face->flags & CCN_FACE_LINK) != 0) {
19111911
c = charbuf_obtain(h);
19121912
ccn_charbuf_reserve(c, size1 + size2 + 5 + 8);
1913-
ccn_charbuf_append_tt(c, CCN_DTAG_CCNProtocolDataUnit, CCN_DTAG);
1913+
ccnb_element_begin(c, CCN_DTAG_CCNProtocolDataUnit);
19141914
ccn_charbuf_append(c, data1, size1);
19151915
if (size2 != 0)
19161916
ccn_charbuf_append(c, data2, size2);
19171917
if (tag != NULL)
19181918
ccnd_debug_ccnb(h, lineno, tag, face, c->buf + 4, c->length - 4);
19191919
ccn_stuff_interest(h, face, c);
19201920
ccn_append_link_stuff(h, face, c);
1921-
ccn_charbuf_append_closer(c);
1921+
ccnb_element_end(c);
19221922
}
19231923
else if (size2 != 0 || h->mtu > size1 + size2 ||
19241924
(face->flags & (CCN_FACE_SEQOK | CCN_FACE_SEQPROBE)) != 0 ||
@@ -1970,11 +1970,11 @@ stuff_link_check(struct ccnd_handle *h,
19701970
if (res < 0) goto Bail;
19711971
ibuf = ccn_charbuf_create();
19721972
if (ibuf == NULL) goto Bail;
1973-
ccn_charbuf_append_tt(ibuf, CCN_DTAG_Interest, CCN_DTAG);
1973+
ccnb_element_begin(ibuf, CCN_DTAG_Interest);
19741974
ccn_charbuf_append(ibuf, name->buf, name->length);
19751975
ccnb_tagged_putf(ibuf, CCN_DTAG_Scope, "2");
19761976
// XXX - ought to generate a nonce
1977-
ccn_charbuf_append_closer(ibuf);
1977+
ccnb_element_end(ibuf);
19781978
ccn_charbuf_append(c, ibuf->buf, ibuf->length);
19791979
ccnd_meter_bump(h, face->meter[FM_INTO], 1);
19801980
h->interests_stuffed++;
@@ -2035,7 +2035,7 @@ ccn_append_link_stuff(struct ccnd_handle *h,
20352035
{
20362036
if ((face->flags & (CCN_FACE_SEQOK | CCN_FACE_SEQPROBE)) == 0)
20372037
return;
2038-
ccn_charbuf_append_tt(c, CCN_DTAG_SequenceNumber, CCN_DTAG);
2038+
ccnb_element_begin(c, CCN_DTAG_SequenceNumber);
20392039
ccn_charbuf_append_tt(c, 2, CCN_BLOB);
20402040
ccn_charbuf_append_value(c, face->pktseq, 2);
20412041
ccnb_element_end(c);
@@ -3274,7 +3274,7 @@ send_interest(struct ccnd_handle *h, struct interest_entry *ie,
32743274
noncesize = p->pfi_flags & CCND_PFI_NONCESZ;
32753275
if (noncesize != 0)
32763276
ccnb_append_tagged_blob(c, CCN_DTAG_Nonce, p->nonce, noncesize);
3277-
ccn_charbuf_append_closer(c);
3277+
ccnb_element_end(c);
32783278
h->interests_sent += 1;
32793279
p->pfi_flags |= CCND_PFI_UPENDING;
32803280
p->pfi_flags &= ~(CCND_PFI_SENDUPST | CCND_PFI_UPHUNGRY);

‎csrc/ccnd/ccnd_internal_client.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ ccnd_init_service_ccnb(struct ccnd_handle *ccnd, const char *baseuri, int freshn
8484
ccn_name_append(name, keyid->buf, keyid->length);
8585
ccn_create_version(h, name, 0, ccnd->starttime, ccnd->starttime_usec * 1000);
8686
sp.template_ccnb = ccn_charbuf_create();
87-
ccn_charbuf_append_tt(sp.template_ccnb, CCN_DTAG_SignedInfo, CCN_DTAG);
88-
ccn_charbuf_append_tt(sp.template_ccnb, CCN_DTAG_KeyLocator, CCN_DTAG);
89-
ccn_charbuf_append_tt(sp.template_ccnb, CCN_DTAG_KeyName, CCN_DTAG);
87+
ccnb_element_begin(sp.template_ccnb, CCN_DTAG_SignedInfo);
88+
ccnb_element_begin(sp.template_ccnb, CCN_DTAG_KeyLocator);
89+
ccnb_element_begin(sp.template_ccnb, CCN_DTAG_KeyName);
9090
ccn_charbuf_append_charbuf(sp.template_ccnb, name);
91-
ccn_charbuf_append_closer(sp.template_ccnb);
92-
ccn_charbuf_append_closer(sp.template_ccnb);
93-
ccn_charbuf_append_closer(sp.template_ccnb);
91+
ccnb_element_end(sp.template_ccnb);
92+
ccnb_element_end(sp.template_ccnb);
93+
ccnb_element_end(sp.template_ccnb);
9494
sp.sp_flags |= CCN_SP_TEMPL_KEY_LOCATOR;
9595
ccn_name_from_uri(name, "%00");
9696
sp.sp_flags |= CCN_SP_FINAL_BLOCK;
@@ -917,7 +917,7 @@ ccnd_req_guest(struct ccn_closure *selfp,
917917
start = info->pi->offset[CCN_PI_B_Name];
918918
end = info->interest_comps->buf[info->pi->prefix_comps];
919919
ccn_charbuf_append(name, info->interest_ccnb + start, end - start);
920-
ccn_charbuf_append_closer(name);
920+
ccnb_element_end(name);
921921
ccn_create_version(info->h, name, CCN_V_NOW, 0, 0);
922922
ccn_name_from_uri(name, "%00");
923923
sp.sp_flags = CCN_SP_FINAL_BLOCK;
@@ -1191,7 +1191,7 @@ ccnd_answer_req(struct ccn_closure *selfp,
11911191
start = info->pi->offset[CCN_PI_B_Name];
11921192
end = info->interest_comps->buf[info->pi->prefix_comps];
11931193
ccn_charbuf_append(name, info->interest_ccnb + start, end - start);
1194-
ccn_charbuf_append_closer(name);
1194+
ccnb_element_end(name);
11951195
res = ccn_sign_content(info->h, msg, name, &sp,
11961196
reply_body->buf, reply_body->length);
11971197
if (res < 0)

‎csrc/ccnr/ccnr_internal_client.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ ccnr_init_service_ccnb(struct ccnr_handle *ccnr, struct ccn *h, const char *base
6767
ccn_name_append(name, keyid->buf, keyid->length);
6868
ccn_create_version(h, name, 0, ccnr->starttime, ccnr->starttime_usec * 1000);
6969
sp.template_ccnb = ccn_charbuf_create();
70-
ccn_charbuf_append_tt(sp.template_ccnb, CCN_DTAG_SignedInfo, CCN_DTAG);
71-
ccn_charbuf_append_tt(sp.template_ccnb, CCN_DTAG_KeyLocator, CCN_DTAG);
72-
ccn_charbuf_append_tt(sp.template_ccnb, CCN_DTAG_KeyName, CCN_DTAG);
70+
ccnb_element_begin(sp.template_ccnb, CCN_DTAG_SignedInfo);
71+
ccnb_element_begin(sp.template_ccnb, CCN_DTAG_KeyLocator);
72+
ccnb_element_begin(sp.template_ccnb, CCN_DTAG_KeyName);
7373
ccn_charbuf_append_charbuf(sp.template_ccnb, name);
74-
ccn_charbuf_append_closer(sp.template_ccnb);
74+
ccnb_element_end(sp.template_ccnb);
7575
// ccn_charbuf_append_tt(sp.template_ccnb, CCN_DTAG_PublisherPublicKeyDigest,
7676
// CCN_DTAG);
7777
// ccn_charbuf_append_charbuf(sp.template_ccnb, pubid);
78-
// ccn_charbuf_append_closer(sp.template_ccnb);
79-
ccn_charbuf_append_closer(sp.template_ccnb);
80-
ccn_charbuf_append_closer(sp.template_ccnb);
78+
// ccnb_element_end(sp.template_ccnb);
79+
ccnb_element_end(sp.template_ccnb);
80+
ccnb_element_end(sp.template_ccnb);
8181
sp.sp_flags |= CCN_SP_TEMPL_KEY_LOCATOR;
8282
ccn_name_from_uri(name, "%00");
8383
sp.sp_flags |= CCN_SP_FINAL_BLOCK;

‎csrc/ccnr/ccnr_proto.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ r_proto_start_write(struct ccn_closure *selfp,
683683
end = info->interest_comps->buf[marker_comp - 1]; // not including version or marker
684684
name = ccn_charbuf_create();
685685
ccn_charbuf_append(name, info->interest_ccnb + start, end - start);
686-
ccn_charbuf_append_closer(name);
686+
ccnb_element_end(name);
687687
if (0 ==ccn_compare_names(name->buf, name->length,
688688
ccnr->policy_name->buf, ccnr->policy_name->length))
689689
is_policy = 1;
@@ -693,7 +693,7 @@ r_proto_start_write(struct ccn_closure *selfp,
693693
end = info->interest_comps->buf[info->pi->prefix_comps];
694694
name->length = 0;
695695
ccn_charbuf_append(name, info->interest_ccnb + start, end - start);
696-
ccn_charbuf_append_closer(name);
696+
ccnb_element_end(name);
697697
msg = ccn_charbuf_create();
698698
reply_body = ccn_charbuf_create();
699699
r_proto_append_repo_info(ccnr, reply_body, NULL, NULL);
@@ -836,7 +836,7 @@ r_proto_start_write_checked(struct ccn_closure *selfp,
836836
end = info->interest_comps->buf[info->pi->prefix_comps];
837837
name->length = 0;
838838
ccn_charbuf_append(name, info->interest_ccnb + start, end - start);
839-
ccn_charbuf_append_closer(name);
839+
ccnb_element_end(name);
840840
sp.freshness = 12; /* Seconds */
841841
res = ccn_sign_content(info->h, msg, name, &sp,
842842
reply_body->buf, reply_body->length);
@@ -1581,7 +1581,7 @@ r_proto_initiate_key_fetch(struct ccnr_handle *ccnr,
15811581
ccn_charbuf_append(key_name, namestart, namelen);
15821582
/* Construct an interest complete with Name so we can do lookup */
15831583
templ = ccn_charbuf_create();
1584-
ccn_charbuf_append_tt(templ, CCN_DTAG_Interest, CCN_DTAG);
1584+
ccnb_element_begin(templ, CCN_DTAG_Interest);
15851585
ccn_charbuf_append(templ, key_name->buf, key_name->length);
15861586
ccnb_tagged_putf(templ, CCN_DTAG_MinSuffixComponents, "%d", 1);
15871587
ccnb_tagged_putf(templ, CCN_DTAG_MaxSuffixComponents, "%d", 3);
@@ -1591,7 +1591,7 @@ r_proto_initiate_key_fetch(struct ccnr_handle *ccnr,
15911591
(pco->offset[CCN_PCO_E_KeyName_Pub] -
15921592
pco->offset[CCN_PCO_B_KeyName_Pub]));
15931593
}
1594-
ccn_charbuf_append_closer(templ); /* </Interest> */
1594+
ccnb_element_end(templ); /* </Interest> */
15951595
/* See if we already have it - if so we declare we are done. */
15961596
if (r_lookup(ccnr, templ, NULL) == 0) {
15971597
res = 1;

‎csrc/cmd/ccnbuzz.c

+14-14
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ append_bloom_element(struct ccn_charbuf *templ,
7575
enum ccn_dtag dtag, struct ccn_bloom *b)
7676
{
7777
int i;
78-
ccn_charbuf_append_tt(templ, dtag, CCN_DTAG);
78+
ccnb_element_begin(templ, dtag);
7979
i = ccn_bloom_wiresize(b);
8080
ccn_charbuf_append_tt(templ, i, CCN_BLOB);
8181
ccn_bloom_store_wire(b, ccn_charbuf_reserve(templ, i), i);
8282
templ->length += i;
83-
ccn_charbuf_append_closer(templ);
83+
ccnb_element_end(templ);
8484
}
8585

8686
/*
@@ -131,15 +131,15 @@ make_template(struct mydata *md, struct ccn_upcall_info *info, struct ccn_bloom
131131
size_t start;
132132
size_t stop;
133133

134-
ccn_charbuf_append_tt(templ, CCN_DTAG_Interest, CCN_DTAG);
135-
ccn_charbuf_append_tt(templ, CCN_DTAG_Name, CCN_DTAG);
136-
ccn_charbuf_append_closer(templ); /* </Name> */
134+
ccnb_element_begin(templ, CCN_DTAG_Interest);
135+
ccnb_element_begin(templ, CCN_DTAG_Name);
136+
ccnb_element_end(templ); /* </Name> */
137137
// XXX - use pubid if possible
138-
ccn_charbuf_append_tt(templ, CCN_DTAG_MaxSuffixComponents, CCN_DTAG);
138+
ccnb_element_begin(templ, CCN_DTAG_MaxSuffixComponents);
139139
ccnb_append_number(templ, 2);
140-
ccn_charbuf_append_closer(templ); /* </MaxSuffixComponents> */
140+
ccnb_element_end(templ); /* </MaxSuffixComponents> */
141141
if (info != NULL) {
142-
ccn_charbuf_append_tt(templ, CCN_DTAG_Exclude, CCN_DTAG);
142+
ccnb_element_begin(templ, CCN_DTAG_Exclude);
143143
ib = info->interest_ccnb;
144144
cb = info->content_ccnb;
145145
cc = info->content_comps;
@@ -190,20 +190,20 @@ make_template(struct mydata *md, struct ccn_upcall_info *info, struct ccn_bloom
190190
/* Use the supplied Bloom */
191191
append_bloom_element(templ, CCN_DTAG_Bloom, b);
192192
}
193-
ccn_charbuf_append_closer(templ); /* </Exclude> */
193+
ccnb_element_end(templ); /* </Exclude> */
194194
}
195195
else if (b != NULL) {
196-
ccn_charbuf_append_tt(templ, CCN_DTAG_Exclude, CCN_DTAG);
196+
ccnb_element_begin(templ, CCN_DTAG_Exclude);
197197
append_bloom_element(templ, CCN_DTAG_Bloom, b);
198-
ccn_charbuf_append_closer(templ); /* </Exclude> */
198+
ccnb_element_end(templ); /* </Exclude> */
199199
}
200200
if (md->allow_stale) {
201-
ccn_charbuf_append_tt(templ, CCN_DTAG_AnswerOriginKind, CCN_DTAG);
201+
ccnb_element_begin(templ, CCN_DTAG_AnswerOriginKind);
202202
ccnb_append_number(templ,
203203
CCN_AOK_DEFAULT | CCN_AOK_STALE);
204-
ccn_charbuf_append_closer(templ); /* </AnswerOriginKind> */
204+
ccnb_element_end(templ); /* </AnswerOriginKind> */
205205
}
206-
ccn_charbuf_append_closer(templ); /* </Interest> */
206+
ccnb_element_end(templ); /* </Interest> */
207207
return(templ);
208208
}
209209

‎csrc/cmd/ccnc.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,11 @@ express_interest(struct ccnxchat_state *st)
458458
struct ccn_charbuf *comp = NULL;
459459
int i;
460460

461-
ccn_charbuf_append_tt(templ, CCN_DTAG_Interest, CCN_DTAG);
461+
ccnb_element_begin(templ, CCN_DTAG_Interest);
462462
ccn_charbuf_append(templ, st->basename->buf, st->basename->length);
463463
ccnb_tagged_putf(templ, CCN_DTAG_MinSuffixComponents, "%d", 3);
464464
ccnb_tagged_putf(templ, CCN_DTAG_MaxSuffixComponents, "%d", 3);
465-
ccn_charbuf_append_tt(templ, CCN_DTAG_Exclude, CCN_DTAG);
465+
ccnb_element_begin(templ, CCN_DTAG_Exclude);
466466
if (st->n_ver > 1)
467467
ccnb_tagged_putf(templ, CCN_DTAG_Any, "");
468468
for (i = 0; i < st->n_ver; i++) {
@@ -471,10 +471,10 @@ express_interest(struct ccnxchat_state *st)
471471
ccn_charbuf_append(templ, comp->buf + 1, comp->length - 2);
472472
}
473473
ccnb_tagged_putf(templ, CCN_DTAG_Any, "");
474-
ccn_charbuf_append_closer(templ); /* </Exclude> */
474+
ccnb_element_end(templ); /* </Exclude> */
475475
if (st->prefer_newest)
476476
ccnb_tagged_putf(templ, CCN_DTAG_ChildSelector, "%d", 1);
477-
ccn_charbuf_append_closer(templ); /* </Interest> */
477+
ccnb_element_end(templ); /* </Interest> */
478478
ccn_express_interest(st->h, st->basename, st->cc, templ);
479479
ccn_charbuf_destroy(&templ);
480480
}

‎csrc/cmd/ccncat.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,22 @@ struct ccn_charbuf *
5858
make_template(int allow_stale, int scope)
5959
{
6060
struct ccn_charbuf *templ = ccn_charbuf_create();
61-
ccn_charbuf_append_tt(templ, CCN_DTAG_Interest, CCN_DTAG);
62-
ccn_charbuf_append_tt(templ, CCN_DTAG_Name, CCN_DTAG);
63-
ccn_charbuf_append_closer(templ); /* </Name> */
61+
ccnb_element_begin(templ, CCN_DTAG_Interest);
62+
ccnb_element_begin(templ, CCN_DTAG_Name);
63+
ccnb_element_end(templ); /* </Name> */
6464
// XXX - use pubid if possible
65-
ccn_charbuf_append_tt(templ, CCN_DTAG_MaxSuffixComponents, CCN_DTAG);
65+
ccnb_element_begin(templ, CCN_DTAG_MaxSuffixComponents);
6666
ccnb_append_number(templ, 1);
67-
ccn_charbuf_append_closer(templ); /* </MaxSuffixComponents> */
67+
ccnb_element_end(templ); /* </MaxSuffixComponents> */
6868
if (allow_stale) {
69-
ccn_charbuf_append_tt(templ, CCN_DTAG_AnswerOriginKind, CCN_DTAG);
69+
ccnb_element_begin(templ, CCN_DTAG_AnswerOriginKind);
7070
ccnb_append_number(templ, CCN_AOK_DEFAULT | CCN_AOK_STALE);
71-
ccn_charbuf_append_closer(templ); /* </AnswerOriginKind> */
71+
ccnb_element_end(templ); /* </AnswerOriginKind> */
7272
}
7373
if (scope >= 0 && scope <= 2) {
7474
ccnb_tagged_putf(templ, CCN_DTAG_Scope, "%d", scope);
7575
}
76-
ccn_charbuf_append_closer(templ); /* </Interest> */
76+
ccnb_element_end(templ); /* </Interest> */
7777
return(templ);
7878
}
7979

‎csrc/cmd/ccncatchunks.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ struct ccn_charbuf *
4545
make_template(struct mydata *md, struct ccn_upcall_info *info)
4646
{
4747
struct ccn_charbuf *templ = ccn_charbuf_create();
48-
ccn_charbuf_append_tt(templ, CCN_DTAG_Interest, CCN_DTAG);
49-
ccn_charbuf_append_tt(templ, CCN_DTAG_Name, CCN_DTAG);
50-
ccn_charbuf_append_closer(templ); /* </Name> */
48+
ccnb_element_begin(templ, CCN_DTAG_Interest);
49+
ccnb_element_begin(templ, CCN_DTAG_Name);
50+
ccnb_element_end(templ); /* </Name> */
5151
// XXX - use pubid if possible
52-
ccn_charbuf_append_tt(templ, CCN_DTAG_MaxSuffixComponents, CCN_DTAG);
52+
ccnb_element_begin(templ, CCN_DTAG_MaxSuffixComponents);
5353
ccnb_append_number(templ, 1);
54-
ccn_charbuf_append_closer(templ); /* </MaxSuffixComponents> */
54+
ccnb_element_end(templ); /* </MaxSuffixComponents> */
5555
if (md->allow_stale) {
56-
ccn_charbuf_append_tt(templ, CCN_DTAG_AnswerOriginKind, CCN_DTAG);
56+
ccnb_element_begin(templ, CCN_DTAG_AnswerOriginKind);
5757
ccnb_append_number(templ, CCN_AOK_DEFAULT | CCN_AOK_STALE);
58-
ccn_charbuf_append_closer(templ); /* </AnswerOriginKind> */
58+
ccnb_element_end(templ); /* </AnswerOriginKind> */
5959
}
60-
ccn_charbuf_append_closer(templ); /* </Interest> */
60+
ccnb_element_end(templ); /* </Interest> */
6161
return(templ);
6262
}
6363

‎csrc/cmd/ccncatchunks2.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -234,19 +234,19 @@ struct ccn_charbuf *
234234
make_template(struct mydata *md)
235235
{
236236
struct ccn_charbuf *templ = ccn_charbuf_create();
237-
ccn_charbuf_append_tt(templ, CCN_DTAG_Interest, CCN_DTAG);
238-
ccn_charbuf_append_tt(templ, CCN_DTAG_Name, CCN_DTAG);
239-
ccn_charbuf_append_closer(templ); /* </Name> */
237+
ccnb_element_begin(templ, CCN_DTAG_Interest);
238+
ccnb_element_begin(templ, CCN_DTAG_Name);
239+
ccnb_element_end(templ); /* </Name> */
240240
// XXX - use pubid if possible
241-
ccn_charbuf_append_tt(templ, CCN_DTAG_MaxSuffixComponents, CCN_DTAG);
241+
ccnb_element_begin(templ, CCN_DTAG_MaxSuffixComponents);
242242
ccnb_append_number(templ, 1);
243-
ccn_charbuf_append_closer(templ); /* </MaxSuffixComponents> */
243+
ccnb_element_end(templ); /* </MaxSuffixComponents> */
244244
if (md->allow_stale) {
245-
ccn_charbuf_append_tt(templ, CCN_DTAG_AnswerOriginKind, CCN_DTAG);
245+
ccnb_element_begin(templ, CCN_DTAG_AnswerOriginKind);
246246
ccnb_append_number(templ, CCN_AOK_DEFAULT | CCN_AOK_STALE);
247-
ccn_charbuf_append_closer(templ); /* </AnswerOriginKind> */
247+
ccnb_element_end(templ); /* </AnswerOriginKind> */
248248
}
249-
ccn_charbuf_append_closer(templ); /* </Interest> */
249+
ccnb_element_end(templ); /* </Interest> */
250250
return(templ);
251251
}
252252

0 commit comments

Comments
 (0)