- Timestamp:
- 03/29/10 14:03:37 (14 years ago)
- Location:
- branches/modular
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/modular/config.sh
r1916 r1919 14 14 15 15 addons="WEBIF HAVE_DVBAPI IRDETO_GUESSING" 16 protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_RADEGAST MODULE_ MONITOR"17 readers=" READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE"16 protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_RADEGAST MODULE_SERIAL MODULE_MONITOR" 17 readers="WITH_CARDREADER READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE" 18 18 19 19 check_test() { 20 if [ "$(cat $configfile | grep "^#define $1 ")" != "" ]; then20 if [ "$(cat $configfile | grep "^#define $1$")" != "" ]; then 21 21 echo "on" 22 22 else … … 27 27 disable_all() { 28 28 for i in $1; do 29 sed "s/^#define ${i}/\/\/#define ${i}/g" $configfile > $configfile.new 30 mv $configfile.new $configfile 29 sed -i "s/^#define ${i}$/\/\/#define ${i}/g" $configfile 31 30 done 32 31 … … 36 35 for i in $(cat $tempfile); do 37 36 strip=$(echo $i | sed "s/\"//g") 38 sed "s/\/\/#define ${strip}/#define ${strip}/g" $configfile > $configfile.new 39 mv $configfile.new $configfile 37 sed -i "s/\/\/#define ${strip}$/#define ${strip}/g" $configfile 40 38 done 41 39 } … … 82 80 MODULE_CCCAM "CCCam" $(check_test "MODULE_CCCAM") \ 83 81 MODULE_RADEGAST "Radegast" $(check_test "MODULE_RADEGAST") \ 82 MODULE_SERIAL "Serial" $(check_test "MODULE_SERIAL") \ 84 83 MODULE_MONITOR "Monitor" $(check_test "MODULE_MONITOR") \ 85 84 2> ${tempfile} … … 107 106 if [ $opt != 0 ]; then return; fi 108 107 108 menuitem=`cat $tempfile` 109 if [ "$menuitem" != "" ]; then 110 echo -n " \"WITH_CARDREADER\"" >> ${tempfile} 111 fi 109 112 disable_all "$readers" 110 113 enable_package -
branches/modular/module-camd35.c
r1916 r1919 473 473 static int camd35_send_emm(EMM_PACKET *ep) 474 474 { 475 476 uchar buf[400]; 477 if (!client[cs_idx].udp_sa.sin_addr.s_addr) // once resolved at least 478 return(-1); 479 480 if (!is_udp && !tcp_connect()) return(-1); 481 482 memset(buf, 0, 20); 483 memset(buf+20, 0xff, ep->l+15); 484 485 buf[0]=0x06; 486 buf[1]=ep->l; 487 memcpy(buf+10, ep->caid, 2); 488 memcpy(buf+12, ep->provid, 4); 489 memcpy(buf+20, ep->emm, ep->l); 490 491 return((camd35_send(buf)<1) ? (-1) : 0); 475 uchar buf[512]; 476 if (!client[cs_idx].udp_sa.sin_addr.s_addr) // once resolved at least 477 return(-1); 478 479 if (!is_udp && !tcp_connect()) return(-1); 480 481 memset(buf, 0, 20); 482 memset(buf+20, 0xff, ep->l+15); 483 484 buf[0]=0x06; 485 buf[1]=ep->l; 486 memcpy(buf+10, ep->caid, 2); 487 memcpy(buf+12, ep->provid, 4); 488 memcpy(buf+20, ep->emm, ep->l); 489 490 return((camd35_send(buf)<1) ? (-1) : 0); 492 491 } 493 492 -
branches/modular/module-dvbapi.c
r1917 r1919 460 460 461 461 void dvbapi_process_emm (int demux_index, unsigned char *buffer, unsigned int len) { 462 int i;463 462 EMM_PACKET epg; 464 463 … … 763 762 // QboxHD pmt.tmp is the full capmt written as a string of hex values 764 763 // pmt.tmp must be longer than 3 bytes (6 hex chars) and even length 765 if ((len<6) || ((len%2) != 0) ) {764 if ((len<6) || ((len%2) != 0) || ((len/2)>sizeof(dest))) { 766 765 cs_log("dvbapi: error parsing QboxHD pmt.tmp, incorrect length"); 767 766 return; … … 779 778 pmt_id = dvbapi_parse_capmt(dest+4, (len/2)-4, -1); 780 779 #else 780 if (len>sizeof(dest)) return; 781 781 cs_ddump(mbuf,len,"pmt:"); 782 782
Note:
See TracChangeset
for help on using the changeset viewer.