Changeset 405
- Timestamp:
- 09/04/09 16:17:34 (15 years ago)
- Location:
- branches/merlin
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/merlin/include/oscam.h
r397 r405 17 17 int oscam_write_ecm_request(int, ECM_REQUEST *); 18 18 int oscam_write_ecm_answer(int, ECM_REQUEST *); 19 void oscam_log_emm_request(int);20 void oscam_get_cw(ECM_REQUEST *);21 void oscam_do_emm(EMM_PACKET *);22 19 ECM_REQUEST *oscam_get_ecmtask(); 23 20 void oscam_request_cw(ECM_REQUEST *, int, int); … … 26 23 void oscam_set_signal_handler(int, int, void (*)(int)); 27 24 void oscam_set_priority(int); 28 void oscam_log_config();29 25 struct timeval *oscam_chk_pending(struct timeb tp_ctimeout); 30 void oscam_store_logentry(char *);31 26 void oscam_resolve(); 32 27 28 void oscam_process_ecm(ECM_REQUEST *); 29 void oscam_process_emm(EMM_PACKET *); 30 31 void oscam_log_emm_request(int); 32 void oscam_log_config(); 33 void oscam_store_logentry(char *); 34 33 35 #endif // __OSCAM_H__ -
branches/merlin/src/oscam.c
r403 r405 1653 1653 } 1654 1654 1655 void oscam_ get_cw(ECM_REQUEST * er)1655 void oscam_process_ecm(ECM_REQUEST * er) 1656 1656 { 1657 1657 int i, j, m, rejected; … … 1811 1811 } 1812 1812 1813 void oscam_ do_emm(EMM_PACKET * ep)1813 void oscam_process_emm(EMM_PACKET * ep) 1814 1814 { 1815 1815 int au; //, ephs; -
branches/merlin/src/sharing/camd33.c
r400 r405 198 198 er->caid = b2i(2, buf + 1); 199 199 memcpy(er->ecm, buf + 7, er->l); 200 oscam_ get_cw(er);200 oscam_process_ecm(er); 201 201 } 202 202 … … 208 208 memcpy(epg.hexserial, buf + 3, 4); 209 209 memcpy(epg.emm, buf + 7, epg.l); 210 oscam_ do_emm(&epg);210 oscam_process_emm(&epg); 211 211 } 212 212 -
branches/merlin/src/sharing/camd35.c
r401 r405 259 259 er->pid = b2i(2, buf + 16); 260 260 memcpy(er->ecm, buf + 20, er->l); 261 oscam_ get_cw(er);261 oscam_process_ecm(er); 262 262 } 263 263 … … 275 275 memcpy(epg.hexserial, reader[au].hexserial, 8); // dummy 276 276 memcpy(epg.emm, buf + 20, epg.l); 277 oscam_ do_emm(&epg);277 oscam_process_emm(&epg); 278 278 } 279 279 -
branches/merlin/src/sharing/newcamd.c
r401 r405 889 889 er->caid = cfg->ncd_ptab.ports[pi].ftab.filts[0].caid; 890 890 memcpy(er->ecm, buf + 2, er->l); 891 oscam_ get_cw(er);891 oscam_process_ecm(er); 892 892 } 893 893 … … 932 932 memcpy(epg.emm, buf, epg.l); 933 933 if (ok) { 934 oscam_ do_emm(&epg);934 oscam_process_emm(&epg); 935 935 } 936 936 } -
branches/merlin/src/sharing/radegast.c
r395 r405 118 118 log_normal("WARNING: ECM-request corrupt"); 119 119 } else { 120 oscam_ get_cw(er);120 oscam_process_ecm(er); 121 121 } 122 122 } -
branches/merlin/src/sharing/serial.c
r401 r405 129 129 } 130 130 if ((!is_server) && (sharing_serial_proto == P_AUTO)) 131 return (0);131 return 0; 132 132 133 133 switch (sharing_serial_proto) // set the defaults … … 161 161 *dummy++ = '\0'; 162 162 if ((is_server) && (!usr[0])) 163 return (0);163 return 0; 164 164 } else { 165 165 if (is_server) 166 return (0); // user needed in server-mode166 return 0; // user needed in server-mode 167 167 dev = usr; 168 168 } … … 246 246 msec = 1000 * (tpe.time - tpc.time) + tpe.millitm - tpc.millitm; 247 247 if (msec < 0) 248 return (0);248 return 0; 249 249 pfds.fd = pfd; 250 250 pfds.events = event; 251 251 pfds.revents = 0; 252 252 if (poll(&pfds, 1, msec) != 1) 253 return (0);253 return 0; 254 254 else 255 255 return (((pfds.revents) & event) == event); … … 275 275 276 276 if (!pfd) 277 return (0);277 return 0; 278 278 cs_ftime(&tps); 279 279 tpe = tps; … … 297 297 n = l - *c; 298 298 if (n <= 0) 299 return (0);299 return 0; 300 300 for (i = 0; (i < n) && (sharing_serial_poll(POLLIN)); i++) 301 301 if (read(pfd, buf + *c, 1) < 1) 302 return (0);302 return 0; 303 303 else 304 304 (*c)++; … … 772 772 if (l < 16) { 773 773 log_normal(incomplete, l); 774 return (1);774 return 1; 775 775 } 776 776 … … 809 809 if (cs_atob(er->ecm, (char *) buf + 13, er->l) < 0) { 810 810 log_normal("illegal characters in ecm-request"); 811 return (1);811 return 1; 812 812 } 813 813 if (dsr9500type == P_DSR_WITHSID) { … … 831 831 if ((er->l != l - 5) || (er->l > 257)) { 832 832 log_normal(incomplete, l); 833 return (1);833 return 1; 834 834 } 835 835 memcpy(er->ecm, buf + 5, er->l); … … 841 841 break; 842 842 } 843 return (0); 843 844 return 0; 844 845 } 845 846 … … 859 860 } 860 861 861 oscam_ get_cw(er);862 oscam_process_ecm(er); 862 863 } 863 864
Note:
See TracChangeset
for help on using the changeset viewer.