Changeset 9961
- Timestamp:
- 10/26/14 18:23:59 (9 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cacheex.c
r9958 r9961 325 325 && (!checkECMD5(er) || chk_ident_filter(er->caid, er->prid, &cl->reader->ftab)) //Ident-check (not for csp: prid=0 always!) 326 326 && chk_srvid(cl, er) //Service-check 327 && chk_csp_ctab(er, &cl->reader->cacheex.filter_caidtab) //cacheex_ecm_filter -> for compatibility with old oscam328 327 ) 329 328 { return 1; } … … 334 333 && (!checkECMD5(er) || chk_ident_filter(er->caid, er->prid, &cl->ftab)) //Ident-check (not for csp: prid=0 always!) 335 334 && chk_srvid(cl, er) //Service-check 336 && chk_csp_ctab(er, &cl->account->cacheex.filter_caidtab) //cacheex_ecm_filter -> for compatibility with old oscam337 335 ) 338 336 { return 1; } -
trunk/module-camd35.c
r9958 r9961 211 211 if(buf[0] == 0) 212 212 { buflen = (((buf[21] & 0x0f) << 8) | buf[22]) + 3; } 213 else if(buf[0] == 0x3 c || buf[0] == 0x3d || buf[0] == 0x3e || buf[0] == 0x3f) //cacheex-push213 else if(buf[0] == 0x3d || buf[0] == 0x3e || buf[0] == 0x3f) //cacheex-push 214 214 { buflen = buf[1] | (buf[2] << 8); } 215 215 else … … 613 613 int i = 20, j; 614 614 CECSPVALUETAB *filter; 615 //m inimal size, keep it <= 512 for max UDP packet size without fragmentation616 uint8_t buf[20+ 482];615 //maximum size: 20+255 616 uint8_t buf[20+242]; 617 617 memset(buf, 0, sizeof(buf)); 618 618 buf[0] = 0x3c; 619 buf[1] = 0xe2; 620 buf[2] = 0x01; 619 buf[1] = 0xf2; 621 620 622 621 //mode==2 send filters from rdr … … 637 636 i += 2; 638 637 639 for(j=0; j< 30; j++)638 for(j=0; j<15; j++) 640 639 { 641 640 if(j<CS_MAXCAIDTAB) … … 646 645 } 647 646 648 for(j=0; j< 30&& j<CS_MAXCAIDTAB; j++)647 for(j=0; j<15 && j<CS_MAXCAIDTAB; j++) 649 648 { 650 649 if(j<CS_MAXCAIDTAB) … … 655 654 } 656 655 657 for(j=0; j< 30&& j<CS_MAXCAIDTAB; j++)656 for(j=0; j<15 && j<CS_MAXCAIDTAB; j++) 658 657 { 659 658 if(j<CS_MAXCAIDTAB) … … 664 663 } 665 664 666 for(j=0; j< 30&& j<CS_MAXCAIDTAB; j++)665 for(j=0; j<15 && j<CS_MAXCAIDTAB; j++) 667 666 { 668 667 if(j<CS_MAXCAIDTAB) … … 674 673 675 674 cs_debug_mask(D_CACHEEX, "cacheex: sending push filter request to %s", username(cl)); 676 camd35_send (cl, buf, 482); //send adds +20675 camd35_send_without_timeout(cl, buf, 242); //send adds +20 677 676 } 678 677 … … 703 702 filter->n = b2i(2, buf + i); 704 703 i += 2; 704 if(filter->n > CS_MAXCAIDTAB) 705 { 706 filter->n = CS_MAXCAIDTAB; 707 } 705 708 706 for(j=0; j< 30; j++)709 for(j=0; j<15; j++) 707 710 { 708 711 if(j<CS_MAXCAIDTAB) … … 713 716 } 714 717 715 for(j=0; j< 30&& j<CS_MAXCAIDTAB; j++)718 for(j=0; j<15 && j<CS_MAXCAIDTAB; j++) 716 719 { 717 720 if(j<CS_MAXCAIDTAB) … … 722 725 } 723 726 724 for(j=0; j< 30&& j<CS_MAXCAIDTAB; j++)727 for(j=0; j<15 && j<CS_MAXCAIDTAB; j++) 725 728 { 726 729 if(j<CS_MAXCAIDTAB) … … 731 734 } 732 735 733 for(j=0; j< 30&& j<CS_MAXCAIDTAB; j++)736 for(j=0; j<15 && j<CS_MAXCAIDTAB; j++) 734 737 { 735 738 if(j<CS_MAXCAIDTAB)
Note:
See TracChangeset
for help on using the changeset viewer.