Changeset 3761 for trunk/oscam-reader.c
- Timestamp:
- 10/29/10 09:27:25 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-reader.c
r3712 r3761 60 60 { 61 61 int i; 62 struct s_client *cl = cur_client();62 struct s_client *cl = reader->client; 63 63 for (i=1; i<CS_MAXPENDING; i++) 64 64 { … … 136 136 { 137 137 int result = 0; 138 struct s_client *cl = cur_client();138 struct s_client *cl = rdr->client; 139 139 140 140 pthread_mutex_lock(&gethostbyname_lock); … … 273 273 void network_tcp_connection_close(struct s_reader * reader, int fd) 274 274 { 275 struct s_client *cl = cur_client();275 struct s_client *cl = reader->client; 276 276 cs_debug("tcp_conn_close(): fd=%d, cl->typ == 'c'=%d", fd, cl->typ == 'c'); 277 277 if (fd) … … 316 316 ushort caid, srvid; 317 317 ulong provid; 318 struct s_client *cl = cur_client();318 struct s_client *cl = reader->client; 319 319 320 320 idx=reader->ph.c_recv_log(&caid, &provid, &srvid); … … 380 380 int w; 381 381 struct timeb tps, tpe; 382 struct s_client *cl = cur_client();382 struct s_client *cl = reader->client; 383 383 tpe=cl->ecmtask[n].tps; 384 384 //tpe.millitm+=1500; // TODO: timeout of 1500 should be config … … 404 404 int rc, n, i, sflag; 405 405 time_t t;//, tls; 406 struct s_client *cl = cur_client();406 struct s_client *cl = reader->client; 407 407 408 408 uchar buf[512]; … … 511 511 if (reader->typ & R_IS_CASCADING) 512 512 { 513 cur_client()->last_srvid=er->srvid; 514 cur_client()->last_caid=er->caid; 513 struct s_client *cl = reader->client; 514 cl->last_srvid=er->srvid; 515 cl->last_caid=er->caid; 515 516 casc_process_ecm(reader, er); 516 517 return; … … 570 571 char *typedesc[]= { "unknown", "unique", "shared", "global" }; 571 572 struct timeb tps, tpe; 572 struct s_client *cl = cur_client();573 struct s_client *cl = reader->client; 573 574 574 575 cs_ftime(&tps); … … 757 758 { 758 759 uchar *ptr; 759 int pipeCmd = read_from_pipe( cur_client()->fd_m2c_c, &ptr, 0);760 int pipeCmd = read_from_pipe(reader->client->fd_m2c_c, &ptr, 0); 760 761 761 762 switch(pipeCmd) … … 790 791 while (1) 791 792 { 792 switch(reader_listen(reader, reader->client->fd_m2c_c, cur_client()->pfd))793 switch(reader_listen(reader, reader->client->fd_m2c_c, reader->client->pfd)) 793 794 { 794 795 case 0: reader_do_idle(reader); break;
Note:
See TracChangeset
for help on using the changeset viewer.