SC8in1:

 * merged trunk @6331

CMakeLists.txt

@@ -231,8 +231,8 @@ add_definitions ("-DCS_OS_SYS=\\\"${CS_OS_SYS}\\\"")
 # Manipulate config file based on given parameters and read unset parameters
 
 # Available options
-set(addons WEBIF HAVE_DVBAPI WITH_STAPI IRDETO_GUESSING CS_ANTICASC WITH_DEBUG CS_WITH_DOUBLECHECK CS_LED QBOXHD_LED CS_LOGHISTORY WITH_SSL CS_CACHEEX)
-set(protocols MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_RADEGAST MODULE_SERIAL MODULE_MONITOR MODULE_CONSTCW)
+set(addons WEBIF HAVE_DVBAPI WITH_STAPI IRDETO_GUESSING CS_ANTICASC WITH_DEBUG WITH_SSL CS_CACHEEX)
+set(protocols MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_RADEGAST MODULE_SERIAL MODULE_MONITOR MODULE_CONSTCW)
 set(readers WITH_CARDREADER READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG)
 
 MACRO(GENERATE_OSCAM_CONFIG fullpath)
@@ -566,7 +566,16 @@ endif (OSCAM_SVN_REVISION MATCHES "Unversioned directory")
 add_definitions ("-D'CS_SVN_VERSION=\"${OSCAM_SVN_REVISION}\"'")
 
 #----------------------- global compile and link options ------------------------------
-
+# disable warning about unused but set variables in gcc 4.6+
+if (CMAKE_COMPILER_IS_GNUCC)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+    string(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION})
+    list(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR)
+    list(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR)
+    if (${GCC_MAJOR} GREATER 3 AND ${GCC_MINOR} GREATER 5)
+        add_definitions ("-Wno-unused-but-set-variable")
+    endif (${GCC_MAJOR} GREATER 3 AND ${GCC_MINOR} GREATER 5)
+endif (CMAKE_COMPILER_IS_GNUCC)
 # some optimisations
 if (OSCamOperatingSystem MATCHES "Mac OS X")
     add_definitions ("-Winline -Wall -Wextra -m32 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")

Distribution/doc/html/oscam.1.html

@@ -90,6 +90,16 @@ <H2>OPTIONS</H2>
 
 <P>
 
+<B>-g</B> &lt;mode&gt;
+<DL COMPACT><DT><DD>
+garbage collector debug mode, default:none:
+<P>
+<BR>&nbsp;&nbsp;&nbsp;<B>0</B>&nbsp;=&nbsp;immediate&nbsp;free
+<BR>&nbsp;&nbsp;&nbsp;<B>1</B>&nbsp;=&nbsp;check&nbsp;for&nbsp;double&nbsp;frees
+</DL>
+
+<P>
+
 <B>-h</B>
 <DL COMPACT><DT><DD>
 usage

Distribution/doc/html/oscam.conf.5.html

@@ -38,6 +38,20 @@ <H3>The [global] section</H3>
 
 <P>
 
+<B>max_cache_time</B> = <B>seconds</B>
+<DL COMPACT><DT><DD>
+maximum time CWs resist in cache after 1st client request, default:15
+</DL>
+
+<P>
+
+<B>max_cache_count</B> = <B>count</B>
+<DL COMPACT><DT><DD>
+maximum CWs in cache, default:1000
+</DL>
+
+<P>
+
 <B>logfile</B> = [<B>filename</B>][<B>;syslog</B>][<B>;stdout</B>]
 <DL COMPACT><DT><DD>
 logging targets, default: /var/log/oscam.log. You can define a maximum of one filename and 
@@ -622,6 +636,13 @@ <H3>The [webif] section</H3>
 
 <P>
 
+<B>httpforcesslv3 </B> = <B>0</B>|<B>1</B>
+<DL COMPACT><DT><DD>
+1 = force using SSLv3, default:0
+</DL>
+
+<P>
+
 <B>httpreadonly</B> = <B>0</B>|<B>1</B>
 <DL COMPACT><DT><DD>
 1 = read only modus for web interface, default:0
