Changeset 7178
- Timestamp:
- 07/14/12 23:28:57 (12 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Distribution/doc/html/oscam.conf.5.html
r7175 r7178 549 549 <B>hideclient_to</B> = <B>seconds</B> 550 550 <DL COMPACT><DT><DD> 551 time to hide clients in the monitor if not sending requests, 0 = disabled, default: 0551 time to hide clients in the monitor if not sending requests, 0 = disabled, default:15 552 552 </DL> 553 553 -
trunk/Distribution/doc/html/oscam.server.5.html
r7175 r7178 396 396 <B>inactivitytimeout</B> = <B>seconds</B> 397 397 <DL COMPACT><DT><DD> 398 inactivity timeout for all TCP based remote readers, default: 0398 inactivity timeout for all TCP based remote readers, default:30 for CCCam, 0 for all others 399 399 </DL> 400 400 -
trunk/Distribution/doc/man/oscam.conf.5
r7175 r7178 410 410 \fBhideclient_to\fP = \fBseconds\fP 411 411 .RS 3n 412 time to hide clients in the monitor if not sending requests, 0 = disabled, default: 0412 time to hide clients in the monitor if not sending requests, 0 = disabled, default:15 413 413 .RE 414 414 .PP -
trunk/Distribution/doc/man/oscam.server.5
r7175 r7178 299 299 \fBinactivitytimeout\fP = \fBseconds\fP 300 300 .RS 3n 301 inactivity timeout for all TCP based remote readers, default: 0301 inactivity timeout for all TCP based remote readers, default:30 for CCCam, 0 for all others 302 302 .RE 303 303 .PP -
trunk/Distribution/doc/txt/oscam.conf.txt
r7175 r7178 292 292 293 293 hideclient_to = seconds 294 time to hide clients in the monitor if not sending requests, 0 = disabled, default: 0294 time to hide clients in the monitor if not sending requests, 0 = disabled, default:15 295 295 296 296 appendchaninfo = 0|1 -
trunk/Distribution/doc/txt/oscam.server.txt
r7175 r7178 225 225 226 226 inactivitytimeout = seconds 227 inactivity timeout for all TCP based remote readers, default: 0227 inactivity timeout for all TCP based remote readers, default:30 for CCCam, 0 for all others 228 228 229 229 reconnecttimeout = seconds -
trunk/oscam-config.c
r7175 r7178 885 885 886 886 if (!strcmp(token, "hideclient_to")) { 887 cfg.mon_hideclient_to = strToIntVal(value, 0);887 cfg.mon_hideclient_to = strToIntVal(value, 15); 888 888 return; 889 889 } … … 1678 1678 if(!cs_malloc(&token, MAXLINESIZE, -1)) return 1; 1679 1679 1680 #ifdef PRIO_PROCESS1681 // FIXME: On WRT54G calling getpriority() results in OSCam not starting.1682 // This needs additional debugging by somebody who has WRT54G in1683 // front of him and can debug this.1684 #if !defined(__UCLIBC__)1685 errno=0;1686 if ((cfg.nice = getpriority(PRIO_PROCESS, 0)) == (-1))1687 if (errno)1688 #endif1689 #endif1690 1680 cfg.nice = 99; 1691 1681 cfg.ctimeout = CS_CLIENT_TIMEOUT; … … 1695 1685 cfg.bindwait = CS_BIND_TIMEOUT; 1696 1686 cfg.mon_level = 2; 1697 cfg.mon_hideclient_to = 0;1687 cfg.mon_hideclient_to = 15; 1698 1688 cfg.srtimeout = 1500; 1699 1689 cfg.ulparent = 0; … … 1721 1711 cfg.http_refresh = 0; 1722 1712 cfg.http_hide_idle_clients = 0; 1723 cfg.mon_hideclient_to = 15;1724 1713 cs_strncpy(cfg.http_tpl, "", sizeof(cfg.http_tpl)); 1725 1714 #endif … … 2318 2307 2319 2308 /*monitor settings*/ 2320 if(cfg.mon_port || cfg.mon_appendchaninfo || cfg.mon_hideclient_to != 0|| cfg.mon_aulow != 30) {2309 if(cfg.mon_port || cfg.mon_appendchaninfo || cfg.mon_hideclient_to != 15 || cfg.mon_aulow != 30) { 2321 2310 fprintf(f,"[monitor]\n"); 2322 2311 if (cfg.mon_port != 0 || cfg.http_full_cfg) … … 2330 2319 if(cfg.mon_aulow != 30 || cfg.http_full_cfg) 2331 2320 fprintf_conf(f, "aulow", "%d\n", cfg.mon_aulow); 2332 if(cfg.mon_hideclient_to != 0|| cfg.http_full_cfg)2321 if(cfg.mon_hideclient_to != 15 || cfg.http_full_cfg) 2333 2322 fprintf_conf(f, "hideclient_to", "%d\n", cfg.mon_hideclient_to); 2334 2323 if(cfg.mon_level != 2 || cfg.http_full_cfg) 2335 2324 fprintf_conf(f, "monlevel", "%d\n", cfg.mon_level); 2336 if(cfg.mon_appendchaninfo != 2|| cfg.http_full_cfg)2325 if(cfg.mon_appendchaninfo != 0 || cfg.http_full_cfg) 2337 2326 fprintf_conf(f, "appendchaninfo", "%d\n", cfg.mon_appendchaninfo); 2338 2327 fputc((int)'\n', f); … … 2909 2898 free_mk_t(value); 2910 2899 2911 if (( rdr->tcp_ito != DEFAULT_INACTIVITYTIMEOUT|| cfg.http_full_cfg) && !isphysical)2900 if (((rdr->typ != R_CCCAM && rdr->tcp_ito != DEFAULT_INACTIVITYTIMEOUT) || (rdr->typ == R_CCCAM && rdr->tcp_ito != 30) || cfg.http_full_cfg) && !isphysical) 2912 2901 fprintf_conf(f, "inactivitytimeout", "%d\n", rdr->tcp_ito); 2913 2902 … … 4063 4052 4064 4053 if (!strcmp(token, "inactivitytimeout")) { 4065 rdr->tcp_ito = strToIntVal(value, DEFAULT_INACTIVITYTIMEOUT);4054 rdr->tcp_ito = strToIntVal(value, rdr->typ == R_CCCAM?30:DEFAULT_INACTIVITYTIMEOUT); 4066 4055 return; 4067 4056 } … … 4975 4964 rdr->enable = 1; 4976 4965 rdr->tcp_rto = DEFAULT_TCP_RECONNECT_TIMEOUT; 4966 rdr->tcp_ito = DEFAULT_INACTIVITYTIMEOUT; 4977 4967 rdr->nagra_read = 0; 4978 4968 rdr->mhz = 357;
Note:
See TracChangeset
for help on using the changeset viewer.