Changeset 7933 for trunk/module-newcamd.c
- Timestamp:
- 11/15/12 15:55:12 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-newcamd.c
r7906 r7933 1028 1028 // save client ncd_msgid 1029 1029 er->msgid = cl->ncd_msgid; 1030 er-> l=buf[4]+3;1031 cs_debug_mask(D_CLIENT, "ncd_process_ecm: er->msgid=%d len=%d ecmlen=%d", er->msgid, len, er-> l);1030 er->ecmlen = buf[4]+3; 1031 cs_debug_mask(D_CLIENT, "ncd_process_ecm: er->msgid=%d len=%d ecmlen=%d", er->msgid, len, er->ecmlen); 1032 1032 er->srvid = cl->ncd_header[4]<<8 | cl->ncd_header[5]; 1033 1033 er->caid = cl->ncd_header[6]<<8 | cl->ncd_header[7]; … … 1038 1038 er->caid=cfg.ncd_ptab.ports[pi].ftab.filts[0].caid; 1039 1039 } 1040 memcpy(er->ecm, buf+2, er-> l);1040 memcpy(er->ecm, buf+2, er->ecmlen); 1041 1041 get_cw(cl, er); 1042 1042 } … … 1051 1051 memset(&epg, 0, sizeof(epg)); 1052 1052 1053 epg. l=buf[2]+3;1053 epg.emmlen = buf[2]+3; 1054 1054 caid = cl->ftab.filts[0].caid; 1055 1055 epg.caid[0] = (uchar)(caid>>8); … … 1083 1083 else*/ 1084 1084 1085 memcpy(epg.emm, buf, epg. l);1085 memcpy(epg.emm, buf, epg.emmlen); 1086 1086 if( ok ) 1087 1087 do_emm(cl, &epg); … … 1292 1292 return(-1); 1293 1293 1294 memcpy(buf, er->ecm, er-> l);1294 memcpy(buf, er->ecm, er->ecmlen); 1295 1295 1296 1296 client->ncd_header[4] = er->srvid >> 8; … … 1302 1302 client->ncd_header[10] = er->prid & 0xFF; 1303 1303 1304 return((newcamd_send(buf, er-> l, er->srvid)<1) ? (-1) : 0);1304 return((newcamd_send(buf, er->ecmlen, er->srvid)<1) ? (-1) : 0); 1305 1305 } 1306 1306 … … 1308 1308 static int32_t newcamd_send_emm(EMM_PACKET *ep) 1309 1309 { 1310 uchar buf[ep-> l];1310 uchar buf[ep->emmlen]; 1311 1311 1312 1312 if(!newcamd_connect()) 1313 1313 return (-1); 1314 1314 1315 memcpy(buf, ep->emm, ep-> l);1316 return((newcamd_send(buf, ep-> l, 0)<1) ? 0 : 1);1315 memcpy(buf, ep->emm, ep->emmlen); 1316 return((newcamd_send(buf, ep->emmlen, 0)<1) ? 0 : 1); 1317 1317 } 1318 1318
Note:
See TracChangeset
for help on using the changeset viewer.