Compare commits
No commits in common. "main" and "fix-detector32-64" have entirely different histories.
main
...
fix-detect
0
.gitignore
vendored
Executable file → Normal file
0
.gitignore
vendored
Executable file → Normal file
0
.gitmodules
vendored
Executable file → Normal file
0
.gitmodules
vendored
Executable file → Normal file
0
CMakeLists.txt
Executable file → Normal file
0
CMakeLists.txt
Executable file → Normal file
0
CODING.RULES.txt
Executable file → Normal file
0
CODING.RULES.txt
Executable file → Normal file
0
Distribution/doc/example/oscam.ac
Executable file → Normal file
0
Distribution/doc/example/oscam.ac
Executable file → Normal file
0
Distribution/doc/example/oscam.cacheex
Executable file → Normal file
0
Distribution/doc/example/oscam.cacheex
Executable file → Normal file
0
Distribution/doc/example/oscam.cert
Executable file → Normal file
0
Distribution/doc/example/oscam.cert
Executable file → Normal file
0
Distribution/doc/example/oscam.conf
Executable file → Normal file
0
Distribution/doc/example/oscam.conf
Executable file → Normal file
0
Distribution/doc/example/oscam.dvbapi
Executable file → Normal file
0
Distribution/doc/example/oscam.dvbapi
Executable file → Normal file
0
Distribution/doc/example/oscam.guess
Executable file → Normal file
0
Distribution/doc/example/oscam.guess
Executable file → Normal file
0
Distribution/doc/example/oscam.ird
Executable file → Normal file
0
Distribution/doc/example/oscam.ird
Executable file → Normal file
0
Distribution/doc/example/oscam.provid
Executable file → Normal file
0
Distribution/doc/example/oscam.provid
Executable file → Normal file
0
Distribution/doc/example/oscam.server
Executable file → Normal file
0
Distribution/doc/example/oscam.server
Executable file → Normal file
0
Distribution/doc/example/oscam.services
Executable file → Normal file
0
Distribution/doc/example/oscam.services
Executable file → Normal file
0
Distribution/doc/example/oscam.srvid
Executable file → Normal file
0
Distribution/doc/example/oscam.srvid
Executable file → Normal file
0
Distribution/doc/example/oscam.tiers
Executable file → Normal file
0
Distribution/doc/example/oscam.tiers
Executable file → Normal file
0
Distribution/doc/example/oscam.user
Executable file → Normal file
0
Distribution/doc/example/oscam.user
Executable file → Normal file
0
Distribution/doc/example/oscam.whitelist
Executable file → Normal file
0
Distribution/doc/example/oscam.whitelist
Executable file → Normal file
0
Distribution/doc/html/list_smargo.1.html
Executable file → Normal file
0
Distribution/doc/html/list_smargo.1.html
Executable file → Normal file
0
Distribution/doc/html/oscam.1.html
Executable file → Normal file
0
Distribution/doc/html/oscam.1.html
Executable file → Normal file
0
Distribution/doc/html/oscam.ac.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.ac.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.cacheex.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.cacheex.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.cert.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.cert.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.conf.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.conf.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.dvbapi.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.dvbapi.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.guess.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.guess.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.ird.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.ird.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.provid.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.provid.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.ratelimit.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.ratelimit.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.server.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.server.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.services.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.services.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.srvid.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.srvid.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.srvid2.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.srvid2.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.tiers.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.tiers.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.user.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.user.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.whitelist.5.html
Executable file → Normal file
0
Distribution/doc/html/oscam.whitelist.5.html
Executable file → Normal file
0
Distribution/doc/man/list_smargo.1
Executable file → Normal file
0
Distribution/doc/man/list_smargo.1
Executable file → Normal file
0
Distribution/doc/man/oscam.1
Executable file → Normal file
0
Distribution/doc/man/oscam.1
Executable file → Normal file
0
Distribution/doc/man/oscam.ac.5
Executable file → Normal file
0
Distribution/doc/man/oscam.ac.5
Executable file → Normal file
0
Distribution/doc/man/oscam.cacheex.5
Executable file → Normal file
0
Distribution/doc/man/oscam.cacheex.5
Executable file → Normal file
0
Distribution/doc/man/oscam.cert.5
Executable file → Normal file
0
Distribution/doc/man/oscam.cert.5
Executable file → Normal file
0
Distribution/doc/man/oscam.conf.5
Executable file → Normal file
0
Distribution/doc/man/oscam.conf.5
Executable file → Normal file
0
Distribution/doc/man/oscam.dvbapi.5
Executable file → Normal file
0
Distribution/doc/man/oscam.dvbapi.5
Executable file → Normal file
0
Distribution/doc/man/oscam.guess.5
Executable file → Normal file
0
Distribution/doc/man/oscam.guess.5
Executable file → Normal file
0
Distribution/doc/man/oscam.ird.5
Executable file → Normal file
0
Distribution/doc/man/oscam.ird.5
Executable file → Normal file
0
Distribution/doc/man/oscam.provid.5
Executable file → Normal file
0
Distribution/doc/man/oscam.provid.5
Executable file → Normal file
0
Distribution/doc/man/oscam.ratelimit.5
Executable file → Normal file
0
Distribution/doc/man/oscam.ratelimit.5
Executable file → Normal file
0
Distribution/doc/man/oscam.server.5
Executable file → Normal file
0
Distribution/doc/man/oscam.server.5
Executable file → Normal file
0
Distribution/doc/man/oscam.services.5
Executable file → Normal file
0
Distribution/doc/man/oscam.services.5
Executable file → Normal file
0
Distribution/doc/man/oscam.srvid.5
Executable file → Normal file
0
Distribution/doc/man/oscam.srvid.5
Executable file → Normal file
0
Distribution/doc/man/oscam.srvid2.5
Executable file → Normal file
0
Distribution/doc/man/oscam.srvid2.5
Executable file → Normal file
0
Distribution/doc/man/oscam.tiers.5
Executable file → Normal file
0
Distribution/doc/man/oscam.tiers.5
Executable file → Normal file
0
Distribution/doc/man/oscam.user.5
Executable file → Normal file
0
Distribution/doc/man/oscam.user.5
Executable file → Normal file
0
Distribution/doc/man/oscam.whitelist.5
Executable file → Normal file
0
Distribution/doc/man/oscam.whitelist.5
Executable file → Normal file
0
Distribution/doc/txt/list_smargo.txt
Executable file → Normal file
0
Distribution/doc/txt/list_smargo.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.ac.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.ac.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.cacheex.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.cacheex.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.cert.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.cert.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.conf.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.conf.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.dvbapi.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.dvbapi.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.guess.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.guess.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.ird.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.ird.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.provid.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.provid.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.ratelimit.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.ratelimit.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.server.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.server.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.services.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.services.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.srvid.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.srvid.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.srvid2.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.srvid2.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.tiers.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.tiers.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.user.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.user.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.whitelist.txt
Executable file → Normal file
0
Distribution/doc/txt/oscam.whitelist.txt
Executable file → Normal file
0
Distribution/monitor/mpcsmon-src-0.6.tar.bz2
Executable file → Normal file
0
Distribution/monitor/mpcsmon-src-0.6.tar.bz2
Executable file → Normal file
0
Distribution/monitor/mpcsmon.sh
Executable file → Normal file
0
Distribution/monitor/mpcsmon.sh
Executable file → Normal file
0
Makefile.extra
Executable file → Normal file
0
Makefile.extra
Executable file → Normal file
0
README.build
Executable file → Normal file
0
README.build
Executable file → Normal file
0
README.config
Executable file → Normal file
0
README.config
Executable file → Normal file
0
README.dvbapi_protocol
Executable file → Normal file
0
README.dvbapi_protocol
Executable file → Normal file
0
SoftCam.Key
Executable file
0
SoftCam.Key
Executable file
11
config.h
Executable file → Normal file
11
config.h
Executable file → Normal file
|
|
@ -4,11 +4,7 @@
|
||||||
#define WEBIF 1
|
#define WEBIF 1
|
||||||
#define WEBIF_LIVELOG 1
|
#define WEBIF_LIVELOG 1
|
||||||
#define WEBIF_JQUERY 1
|
#define WEBIF_JQUERY 1
|
||||||
<<<<<<< Updated upstream
|
|
||||||
//#define WEBIF_WIKI 1
|
//#define WEBIF_WIKI 1
|
||||||
=======
|
|
||||||
#define WEBIF_WIKI 1
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
#define WITH_COMPRESS_WEBIF 1
|
#define WITH_COMPRESS_WEBIF 1
|
||||||
//#define WITH_SSL 1
|
//#define WITH_SSL 1
|
||||||
#if defined(__linux__) || defined(__CYGWIN__)
|
#if defined(__linux__) || defined(__CYGWIN__)
|
||||||
|
|
@ -18,7 +14,7 @@
|
||||||
//#define WITH_NEUTRINO 1
|
//#define WITH_NEUTRINO 1
|
||||||
#define READ_SDT_CHARSETS 1
|
#define READ_SDT_CHARSETS 1
|
||||||
//#define CLOCKFIX 1
|
//#define CLOCKFIX 1
|
||||||
#define CS_ANTICASC 1
|
//#define CS_ANTICASC 1
|
||||||
#define WITH_DEBUG 1
|
#define WITH_DEBUG 1
|
||||||
#define WITH_LB 1
|
#define WITH_LB 1
|
||||||
#define CS_CACHEEX 1
|
#define CS_CACHEEX 1
|
||||||
|
|
@ -43,13 +39,8 @@
|
||||||
//#define MODULE_CONSTCW 1
|
//#define MODULE_CONSTCW 1
|
||||||
//#define MODULE_PANDORA 1
|
//#define MODULE_PANDORA 1
|
||||||
//#define MODULE_GHTTP 1
|
//#define MODULE_GHTTP 1
|
||||||
<<<<<<< Updated upstream
|
|
||||||
//#define MODULE_SCAM 1
|
//#define MODULE_SCAM 1
|
||||||
//#define MODULE_STREAMRELAY 1
|
//#define MODULE_STREAMRELAY 1
|
||||||
=======
|
|
||||||
#define MODULE_SCAM 1
|
|
||||||
#define MODULE_STREAMRELAY 1
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
|
|
||||||
//#define WITH_CARDREADER 1
|
//#define WITH_CARDREADER 1
|
||||||
|
|
||||||
|
|
|
||||||
0
config.mak
Executable file → Normal file
0
config.mak
Executable file → Normal file
0
cscrypt/CMakeLists.txt
Executable file → Normal file
0
cscrypt/CMakeLists.txt
Executable file → Normal file
0
cscrypt/Makefile
Executable file → Normal file
0
cscrypt/Makefile
Executable file → Normal file
0
cscrypt/aes.c
Executable file → Normal file
0
cscrypt/aes.c
Executable file → Normal file
0
cscrypt/aes.h
Executable file → Normal file
0
cscrypt/aes.h
Executable file → Normal file
0
cscrypt/bn.h
Executable file → Normal file
0
cscrypt/bn.h
Executable file → Normal file
0
cscrypt/bn_add.c
Executable file → Normal file
0
cscrypt/bn_add.c
Executable file → Normal file
0
cscrypt/bn_asm.c
Executable file → Normal file
0
cscrypt/bn_asm.c
Executable file → Normal file
0
cscrypt/bn_ctx.c
Executable file → Normal file
0
cscrypt/bn_ctx.c
Executable file → Normal file
0
cscrypt/bn_div.c
Executable file → Normal file
0
cscrypt/bn_div.c
Executable file → Normal file
0
cscrypt/bn_exp.c
Executable file → Normal file
0
cscrypt/bn_exp.c
Executable file → Normal file
0
cscrypt/bn_lcl.h
Executable file → Normal file
0
cscrypt/bn_lcl.h
Executable file → Normal file
0
cscrypt/bn_lib.c
Executable file → Normal file
0
cscrypt/bn_lib.c
Executable file → Normal file
0
cscrypt/bn_mul.c
Executable file → Normal file
0
cscrypt/bn_mul.c
Executable file → Normal file
0
cscrypt/bn_print.c
Executable file → Normal file
0
cscrypt/bn_print.c
Executable file → Normal file
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user