Changeset 157
- Timestamp:
- 08/05/09 13:04:20 (15 years ago)
- Location:
- branches/merlin/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/merlin/src/ac.c
r151 r157 118 118 cs_debug("WARNING: CAID %04X, PROVID %06X, SID %04X, CHID %04X not found in oscam.ac", er->caid, er->prid, er->srvid, er->chid); 119 119 cs_debug("set DW lifetime 10 sec"); 120 return 16; 120 return 16; // 10*100/60 121 121 } 122 122 -
branches/merlin/src/monitor.c
r151 r157 84 84 if (!client[idx].udp_fd) 85 85 return (-1); 86 usleep(500L); 86 usleep(500L); // avoid lost udp-pakets .. 87 87 if (!client[idx].crypted) 88 88 return (sendto(client[idx].udp_fd, txt, strlen(txt), 0, (struct sockaddr *) &client[idx].udp_sa, sizeof (client[idx].udp_sa))); -
branches/merlin/src/oscam.c
r151 r157 921 921 } 922 922 #endif 923 sleep(1); 923 sleep(1); // wait for reader 924 924 while (1) { 925 925 if (master_pid != getppid()) … … 1150 1150 1151 1151 ptr = (char *) (loghist + (*loghistidx * CS_LOGHISTSIZE)); 1152 ptr[0] = '\1'; 1152 ptr[0] = '\1'; // make username unusable 1153 1153 ptr[1] = '\0'; 1154 1154 if ((client[cs_idx].typ == 'c') || (client[cs_idx].typ == 'm')) … … 1330 1330 fflush(pfCWL); 1331 1331 fclose(pfCWL); 1332 } 1332 } /* if (cfg->pidfile[0]) */ 1333 1333 } 1334 1334 … … 1483 1483 ert = &ecmtask[er->cpti]; 1484 1484 if (ert->rc < 100) 1485 return; 1485 return; // already done 1486 1486 if ((er->caid != ert->caid) || memcmp(er->ecm, ert->ecm, sizeof (er->ecm))) 1487 return; 1487 return; // obsolete 1488 1488 ert->rcEx = er->rcEx; 1489 if (er->rc > 0) 1489 if (er->rc > 0) // found 1490 1490 { 1491 1491 ert->rc = (er->rc == 2) ? 2 : 0; … … 1494 1494 memcpy(ert->cw, er->cw, sizeof (er->cw)); 1495 1495 ert->gbxCWFrom = er->gbxCWFrom; 1496 } else 1496 } else // not found (from ONE of the readers !) 1497 1497 { 1498 1498 int i; … … 1597 1597 */ 1598 1598 1599 if (!er->caid) 1599 if (!er->caid) // guess by len .. 1600 1600 er->caid = len4caid[er->ecm[2] + 3]; 1601 1601 … … 2158 2158 cs_log("Init for all local cards done !"); 2159 2159 } 2160 2161 2160 #ifdef CS_ANTICASC 2162 2161 if (!cfg->ac_enabled) -
branches/merlin/src/reader.c
r151 r157 117 117 client[cs_idx].last = time((time_t) 0); 118 118 if (idx < 0) 119 return; 119 return; // no dcw-msg received 120 120 121 121 for (i = 1; i < CS_MAXPENDING; i++) { … … 147 147 idx = reader[ridx].ph.c_recv_chk(dcw, &rc, buf, n); 148 148 if (idx < 0) 149 return; 149 return; // no dcw received 150 150 reader[ridx].last_g = time((time_t *) 0); // for reconnect timeout 151 151 //cs_log("casc_do_sock: last_s=%d, last_g=%d", reader[ridx].last_s, reader[ridx].last_g); -
branches/merlin/src/simples.c
r152 r157 141 141 } 142 142 143 int key_atob14(char *asc, uchar * bin)143 int key_atob14(char *asc, uchar * bin) 144 144 { 145 145 int i, n1, n2, rc; … … 155 155 } 156 156 157 char *key_btoa(char *asc, uchar * bin)157 char *key_btoa(char *asc, uchar * bin) 158 158 { 159 159 int i; //, n1, n2, rc; … … 167 167 } 168 168 169 char *cs_hexdump(int m, uchar * buf, int n)169 char *cs_hexdump(int m, uchar * buf, int n) 170 170 { 171 171 int i; … … 199 199 { 200 200 struct in_addr in; 201 201 202 in.s_addr = cs_inet_order(n); 202 203 return ((char *) inet_ntoa(in)); … … 220 221 } 221 222 222 ulong b2i(int n, uchar * b)223 ulong b2i(int n, uchar * b) 223 224 { 224 225 switch (n) { … … 232 233 } 233 234 234 ullong b2ll(int n, uchar * b)235 ullong b2ll(int n, uchar * b) 235 236 { 236 237 int i;
Note:
See TracChangeset
for help on using the changeset viewer.