equal
deleted
inserted
replaced
131 if (bundle->fragmented_incoming() |
131 if (bundle->fragmented_incoming() |
132 && xmit_blocks->find_block(BundleProtocol::PAYLOAD_BLOCK)) { |
132 && xmit_blocks->find_block(BundleProtocol::PAYLOAD_BLOCK)) { |
133 continue; |
133 continue; |
134 } |
134 } |
135 |
135 |
|
136 log_debug_p(LOG, "adding recv_block %d", iter->type()); |
136 iter->owner()->prepare(bundle, xmit_blocks, &*iter, link, |
137 iter->owner()->prepare(bundle, xmit_blocks, &*iter, link, |
137 BlockInfo::LIST_RECEIVED); |
138 BlockInfo::LIST_RECEIVED); |
138 } |
139 } |
139 } |
140 } |
140 else { |
141 else { |
148 // locally generated bundles need to include blocks specified at the API |
149 // locally generated bundles need to include blocks specified at the API |
149 for (BlockInfoVec::iterator iter = api_blocks->begin(); |
150 for (BlockInfoVec::iterator iter = api_blocks->begin(); |
150 iter != api_blocks->end(); |
151 iter != api_blocks->end(); |
151 ++iter) |
152 ++iter) |
152 { |
153 { |
153 log_debug_p(LOG, "adding api_block"); |
154 log_debug_p(LOG, "adding api_block %d", iter->type()); |
154 iter->owner()->prepare(bundle, xmit_blocks, |
155 iter->owner()->prepare(bundle, xmit_blocks, |
155 &*iter, link, BlockInfo::LIST_API); |
156 &*iter, link, BlockInfo::LIST_API); |
156 } |
157 } |
157 |
158 |
158 // now we also make sure to prepare() on any registered processors |
159 // now we also make sure to prepare() on any registered processors |