Changeset 3400
- Timestamp:
- 10/06/10 22:51:10 (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-http.c
r3390 r3400 2317 2317 st->tm_min, st->tm_sec); 2318 2318 2319 tpl_printf(vars, 0, "LEFTTIME", "%u", ((cfg->failbantime * 60) - (now - v_ban_entry->v_time))/60); 2319 int lsec = (cfg->failbantime * 60) - (now - v_ban_entry->v_time); 2320 int secs = 0, fullmins =0, mins =0, fullhours =0, hours =0, days =0; 2321 if(lsec > 0) { 2322 secs = lsec % 60; 2323 if (lsec > 60) { 2324 fullmins = lsec / 60; 2325 mins = fullmins % 60; 2326 if(fullmins > 60) { 2327 fullhours = fullmins / 60; 2328 hours = fullhours % 24; 2329 days = fullhours / 24; 2330 } 2331 } 2332 } 2333 if(days == 0) 2334 tpl_printf(vars, 0, "LEFTTIME", "%02d:%02d:%02d", hours, mins, secs); 2335 else 2336 tpl_printf(vars, 0, "LEFTTIME", "%02dd %02d:%02d:%02d", days, hours, mins, secs); 2337 2320 2338 tpl_printf(vars, 0, "INTIP", "%u", v_ban_entry->v_ip); 2321 2339 tpl_addVar(vars, 1, "FAILBANROW", tpl_getTpl(vars, "FAILBANBIT")); -
trunk/oscam-http.h
r3345 r3400 312 312 <TABLE cellspacing=\"0\" cellpadding=\"10\">\n\ 313 313 <TR><TH colspan=\"4\">List of banned IP Addresses</TH></TR>\n\ 314 <TR><TH>IP Address</TH><TH>Violation date</TH><TH>left ban time (min)</TH><TH>Action</TH></TR>\n\314 <TR><TH>IP Address</TH><TH>Violation date</TH><TH>left ban time</TH><TH>Action</TH></TR>\n\ 315 315 ##FAILBANROW##\n\ 316 316 </TABLE><BR>\n\ -
trunk/oscam.c
r3397 r3400 101 101 return 0; 102 102 } 103 cs_debug ("banned ip %u- %ld seconds left",104 v_ban_entry->v_ip,(cfg->failbantime * 60) - (now - v_ban_entry->v_time));103 cs_debug_mask(D_TRACE, "failban: banned ip %s - %ld seconds left", 104 cs_inet_ntoa(v_ban_entry->v_ip),(cfg->failbantime * 60) - (now - v_ban_entry->v_time)); 105 105 return 1; 106 106 } … … 122 122 while (v_ban_entry) { 123 123 if (ip == v_ban_entry->v_ip) { 124 cs_debug ("banned ip %u - already exist in list", v_ban_entry->v_ip);124 cs_debug_mask(D_TRACE, "failban: banned ip %s - already exist in list", cs_inet_ntoa(v_ban_entry->v_ip)); 125 125 return ; 126 126 } … … 136 136 llist_append(cfg->v_list, v_ban_entry); 137 137 138 cs_debug ("ban ip: %u timestamp: %d", v_ban_entry->v_ip, v_ban_entry->v_time);138 cs_debug_mask(D_TRACE, "failban: ban ip %s with timestamp %d", cs_inet_ntoa(v_ban_entry->v_ip), v_ban_entry->v_time); 139 139 140 140 }
Note:
See TracChangeset
for help on using the changeset viewer.