Changeset 10619
- Timestamp:
- 03/08/15 00:55:17 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-gbox-cards.c
r10617 r10619 89 89 FILE *fhandle_expired; 90 90 fhandle_expired = fopen(fname, "w"); 91 if(!fhandle_ shared)91 if(!fhandle_expired) 92 92 { 93 93 cs_log("Couldn't open %s: %s", fname, strerror(errno)); … … 95 95 } 96 96 cs_readlock(&gbox_cards_lock); 97 it= ll_iter_create(gbox_backup_cards);98 while((card = ll_iter_next(&it )))97 LL_ITER it2 = ll_iter_create(gbox_backup_cards); 98 while((card = ll_iter_next(&it2))) 99 99 { 100 100 if (card->type == GBOX_CARD_TYPE_GBOX) 101 101 { 102 fprintf(fhandle_ shared, "CardID %2d at %s Card %08X Sl:%2d Lev:%1d dist:%1d id:%04X\n",102 fprintf(fhandle_expired, "CardID %2d at %s Card %08X Sl:%2d Lev:%1d dist:%1d id:%04X\n", 103 103 card_count_expired, card->origin_peer->hostname, card->caprovid, 104 104 card->id.slot, card->lvl, card->dist, card->id.peer); … … 154 154 { 155 155 gbox_cards = ll_create("gbox.cards"); 156 gbox_backup_cards = ll_create("gbox _backup_cards");156 gbox_backup_cards = ll_create("gbox.backup.cards"); 157 157 cs_lock_create(&gbox_cards_lock, "gbox_cards_lock", 5000); 158 158 cs_writelock(&gbox_cards_lock); … … 205 205 static int8_t got_from_backup(uint32_t caprovid, uint16_t id_peer, uint8_t slot, struct gbox_peer *origin_peer) 206 206 { 207 uint8_t ret = 0; 207 208 cs_writelock(&gbox_cards_lock); 208 209 LL_ITER it = ll_iter_create(gbox_backup_cards); … … 212 213 if (card->caprovid == caprovid && card->id.peer == id_peer && card->id.slot == slot) 213 214 { 214 ll_iter_remove(&it); 215 cs_log_dbg(D_READER, "getting backup card: %04X\n", card->id.peer); 216 ll_remove(gbox_backup_cards, card); 215 217 card->origin_peer = origin_peer; 216 218 ll_append(gbox_cards, card); 217 219 update_checkcode(card); 218 cs_writeunlock(&gbox_cards_lock);219 return 1;220 ret = 1; 221 break; 220 222 } 221 223 } 222 224 cs_writeunlock(&gbox_cards_lock); 223 225 224 return 0;226 return ret; 225 227 } 226 228 … … 245 247 return; 246 248 } 249 cs_log_dbg(D_READER, "new card: %04X\n", id_peer); 247 250 card->caprovid = caprovid; 248 251 card->id.peer = id_peer; … … 317 320 if (found) 318 321 { 319 ll_iter_remove(&it); 322 cs_log_dbg(D_READER, "remove card: %04X\n", card->id.peer); 323 ll_remove(gbox_cards, card); 320 324 ll_append(gbox_backup_cards, card); 321 325 update_checkcode(card);
Note:
See TracChangeset
for help on using the changeset viewer.