Changeset 3412
- Timestamp:
- 10/08/10 12:35:47 (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r3411 r3412 1245 1245 extern int read_from_pipe(int, uchar **, int); 1246 1246 extern int write_ecm_request(int, ECM_REQUEST *); 1247 extern int write_ecm_answer(struct s_reader *, int,ECM_REQUEST *);1247 extern int write_ecm_answer(struct s_reader *, ECM_REQUEST *); 1248 1248 extern void log_emm_request(int); 1249 1249 extern ulong chk_provid(uchar *, ushort); -
trunk/module-cccam.c
r3409 r3412 894 894 cs_debug_mask(D_TRACE, "%s server not init! ccinit=%d pfd=%d", 895 895 getprefix(), cc ? 1 : 0, cl->pfd); 896 write_ecm_answer(rdr, client[0].fd_m2c,er);896 write_ecm_answer(rdr, er); 897 897 } 898 898 cc_cli_close(); … … 1116 1116 cur_er->rc = 0; 1117 1117 cur_er->rcEx = 0x27; 1118 write_ecm_answer(rdr, c lient[0].fd_m2c, cur_er);1118 write_ecm_answer(rdr, cur_er); 1119 1119 //cur_er->rc = 1; 1120 1120 //cur_er->rcEx = 0; -
trunk/module-constcw.c
r3403 r3412 122 122 123 123 //cs_sleepms(50); 124 write_ecm_answer(reader, client[0].fd_m2c,er);124 write_ecm_answer(reader, er); 125 125 126 126 client->last = t; -
trunk/oscam-reader.c
r3411 r3412 76 76 else 77 77 cur_client()->ecmtask[i].rc=0; 78 write_ecm_answer(reader, client[0].fd_m2c,&cur_client()->ecmtask[i]);78 write_ecm_answer(reader, &cur_client()->ecmtask[i]); 79 79 cur_client()->ecmtask[i].idx=0; 80 80 } … … 452 452 er->rcEx=E2_CAID; 453 453 er->rc=0; 454 write_ecm_answer(reader, client[0].fd_m2c,er);454 write_ecm_answer(reader, er); 455 455 return; 456 456 } … … 459 459 { 460 460 er->rc=2; 461 write_ecm_answer(reader, client[0].fd_m2c,er);461 write_ecm_answer(reader, er); 462 462 return; 463 463 } … … 498 498 for (clcw=0;clcw<16;clcw++) er->cw[clcw]=(uchar)0; 499 499 snprintf( er->msglog, MSGLOGSIZE, "ECMratelimit no space for srvid" ); 500 write_ecm_answer(reader, client[0].fd_m2c,er);500 write_ecm_answer(reader, er); 501 501 return; 502 502 } else { … … 509 509 er->msglog[0] = 0; 510 510 er->rc=reader_ecm(reader, er); 511 write_ecm_answer(reader, client[0].fd_m2c,er);511 write_ecm_answer(reader, er); 512 512 reader_post_process(reader); 513 513 #endif -
trunk/oscam.c
r3411 r3412 1427 1427 } 1428 1428 1429 int write_ecm_answer(struct s_reader * reader, int fd,ECM_REQUEST *er)1429 int write_ecm_answer(struct s_reader * reader, ECM_REQUEST *er) 1430 1430 { 1431 1431 int i; … … 1457 1457 } 1458 1458 1459 if( er->client && er->client->fd_m2c ) {1459 if( er->client && er->client->fd_m2c ) 1460 1460 //fixme 1461 fd=er->client->fd_m2c; 1462 } 1463 1464 return(write_ecm_request(fd, er)); 1461 return(write_ecm_request(er->client->fd_m2c, er)); 1462 else 1463 return(write_ecm_request(client[0].fd_m2c, er)); //does this ever happen? 1465 1464 } 1466 1465
Note:
See TracChangeset
for help on using the changeset viewer.