Changeset 1617
- Timestamp:
- 02/19/10 16:33:35 (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-monitor.c
r1588 r1617 233 233 } 234 234 235 staticint cs_idx2ridx(int idx)235 int cs_idx2ridx(int idx) 236 236 { 237 237 int i; … … 258 258 } 259 259 260 static char *monitor_get_proto(int idx) 261 { 262 int i; 263 char *ctyp; 264 switch(client[idx].typ) 265 { 266 case 's': ctyp="server" ; break; 267 case 'n': ctyp="resolver" ; break; 268 case 'l': ctyp="logger" ; break; 269 case 'p': 270 case 'r': if ((i=cs_idx2ridx(idx))<0) // should never happen 271 ctyp=(client[idx].typ=='p') ? "proxy" : "reader"; 272 else 273 { 274 switch(reader[i].typ) // TODO like ph 275 { 276 case R_MOUSE : ctyp="mouse"; break; 277 case R_INTERNAL: ctyp="intern"; break; 278 case R_SMART : ctyp="smartreader"; break; 279 case R_CAMD35 : ctyp="camd 3.5x";break; 280 case R_CAMD33 : ctyp="camd 3.3x";break; 281 case R_CCCAM : ctyp="cccam"; break; 282 case R_NEWCAMD : ctyp="newcamd"; break; 283 case R_RADEGAST: ctyp="radegast"; break; 284 case R_SERIAL : ctyp="serial"; break; 285 case R_GBOX : ctyp="gbox"; break; 286 default : ctyp="unknown"; break; 287 } 288 } 289 break; 290 default : ctyp=ph[client[idx].ctyp].desc; 291 } 292 return(ctyp); 260 char *monitor_get_proto(int idx) 261 { 262 int i; 263 char *ctyp; 264 switch(client[idx].typ) { 265 case 's' : ctyp = "server" ; break; 266 case 'n' : ctyp = "resolver" ; break; 267 case 'l' : ctyp = "logger" ; break; 268 case 'p' : 269 case 'r' : 270 if ((i = cs_idx2ridx(idx)) < 0) // should never happen 271 ctyp = (client[idx].typ == 'p') ? "proxy" : "reader"; 272 else { 273 switch(reader[i].typ) { /* TODO like ph*/ 274 case R_MOUSE : ctyp = "mouse"; break; 275 case R_INTERNAL : ctyp = "intern"; break; 276 case R_SMART : ctyp = "smartreader"; break; 277 case R_CAMD35 : ctyp = "camd 3.5x"; break; 278 case R_CAMD33 : ctyp = "camd 3.3x"; break; 279 case R_NEWCAMD : ctyp = "newcamd"; break; 280 case R_RADEGAST : ctyp = "radegast"; break; 281 case R_SERIAL : ctyp = "serial"; break; 282 #ifdef CS_WITH_GBOX 283 case R_GBOX : ctyp = "gbox"; break; 284 #endif 285 #ifdef HAVE_PCSC 286 case R_PCSC : ctyp = "pcsc"; break; 287 #endif 288 case R_CCCAM : ctyp = "cccam"; break; 289 case R_CS378X : ctyp = "cs378x"; break; 290 case R_DB2COM1 : ctyp = "dbox COM1"; break; 291 case R_DB2COM2 : ctyp = "dbox COM2"; break; 292 default : ctyp = "unknown"; break; 293 } 294 } 295 break; 296 default : ctyp = ph[client[idx].ctyp].desc; 297 } 298 return(ctyp); 293 299 } 294 300 … … 307 313 308 314 if ((cfg->mon_hideclient_to <= 0) || 309 (((now-client[i].lastecm)/60)<cfg->mon_hideclient_to) ||310 315 (((now-client[i].lastemm)/60)<cfg->mon_hideclient_to) || 311 316 (client[i].typ!='c')) -
trunk/oscam-config.c
r1616 r1617 116 116 } 117 117 118 staticvoid chk_caidtab(char *caidasc, CAIDTAB *ctab)118 void chk_caidtab(char *caidasc, CAIDTAB *ctab) 119 119 { 120 120 int i; … … 142 142 } 143 143 144 staticvoid chk_tuntab(char *tunasc, TUNTAB *ttab)144 void chk_tuntab(char *tunasc, TUNTAB *ttab) 145 145 { 146 146 int i; … … 168 168 } 169 169 170 staticvoid chk_services(char *labels, ulong *sidok, ulong *sidno)170 void chk_services(char *labels, ulong *sidok, ulong *sidno) 171 171 { 172 172 int i; … … 182 182 } 183 183 184 static 185 void chk_ftab(char *zFilterAsc, FTAB *ftab, const char *zType, const char *zName, 186 const char *zFiltName) 184 void chk_ftab(char *zFilterAsc, FTAB *ftab, const char *zType, const char *zName, const char *zFiltName) 187 185 { 188 186 int i,j; … … 226 224 } 227 225 228 staticvoid chk_cltab(char *classasc, CLASSTAB *clstab)226 void chk_cltab(char *classasc, CLASSTAB *clstab) 229 227 { 230 228 int i; … … 240 238 } 241 239 242 staticvoid chk_port_tab(char *portasc, PTAB *ptab)240 void chk_port_tab(char *portasc, PTAB *ptab) 243 241 { 244 242 int i,j,nfilts,ifilt,iport; … … 298 296 #endif 299 297 300 staticvoid chk_t_global(char *token, char *value)298 void chk_t_global(char *token, char *value) 301 299 { 302 300 if (!strcmp(token, "serverip")) { cfg->srvip=inet_addr(value); return; } … … 390 388 391 389 #ifdef CS_ANTICASC 392 staticvoid chk_t_ac(char *token, char *value)390 void chk_t_ac(char *token, char *value) 393 391 { 394 392 if (!strcmp(token, "enabled")) … … 449 447 #endif 450 448 451 staticvoid chk_t_monitor(char *token, char *value)449 void chk_t_monitor(char *token, char *value) 452 450 { 453 451 if (!strcmp(token, "port")) { cfg->mon_port=atoi(value); return; } … … 461 459 } 462 460 463 staticvoid chk_t_camd33(char *token, char *value)461 void chk_t_camd33(char *token, char *value) 464 462 { 465 463 if (!strcmp(token, "port")) { cfg->c33_port=atoi(value); return; } … … 481 479 } 482 480 483 staticvoid chk_t_camd35(char *token, char *value)481 void chk_t_camd35(char *token, char *value) 484 482 { 485 483 if (!strcmp(token, "port")) { cfg->c35_port=atoi(value); return; } … … 490 488 } 491 489 492 staticvoid chk_t_camd35_tcp(char *token, char *value)490 void chk_t_camd35_tcp(char *token, char *value) 493 491 { 494 492 if (!strcmp(token, "port")) { chk_port_tab(value, &cfg->c35_tcp_ptab); return; } … … 499 497 } 500 498 501 staticvoid chk_t_newcamd(char *token, char *value)499 void chk_t_newcamd(char *token, char *value) 502 500 { 503 501 if (!strcmp(token, "port")) { chk_port_tab(value, &cfg->ncd_ptab); return; } … … 522 520 } 523 521 524 staticvoid chk_t_cccam(char *token, char *value)522 void chk_t_cccam(char *token, char *value) 525 523 { 526 524 if (!strcmp(token, "port")) { cfg->cc_port=atoi(value); return; } … … 549 547 } 550 548 551 staticvoid chk_t_radegast(char *token, char *value)549 void chk_t_radegast(char *token, char *value) 552 550 { 553 551 if (!strcmp(token, "port")) { cfg->rad_port=atoi(value); return; } … … 559 557 } 560 558 561 staticvoid chk_t_serial(char *token, char *value)559 void chk_t_serial(char *token, char *value) 562 560 { 563 561 if (!strcmp(token, "device")) … … 600 598 601 599 #ifdef HAVE_DVBAPI 602 staticvoid chk_t_dvbapi(char *token, char *value)600 void chk_t_dvbapi(char *token, char *value) 603 601 { 604 602 if (!strcmp(token, "enabled")) { cfg->dvbapi_enabled=atoi(value); return; } … … 803 801 } 804 802 805 staticvoid chk_account(char *token, char *value, struct s_auth *account)803 void chk_account(char *token, char *value, struct s_auth *account) 806 804 { 807 805 int i; … … 1036 1034 } 1037 1035 1038 staticvoid chk_sidtab(char *token, char *value, struct s_sidtab *sidtab)1036 void chk_sidtab(char *token, char *value, struct s_sidtab *sidtab) 1039 1037 { 1040 1038 if (!strcmp(token, "caid")) { chk_entry4sidtab(value, sidtab, 0); return; } -
trunk/oscam-log.c
r1490 r1617 152 152 // get_log_header(flag, sbuf); 153 153 // memcpy(txt, sbuf, 11); 154 155 156 time(&t); 157 lt=localtime(&t); 158 sprintf(buf, "[LOG000]%4d/%02d/%02d %2d:%02d:%02d %s\n", 159 lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday, 160 lt->tm_hour, lt->tm_min, lt->tm_sec, txt); 154 161 155 162 if (use_syslog && !use_ac_log) // system-logfile … … 374 381 cwps=0; 375 382 376 fprintf(fps, "%02d.%02d.%02d %02d:%02d:%02d %3.1f %s %s %d %d %d %d %d %d %d %ld %ld %s \n",383 fprintf(fps, "%02d.%02d.%02d %02d:%02d:%02d %3.1f %s %s %d %d %d %d %d %d %d %ld %ld %s %04X:%04X\n", 377 384 lt->tm_mday, lt->tm_mon+1, lt->tm_year%100, 378 385 lt->tm_hour, lt->tm_min, lt->tm_sec, cwps, … … 381 388 client[idx].cwfound, client[idx].cwcache, client[idx].cwnot, client[idx].cwignored, 382 389 client[idx].cwtout, client[idx].cwtun, client[idx].login, client[idx].last, 383 ph[client[idx].ctyp].desc );390 ph[client[idx].ctyp].desc,client[idx].last_caid,client[idx].last_srvid); 384 391 fflush(fps); 385 392 } -
trunk/oscam.c
r1616 r1617 139 139 fprintf(stderr, "\t-d <level> : debug level mask\n"); 140 140 fprintf(stderr, "\t 0 = no debugging (default)\n"); 141 fprintf(stderr, "\t 1 = detailed error messages\n"); 141 142 fprintf(stderr, "\t 2 = ATR parsing info, ECM, EMM and CW dumps\n"); 142 143 fprintf(stderr, "\t 4 = traffic from/to the reader\n"); … … 339 340 } 340 341 341 staticvoid cs_reinit_clients()342 void cs_reinit_clients() 342 343 { 343 344 int i; … … 1452 1453 { 1453 1454 /* no global macro for cardserver name :( */ 1454 fprintf(pfCWL, "# OSCam cardserver v%s - http://streamboard.gmc.to:8001/ oscam/wiki\n", CS_VERSION_X);1455 fprintf(pfCWL, "# OSCam cardserver v%s - http://streamboard.gmc.to:8001/wiki\n", CS_VERSION_X); 1455 1456 fprintf(pfCWL, "# control word log file for use with tsdec offline decrypter\n"); 1456 1457 strftime(buf,sizeof(buf),"DATE %Y-%m-%d, TIME %H:%M:%S, TZ %Z\n",timeinfo); … … 2064 2065 if ((!reader[au].fd) || // reader has no fd 2065 2066 (reader[au].caid[0]!=b2i(2,ep->caid)) || // wrong caid 2066 (memcmp(reader[au].hexserial, ep->hexserial, 8))) // wrong serial2067 (memcmp(reader[au].hexserial, ep->hexserial, 8))) {// wrong serial 2067 2068 return; 2069 } 2068 2070 2069 2071 ep->cidx=cs_idx;
Note:
See TracChangeset
for help on using the changeset viewer.