Changeset 8456 for trunk/module-newcamd.c
- Timestamp:
- 03/02/13 22:43:16 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-newcamd.c
r8455 r8456 153 153 cs_debug_mask(D_TRACE,"Send SID list to mgcamd client."); 154 154 memset(&cd, 0, sizeof(cd)); 155 FILTER *pfilts = cfg.ncd_ptab.ports[cl->port_idx]. ftab.filts;155 FILTER *pfilts = cfg.ncd_ptab.ports[cl->port_idx].ncd->ncd_ftab.filts; 156 156 157 157 /*memset(mbuf, 0, sizeof(mbuf));*/ // not nessesery … … 591 591 592 592 port_idx = cl->port_idx; 593 psfilt = &cfg.ncd_ptab.ports[port_idx]. ftab.filts[0];593 psfilt = &cfg.ncd_ptab.ports[port_idx].ncd->ncd_ftab.filts[0]; 594 594 595 595 // 1. CAID … … 809 809 // check for non ready reader and reject client 810 810 for (rdr=first_active_reader; rdr ; rdr=rdr->next) { 811 if(rdr->caid==cfg.ncd_ptab.ports[cl->port_idx]. ftab.filts[0].caid) {811 if(rdr->caid==cfg.ncd_ptab.ports[cl->port_idx].ncd->ncd_ftab.filts[0].caid) { 812 812 if(rdr->card_status == CARD_NEED_INIT) { 813 813 cs_log("init for reader %s not finished -> reject client", rdr->label); … … 822 822 while ((rdr = ll_iter_next(&itr))) { 823 823 int32_t n; 824 for (n=0;n<cfg.ncd_ptab.ports[cl->port_idx]. ftab.filts[0].nprids;n++) {825 if (emm_reader_match(rdr, cfg.ncd_ptab.ports[cl->port_idx]. ftab.filts[0].caid, cfg.ncd_ptab.ports[cl->port_idx].ftab.filts[0].prids[n])) {824 for (n=0;n<cfg.ncd_ptab.ports[cl->port_idx].ncd->ncd_ftab.filts[0].nprids;n++) { 825 if (emm_reader_match(rdr, cfg.ncd_ptab.ports[cl->port_idx].ncd->ncd_ftab.filts[0].caid, cfg.ncd_ptab.ports[cl->port_idx].ncd->ncd_ftab.filts[0].prids[n])) { 826 826 aureader=rdr; 827 827 break; … … 1053 1053 pi = cl->port_idx; 1054 1054 if( cfg.ncd_ptab.nports && cfg.ncd_ptab.nports >= pi) 1055 er->caid=cfg.ncd_ptab.ports[pi]. ftab.filts[0].caid;1055 er->caid=cfg.ncd_ptab.ports[pi].ncd->ncd_ftab.filts[0].caid; 1056 1056 } 1057 1057 memcpy(er->ecm, buf+2, er->ecmlen); … … 1191 1191 cs_log("client connected to %d port", cfg.ncd_ptab.ports[client->port_idx].s_port); 1192 1192 1193 if (cfg.ncd_ptab.ports[client->port_idx].ncd _key_is_set) {1193 if (cfg.ncd_ptab.ports[client->port_idx].ncd->ncd_key_is_set) { 1194 1194 //port has a des key specified 1195 res = newcamd_auth_client(client->ip, cfg.ncd_ptab.ports[client->port_idx].ncd _key);1195 res = newcamd_auth_client(client->ip, cfg.ncd_ptab.ports[client->port_idx].ncd->ncd_key); 1196 1196 } else { 1197 1197 //default global des key
Note:
See TracChangeset
for help on using the changeset viewer.