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

fix-stats-cacheex #18

Merged
mardock2009 merged 1 commits from fix-stats-bug into main 2026-02-18 12:18:09 +00:00
Conversation 0 Commits 1 Files Changed 5 +708 -779
5 changed files with 708 additions and 779 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.h
View File

@ -7,7 +7,7 @@
#define WEBIF_LIVELOG 1 #define WEBIF_LIVELOG 1
#define WEBIF_JQUERY 1 #define WEBIF_JQUERY 1
#define WEBIF_WIKI 1 #define WEBIF_WIKI 1
#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__)
#define HAVE_DVBAPI 1 #define HAVE_DVBAPI 1
@ -16,7 +16,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
@ -40,8 +40,8 @@
//#define MODULE_SERIAL 1 //#define MODULE_SERIAL 1
#define MODULE_CONSTCW 1 #define MODULE_CONSTCW 1
//#define MODULE_PANDORA 1 //#define MODULE_PANDORA 1
//#define MODULE_GHTTP 1 #define MODULE_GHTTP 1
#define MODULE_SCAM 1 //#define MODULE_SCAM 1
#define MODULE_STREAMRELAY 1 #define MODULE_STREAMRELAY 1
#define WITH_CARDREADER 1 #define WITH_CARDREADER 1

6
oscam-ecm.c
View File

@ -3943,6 +3943,12 @@ int cw_vote_add(struct ecm_request_t *er, uint8_t *cw, struct s_reader *rdr)
is_local = is_localreader(rdr, er); is_local = is_localreader(rdr, er);
is_cacheex = cacheex_reader(rdr) ? 1 : 0; is_cacheex = cacheex_reader(rdr) ? 1 : 0;
} }
// Dodatkowe sprawdzenie: jeśli er->cacheex_src lub er->from_csp jest ustawione,
// to CW pochodzi z CacheEX, nawet jeśli selected_reader nie jest CacheEX readerem
if (er->cacheex_src || er->from_csp) {
is_cacheex = 1;
check_source_duplicates = 0;
}
} else if (er->cacheex_src) { } else if (er->cacheex_src) {
is_cacheex = 1; is_cacheex = 1;
if (check_client(er->cacheex_src) && er->cacheex_src->account) { if (check_client(er->cacheex_src) && er->cacheex_src->account) {

1461
webif/pages_wiki.c
View File

File diff suppressed because one or more lines are too long

12
webif/pages_wiki.h
View File

@ -7,13 +7,11 @@
#ifdef WEBIF_WIKI #ifdef WEBIF_WIKI
#define COMPRESSED_WIKI 1
struct wiki_entry { struct wiki_entry {
uint32_t param_ofs; const char *param;
uint32_t config_ofs; const char *config;
uint32_t section_ofs; const char *section;
uint32_t text_ofs; const char *text;
int8_t status; int8_t status;
}; };
@ -21,8 +19,6 @@ int32_t wiki_count(void);
const struct wiki_entry *wiki_get_entries(void); const struct wiki_entry *wiki_get_entries(void);
const char *wiki_get_help(const char *config, const char *section, const char *param); 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); 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_prepare(void);
void webif_wiki_free(void); void webif_wiki_free(void);

BIN
webif/wiki_gen
View File

Binary file not shown.