Changeset 1725
- Timestamp:
- 02/26/10 21:44:51 (11 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r1724 r1725 626 626 char *logfile; 627 627 int disablelog; 628 int disableuserfile; 628 629 int usrfileflag; 629 630 struct s_auth *account; … … 643 644 char http_tpl[128]; 644 645 char http_script[128]; 645 int http_refresh; 646 int http_hide_idle_clients; 647 struct s_ip *http_allowed; 646 int http_refresh; 647 int http_hide_idle_clients; 648 struct s_ip *http_allowed; 649 int http_readonly; 648 650 #endif 649 651 int c33_port; -
trunk/oscam-config.c
r1713 r1725 284 284 } 285 285 286 if (!strcmp(token, "disableuserfile")) { 287 if (strlen(value) == 0) { 288 cfg->disableuserfile = 0; 289 return; 290 } else { 291 cfg->disableuserfile = atoi(value); 292 return; 293 } 294 } 295 286 296 if (!strcmp(token, "serverip")) { 287 297 if (strlen(value) == 0) { … … 683 693 return; 684 694 } else { 685 cfg->http_hide_idle_clients =atoi(value);695 cfg->http_hide_idle_clients = atoi(value); 686 696 return; 687 697 } … … 694 704 } else { 695 705 chk_iprange(value, &cfg->http_allowed); 706 return; 707 } 708 } 709 710 if (!strcmp(token, "httpreadonly")) { 711 if(strlen(value) == 0) { 712 cfg->http_readonly = 0; 713 return; 714 } else { 715 cfg->http_readonly = atoi(value); 696 716 return; 697 717 } … … 1532 1552 if (cfg->cwlogdir != NULL) fprintf_conf(f, CONFVARWIDTH, "cwlogdir", "%s\n", cfg->cwlogdir); 1533 1553 fprintf_conf(f, CONFVARWIDTH, "disablelog", "%d\n", cfg->disablelog); 1554 fprintf_conf(f, CONFVARWIDTH, "disableuserfile", "%d\n", cfg->disableuserfile); 1534 1555 fprintf_conf(f, CONFVARWIDTH, "usrfileflag", "%d\n", cfg->usrfileflag); 1535 1556 fprintf_conf(f, CONFVARWIDTH, "clienttimeout", "%ld\n", cfg->ctimeout/1000); … … 1729 1750 fprintf_conf(f, CONFVARWIDTH, "httpscript", "%s\n", cfg->http_script); 1730 1751 fprintf_conf(f, CONFVARWIDTH, "httprefresh", "%d\n", cfg->http_refresh); 1731 fprintf_conf(f, CONFVARWIDTH, "httpallowed", "%d\n", cfg->http_allowed); 1752 fprintf_conf(f, CONFVARWIDTH, "httpallowed", ""); 1753 dot = ""; 1754 for (cip = cfg->http_allowed; cip; cip = cip->next){ 1755 fprintf(f,"%s%s", dot, cs_inet_ntoa(cip->ip[0])); 1756 if (cip->ip[0] != cip->ip[1]) fprintf(f,"-%s", cs_inet_ntoa(cip->ip[1])); 1757 dot = ","; 1758 } 1759 fputc((int)'\n', f); 1732 1760 fprintf_conf(f, CONFVARWIDTH, "httphideidleclients", "%d\n", cfg->http_hide_idle_clients); 1761 fprintf_conf(f, CONFVARWIDTH, "httpreadonly", "%d\n", cfg->http_readonly); 1733 1762 fputc((int)'\n', f); 1734 1763 } -
trunk/oscam-log.c
r1697 r1725 357 357 void cs_statistics(int idx) 358 358 { 359 time_t t; 360 struct tm *lt; 361 362 if (fps) 363 { 364 float cwps; 365 366 switch_log(cfg->usrfile, &fps, cs_init_statistics); 367 time(&t); 368 lt=localtime(&t); 369 if (client[idx].cwfound+client[idx].cwnot>0) 370 { 371 cwps=client[idx].last-client[idx].login; 372 cwps/=client[idx].cwfound+client[idx].cwnot; 373 } 374 else 375 cwps=0; 376 377 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", 378 lt->tm_mday, lt->tm_mon+1, lt->tm_year%100, 379 lt->tm_hour, lt->tm_min, lt->tm_sec, cwps, 380 client[idx].usr[0] ? client[idx].usr : "-", 381 cs_inet_ntoa(client[idx].ip), client[idx].port, 382 client[idx].cwfound, client[idx].cwcache, client[idx].cwnot, client[idx].cwignored, 383 client[idx].cwtout, client[idx].cwtun, client[idx].login, client[idx].last, 384 ph[client[idx].ctyp].desc,client[idx].last_caid,client[idx].last_srvid); 385 fflush(fps); 386 } 387 } 359 time_t t; 360 struct tm *lt; 361 362 if (fps) 363 { 364 float cwps; 365 366 switch_log(cfg->usrfile, &fps, cs_init_statistics); 367 time(&t); 368 lt=localtime(&t); 369 if (client[idx].cwfound+client[idx].cwnot>0) 370 { 371 cwps=client[idx].last-client[idx].login; 372 cwps/=client[idx].cwfound+client[idx].cwnot; 373 } 374 else 375 cwps=0; 376 if(!cfg->disableuserfile) { 377 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", 378 lt->tm_mday, lt->tm_mon+1, lt->tm_year%100, 379 lt->tm_hour, lt->tm_min, lt->tm_sec, cwps, 380 client[idx].usr[0] ? client[idx].usr : "-", 381 cs_inet_ntoa(client[idx].ip), client[idx].port, 382 client[idx].cwfound, client[idx].cwcache, client[idx].cwnot, client[idx].cwignored, 383 client[idx].cwtout, client[idx].cwtun, client[idx].login, client[idx].last, 384 ph[client[idx].ctyp].desc,client[idx].last_caid,client[idx].last_srvid); 385 fflush(fps); 386 } 387 } 388 }
Note:
See TracChangeset
for help on using the changeset viewer.