Revision 56d5986f src/chunk_signaling.c

View differences:

src/chunk_signaling.c
62 62
  // rc_reg_ack(trans_id);
63 63
}
64 64

  
65
void bmap_received(const struct psinstance * ps, struct nodeID *fromid, struct nodeID *ownerid, struct chunkID_set *c_set, int cb_size, uint16_t trans_id) {
65
void bmap_received(const struct psinstance * ps, struct nodeID *fromid, struct nodeID *ownerid, struct chunkID_set *c_set, int maxdeliver, uint16_t trans_id) {
66 66
  struct peer *owner;
67 67
  if (nodeid_equal(fromid, ownerid)) {
68 68
    owner = nodeid_to_peer(psinstance_topology(ps), ownerid, neigh_on_sign_recv);
......
75 75
  if (owner) {	//now we have it almost sure
76 76
    chunkID_set_clear(owner->bmap,0);	//TODO: some better solution might be needed to keep info about chunks we sent in flight.
77 77
    chunkID_set_union(owner->bmap,c_set);
78
    owner->cb_size = cb_size;
79 78
    gettimeofday(&owner->bmap_timestamp, NULL);
80 79
  }
81 80
}
......
149 148
    }
150 149
    switch (sig_type) {
151 150
        case sig_send_buffermap:
152
          bmap_received(ps, fromid, ownerid, c_set, max_deliver, trans_id); //FIXME: cb_size has gone from signaling
151
          bmap_received(ps, fromid, ownerid, c_set, max_deliver, trans_id); 
153 152
          break;
154 153
        case sig_offer:
155 154
          offer_received(ps, fromid, c_set, max_deliver, trans_id);

Also available in: Unified diff