Changeset 3175 for trunk/oscam.c
- Timestamp:
- 09/22/10 22:09:09 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam.c
r3174 r3175 1477 1477 add_stat.prid = er->prid; 1478 1478 add_stat.srvid = er->srvid; 1479 write_to_pipe(fd_c2m, PIP_ID_STA, (uchar*)&add_stat, sizeof(ADD_READER_STAT));1479 add_reader_stat(&add_stat); 1480 1480 } 1481 1481 … … 1958 1958 cs_debug_mask(D_TRACE, "requesting client %s best reader for %04X/%06X/%04X", username(cs_idx), grs.caid, grs.prid, grs.srvid); 1959 1959 1960 int res_write = write_to_pipe(fd_c2m, PIP_ID_BES, (uchar*)&grs, sizeof(GET_READER_STAT)); 1961 if (res_write <= 0) { 1962 cs_debug_mask(D_TRACE, "get best reader: write error!"); 1963 return; 1964 } 1965 1966 uchar *ptr; 1967 do 1968 { 1969 int n = read_from_pipe(client[cs_idx].fd_m2c_c, &ptr, 1); 1970 if (n == PIP_ID_BES) { 1971 int *best_readers = (int*)ptr; 1972 memcpy(reader_avail, best_readers, sizeof(int)*CS_MAXREADER); 1973 return; 1974 } 1975 else if (n == PIP_ID_DIR) 1976 continue; 1977 else //should neven happen 1978 cs_debug_mask(D_TRACE, "get best reader: illegal paket? n=%d", n); 1979 } while (1); 1960 get_best_reader(&grs, reader_avail); 1980 1961 } 1981 1962 … … 2535 2516 2536 2517 2537 // gets and send the best reader to the client. Called from master-process2538 void send_best_reader(GET_READER_STAT *grs)2539 {2540 //cs_debug_mask(D_TRACE, "got request for best reader for %04X/%04X/%04X", grs->caid, grs->prid, grs->srvid);2541 int best_reader[CS_MAXREADER];2542 get_best_reader(grs, best_reader);2543 //cs_debug_mask(D_TRACE, "sending best reader %d", ridx);2544 write_to_pipe(client[grs->cidx].fd_m2c, PIP_ID_BES, (uchar*)&best_reader, sizeof(best_reader));2545 }2546 2547 2518 void send_clear_reader_stat(int ridx) 2548 2519 { … … 2575 2546 restart_clients(); 2576 2547 break; 2577 case PIP_ID_STA: //Add reader statistics2578 add_reader_stat((ADD_READER_STAT *)ptr);2579 break;2580 case PIP_ID_BES: //Get best reader2581 send_best_reader((GET_READER_STAT *)ptr);2582 break;2583 2548 case PIP_ID_RES: //Reset reader statistics 2584 2549 clear_reader_stat(*(int*)ptr);
Note:
See TracChangeset
for help on using the changeset viewer.