Changeset 3094
- Timestamp:
- 09/19/10 16:32:55 (14 years ago)
- Location:
- branches/threaded
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/threaded/globals.h
r3074 r3094 586 586 int pid; 587 587 int cidx; 588 int ridx; //FIXME reader[ridx] reader has to know what number it is, should be replaced by storing pointer to reader instead of array index589 588 int enable; 590 589 int available; //Schlocke: New flag for loadbalancing. Only reader if reader supports ph.c_available function -
branches/threaded/oscam-chk.c
r2900 r3094 288 288 289 289 //Schlocke reader-defined function 290 if (rdr->ph.c_available && !rdr->ph.c_available( rdr->ridx, AVAIL_CHECK_CONNECTED))290 if (rdr->ph.c_available && !rdr->ph.c_available(client[cs_idx].ridx, AVAIL_CHECK_CONNECTED)) 291 291 return 0; 292 292 -
branches/threaded/oscam-reader.c
r2900 r3094 33 33 char filename[32]; 34 34 char *buffer; 35 sprintf(filename, "%s/reader%d", get_tmp_dir(), reader->ridx);35 sprintf(filename, "%s/reader%d", get_tmp_dir(), client[cs_idx].ridx); 36 36 int size = reader->init_history_pos+strlen(txt)+1; 37 37 buffer = malloc(size+1); … … 148 148 if (err != 0 || !res || !res->ai_addr) { 149 149 client[cs_idx].udp_sa.sin_addr.s_addr = 0; 150 cs_log("can't resolve %s, error: %s", reader[ reader[ridx].ridx].device, err ? gai_strerror(err) : "unknown");150 cs_log("can't resolve %s, error: %s", reader[client[cs_idx].ridx].device, err ? gai_strerror(err) : "unknown"); 151 151 } 152 152 else { … … 563 563 for(x=0;x<CS_MAXPENDING;x++){ 564 564 ms=1000*(tpe.time-client[cs_idx].ecmtask[x].tps.time)+tpe.millitm-client[cs_idx].ecmtask[x].tps.millitm; 565 if(client[cs_idx].ecmtask[x].rc == 10 && ms > cfg->ctimeout && reader->ridx == client[cs_idx].ecmtask[x].gbxRidx) {565 if(client[cs_idx].ecmtask[x].rc == 10 && ms > cfg->ctimeout && client[cs_idx].ridx == client[cs_idx].ecmtask[x].gbxRidx) { 566 566 //cs_log("hello rc=%d idx:%d x:%d ridx%d ridx:%d",client[cs_idx].ecmtask[x].rc,client[cs_idx].ecmtask[x].idx,x,ridx,client[cs_idx].ecmtask[x].gbxRidx); 567 567 client[cs_idx].ecmtask[x].rc=5; -
branches/threaded/oscam.c
r2900 r3094 953 953 static void restart_cardreader(int reader_idx, int restart) { 954 954 int i; 955 reader[reader_idx].ridx = reader_idx;956 955 if ((reader[reader_idx].device[0]) && (reader[reader_idx].enable == 1) && (!reader[reader_idx].deleted)) { 957 956 … … 1004 1003 int reader_idx; 1005 1004 for (reader_idx=0; reader_idx<CS_MAXREADER; reader_idx++) { 1006 reader[reader_idx].ridx = reader_idx;1007 1005 if ((reader[reader_idx].device[0]) && (reader[reader_idx].enable == 1)) { 1008 1006 restart_cardreader(reader_idx, 0); … … 1488 1486 } 1489 1487 1490 er->reader[0]= reader->ridx;1488 er->reader[0]=client[cs_idx].ridx; 1491 1489 //cs_log("answer from reader %d (rc=%d)", er->reader[0], er->rc); 1492 1490 er->caid=er->ocaid; -
branches/threaded/reader-common.c
r2900 r3094 321 321 else 322 322 { 323 client[cs_idx].au = reader->ridx;323 client[cs_idx].au = client[cs_idx].ridx; 324 324 reader_card_info(reader); 325 325 reader->card_status = CARD_INSERTED;
Note:
See TracChangeset
for help on using the changeset viewer.