@@ -1122,7 +1143,7 @@ <H3>The [dvbapi] section</H3>
 
 <P>
 
-<B>boxtype</B> = <B>dbox2</B>|<B>dreambox</B>|<B>dm7000</B>|<B>duckbox</B>|<B>ufs910</B>|<B>ipbox</B>|<B>ipbox-pmt</B>|<B>qboxhd</B>|<B>coolstream</B>|<B>neumo</B>
+<B>boxtype</B> = <B>dbox2</B>|<B>dreambox</B>|<B>dm7000</B>|<B>duckbox</B>|<B>ufs910</B>|<B>ipbox</B>|<B>ipbox-pmt</B>|<B>qboxhd</B>|<B>coolstream</B>|<B>neumo</B>|<B>pc</B>
 <DL COMPACT><DT><DD>
 set boxtype, auto detection of DVB API will be aspired, default:dreambox
 <P>
@@ -1131,6 +1152,8 @@ <H3>The [dvbapi] section</H3>
 <P>
 ipbox-pmt can be used on any DGS based images (with or without camd.socket support), 
 verified on HD models only
+<P>
+pc is for generic pc support (currently supported on VDR with vdr-plugin-dvbapi)
 </DL>
 
 <A NAME="lbAT">&nbsp;</A>

Distribution/doc/man/oscam.1

@@ -81,6 +81,14 @@ debug level mask:
  \fB255\fP = debug all
 .RE
 .PP
+\fB-g\fP <mode>
+.RS 3n
+garbage collector debug mode, default:none:
+
+   \fB0\fP = immediate free
+   \fB1\fP = check for double frees
+.RE
+.PP
 \fB-h\fP
 .RS 3n
 usage

Distribution/doc/man/oscam.conf.5

@@ -19,6 +19,16 @@ bind service to specified IP address, default:all
 value to delay cached requests, default:0
 .RE
 .PP
+\fBmax_cache_time\fP = \fBseconds\fP
+.RS 3n
+maximum time CWs resist in cache after 1st client request, default:15
+.RE
+.PP
+\fBmax_cache_count\fP = \fBcount\fP
+.RS 3n
+maximum CWs in cache, default:1000
+.RE
+.PP
 \fBlogfile\fP = [\fBfilename\fP][\fB;syslog\fP][\fB;stdout\fP]
 .RS 3n
 logging targets, default: /var/log/oscam.log. You can define a maximum of one filename and 
@@ -458,6 +468,11 @@ write config:
  \fB1\fP = all parameters
 .RE
 .PP
+\fBhttpforcesslv3 \fP = \fB0\fP|\fB1\fP
+.RS 3n
+1 = force using SSLv3, default:0
+.RE
+.PP
 \fBhttpreadonly\fP = \fB0\fP|\fB1\fP
 .RS 3n
 1 = read only modus for web interface, default:0
@@ -827,7 +842,7 @@ CAID request mode:
  \fB1\fP = try all CAIDs simultaneously
 .RE
 .PP
-\fBboxtype\fP = \fBdbox2\fP|\fBdreambox\fP|\fBdm7000\fP|\fBduckbox\fP|\fBufs910\fP|\fBipbox\fP|\fBipbox-pmt\fP|\fBqboxhd\fP|\fBcoolstream\fP|\fBneumo\fP
+\fBboxtype\fP = \fBdbox2\fP|\fBdreambox\fP|\fBdm7000\fP|\fBduckbox\fP|\fBufs910\fP|\fBipbox\fP|\fBipbox-pmt\fP|\fBqboxhd\fP|\fBcoolstream\fP|\fBneumo\fP|\fBpc\fP
 .RS 3n
 set boxtype, auto detection of DVB API will be aspired, default:dreambox
 
@@ -836,6 +851,8 @@ verified on HD models only
 
 ipbox-pmt can be used on any DGS based images (with or without camd.socket support), 
 verified on HD models only
+
+pc is for generic pc support (currently supported on VDR with vdr-plugin-dvbapi)
 .RE
 .SS "The [anticasc] section"
 .PP