Changeset 4536 for trunk/module-cccam.c
- Timestamp:
- 01/20/11 10:53:11 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cccam.c
r4528 r4536 2633 2633 ulong crc = 0; 2634 2634 struct s_reader *rdr; 2635 for (rdr = first_ reader; rdr; rdr = rdr->next) {2636 if (rdr-> enable && !rdr->deleted && rdr->client && !rdr->audisabled)2635 for (rdr = first_active_reader; rdr; rdr = rdr->next) { 2636 if (rdr->client && !rdr->audisabled) 2637 2637 crc += crc32(0, rdr->hexserial, 8); 2638 2638 } … … 3032 3032 struct s_reader *rdr; 3033 3033 int r = 0; 3034 for (rdr = first_ reader; rdr; rdr = rdr->next) {3035 if (!rdr->fd || !rdr->enable || rdr->deleted)3034 for (rdr = first_active_reader; rdr; rdr = rdr->next) { 3035 if (!rdr->fd) 3036 3036 continue; 3037 3037 if (!(rdr->grp & cl->grp)) … … 3047 3047 rdr->cc_id = ++r; 3048 3048 struct s_reader *rdr2; 3049 for (rdr2 = first_ reader; rdr2; rdr2 = rdr2->next) {3049 for (rdr2 = first_active_reader; rdr2; rdr2 = rdr2->next) { 3050 3050 if (rdr2 != rdr && rdr2->cc_id == rdr->cc_id) { 3051 rdr2 = first_ reader;3051 rdr2 = first_active_reader; 3052 3052 rdr->cc_id=++r; 3053 3053 } … … 3256 3256 int wakeup = 0; 3257 3257 struct s_reader *rdr; 3258 for (rdr = first_ reader; rdr; rdr = rdr->next) {3258 for (rdr = first_active_reader; rdr; rdr = rdr->next) { 3259 3259 if (rdr->typ != R_CCCAM) 3260 3260 continue; 3261 if (!rdr->fd || !rdr->enable || rdr->deleted ||rdr->tcp_connected == 2)3261 if (!rdr->fd || rdr->tcp_connected == 2) 3262 3262 continue; 3263 3263 if (!(rdr->grp & cl->grp)) … … 3277 3277 int modified = 0; 3278 3278 struct s_reader *rdr; 3279 for (rdr = first_ reader; rdr; rdr = rdr->next) {3280 if (rdr->typ == R_CCCAM && rdr->fd && rdr->enable && !rdr->deleted) {3279 for (rdr = first_active_reader; rdr; rdr = rdr->next) { 3280 if (rdr->typ == R_CCCAM && rdr->fd) { 3281 3281 struct s_client *clr = rdr->client; 3282 3282 if (clr && clr->cc) { … … 3833 3833 struct s_reader *reader = cl->reader; 3834 3834 3835 if ((cc && cc->mode == CCCAM_MODE_SHUTDOWN) || !cl->reader->enable || cl->reader->deleted)3835 if ((cc && cc->mode == CCCAM_MODE_SHUTDOWN)) 3836 3836 return -1; 3837 3837 … … 3844 3844 while (!reader->tcp_connected && reader->cc_keepalive && cfg->reader_restart_seconds > 0) { 3845 3845 3846 if ((cc && cc->mode == CCCAM_MODE_SHUTDOWN) || !cl->reader->enable || cl->reader->deleted)3846 if ((cc && cc->mode == CCCAM_MODE_SHUTDOWN)) 3847 3847 return -1; 3848 3848
Note:
See TracChangeset
for help on using the changeset viewer.