Skip to content

Commit

Permalink
Change mgmt reply msg to contentobj to match ccnx properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@blacksheeep
blacksheeep committed Nov 14, 2013
1 parent 25a55ec commit 714f724
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ccnl-ext-crypto.c
View file
Expand Up @@ -513,7 +513,7 @@ ccnl_mgmt_crypto(struct ccnl_relay_s *ccnl, char *type, char *buf, int buflen)
len = ccnl_crypto_extract_msg(&buf, &buflen, &msg);
out = (char *) ccnl_malloc(sizeof(char)*len + sizeof(char)*siglen + 4096);

len1 = mkHeader(out, CCN_DTAG_CONTENT, CCN_TT_DTAG); // content
len1 = mkHeader(out, CCN_DTAG_CONTENTOBJ, CCN_TT_DTAG); // content
len1 += mkHeader(out+len1, CCN_DTAG_NAME, CCN_TT_DTAG); // name
if(siglen > 0) len1 += ccnl_crypto_add_signature(out+len1, sig, siglen);

Expand Down
14 changes: 7 additions & 7 deletions ccnl-ext-mgmt.c
View file
Expand Up @@ -123,7 +123,7 @@ void ccnl_mgmt_return_ccn_msg(struct ccnl_relay_s *ccnl, struct ccnl_buf_s *orig
struct ccnl_buf_s *retbuf;
if(ccnl_is_local_addr(&from->peer))
{
len = mkHeader(out1, CCN_DTAG_CONTENT, CCN_TT_DTAG); // content
len = mkHeader(out1, CCN_DTAG_CONTENTOBJ, CCN_TT_DTAG); // content
len += mkHeader(out1+len, CCN_DTAG_NAME, CCN_TT_DTAG); // name
}

Expand Down Expand Up @@ -573,7 +573,7 @@ ccnl_mgmt_debug(struct ccnl_relay_s *ccnl, struct ccnl_buf_s *orig,
stmt = ccnl_malloc(stmt_length);

if(ccnl_is_local_addr(&from->peer)){
len = mkHeader(out, CCN_DTAG_CONTENT, CCN_TT_DTAG); // interest
len = mkHeader(out, CCN_DTAG_CONTENTOBJ, CCN_TT_DTAG); // interest
len += mkHeader(out+len, CCN_DTAG_NAME, CCN_TT_DTAG); // name
}

Expand Down Expand Up @@ -838,7 +838,7 @@ ccnl_mgmt_newface(struct ccnl_relay_s *ccnl, struct ccnl_buf_s *orig,
Bail:
/*ANSWER*/
if(ccnl_is_local_addr(&from->peer)){
len = mkHeader(out_buf, CCN_DTAG_CONTENT, CCN_TT_DTAG); // content
len = mkHeader(out_buf, CCN_DTAG_CONTENTOBJ, CCN_TT_DTAG); // content
len += mkHeader(out_buf+len, CCN_DTAG_NAME, CCN_TT_DTAG); // name
}

Expand Down Expand Up @@ -1002,7 +1002,7 @@ ccnl_mgmt_setfrag(struct ccnl_relay_s *ccnl, struct ccnl_buf_s *orig,
ccnl_free(action);

if(ccnl_is_local_addr(&from->peer)){
len = mkHeader(out_buf, CCN_DTAG_CONTENT, CCN_TT_DTAG); // interest
len = mkHeader(out_buf, CCN_DTAG_CONTENTOBJ, CCN_TT_DTAG); // interest
len += mkHeader(out_buf+len, CCN_DTAG_NAME, CCN_TT_DTAG); // name
}

Expand Down Expand Up @@ -1119,7 +1119,7 @@ ccnl_mgmt_destroyface(struct ccnl_relay_s *ccnl, struct ccnl_buf_s *orig,
return -1;
}
if(ccnl_is_local_addr(&from->peer)){
len = mkHeader(out_buf, CCN_DTAG_CONTENT, CCN_TT_DTAG); // interest
len = mkHeader(out_buf, CCN_DTAG_CONTENTOBJ, CCN_TT_DTAG); // interest
len += mkHeader(out_buf+len, CCN_DTAG_NAME, CCN_TT_DTAG); // name
}

Expand Down Expand Up @@ -1343,7 +1343,7 @@ ccnl_mgmt_newdev(struct ccnl_relay_s *ccnl, struct ccnl_buf_s *orig,

Bail:
if(ccnl_is_local_addr(&from->peer)){
len = mkHeader(out_buf, CCN_DTAG_CONTENT, CCN_TT_DTAG); // interest
len = mkHeader(out_buf, CCN_DTAG_CONTENTOBJ, CCN_TT_DTAG); // interest
len += mkHeader(out_buf+len, CCN_DTAG_NAME, CCN_TT_DTAG); // name
}

Expand Down Expand Up @@ -1533,7 +1533,7 @@ ccnl_mgmt_prefixreg(struct ccnl_relay_s *ccnl, struct ccnl_buf_s *orig,
return -1;
}
if(ccnl_is_local_addr(&from->peer)){
len = mkHeader(out_buf, CCN_DTAG_CONTENT, CCN_TT_DTAG); // interest
len = mkHeader(out_buf, CCN_DTAG_CONTENTOBJ, CCN_TT_DTAG); // interest
len += mkHeader(out_buf+len, CCN_DTAG_NAME, CCN_TT_DTAG); // name
}

Expand Down
52 changes: 52 additions & 0 deletions util/ccn-lite-ccnb2xml.c
View file
Expand Up @@ -365,6 +365,7 @@ handle_ccn_signature(unsigned char **buf, int *buflen, int offset, FILE *stream)
{
printf("Signature verified");
}
print_offset(offset);
printf("</SIGNATURE>\n");
}
else{
Expand All @@ -376,6 +377,7 @@ handle_ccn_signature(unsigned char **buf, int *buflen, int offset, FILE *stream)
printf("0x%04zx ", sig[i]);
}
printf("</SIGNATUREBITS>\n");
print_offset(offset);
printf("</SIGNATURE>\n");
}
Bail:
Expand Down Expand Up @@ -508,6 +510,53 @@ handle_ccn_content(unsigned char **buf, int *len, int offset, FILE *stream){
return 0;
}

int
handle_ccn_content_obj_outer(unsigned char **buf, int *len, int offset, FILE *stream){
int num, typ;
if(dehead(buf, len, &num, &typ)) return -1;
print_offset(offset); printf("<CONTENTOBJ>\n");
while(typ != 2){
dehead(buf, len, &num, &typ);
}
while(1)
{
switch(num)
{
case CCN_DTAG_NAME:
handle_ccn_name(buf, len, offset+4, stream);
break;
case CCN_DTAG_INTEREST:
break;
case CCNL_DTAG_DEBUGREQUEST:
handle_ccn_debugrequest(buf, len, offset+4, stream);
break;
case CCNL_DTAG_DEBUGREPLY:
handle_ccn_debugreply(buf, len, offset+4, stream);
break;
case CCN_DTAG_FACEINSTANCE:
handle_ccn_debugreply_content(buf, len, offset+4, "FACEINSTANCE", stream);
break;
case CCNL_DTAG_DEVINSTANCE:
handle_ccn_debugreply_content(buf, len, offset+4, "DEVINSTANCE", stream);
break;
case CCNL_DTAG_PREFIX:
handle_ccn_debugreply_content(buf, len, offset+4, "PREFIX", stream);
break;
case CCN_DTAG_ACTION:
print_offset(offset + 4); print_tag_content_with_tag(buf, len, "ACTION", stream);
break;
default:
//printf("%i,%i\n", num, typ);
goto Bail;
break;
}
if(dehead(buf, len, &num, &typ)) break;
}
Bail:
print_offset(offset); printf("</CONTENTOBJ>\n");
return 0;
}


int
handle_ccn_packet(unsigned char *buf, int len, int offset, FILE *stream){
Expand All @@ -519,6 +568,9 @@ handle_ccn_packet(unsigned char *buf, int len, int offset, FILE *stream){
case CCN_DTAG_CONTENT:
return handle_ccn_content(&buf, &len, offset, stream);
break;
case CCN_DTAG_CONTENTOBJ:
return handle_ccn_content_obj_outer(&buf, &len, offset, stream);
break;
case CCN_DTAG_INTEREST:
break;
}
Expand Down

0 comments on commit 714f724

Please sign in to comment.