Changeset 4337
- Timestamp:
- 01/06/11 12:35:17 (13 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-http.c
r4333 r4337 1982 1982 cs_log("*** Warning: Debug Support not compiled in ***"); 1983 1983 #else 1984 cs_dblevel = atoi(debuglvl); 1984 int dblvl = atoi(debuglvl); 1985 if(dblvl == 0) { 1986 cs_dblevel = 0; 1987 } else if (dblvl == 255) { 1988 cs_dblevel = 255; 1989 } else if (dblvl == (-255)) { 1990 cs_dblevel = 0; 1991 } else { 1992 cs_dblevel += dblvl; 1993 } 1985 1994 cs_log("%s debug_level=%d", "all", cs_dblevel); 1986 1995 #endif … … 2302 2311 2303 2312 // Debuglevel Selector 2313 int lvl; 2314 for (i = 0; i < 8; i++) { 2315 lvl = 1 << i; 2316 tpl_printf(vars, 0, "TMPC", "DCLASS%d", lvl); 2317 tpl_printf(vars, 0, "TMPV", "DEBUGVAL%d", lvl); 2318 if (cs_dblevel & lvl) { 2319 tpl_addVar(vars, 0, tpl_getVar(vars, "TMPC"), "debugls"); 2320 tpl_printf(vars, 0, tpl_getVar(vars, "TMPV"), "-%d", lvl); 2321 } else { 2322 tpl_addVar(vars, 0, tpl_getVar(vars, "TMPC"), "debugl"); 2323 tpl_printf(vars, 0, tpl_getVar(vars, "TMPV"), "%d", lvl); 2324 } 2325 } 2326 2327 if (cs_dblevel == 255) 2328 tpl_addVar(vars, 0, "DCLASS255", "debugls"); 2329 2304 2330 tpl_addVar(vars, 0, "NEXTPAGE", "status.html"); 2331 tpl_addVar(vars, 0, "DCLASS", "debugl"); //default 2305 2332 tpl_printf(vars, 0, "ACTDEBUG", "%d", cs_dblevel); 2306 2333 tpl_addVar(vars, 0, "SDEBUG", tpl_getTpl(vars, "DEBUGSELECT")); … … 2547 2574 2548 2575 char *debuglvl = getParam(params, "debug"); 2549 if(strlen(debuglvl) > 0) 2576 if(strlen(debuglvl) > 0) { 2550 2577 #ifndef WITH_DEBUG 2551 2578 cs_log("*** Warning: Debug Support not compiled in ***"); 2552 2579 #else 2553 cs_dblevel = atoi(debuglvl); 2580 int dblvl = atoi(debuglvl); 2581 if(dblvl == 0) { 2582 cs_dblevel = 0; 2583 } else if (dblvl == 255) { 2584 cs_dblevel = 255; 2585 } else if (dblvl == (-255)) { 2586 cs_dblevel = 0; 2587 } else { 2588 cs_dblevel += dblvl; 2589 } 2590 2554 2591 cs_log("%s debug_level=%d", "all", cs_dblevel); 2555 2592 #endif 2593 } 2556 2594 2557 2595 char targetfile[256]; … … 2598 2636 2599 2637 // Debuglevel Selector 2600 tpl_addVar(vars, 0, "NEXTPAGE", "files.html"); 2638 int i, lvl; 2639 for (i = 0; i < 8; i++) { 2640 lvl = 1 << i; 2641 tpl_printf(vars, 0, "TMPC", "DCLASS%d", lvl); 2642 tpl_printf(vars, 0, "TMPV", "DEBUGVAL%d", lvl); 2643 if (cs_dblevel & lvl) { 2644 tpl_addVar(vars, 0, tpl_getVar(vars, "TMPC"), "debugls"); 2645 tpl_printf(vars, 0, tpl_getVar(vars, "TMPV"), "-%d", lvl); 2646 } else { 2647 tpl_addVar(vars, 0, tpl_getVar(vars, "TMPC"), "debugl"); 2648 tpl_printf(vars, 0, tpl_getVar(vars, "TMPV"), "%d", lvl); 2649 } 2650 } 2651 2652 if (cs_dblevel == 255) 2653 tpl_addVar(vars, 0, "DCLASS255", "debugls"); 2654 2601 2655 tpl_addVar(vars, 0, "CUSTOMPARAM", "&part=logfile"); 2602 2656 tpl_printf(vars, 0, "ACTDEBUG", "%d", cs_dblevel); 2603 2657 tpl_addVar(vars, 0, "SDEBUG", tpl_getTpl(vars, "DEBUGSELECT")); 2658 tpl_addVar(vars, 0, "NEXTPAGE", "files.html"); 2604 2659 2605 2660 if(!cfg->disablelog) -
trunk/oscam-http.h
r4328 r4337 44 44 input{font-family: Arial; font-size: 12px;}\n\ 45 45 A:link {color: #050840;}\n\ 46 A.debugls:link {color: white;background-color:red;}\n\ 46 47 A:visited {color: #050840;}\n\ 47 48 A:active {color: #050840;}\n\ … … 356 357 #define TPLDEBUGSELECT "\ 357 358 <SPAN CLASS=\"debugt\"> Switch Debug from ##ACTDEBUG## to </SPAN>\n\ 358 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=0##CUSTOMPARAM##\" title=\"no debugging (default)\">0</A> \n\359 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=1##CUSTOMPARAM##\" title=\"detailed error messages\">1</A> \n\360 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=2##CUSTOMPARAM##\" title=\"ATR parsing info, ECM dumps, CW dumps\">2</A> \n\361 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=4##CUSTOMPARAM##\" title=\"traffic from/to the reader\">4</A> \n\362 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=8##CUSTOMPARAM##\" title=\"traffic from/to the clients\">8</A> \n\363 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=16##CUSTOMPARAM##\" title=\"traffic to the reader-device on IFD layer\">16</A> \n\364 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=32##CUSTOMPARAM##\" title=\"traffic to the reader-device on I/O layer\">32</A> \n\365 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=64##CUSTOMPARAM##\" title=\"EMM logging\">64</A> \n\366 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=128##CUSTOMPARAM##\" title=\"DVBAPI logging\">128</A> \n\367 <A CLASS=\" debugl\" HREF=\"##NEXTPAGE##?debug=255##CUSTOMPARAM##\" title=\"debug all\">255</A>\n"359 <A CLASS=\"##DCLASS0##\" HREF=\"##NEXTPAGE##?debug=0##CUSTOMPARAM##\" title=\"no debugging (default)\">0</A> \n\ 360 <A CLASS=\"##DCLASS1##\" HREF=\"##NEXTPAGE##?debug=##DEBUGVAL1####CUSTOMPARAM##\" title=\"detailed error messages\">1</A> \n\ 361 <A CLASS=\"##DCLASS2##\" HREF=\"##NEXTPAGE##?debug=##DEBUGVAL2####CUSTOMPARAM##\" title=\"ATR parsing info, ECM dumps, CW dumps\">2</A> \n\ 362 <A CLASS=\"##DCLASS4##\" HREF=\"##NEXTPAGE##?debug=##DEBUGVAL4####CUSTOMPARAM##\" title=\"traffic from/to the reader\">4</A> \n\ 363 <A CLASS=\"##DCLASS8##\" HREF=\"##NEXTPAGE##?debug=##DEBUGVAL8####CUSTOMPARAM##\" title=\"traffic from/to the clients\">8</A> \n\ 364 <A CLASS=\"##DCLASS16##\" HREF=\"##NEXTPAGE##?debug=##DEBUGVAL16####CUSTOMPARAM##\" title=\"traffic to the reader-device on IFD layer\">16</A> \n\ 365 <A CLASS=\"##DCLASS32##\" HREF=\"##NEXTPAGE##?debug=##DEBUGVAL32####CUSTOMPARAM##\" title=\"traffic to the reader-device on I/O layer\">32</A> \n\ 366 <A CLASS=\"##DCLASS64##\" HREF=\"##NEXTPAGE##?debug=##DEBUGVAL64####CUSTOMPARAM##\" title=\"EMM logging\">64</A> \n\ 367 <A CLASS=\"##DCLASS128##\" HREF=\"##NEXTPAGE##?debug=##DEBUGVAL128####CUSTOMPARAM##\" title=\"DVBAPI logging\">128</A> \n\ 368 <A CLASS=\"##DCLASS255##\" HREF=\"##NEXTPAGE##?debug=255##CUSTOMPARAM##\" title=\"debug all\">255</A>\n" 368 369 369 370 #define TPLFAILBAN "\
Note:
See TracChangeset
for help on using the changeset viewer.