Changeset 3551
- Timestamp:
- 10/16/10 10:28:15 (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r3546 r3551 686 686 int deleted; // if this flag is set the reader is not shown in webif and becomes not writte to oscam.server 687 687 int smargopatch; 688 int pid;689 688 struct s_client * client; //pointer to 'r'client this reader is running in 690 689 int enable; -
trunk/module-stat.c
r3409 r3551 327 327 int i; 328 328 for (i = 0; i < CS_MAXREADER; i++) { 329 if (reader_stat[i] && reader[i]. pid && reader[i].client) {329 if (reader_stat[i] && reader[i].client) { 330 330 READER_STAT *stat = get_stat(i, caid, prid, srvid); 331 331 if (stat) { -
trunk/oscam-reader.c
r3546 r3551 765 765 pthread_setspecific(getclient, reader->client); 766 766 reader->client->cs_ptyp=D_READER; 767 strcpy(reader->client->usr, first_client->usr); 767 768 768 769 if (reader->typ & R_IS_CASCADING) … … 771 772 reader->client->port=reader->r_port; 772 773 strcpy(reader->client->usr, reader->r_usr); 774 cs_log("proxy thread started (thread=%9lX, server=%s)",pthread_self(), reader->device); 773 775 774 776 if (!(reader->ph.c_init)) { … … 792 794 { 793 795 reader->client->ip=cs_inet_addr("127.0.0.1"); 794 if (reader->typ != R_SC8in1) 796 if (reader->typ != R_SC8in1) { 797 cs_log("reader thread started (thread=%9lX, device=%s, detect=%s%s, mhz=%d, cardmhz=%d)", pthread_self(), 798 reader->device, reader->detect&0x80 ? "!" : "",RDR_CD_TXT[reader->detect&0x7f], reader->mhz,reader->cardmhz); 795 799 while (reader_device_init(reader)==2) 796 800 cs_sleepms(60000); // wait 60 secs and try again 801 } 802 else { 803 cs_log("reader thread started (thread=%9lX, device=%s:%i, detect=%s%s, mhz=%d, cardmhz=%d)", pthread_self(), 804 reader->device, reader->slot,reader->detect&0x80 ? "!" : "", RDR_CD_TXT[reader->detect&0x7f], reader->mhz,reader->cardmhz); 805 } 797 806 } 798 807 -
trunk/oscam.c
r3550 r3551 913 913 cl->sidtabno=reader[reader_idx].sidtabno; 914 914 915 reader[reader_idx].pid=getpid();916 917 915 reader[reader_idx].client=cl; 918 916 … … 926 924 pthread_detach(cl->thread); 927 925 pthread_attr_destroy(&attr); 928 929 if (reader[reader_idx].r_port)930 cs_log("proxy thread started (pid=%d, server=%s)",reader[reader_idx].pid, reader[reader_idx].device);931 else {932 switch(reader[reader_idx].typ) {933 case R_MOUSE:934 case R_SMART:935 cs_log("reader thread started (pid=%d, device=%s, detect=%s%s, mhz=%d, cardmhz=%d)",reader[reader_idx].pid,936 reader[reader_idx].device,reader[reader_idx].detect&0x80 ? "!" : "",RDR_CD_TXT[reader[reader_idx].detect&0x7f],937 reader[reader_idx].mhz,reader[reader_idx].cardmhz);938 break;939 case R_SC8in1:940 cs_log("reader thread started (pid=%d, device=%s:%i, detect=%s%s, mhz=%d, cardmhz=%d)",reader[reader_idx].pid,941 reader[reader_idx].device,reader[reader_idx].slot,reader[reader_idx].detect&0x80 ? "!" : "",942 RDR_CD_TXT[reader[reader_idx].detect&0x7f],reader[reader_idx].mhz,reader[reader_idx].cardmhz);943 break;944 default:945 cs_log("reader thread started (pid=%d, device=%s)",reader[reader_idx].pid, reader[reader_idx].device);946 }947 strcpy(cl->usr, first_client->usr);948 }949 926 } 950 927 }
Note:
See TracChangeset
for help on using the changeset viewer.