Compare commits

...

7 Commits

735 changed files with 814 additions and 31626 deletions

0
.gitignore vendored Normal file → Executable file
View File

0
.gitmodules vendored Normal file → Executable file
View File

0
CMakeLists.txt Normal file → Executable file
View File

0
CODING.RULES.txt Normal file → Executable file
View File

0
COPYING Normal file → Executable file
View File

0
Distribution/doc/example/oscam.ac Normal file → Executable file
View File

0
Distribution/doc/example/oscam.cacheex Normal file → Executable file
View File

0
Distribution/doc/example/oscam.cert Normal file → Executable file
View File

0
Distribution/doc/example/oscam.conf Normal file → Executable file
View File

0
Distribution/doc/example/oscam.dvbapi Normal file → Executable file
View File

0
Distribution/doc/example/oscam.guess Normal file → Executable file
View File

0
Distribution/doc/example/oscam.ird Normal file → Executable file
View File

0
Distribution/doc/example/oscam.provid Normal file → Executable file
View File

0
Distribution/doc/example/oscam.server Normal file → Executable file
View File

0
Distribution/doc/example/oscam.services Normal file → Executable file
View File

0
Distribution/doc/example/oscam.srvid Normal file → Executable file
View File

0
Distribution/doc/example/oscam.tiers Normal file → Executable file
View File

0
Distribution/doc/example/oscam.user Normal file → Executable file
View File

0
Distribution/doc/example/oscam.whitelist Normal file → Executable file
View File

0
Distribution/doc/html/list_smargo.1.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.1.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.ac.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.cacheex.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.cert.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.conf.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.dvbapi.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.guess.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.ird.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.provid.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.ratelimit.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.server.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.services.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.srvid.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.srvid2.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.tiers.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.user.5.html Normal file → Executable file
View File

0
Distribution/doc/html/oscam.whitelist.5.html Normal file → Executable file
View File

0
Distribution/doc/man/list_smargo.1 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.1 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.ac.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.cacheex.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.cert.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.conf.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.dvbapi.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.guess.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.ird.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.provid.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.ratelimit.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.server.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.services.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.srvid.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.srvid2.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.tiers.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.user.5 Normal file → Executable file
View File

0
Distribution/doc/man/oscam.whitelist.5 Normal file → Executable file
View File

0
Distribution/doc/txt/list_smargo.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.ac.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.cacheex.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.cert.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.conf.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.dvbapi.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.guess.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.ird.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.provid.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.ratelimit.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.server.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.services.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.srvid.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.srvid2.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.tiers.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.user.txt Normal file → Executable file
View File

0
Distribution/doc/txt/oscam.whitelist.txt Normal file → Executable file
View File

0
Distribution/monitor/mpcsmon-src-0.6.tar.bz2 Normal file → Executable file
View File

0
Distribution/monitor/mpcsmon.sh Normal file → Executable file
View File

0
Makefile Normal file → Executable file
View File

0
Makefile.extra Normal file → Executable file
View File

0
README.build Normal file → Executable file
View File

0
README.config Normal file → Executable file
View File

0
README.dvbapi_protocol Normal file → Executable file
View File

0
README.md Normal file → Executable file
View File

View File

0
caid, Normal file → Executable file
View File

11
config.h Normal file → Executable file
View File

@ -4,7 +4,11 @@
#define WEBIF 1
#define WEBIF_LIVELOG 1
#define WEBIF_JQUERY 1
<<<<<<< Updated upstream
//#define WEBIF_WIKI 1
=======
#define WEBIF_WIKI 1
>>>>>>> Stashed changes
#define WITH_COMPRESS_WEBIF 1
//#define WITH_SSL 1
#if defined(__linux__) || defined(__CYGWIN__)
@ -14,7 +18,7 @@
//#define WITH_NEUTRINO 1
#define READ_SDT_CHARSETS 1
//#define CLOCKFIX 1
//#define CS_ANTICASC 1
#define CS_ANTICASC 1
#define WITH_DEBUG 1
#define WITH_LB 1
#define CS_CACHEEX 1
@ -39,8 +43,13 @@
//#define MODULE_CONSTCW 1
//#define MODULE_PANDORA 1
//#define MODULE_GHTTP 1
<<<<<<< Updated upstream
//#define MODULE_SCAM 1
//#define MODULE_STREAMRELAY 1
=======
#define MODULE_SCAM 1
#define MODULE_STREAMRELAY 1
>>>>>>> Stashed changes
//#define WITH_CARDREADER 1

0
config.mak Normal file → Executable file
View File

0
config.sh Normal file → Executable file
View File

0
cscrypt/CMakeLists.txt Normal file → Executable file
View File

0
cscrypt/Makefile Normal file → Executable file
View File

0
cscrypt/aes.c Normal file → Executable file
View File

0
cscrypt/aes.h Normal file → Executable file
View File

0
cscrypt/bn.h Normal file → Executable file
View File

0
cscrypt/bn_add.c Normal file → Executable file
View File

0
cscrypt/bn_asm.c Normal file → Executable file
View File

0
cscrypt/bn_ctx.c Normal file → Executable file
View File

0
cscrypt/bn_div.c Normal file → Executable file
View File

0
cscrypt/bn_exp.c Normal file → Executable file
View File

0
cscrypt/bn_lcl.h Normal file → Executable file
View File

0
cscrypt/bn_lib.c Normal file → Executable file
View File

0
cscrypt/bn_mul.c Normal file → Executable file
View File

0
cscrypt/bn_print.c Normal file → Executable file
View File

Some files were not shown because too many files have changed in this diff Show More