mardock2009/oscam-2.26.01-11942-802-with-Advanced-fake-dcw-detection
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mardock2009:5bf5a48714da6dd5f1a7c80035757eb0997f1144
Branches Tags
mardock2009:main
mardock2009:fix-detector32-64
mardock2009:fix-test-pawel
..
compare: mardock2009:b0ae4185cd477b2195a28b2b31e6ef38031390c2
Branches Tags
mardock2009:main
mardock2009:fix-detector32-64
mardock2009:fix-test-pawel

No commits in common. "5bf5a48714da6dd5f1a7c80035757eb0997f1144" and "b0ae4185cd477b2195a28b2b31e6ef38031390c2" have entirely different histories.
5bf5a48714 ... b0ae4185cd

5 changed files with 1 additions and 869 deletions
Show Stats Expand all files Collapse all files

11
config.h
View File

@ -4,11 +4,7 @@
#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__)
@ -18,7 +14,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
@ -43,13 +39,8 @@
//#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

827
webif/pages_wiki.c
View File

File diff suppressed because one or more lines are too long

31
webif/pages_wiki.h
View File

@ -1,31 +0,0 @@
/*
* OSCam WebIf Wiki data - AUTO GENERATED, DO NOT EDIT!
* Generated by wiki_gen from wiki markdown files
*/
#ifndef WEBIF_PAGES_WIKI_H_
#define WEBIF_PAGES_WIKI_H_
#ifdef WEBIF_WIKI
#define COMPRESSED_WIKI 1
struct wiki_entry {
uint32_t param_ofs;
uint32_t config_ofs;
uint32_t section_ofs;
uint32_t text_ofs;
int8_t status;
};
int32_t wiki_count(void);
const struct wiki_entry *wiki_get_entries(void);
const char *wiki_get_help(const char *config, const char *section, const char *param);
int8_t wiki_get_status(const char *config, const char *section, const char *param);
void wiki_get_data(const char **data, size_t *data_len, size_t *data_olen);
char *wiki_get_decompressed_data(void);
void webif_wiki_prepare(void);
void webif_wiki_free(void);
#endif /* WEBIF_WIKI */
#endif /* WEBIF_PAGES_WIKI_H_ */

BIN
webif/wiki_gen
View File

Binary file not shown.

1
wiki

@ -1 +0,0 @@
Subproject commit d29a5a8242d9c7fa8e9b23e79d5b3d884f6d890d