Changeset 5226 for trunk/oscam.c
- Timestamp:
- 05/12/11 12:32:36 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam.c
r5216 r5226 74 74 75 75 time_t now = time((time_t)0); 76 LL_ITER *itr = ll_iter_create(cfg.v_list);76 LL_ITER itr = ll_iter_create(cfg.v_list); 77 77 V_BAN *v_ban_entry; 78 78 int32_t ftime = cfg.failbantime*60; 79 79 80 80 //run over all banned entries to do housekeeping: 81 while ((v_ban_entry=ll_iter_next( itr))) {81 while ((v_ban_entry=ll_iter_next(&itr))) { 82 82 83 83 // housekeeping: 84 84 if ((now - v_ban_entry->v_time) >= ftime) { // entry out of time->remove 85 ll_iter_remove_data( itr);85 ll_iter_remove_data(&itr); 86 86 continue; 87 87 } … … 112 112 v_ban_entry->v_ip = ip; 113 113 114 ll_iter_insert( itr, v_ban_entry);114 ll_iter_insert(&itr, v_ban_entry); 115 115 116 116 cs_debug_mask(D_TRACE, "failban: ban ip %s with timestamp %d", cs_inet_ntoa(v_ban_entry->v_ip), v_ban_entry->v_time); 117 117 } 118 ll_iter_release(itr);119 118 } 120 119 return result; … … 804 803 cl->ip=ip; 805 804 cl->account = first_client->account; 806 cl->itused = 0;807 805 808 806 //master part … … 912 910 first_client->ip=cs_inet_addr("127.0.0.1"); 913 911 first_client->typ='s'; 914 first_client->itused = 0;915 912 first_client->thread=pthread_self(); 916 913 struct s_auth *null_account; … … 1523 1520 time_t timeout = now-(time_t)(cfg.ctimeout/1000)-CS_CACHE_TIMEOUT; 1524 1521 struct s_ecm *ecmc; 1525 LL_ITER *it = ll_iter_create(ecmcache);1526 while ((ecmc=ll_iter_next( it))) {1522 LL_ITER it = ll_iter_create(ecmcache); 1523 while ((ecmc=ll_iter_next(&it))) { 1527 1524 if (ecmc->time < timeout) { 1528 ll_iter_remove_data( it);1525 ll_iter_remove_data(&it); 1529 1526 continue; 1530 1527 } … … 1539 1536 continue; 1540 1537 1541 ll_iter_release(it);1542 1538 //cs_debug_mask(D_TRACE, "cachehit! (ecm)"); 1543 1539 memcpy(er->cw, ecmc->cw, 16); … … 1548 1544 return ecmc->rc; 1549 1545 } 1550 ll_iter_release(it);1551 1546 1552 1547 //Add cache entry: … … 1577 1572 struct s_ecm *ecmc; 1578 1573 1579 LL_ITER *it = ll_iter_create(ecmcache);1580 while ((ecmc=ll_iter_next( it))) {1574 LL_ITER it = ll_iter_create(ecmcache); 1575 while ((ecmc=ll_iter_next(&it))) { 1581 1576 if (ecmc->time < timeout) { 1582 ll_iter_remove_data( it);1577 ll_iter_remove_data(&it); 1583 1578 continue; 1584 1579 } … … 1598 1593 memcpy(er->cw, ecmc->cw, 16); 1599 1594 er->selected_reader = ecmc->reader; 1600 ll_iter_release(it);1601 1595 //cs_debug_mask(D_TRACE, "cachehit!"); 1602 1596 return 1; 1603 1597 } 1604 ll_iter_release(it);1605 1598 return 0; 1606 1599 } … … 2706 2699 cs_ddump_mask(D_EMM, ep->emm, ep->l, "emm:"); 2707 2700 2708 LL_ITER *itr = ll_iter_create(client->aureader_list);2709 while ((aureader = ll_iter_next( itr))) {2701 LL_ITER itr = ll_iter_create(client->aureader_list); 2702 while ((aureader = ll_iter_next(&itr))) { 2710 2703 if (!aureader->enable) 2711 2704 continue; … … 2835 2828 write_to_pipe(aureader->fd, PIP_ID_EMM, (uchar *) ep, sizeof(EMM_PACKET)); 2836 2829 } 2837 ll_iter_release(itr);2838 2830 } 2839 2831
Note:
See TracChangeset
for help on using the changeset viewer.