DTN2-BPQ: comparison servlib/bundling/BPQBlock.cc

equal deleted inserted replaced

-:00dfdf113d87
+:bdf6aee9aa70
 BPQBlock::BPQBlock(BlockInfo* block)
 {
 log_info_p(LOG, "BPQBlock::constructor()");
+ASSERT( block->type() == BundleProtocol::QUERY_EXTENSION_BLOCK);
 initialise(block);
 log_info_p(LOG, "leaving constructor");
 }
 }
 bool
 BPQBlock::match(const BPQBlock* other) const
 {
-/*
-log_debug_p(LOG, "_BPQ_ Match: this(%s) other(%s)",
-(char*)query_val_,
-(char*)other->query_val());
-*/
 return query_len_ == other->query_len() &&
 strncmp( (char*)query_val_, (char*)other->query_val(),
 query_len_ ) == 0;
 }
 BlockInfo* block = NULL;
 if ( b->source() != NULL ) {
 block = const_cast<BlockInfo*>(b->source());
-} else {
+log_debug_p(LOG, "BPQBlock::initialise: b->source() != NULL");
+} else {
+log_debug_p(LOG, "BPQBlock::initialise: b->source() == NULL");
 block = b;
 }
 int decoding_len=0;
 u_int i=0, j=0;
 u_int len = block->data_length();
 u_int num_frags;
 u_char* buf = block->data();
 // BPQ-kind             1-byte
-if ( i < len )
+if ( i < len ) {
 kind_ = (kind_t) buf[i++];
+log_debug_p(LOG, "BPQBlock::initialise: kind = %d", kind_);
+}
 // matching rule type   1-byte
-if ( i < len )
+if ( i < len ) {
 matching_rule_ = (u_int) buf[i++];
+log_debug_p(LOG, "BPQBlock::initialise: matching rule = %u", matching_rule_);
+}
 // Decode the SDNV-encoded query length. Note that we need to know the length of the
 // of the encoded value and provide some pointers to the encoded value along with
 // where we want the decoded value (in this case, query_len_).
 if ( i < len &&
-(decoding_len = SDNV::decode(&(buf[i]), len - i, &query_len_)) >= 0 )
+(decoding_len = SDNV::decode(&(buf[i]), len - i, &query_len_)) >= 0 ) {
 i += decoding_len;
+log_debug_p(LOG, "BPQBlock::initialise: query len = %u", query_len_);
+}
 else
 log_err_p(LOG, "Error decoding BPQ query length");
 // query-value           n-bytes
 if ( (i+query_len_) < len ) {
 query_val_ = (u_char*) malloc ( sizeof(u_char) * query_len_ );
 for (j=0; query_val_ != NULL && i < len && j < query_len_; i++, j++)
 query_val_[j] = buf[i];
+log_debug_p(LOG, "BPQBlock::initialise: query val = %s", query_val_);
 } else {
 query_val_ = NULL;
 }
 if ( i < len &&
-(decoding_len = SDNV::decode(&(buf[i]), len - i, &num_frags)) >= 0 )
+(decoding_len = SDNV::decode(&(buf[i]), len - i, &num_frags)) >= 0 ) {
 i += decoding_len;
+log_debug_p(LOG, "BPQBlock::initialise: num frags = %u", num_frags);
+}
 else
 log_err_p(LOG, "Error decoding BPQ fragment length");
 // todo: Still need to handle fragments
 // test assert - to be removed once we start handling fragments
 return BP_SUCCESS;
 }
 } // namespace dtn

changeset 30	bdf6aee9aa70
parent 6	d1f220643814
child 31	2e5913d44299